refactor: group local instance-related packages

forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java

forge-gui-desktop/src/main/java/forge/GuiDesktop.java

@@ -1,8 +1,7 @@
 package forge;
 
 import com.google.common.base.Function;
-import forge.assets.FSkinProp;
-import forge.assets.ISkinImage;
+
 import forge.download.GuiDownloadService;
 import forge.download.GuiDownloader;
 import forge.error.BugReportDialog;
@@ -14,6 +13,8 @@ import forge.gui.framework.FScreen;
 import forge.interfaces.IGuiBase;
 import forge.interfaces.IGuiGame;
 import forge.item.PaperCard;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.assets.ISkinImage;
 import forge.match.HostedMatch;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;

forge-gui-desktop/src/main/java/forge/ImageCache.java

@@ -21,14 +21,15 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
 import com.google.common.cache.LoadingCache;
 import com.mortennobel.imagescaling.ResampleOp;
-import forge.assets.FSkinProp;
+
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
 import forge.item.InventoryItem;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinIcon;
 import forge.util.ImageUtil;

forge-gui-desktop/src/main/java/forge/ImageLoader.java

@@ -3,8 +3,8 @@ package forge;
 import com.google.common.cache.CacheLoader;
 
 import forge.error.BugReporter;
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 
 import javax.imageio.ImageIO;
 

forge-gui-desktop/src/main/java/forge/control/FControl.java

@@ -44,20 +44,20 @@ import forge.GuiBase;
 import forge.ImageCache;
 import forge.LobbyPlayer;
 import forge.Singletons;
-import forge.assets.FSkinProp;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.InvalidLayoutFileException;
 import forge.gui.framework.SLayoutIO;
 import forge.gui.framework.SOverflowUtil;
 import forge.gui.framework.SResizingUtil;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.HostedMatch;
 import forge.menus.ForgeMenu;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgeConstants;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.quest.data.QuestPreferences.QPref;
 import forge.quest.io.QuestDataIO;
 import forge.screens.deckeditor.CDeckEditorUI;

forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java

@@ -21,9 +21,9 @@ import forge.Singletons;
 import forge.game.spellability.StackItemView;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.SDisplayUtil;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.settings.VSubmenuPreferences.KeyboardShortcutField;
 import forge.screens.match.CMatchUI;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java

@@ -26,9 +26,9 @@ import forge.game.player.RegisteredPlayer;
 import forge.itemmanager.DeckManager;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.ItemManagerContainer;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.quest.QuestController;
 import forge.quest.QuestEvent;
 import forge.quest.QuestEventChallenge;

forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java

@@ -13,8 +13,8 @@ import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.ItemManagerContainer;
 import forge.itemmanager.ItemManagerModel;
 import forge.itemmanager.views.ImageView;
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.toolbox.FButton;
 import forge.toolbox.FOptionPane;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java

@@ -26,8 +26,8 @@ import javax.swing.event.ChangeListener;
 
 import net.miginfocom.swing.MigLayout;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gui.SOverlayUtils;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;

forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java

@@ -38,9 +38,9 @@ import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
 
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import net.miginfocom.swing.MigLayout;
 import forge.gui.WrapLayout;
+import forge.localinstance.properties.ForgePreferences;
 
 /**
  * The class BugReportDialog. Enables showing and saving error messages that

forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java

@@ -33,8 +33,8 @@ import javax.swing.event.ListSelectionListener;
 
 import forge.game.card.CardView;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FScrollPane;

forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java

@@ -20,8 +20,8 @@ package forge.gui;
 
 import forge.game.card.CardView;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;

forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java

@@ -34,8 +34,8 @@ import javax.swing.event.ListSelectionListener;
 
 import forge.game.card.CardView;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FScrollPane;

forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java

@@ -23,8 +23,8 @@ import forge.ImageKeys;
 import forge.game.card.CardView.CardStateView;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.CardFaceSymbols;
 import forge.toolbox.imaging.FImagePanel;
 import forge.toolbox.imaging.FImagePanel.AutoSizeImageMode;

forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java

@@ -15,13 +15,13 @@ import org.apache.commons.lang3.StringUtils;
 
 import forge.Singletons;
 import forge.gui.framework.SDisplayUtil;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 import forge.net.ChatMessage;
 import forge.net.IOnlineChatInterface;
 import forge.net.IRemote;
 import forge.net.event.MessageEvent;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.online.OnlineMenu;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;

forge-gui-desktop/src/main/java/forge/gui/GuiUtils.java

@@ -32,8 +32,8 @@ import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
 
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 
 /**
  * <p>

forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java

@@ -59,10 +59,10 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.google.common.collect.ImmutableList;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.error.BugReporter;
 import forge.gui.ImportSourceAnalyzer.OpType;
-import forge.properties.ForgeConstants;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBoxWrapper;

forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java

@@ -22,8 +22,8 @@ import com.google.common.collect.Iterables;
 import forge.card.CardEdition;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.ImageUtil;
 import org.apache.commons.lang3.StringUtils;

forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java

@@ -11,7 +11,7 @@ import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;
 import forge.toolbox.FPanel;

forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java

@@ -17,10 +17,10 @@ import net.miginfocom.swing.MigLayout;
 
 import com.google.common.collect.Lists;
 
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FPanel;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;

forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java

@@ -1,9 +1,9 @@
 package forge.gui.framework;
 
 import forge.Singletons;
-import forge.assets.FSkinProp;
-import forge.properties.FileLocation;
-import forge.properties.ForgeConstants;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.FileLocation;
+import forge.localinstance.properties.ForgeConstants;
 import forge.screens.bazaar.CBazaarUI;
 import forge.screens.bazaar.VBazaarUI;
 import forge.screens.deckeditor.CDeckEditorUI;

forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java

@@ -29,8 +29,8 @@ import javax.xml.stream.events.XMLEvent;
 import forge.FThreads;
 import forge.Singletons;
 import forge.gui.SOverlayUtils;
-import forge.properties.FileLocation;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.FileLocation;
+import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FAbsolutePositioner;
 import forge.toolbox.SaveOpenDialog;
 import forge.toolbox.SaveOpenDialog.Filetypes;

forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java

@@ -1,7 +1,7 @@
 package forge.gui.framework;
 
-import forge.assets.FSkinProp;
 import forge.gui.MouseUtil;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinCursor;
 import forge.toolbox.FSkin.SkinnedLayeredPane;

forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java

@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import forge.Singletons;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.deck.DeckBase;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
@@ -42,6 +41,7 @@ import forge.itemmanager.filters.ItemFilter;
 import forge.itemmanager.views.ItemCellRenderer;
 import forge.itemmanager.views.ItemListView;
 import forge.itemmanager.views.ItemTableColumn;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.QuestWorld;
 import forge.screens.deckeditor.CDeckEditorUI;

forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java

@@ -43,7 +43,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gui.GuiUtils;
 import forge.item.InventoryItem;
 import forge.itemmanager.filters.ItemFilter;
@@ -51,6 +50,7 @@ import forge.itemmanager.views.ImageView;
 import forge.itemmanager.views.ItemListView;
 import forge.itemmanager.views.ItemTableColumn;
 import forge.itemmanager.views.ItemView;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.match.controllers.CDetailPicture;
 import forge.toolbox.ContextMenuBuilder;
 import forge.toolbox.FComboBox;

forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java

@@ -17,8 +17,8 @@
  */
 package forge.itemmanager.views;
 
-import forge.assets.FSkinProp;
 import forge.item.InventoryItem;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;

forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java

@@ -17,10 +17,10 @@
  */
 package forge.itemmanager.views;
 
-import forge.assets.FSkinProp;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
 import forge.item.InventoryItem;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java

@@ -1,7 +1,36 @@
 package forge.itemmanager.views;
 
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.Shape;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseWheelEvent;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JViewport;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
+
 import forge.ImageCache;
-import forge.assets.FSkinProp;
 import forge.card.ColorSet;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
@@ -11,30 +40,32 @@ import forge.gui.framework.ILocalRepaint;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
-import forge.itemmanager.*;
+import forge.itemmanager.ColumnDef;
+import forge.itemmanager.GroupDef;
+import forge.itemmanager.ItemManager;
+import forge.itemmanager.ItemManagerConfig;
+import forge.itemmanager.ItemManagerModel;
+import forge.itemmanager.SItemManagerUtil;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.match.controllers.CDetailPicture;
-import forge.toolbox.*;
+import forge.toolbox.CardFaceSymbols;
+import forge.toolbox.FComboBoxWrapper;
+import forge.toolbox.FLabel;
+import forge.toolbox.FMouseAdapter;
+import forge.toolbox.FScrollPane;
+import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinColor;
 import forge.toolbox.FSkin.SkinFont;
 import forge.toolbox.FSkin.SkinImage;
+import forge.toolbox.FTextField;
 import forge.toolbox.special.CardZoomer;
 import forge.util.ImageUtil;
 import forge.util.Localizer;
 import forge.view.arcane.CardPanel;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
 public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private static final int PADDING = 5;
     private static final float PILE_SPACING_Y = 0.1f;

forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java

@@ -67,7 +67,6 @@ import javax.swing.table.TableColumnModel;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.assets.FSkinProp;
 import forge.gui.MouseUtil;
 import forge.item.InventoryItem;
 import forge.itemmanager.ColumnDef;
@@ -76,6 +75,7 @@ import forge.itemmanager.ItemColumnConfig;
 import forge.itemmanager.ItemManager;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.ItemManagerModel;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FSkin;

forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java

@@ -17,10 +17,10 @@
  */
 package forge.itemmanager.views;
 
-import forge.assets.FSkinProp;
 import forge.card.CardPreferences;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.CardTranslation;

forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java

@@ -1,6 +1,6 @@
 package forge.menus;
 
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FOptionPane;
 import forge.util.BuildInfo;
 import forge.util.FileUtil;

forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java

@@ -14,14 +14,14 @@ import javax.swing.JRadioButtonMenuItem;
 import javax.swing.KeyStroke;
 
 import forge.Singletons;
-import forge.assets.FSkinProp;
 import forge.gui.GuiChoose;
 import forge.gui.MouseUtil;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.SLayoutIO;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedMenuItem;
 import forge.view.FFrame;

forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java

@@ -1,7 +1,7 @@
 package forge.menus;
 
 import forge.Singletons;
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.imaging.FImageUtil;
 

forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java

@@ -2,9 +2,9 @@ package forge.screens.bazaar;
 
 import forge.GuiBase;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.bazaar.QuestBazaarManager;
 import forge.screens.home.quest.ViewStall;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java

@@ -36,7 +36,6 @@ import com.google.common.collect.Iterables;
 import forge.ImageCache;
 import forge.StaticData;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.mana.ManaCostShard;
@@ -45,6 +44,7 @@ import forge.deck.Deck;
 import forge.deck.DeckProxy;
 import forge.deck.DeckgenUtil;
 import forge.item.PaperCard;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FComboBox;
 import forge.toolbox.FComboBoxPanel;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java

@@ -20,7 +20,6 @@ package forge.screens.deckeditor.controllers;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.deck.*;
 import forge.game.GameType;
 import forge.gui.GuiChoose;
@@ -31,9 +30,10 @@ import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
 import forge.itemmanager.ItemManager;
 import forge.itemmanager.SItemManagerUtil;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.menus.IMenuProvider;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.menus.CDeckEditorUIMenus;
 import forge.screens.deckeditor.views.VCardCatalog;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java

@@ -18,7 +18,7 @@ import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.DeckImport;
 import forge.screens.deckeditor.SEditorIO;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java

@@ -20,8 +20,8 @@ import forge.deck.generation.DeckGeneratorMonoColor;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.SEditorIO;
 import forge.screens.deckeditor.views.VDeckgen;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java

@@ -31,8 +31,8 @@ import forge.gui.framework.FScreen;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
 import forge.itemmanager.ItemManagerConfig;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.AddBasicLandsDialog;
 import forge.screens.deckeditor.SEditorIO;
 import forge.screens.match.controllers.CDetailPicture;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java

@@ -39,8 +39,8 @@ import forge.itemmanager.CardManager;
 import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.views.ItemTableColumn;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.quest.QuestController;
 import forge.quest.data.DeckConstructionRules;
 import forge.screens.deckeditor.AddBasicLandsDialog;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java

@@ -18,7 +18,6 @@
 package forge.screens.deckeditor.controllers;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.deck.DeckBase;
 import forge.game.GameType;
 import forge.gui.framework.DragCell;
@@ -28,6 +27,7 @@ import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.SpellShopManager;
 import forge.itemmanager.views.ItemTableColumn;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.QuestController;
 import forge.quest.QuestSpellShop;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java

@@ -32,8 +32,8 @@ import forge.itemmanager.CardManager;
 import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.views.ItemTableColumn;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.quest.QuestController;
 import forge.quest.QuestEventDraft;
 import forge.screens.deckeditor.SEditorIO;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java

@@ -29,8 +29,8 @@ import forge.gui.framework.FScreen;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
 import forge.itemmanager.ItemManagerConfig;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.SEditorIO;
 import forge.screens.deckeditor.views.VAllDecks;
 import forge.screens.deckeditor.views.VDeckgen;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java

@@ -33,8 +33,8 @@ import forge.itemmanager.ItemManagerConfig;
 import forge.limited.BoosterDraft;
 import forge.limited.IBoosterDraft;
 import forge.limited.WinstonDraft;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.views.VAllDecks;
 import forge.screens.deckeditor.views.VCurrentDeck;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java

@@ -2,7 +2,7 @@ package forge.screens.deckeditor.controllers;
 
 import forge.deck.Deck;
 import forge.item.PaperCard;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.util.ImageUtil;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java

@@ -1,6 +1,6 @@
 package forge.screens.deckeditor.menus;
 
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.menus.MenuUtil;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.views.VCurrentDeck;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCurrentDeck.java

@@ -5,7 +5,6 @@ import javax.swing.SwingConstants;
 
 import forge.util.Localizer;
 import net.miginfocom.swing.MigLayout;
-import forge.assets.FSkinProp;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
@@ -13,6 +12,7 @@ import forge.gui.framework.IVDoc;
 import forge.item.InventoryItem;
 import forge.itemmanager.ItemManager;
 import forge.itemmanager.ItemManagerContainer;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.deckeditor.controllers.CCurrentDeck;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;

forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java

@@ -7,11 +7,11 @@ import javax.swing.JMenu;
 import forge.Singletons;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.sanctioned.VSubmenuConstructed;
 import forge.toolbox.FAbsolutePositioner;
 

forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java

@@ -12,9 +12,9 @@ import com.google.common.collect.Iterables;
 import forge.deck.DeckProxy;
 import forge.deck.DeckType;
 import forge.deckchooser.FDeckChooser;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FList;
 
 public class CLobby {

forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java

@@ -1,8 +1,8 @@
 package forge.screens.home;
 
 import forge.gui.framework.ILocalRepaint;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinColor;
 import forge.toolbox.FSkin.SkinnedLabel;

forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java

@@ -25,16 +25,16 @@ import com.google.common.collect.ImmutableSet;
 import forge.Singletons;
 import forge.UiCommand;
 import forge.ai.AIOption;
-import forge.assets.FSkinProp;
 import forge.deck.DeckSection;
 import forge.game.GameType;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.LobbySlot;
 import forge.match.LobbySlotType;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorVariant;
 import forge.screens.home.sanctioned.AvatarSelector;

forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java

@@ -1,6 +1,6 @@
 package forge.screens.home;
 
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedButton;
 

forge-gui-desktop/src/main/java/forge/screens/home/StopButton.java

@@ -1,6 +1,6 @@
 package forge.screens.home;
 
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedButton;
 

forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java

@@ -18,10 +18,10 @@
 package forge.screens.home;
 
 import forge.Singletons;
-import forge.assets.FSkinProp;
 import forge.gui.framework.*;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
 import forge.screens.home.gauntlet.VSubmenuGauntletContests;
 import forge.screens.home.gauntlet.VSubmenuGauntletLoad;

forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java

@@ -14,13 +14,13 @@ import forge.gui.CardDetailPanel;
 import forge.interfaces.ILobbyView;
 import forge.interfaces.IPlayerChangeListener;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.GameLobby;
 import forge.match.LobbySlot;
 import forge.match.LobbySlotType;
 import forge.model.FModel;
 import forge.net.event.UpdateLobbyPlayerEvent;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.*;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.Aggregates;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java

@@ -16,7 +16,7 @@ import forge.deck.Deck;
 import forge.gauntlet.GauntletData;
 import forge.gauntlet.GauntletIO;
 import forge.gui.framework.ICDoc;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FOptionPane;
 
 /**

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java

@@ -14,9 +14,9 @@ import javax.swing.border.Border;
 
 import net.miginfocom.swing.MigLayout;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gauntlet.GauntletData;
 import forge.gauntlet.GauntletIO;
+import forge.localinstance.assets.FSkinProp;
 import forge.quest.QuestUtil;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java

@@ -1,12 +1,12 @@
 package forge.screens.home.gauntlet;
 
-import forge.assets.FSkinProp;
 import forge.deckchooser.FDeckChooser;
 import forge.game.GameType;
 import forge.gauntlet.GauntletIO;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java

@@ -2,18 +2,18 @@ package forge.screens.home.puzzle;
 
 import forge.GuiBase;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
 import forge.game.player.RegisteredPlayer;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.ICDoc;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
 import forge.match.HostedMatch;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgeConstants;
 import forge.puzzle.Puzzle;
 import forge.puzzle.PuzzleIO;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java

@@ -2,18 +2,18 @@ package forge.screens.home.puzzle;
 
 import forge.GuiBase;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
 import forge.game.player.RegisteredPlayer;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.ICDoc;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
 import forge.match.HostedMatch;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgeConstants;
 import forge.puzzle.Puzzle;
 import forge.puzzle.PuzzleIO;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/PuzzleGameMenu.java

@@ -1,7 +1,7 @@
 package forge.screens.home.puzzle;
 
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.util.Localizer;
 
 import javax.swing.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java

@@ -2,8 +2,8 @@ package forge.screens.home.quest;
 
 import forge.UiCommand;
 import forge.gui.framework.ICDoc;
+import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
 import forge.quest.QuestController;
 import forge.quest.data.QuestData;
 import forge.quest.data.QuestPreferences.QPref;

forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java

@@ -1,8 +1,8 @@
 package forge.screens.home.quest;
 
-import forge.assets.FSkinProp;
 import forge.game.GameFormat;
 import forge.gui.SOverlayUtils;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.*;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java

@@ -1,9 +1,9 @@
 package forge.screens.home.quest;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.card.MagicColor;
 import forge.gui.SOverlayUtils;
+import forge.localinstance.assets.FSkinProp;
 import forge.quest.StartingPoolPreferences.PoolType;
 import forge.toolbox.*;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java

@@ -1,9 +1,9 @@
 package forge.screens.home.quest;
 
-import forge.assets.FSkinProp;
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.gui.SOverlayUtils;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.*;
 import forge.util.TextUtil;

forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java

@@ -1,7 +1,7 @@
 package forge.screens.home.quest;
 
 import forge.ImageCache;
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.quest.QuestEvent;
 import forge.quest.QuestUtil;
 import forge.toolbox.FRadioButton;

forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java

@@ -1,9 +1,9 @@
 package forge.screens.home.quest;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
 import forge.quest.QuestUtil;
 import forge.quest.data.QuestData;
 import forge.toolbox.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java

@@ -1,9 +1,9 @@
 package forge.screens.home.quest;
 
-import forge.assets.FSkinProp;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
+import forge.localinstance.assets.FSkinProp;
 import forge.quest.IVQuestStats;
 import forge.screens.home.*;
 import forge.toolbox.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java

@@ -1,10 +1,10 @@
 package forge.screens.home.quest;
 
-import forge.assets.FSkinProp;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.interfaces.IButton;
+import forge.localinstance.assets.FSkinProp;
 import forge.quest.IVQuestStats;
 import forge.screens.home.*;
 import forge.toolbox.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java

@@ -2,7 +2,6 @@ package forge.screens.home.quest;
 
 import forge.GuiBase;
 import forge.Singletons;
-import forge.assets.FSkinProp;
 import forge.game.GameType;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
@@ -10,6 +9,7 @@ import forge.gui.framework.EDocID;
 import forge.gui.framework.FScreen;
 import forge.itemmanager.DeckManager;
 import forge.limited.BoosterDraft;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.IQuestTournamentView;
 import forge.quest.QuestEventDraft;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestLoadData.java

@@ -3,7 +3,7 @@ package forge.screens.home.quest;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java

@@ -1,8 +1,8 @@
 package forge.screens.home.quest;
-import forge.assets.FSkinProp;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestPreferences.QPref;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java

@@ -7,9 +7,9 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.item.PreconDeck;
+import forge.localinstance.properties.ForgeConstants;
 import forge.model.CardCollections;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
 import forge.quest.QuestController;
 import forge.quest.QuestWorld;
 import forge.quest.StartingPoolType;

forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java

@@ -2,7 +2,7 @@ package forge.screens.home.quest;
 
 import forge.GuiBase;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.quest.QuestUtil;
 import forge.quest.bazaar.IQuestBazaarItem;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java

@@ -15,10 +15,10 @@ import forge.gui.framework.ICDoc;
 import forge.itemmanager.ItemManagerConfig;
 import forge.limited.BoosterDraft;
 import forge.limited.LimitedPoolType;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.HostedMatch;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorDraftingProcess;
 import forge.screens.deckeditor.views.VProbabilities;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java

@@ -22,10 +22,10 @@ import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.itemmanager.ItemManagerConfig;
 import forge.limited.SealedCardPoolGenerator;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.HostedMatch;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.ACEditorBase;
 import forge.screens.deckeditor.controllers.CEditorLimited;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java

@@ -23,10 +23,10 @@ import forge.gui.framework.ICDoc;
 import forge.itemmanager.ItemManagerConfig;
 import forge.limited.LimitedPoolType;
 import forge.limited.WinstonDraft;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.HostedMatch;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorWinstonProcess;
 import forge.toolbox.FOptionPane;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/ConstructedGameMenu.java

@@ -1,9 +1,9 @@
 package forge.screens.home.sanctioned;
 
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.util.Localizer;
 
 import javax.swing.*;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java

@@ -14,7 +14,6 @@ import javax.swing.text.StyledDocument;
 import forge.toolbox.*;
 import forge.util.Localizer;
 import net.miginfocom.swing.MigLayout;
-import forge.assets.FSkinProp;
 import forge.game.GameType;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.DragCell;
@@ -22,6 +21,7 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.itemmanager.DeckManager;
 import forge.itemmanager.ItemManagerContainer;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java

@@ -7,12 +7,12 @@ import forge.download.AutoUpdater;
 import forge.game.GameLogEntryType;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
+import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 import forge.net.server.FServerManager;
 import forge.player.GamePlayerUtil;
-import forge.properties.ForgeConstants;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorTokenViewer;
 import forge.sound.SoundSystem;

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java

@@ -19,7 +19,7 @@
 package forge.screens.home.settings;
 
 import forge.gui.framework.ICDoc;
-import forge.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
 
 /**

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java

@@ -13,14 +13,14 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 
-import forge.achievement.Achievement;
-import forge.achievement.AchievementCollection;
-import forge.assets.FSkinProp;
 import forge.game.card.CardView;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.item.IPaperCard;
+import forge.localinstance.achievements.Achievement;
+import forge.localinstance.achievements.AchievementCollection;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java

@@ -5,8 +5,8 @@ import forge.gui.WrapLayout;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java

@@ -3,7 +3,6 @@ package forge.screens.home.settings;
 import forge.ImageKeys;
 import forge.StaticData;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.card.CardDb;
 import forge.card.CardEdition;
 import forge.card.CardEdition.CardInSet;
@@ -13,7 +12,8 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.item.PaperCard;
 import forge.item.PaperToken;
-import forge.properties.ForgeConstants;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java

@@ -7,8 +7,8 @@ import forge.game.GameLogEntryType;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -51,7 +51,6 @@ import forge.ImageCache;
 import forge.LobbyPlayer;
 import forge.Singletons;
 import forge.StaticData;
-import forge.assets.FSkinProp;
 import forge.card.CardStateName;
 import forge.control.KeyboardShortcuts;
 import forge.deck.CardPool;
@@ -94,14 +93,15 @@ import forge.gui.framework.SLayoutIO;
 import forge.gui.framework.VEmptyDoc;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.match.AbstractGuiGame;
 import forge.menus.IMenuProvider;
 import forge.model.FModel;
 import forge.player.PlayerZoneUpdate;
 import forge.player.PlayerZoneUpdates;
-import forge.properties.ForgeConstants;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.controllers.CAntes;
 import forge.screens.match.controllers.CCombat;
 import forge.screens.match.controllers.CDetailPicture;

forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java

@@ -25,9 +25,9 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
-import forge.assets.FSkinProp;
 import forge.game.GameView;
 import forge.gauntlet.GauntletWinLoseController;
+import forge.localinstance.assets.FSkinProp;
 import forge.util.Localizer;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;

forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java

@@ -17,9 +17,10 @@
 package forge.screens.match;
 
 import com.google.common.collect.ImmutableList;
-import forge.assets.FSkinProp;
+
 import forge.game.GameView;
 import forge.game.player.PlayerView;
+import forge.localinstance.assets.FSkinProp;
 import forge.match.NextGameDecision;
 import forge.model.FModel;
 import forge.quest.QuestController;

forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java

@@ -30,8 +30,8 @@ import forge.game.card.CardView;
 import forge.gui.CardDetailPanel;
 import forge.gui.CardPicturePanel;
 import forge.item.PaperCard;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FList;
 import forge.toolbox.FPanel;
 import forge.toolbox.FScrollPane;

forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java

@@ -43,8 +43,8 @@ import forge.game.card.CardView;
 import forge.game.combat.CombatView;
 import forge.game.player.PlayerView;
 import forge.game.spellability.StackItemView;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.controllers.CDock.ArcState;
 import forge.screens.match.views.VField;
 import forge.screens.match.views.VStack.StackInstanceTextArea;

forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java

@@ -12,7 +12,7 @@ import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
 import forge.gui.framework.SRearrangingUtil;
 import forge.gui.framework.VEmptyDoc;
-import forge.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences;
 import forge.screens.match.views.VDev;
 import forge.screens.match.views.VField;
 import forge.screens.match.views.VHand;

forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java

@@ -18,15 +18,15 @@ import net.miginfocom.swing.MigLayout;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.game.GameLogEntry;
 import forge.game.GameLogEntryType;
 import forge.game.GameView;
 import forge.gui.SOverlayUtils;
 import forge.interfaces.IWinLoseView;
 import forge.item.PaperCard;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java

@@ -24,12 +24,12 @@ import com.google.common.primitives.Ints;
 
 import forge.Singletons;
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SLayoutIO;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.views.VDock;
 import forge.toolbox.FSkin;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java

@@ -37,8 +37,8 @@ import forge.game.GameView;
 import forge.game.card.CardView;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SDisplayUtil;
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.views.VPrompt;
 import forge.toolbox.FSkin;

forge-gui-desktop/src/main/java/forge/screens/match/menus/CMatchUIMenus.java

@@ -6,7 +6,7 @@ import javax.swing.JMenu;
 
 import com.google.common.collect.Lists;
 
-import forge.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences;
 import forge.screens.match.CMatchUI;
 
 /**

forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java

@@ -1,9 +1,9 @@
 package forge.screens.match.menus;
 
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.CMatchUI;
 import forge.util.Localizer;
 

forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java

@@ -9,11 +9,11 @@ import javax.swing.ButtonGroup;
 import javax.swing.JMenu;
 import javax.swing.JPopupMenu;
 
-import forge.assets.FSkinProp;
+import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.VAutoYields;
 import forge.screens.match.controllers.CDock.ArcState;

forge-gui-desktop/src/main/java/forge/screens/match/views/VDetail.java

@@ -17,13 +17,13 @@
  */
 package forge.screens.match.views;
 
-import forge.assets.FSkinProp;
 import forge.game.GameView;
 import forge.gui.CardDetailPanel;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.match.controllers.CDetail;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedLabel;

forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java

@@ -18,8 +18,8 @@
 package forge.screens.match.views;
 
 import forge.UiCommand;
-import forge.assets.FSkinProp;
 import forge.gui.framework.*;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.match.controllers.CDock;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;

forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java

@@ -28,7 +28,6 @@ import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
 
 import net.miginfocom.swing.MigLayout;
-import forge.assets.FSkinProp;
 import forge.game.card.CounterEnumType;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
@@ -36,6 +35,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
+import forge.localinstance.assets.FSkinProp;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.controllers.CField;
 import forge.toolbox.FLabel;

forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java

@@ -33,8 +33,8 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
+import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import forge.properties.ForgePreferences.FPref;
 import forge.screens.match.GameLogPanel;
 import forge.screens.match.controllers.CLog;
 import forge.toolbox.FSkin;