Merge branch 'rename-assets-to-skin' into 'master'

refactor: rename 'assets' package to 'skin' See merge request core-developers/forge!4223
2025-11-18 11:48:02 +00:00 · 2021-03-20 17:58:15 +00:00
parent 1dc21055f7 993fb3b518
commit 5d8bbf8687
113 changed files with 127 additions and 127 deletions
--- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java
+++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java
@@ -34,8 +34,8 @@ import forge.gui.framework.FScreen;
 import forge.gui.interfaces.IGuiBase;
 import forge.gui.interfaces.IGuiGame;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorQuestCardShop;
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -42,10 +42,10 @@ import forge.game.card.CardView;
 import forge.game.player.PlayerView;
 import forge.gui.FThreads;
 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.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinIcon;
--- a/forge-gui-desktop/src/main/java/forge/control/FControl.java
+++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java
@@ -54,10 +54,10 @@ import forge.gui.framework.SLayoutIO;
 import forge.gui.framework.SOverflowUtil;
 import forge.gui.framework.SResizingUtil;
 import forge.gui.util.SOptionPane;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.ForgeMenu;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
--- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
+++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
@@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener;
 import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.download.GuiDownloadService;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;
--- a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
@@ -57,8 +57,8 @@ import com.google.common.collect.ImmutableList;

 import forge.gui.ImportSourceAnalyzer.OpType;
 import forge.gui.error.BugReporter;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBoxWrapper;
--- a/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java
@@ -10,7 +10,7 @@ import java.awt.event.ActionListener;
 import javax.swing.JPanel;

 import forge.Singletons;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;
 import forge.toolbox.FPanel;
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
@@ -15,9 +15,9 @@ import javax.swing.SwingConstants;

 import com.google.common.collect.Lists;

-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FPanel;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
@@ -3,9 +3,9 @@ package forge.gui.framework;
 import java.io.File;

 import forge.Singletons;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.FileLocation;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.bazaar.CBazaarUI;
 import forge.screens.bazaar.VBazaarUI;
 import forge.screens.deckeditor.CDeckEditorUI;
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
@@ -12,7 +12,7 @@ import java.util.List;
 import javax.swing.JPanel;

 import forge.gui.MouseUtil;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinCursor;
 import forge.toolbox.FSkin.SkinnedLayeredPane;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
@@ -41,7 +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.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.SEditorIO;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
@@ -53,7 +53,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.localinstance.skin.FSkinProp;
 import forge.screens.match.controllers.CDetailPicture;
 import forge.toolbox.ContextMenuBuilder;
 import forge.toolbox.FComboBox;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java
@@ -24,7 +24,7 @@ import java.awt.event.MouseEvent;
 import javax.swing.SwingConstants;

 import forge.item.InventoryItem;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java
@@ -26,7 +26,7 @@ import javax.swing.JTable;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
 import forge.item.InventoryItem;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.Localizer;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
@@ -46,8 +46,8 @@ 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.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.match.controllers.CDetailPicture;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
@@ -75,7 +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.localinstance.skin.FSkinProp;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java
@@ -26,7 +26,7 @@ import javax.swing.JTable;
 import forge.gui.card.CardPreferences;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.CardTranslation;
--- a/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java
+++ b/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java
@@ -18,9 +18,9 @@ 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.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedMenuItem;
--- a/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java
+++ b/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java
@@ -7,7 +7,7 @@ import javax.swing.JMenuItem;
 import javax.swing.KeyStroke;

 import forge.Singletons;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.imaging.FImageUtil;

--- a/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java
@@ -10,7 +10,7 @@ import forge.gui.GuiBase;
 import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.home.quest.ViewStall;
 import forge.toolbox.FLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
@@ -46,7 +46,7 @@ import forge.deck.DeckProxy;
 import forge.deck.DeckgenUtil;
 import forge.gui.UiCommand;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FComboBox;
 import forge.toolbox.FComboBoxPanel;
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
@@ -50,8 +50,8 @@ 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.localinstance.skin.FSkinProp;
 import forge.menus.IMenuProvider;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
@@ -36,7 +36,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.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.deckeditor.views.VAllDecks;
 import forge.screens.deckeditor.views.VCardCatalog;
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java
@@ -7,7 +7,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.JMenu;
 import javax.swing.JSeparator;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.MenuUtil;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.views.VCurrentDeck;
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCurrentDeck.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCurrentDeck.java
@@ -10,7 +10,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.localinstance.skin.FSkinProp;
 import forge.screens.deckeditor.controllers.CCurrentDeck;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
@@ -29,9 +29,9 @@ import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorVariant;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java
@@ -8,7 +8,7 @@ import java.awt.event.FocusListener;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedButton;

--- a/forge-gui-desktop/src/main/java/forge/screens/home/StopButton.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/StopButton.java
@@ -8,7 +8,7 @@ import java.awt.event.FocusListener;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedButton;

--- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
@@ -38,8 +38,8 @@ import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.framework.IVTopLevelUI;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
 import forge.screens.home.gauntlet.VSubmenuGauntletContests;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
@@ -16,7 +16,7 @@ import forge.gamemodes.gauntlet.GauntletData;
 import forge.gamemodes.gauntlet.GauntletIO;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gui.UiCommand;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FOptionPane;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
@@ -14,7 +14,7 @@ import forge.gamemodes.gauntlet.GauntletIO;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
@@ -22,8 +22,8 @@ import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.gui.util.SOptionPane;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java
@@ -22,8 +22,8 @@ import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.gui.util.SOptionPane;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
@@ -11,7 +11,7 @@ import javax.swing.SwingUtilities;

 import forge.game.GameFormat;
 import forge.gui.SOverlayUtils;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java
@@ -12,7 +12,7 @@ import forge.card.MagicColor;
 import forge.gamemodes.quest.StartingPoolPreferences.PoolType;
 import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java
@@ -19,7 +19,7 @@ import javax.swing.SwingUtilities;
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.gui.SOverlayUtils;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java
@@ -15,7 +15,7 @@ import javax.swing.event.ChangeListener;
 import forge.ImageCache;
 import forge.gamemodes.quest.QuestEvent;
 import forge.gamemodes.quest.QuestUtil;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FRadioButton;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinColor;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
@@ -18,8 +18,8 @@ import javax.swing.border.Border;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.data.QuestData;
 import forge.gui.UiCommand;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
@@ -12,7 +12,7 @@ import forge.gamemodes.quest.IVQuestStats;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.LblHeader;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java
@@ -13,7 +13,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.interfaces.IButton;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.LblHeader;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
@@ -32,7 +32,7 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.FScreen;
 import forge.itemmanager.DeckManager;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.deckeditor.controllers.CEditorQuestDraftingProcess;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
@@ -16,7 +16,7 @@ import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java
@@ -9,7 +9,7 @@ import forge.gamemodes.quest.bazaar.IQuestBazaarItem;
 import forge.gamemodes.quest.data.QuestAssets;
 import forge.gui.GuiBase;
 import forge.gui.UiCommand;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.bazaar.VBazaarUI;
 import forge.toolbox.FHtmlViewer;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
@@ -22,7 +22,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.localinstance.skin.FSkinProp;
 import forge.screens.deckeditor.CDeckEditorUI;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
@@ -24,7 +24,7 @@ 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.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -30,8 +30,8 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.item.PaperCard;
 import forge.item.PaperToken;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -96,10 +96,10 @@ import forge.gui.framework.VEmptyDoc;
 import forge.gui.util.SOptionPane;
 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.localinstance.skin.FSkinProp;
 import forge.menus.IMenuProvider;
 import forge.model.FModel;
 import forge.player.PlayerZoneUpdate;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java
@@ -26,7 +26,7 @@ import javax.swing.SwingConstants;

 import forge.game.GameView;
 import forge.gamemodes.gauntlet.GauntletWinLoseController;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedPanel;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java
@@ -26,7 +26,7 @@ import forge.game.player.PlayerView;
 import forge.gamemodes.match.NextGameDecision;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestDraftUtils;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.home.quest.CSubmenuQuestDraft;
 import forge.screens.home.quest.VSubmenuQuestDraft;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java
@@ -21,8 +21,8 @@ import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.interfaces.IWinLoseView;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java
@@ -27,8 +27,8 @@ import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SLayoutIO;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.views.VDock;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java
@@ -10,9 +10,9 @@ import javax.swing.JPopupMenu;

 import com.google.common.primitives.Ints;

-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
 import forge.screens.match.CMatchUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDetail.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDetail.java
@@ -25,7 +25,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.localinstance.skin.FSkinProp;
 import forge.screens.match.controllers.CDetail;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java
@@ -31,7 +31,7 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.framework.IVDoc;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.match.controllers.CDock;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java
@@ -34,7 +34,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.localinstance.skin.FSkinProp;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.controllers.CField;
 import forge.toolbox.FLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPicture.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPicture.java
@@ -24,7 +24,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.localinstance.skin.FSkinProp;
 import forge.screens.match.controllers.CPicture;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/WorkshopFileMenu.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/WorkshopFileMenu.java
@@ -7,7 +7,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.menus.MenuUtil;
 import forge.screens.workshop.controllers.CCardScript;
 import forge.toolbox.FSkin.SkinnedMenuItem;
--- a/forge-gui-desktop/src/main/java/forge/screens/workshop/views/VCardDesigner.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/workshop/views/VCardDesigner.java
@@ -9,7 +9,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.localinstance.skin.FSkinProp;
 import forge.screens.workshop.controllers.CCardDesigner;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
@@ -10,7 +10,7 @@ import com.esotericsoftware.minlog.Log;
 import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin.SkinImage;

 /**
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java
@@ -38,7 +38,7 @@ import javax.swing.BorderFactory;
 import forge.gui.UiCommand;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.interfaces.IButton;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin.Colors;
 import forge.toolbox.FSkin.SkinImage;
 import forge.toolbox.FSkin.SkinnedButton;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java
@@ -31,7 +31,7 @@ import javax.swing.event.AncestorListener;
 import forge.gui.UiCommand;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.interfaces.IButton;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin.Colors;
 import forge.toolbox.FSkin.SkinColor;
 import forge.toolbox.FSkin.SkinImage;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
@@ -17,7 +17,7 @@ import javax.swing.text.StyleConstants;

 import com.google.common.collect.ImmutableList;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.Localizer;
 import forge.view.FDialog;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
@@ -105,11 +105,11 @@ import forge.Singletons;
 import forge.gui.FThreads;
 import forge.gui.GuiUtils;
 import forge.gui.framework.ILocalRepaint;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;
 import forge.util.Localizer;
 import forge.util.OperatingSystem;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java
@@ -37,7 +37,7 @@ import forge.game.card.CardView.CardStateView;
 import forge.game.keyword.Keyword;
 import forge.gui.SOverlayUtils;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FOverlay;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedLabel;
--- a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
@@ -17,7 +17,7 @@ import com.google.common.base.Function;

 import forge.card.mana.ManaAtom;
 import forge.game.player.PlayerView;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/view/FDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/view/FDialog.java
@@ -36,7 +36,7 @@ import javax.swing.JRootPane;
 import javax.swing.SwingUtilities;

 import forge.Singletons;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FPanel;
 import forge.toolbox.FSkin;
--- a/forge-gui-desktop/src/main/java/forge/view/FView.java
+++ b/forge-gui-desktop/src/main/java/forge/view/FView.java
@@ -48,9 +48,9 @@ import forge.gui.framework.ICDoc;
 import forge.gui.framework.IVDoc;
 import forge.gui.framework.SLayoutConstants;
 import forge.gui.framework.SLayoutIO;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.bazaar.VBazaarUI;
 import forge.screens.deckeditor.VDeckEditorUI;
--- a/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java
+++ b/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java
@@ -35,9 +35,9 @@ import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;

-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FProgressBar;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinIcon;
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
@@ -30,8 +30,8 @@ import forge.game.card.CardView;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
 import forge.gui.FThreads;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.screens.match.CMatchUI;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FScrollPane;