From 993fb3b518580d85e6a944dce6831d059b8f883b Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Fri, 19 Mar 2021 14:26:40 -0300 Subject: [PATCH] refactor: rename 'assets' package to 'skin' --- forge-gui-desktop/src/main/java/forge/GuiDesktop.java | 4 ++-- forge-gui-desktop/src/main/java/forge/ImageCache.java | 2 +- forge-gui-desktop/src/main/java/forge/control/FControl.java | 2 +- .../src/main/java/forge/download/GuiDownloader.java | 2 +- forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java | 2 +- forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java | 2 +- .../src/main/java/forge/gui/framework/DragCell.java | 2 +- .../src/main/java/forge/gui/framework/FScreen.java | 2 +- .../src/main/java/forge/gui/framework/SRearrangingUtil.java | 2 +- .../src/main/java/forge/itemmanager/DeckManager.java | 2 +- .../src/main/java/forge/itemmanager/ItemManager.java | 2 +- .../java/forge/itemmanager/views/DeckQuantityRenderer.java | 2 +- .../main/java/forge/itemmanager/views/DeckStarRenderer.java | 2 +- .../src/main/java/forge/itemmanager/views/ImageView.java | 2 +- .../src/main/java/forge/itemmanager/views/ItemListView.java | 2 +- .../src/main/java/forge/itemmanager/views/StarRenderer.java | 2 +- forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java | 2 +- forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java | 2 +- .../src/main/java/forge/screens/bazaar/VBazaarUI.java | 2 +- .../java/forge/screens/deckeditor/AddBasicLandsDialog.java | 2 +- .../forge/screens/deckeditor/controllers/ACEditorBase.java | 2 +- .../screens/deckeditor/controllers/CEditorQuestCardShop.java | 2 +- .../java/forge/screens/deckeditor/menus/DeckFileMenu.java | 2 +- .../java/forge/screens/deckeditor/views/VCurrentDeck.java | 2 +- .../src/main/java/forge/screens/home/PlayerPanel.java | 2 +- .../src/main/java/forge/screens/home/StartButton.java | 2 +- .../src/main/java/forge/screens/home/StopButton.java | 2 +- .../src/main/java/forge/screens/home/VHomeUI.java | 2 +- .../forge/screens/home/gauntlet/QuickGauntletLister.java | 2 +- .../forge/screens/home/gauntlet/VSubmenuGauntletBuild.java | 2 +- .../java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java | 2 +- .../java/forge/screens/home/puzzle/CSubmenuTutorial.java | 2 +- .../java/forge/screens/home/quest/DialogChooseFormats.java | 2 +- .../screens/home/quest/DialogChoosePoolDistribution.java | 2 +- .../main/java/forge/screens/home/quest/DialogChooseSets.java | 2 +- .../src/main/java/forge/screens/home/quest/PnlEvent.java | 2 +- .../main/java/forge/screens/home/quest/QuestFileLister.java | 2 +- .../java/forge/screens/home/quest/VSubmenuChallenges.java | 2 +- .../main/java/forge/screens/home/quest/VSubmenuDuels.java | 2 +- .../java/forge/screens/home/quest/VSubmenuQuestDraft.java | 2 +- .../java/forge/screens/home/quest/VSubmenuQuestPrefs.java | 2 +- .../src/main/java/forge/screens/home/quest/ViewItem.java | 2 +- .../java/forge/screens/home/sanctioned/VSubmenuSealed.java | 2 +- .../forge/screens/home/settings/VSubmenuAchievements.java | 2 +- .../forge/screens/home/settings/VSubmenuDownloaders.java | 2 +- .../src/main/java/forge/screens/match/CMatchUI.java | 2 +- .../src/main/java/forge/screens/match/GauntletWinLose.java | 2 +- .../src/main/java/forge/screens/match/QuestDraftWinLose.java | 2 +- .../src/main/java/forge/screens/match/ViewWinLose.java | 2 +- .../src/main/java/forge/screens/match/controllers/CDock.java | 2 +- .../src/main/java/forge/screens/match/menus/GameMenu.java | 2 +- .../src/main/java/forge/screens/match/views/VDetail.java | 2 +- .../src/main/java/forge/screens/match/views/VDock.java | 2 +- .../src/main/java/forge/screens/match/views/VField.java | 2 +- .../src/main/java/forge/screens/match/views/VPicture.java | 2 +- .../java/forge/screens/workshop/menus/WorkshopFileMenu.java | 2 +- .../java/forge/screens/workshop/views/VCardDesigner.java | 2 +- .../src/main/java/forge/toolbox/CardFaceSymbols.java | 2 +- forge-gui-desktop/src/main/java/forge/toolbox/FButton.java | 2 +- forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java | 2 +- .../src/main/java/forge/toolbox/FOptionPane.java | 2 +- forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java | 4 ++-- .../src/main/java/forge/toolbox/special/CardZoomer.java | 2 +- .../main/java/forge/toolbox/special/PlayerDetailsPanel.java | 2 +- forge-gui-desktop/src/main/java/forge/view/FDialog.java | 2 +- forge-gui-desktop/src/main/java/forge/view/FView.java | 2 +- forge-gui-desktop/src/main/java/forge/view/SplashFrame.java | 2 +- .../src/main/java/forge/view/arcane/FloatingZone.java | 2 +- forge-gui-mobile/src/forge/GuiMobile.java | 4 ++-- forge-gui-mobile/src/forge/assets/FImage.java | 2 +- forge-gui-mobile/src/forge/assets/FSkin.java | 2 +- forge-gui-mobile/src/forge/assets/FSkinColor.java | 2 +- forge-gui-mobile/src/forge/assets/FSkinImage.java | 2 +- forge-gui-mobile/src/forge/menu/FMenuItem.java | 2 +- .../src/forge/screens/match/MatchController.java | 2 +- .../src/forge/screens/match/winlose/GauntletWinLose.java | 2 +- .../src/forge/screens/match/winlose/ViewWinLose.java | 2 +- .../src/forge/screens/online/OnlineLobbyScreen.java | 2 +- .../forge/screens/planarconquest/ConquestAEtherScreen.java | 2 +- forge-gui-mobile/src/forge/toolbox/FButton.java | 2 +- forge-gui-mobile/src/forge/toolbox/FChoiceList.java | 4 ++-- forge-gui-mobile/src/forge/toolbox/FLabel.java | 2 +- forge-gui-mobile/src/forge/toolbox/FOptionPane.java | 2 +- .../forge/gamemodes/gauntlet/GauntletWinLoseController.java | 2 +- .../forge/gamemodes/limited/SealedCardPoolGenerator.java | 2 +- .../src/main/java/forge/gamemodes/match/AbstractGuiGame.java | 2 +- .../main/java/forge/gamemodes/net/GameProtocolHandler.java | 2 +- .../src/main/java/forge/gamemodes/net/ProtocolMethod.java | 2 +- .../src/main/java/forge/gamemodes/net/server/NetGuiGame.java | 2 +- .../java/forge/gamemodes/planarconquest/ConquestData.java | 2 +- .../java/forge/gamemodes/planarconquest/ConquestRegion.java | 2 +- .../java/forge/gamemodes/planarconquest/ConquestUtil.java | 4 ++-- .../forge/gamemodes/quest/QuestTournamentController.java | 2 +- forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java | 2 +- .../java/forge/gamemodes/quest/QuestWinLoseController.java | 2 +- .../java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java | 2 +- .../java/forge/gamemodes/quest/bazaar/QuestItemBasic.java | 4 ++-- .../forge/gamemodes/quest/bazaar/QuestPetController.java | 4 ++-- .../forge/gamemodes/quest/bazaar/QuestStallDefinition.java | 2 +- .../gamemodes/tournament/TournamentWinLoseController.java | 2 +- forge-gui/src/main/java/forge/gui/interfaces/IButton.java | 2 +- forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java | 4 ++-- forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java | 2 +- .../src/main/java/forge/gui/interfaces/IWinLoseView.java | 2 +- forge-gui/src/main/java/forge/gui/util/SOptionPane.java | 2 +- .../src/main/java/forge/itemmanager/SItemManagerUtil.java | 4 ++-- .../java/forge/localinstance/achievements/Achievement.java | 4 ++-- .../localinstance/achievements/PlaneswalkerAchievements.java | 4 ++-- .../src/main/java/forge/localinstance/assets/ISkinImage.java | 5 ----- .../java/forge/localinstance/{assets => skin}/FSkinProp.java | 2 +- .../forge/localinstance/{assets => skin}/IHasSkinProp.java | 2 +- .../src/main/java/forge/localinstance/skin/ISkinImage.java | 5 +++++ .../src/main/java/forge/player/PlayerControllerHuman.java | 2 +- 113 files changed, 127 insertions(+), 127 deletions(-) delete mode 100644 forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java rename forge-gui/src/main/java/forge/localinstance/{assets => skin}/FSkinProp.java (99%) rename forge-gui/src/main/java/forge/localinstance/{assets => skin}/IHasSkinProp.java (64%) create mode 100644 forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index ef9b0aaa3a6..5edf6c2a459 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java index 26ff9077e3c..a1587ba2445 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java index fb28631f2cf..169bd7c873e 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java index 72fe758b591..44a49d65f92 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java index 2f60241ee4c..010e328d217 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java b/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java index 4a36912ce34..740ad894453 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java b/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java index d86b2c10e26..ac301ff5451 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java b/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java index 72be76cfcc7..059ce836a4a 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java index 7b4d0b4602c..02f634a7447 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java index 45b2aa2cf36..6a73bfe668c 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java index a253d1cf26b..30febe0f9d0 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java index deee1ee95b2..eefd0a99f92 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java index 4f3223ad367..7bc0ca56c61 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index a51a1a514dd..c47e40893ad 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java index d14f8f48bfa..5b42ce2f655 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java index cf512b7df57..9abd4442f4c 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java b/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java index 154bfdd4188..335a692c5f2 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java b/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java index beff2c6d7a0..9620593d2ad 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java b/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java index d712036ab1c..1c385371497 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java index 3ef2c112db9..8e570cb477e 100644 --- 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; diff --git 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 index 61eb3e05219..0f396bfc986 100644 --- 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; diff --git 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 index fec30f2d99a..0b0864b07c9 100644 --- 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; diff --git 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 index 7e75367e528..3cf13c654eb 100644 --- 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; diff --git 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 index ff80fa5902f..12cd0d0ccda 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java index 5574dff3db1..9a1e6d69f4e 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java b/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java index 27992eac6ba..d9941b8aa9e 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/StopButton.java b/forge-gui-desktop/src/main/java/forge/screens/home/StopButton.java index 7b10502edc2..9d88e9f54dc 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java index 7d0f9cc627b..27a15dc17ea 100644 --- 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; diff --git 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 index 881bd9c6822..1a3157d241f 100644 --- 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; diff --git 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 index 9268ed48fd9..9f549957f5f 100644 --- 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; diff --git 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 index 6f945974450..3ff22f4f0ef 100644 --- 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; diff --git 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 index 08e6a3f2a51..02871bda05e 100644 --- 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; diff --git 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 index 6359b7280a6..c271308c108 100644 --- 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; diff --git 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 index 188a57ca27f..a4e0ecd8f51 100644 --- 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; diff --git 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 index 3234befa94c..b4dd359ade4 100644 --- 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; diff --git 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 index c07e3d12992..d02592e6e44 100644 --- 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; diff --git 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 index 8e694648b8a..2f1c0135e8c 100644 --- 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; diff --git 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 index e532c96bb24..2f9451a8fcd 100644 --- 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; diff --git 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 index 86b946a47b1..14d49efe75a 100644 --- 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; diff --git 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 index acf332f8831..efc2989442d 100644 --- 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; diff --git 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 index 8a5026e9fcf..ce2c2116df8 100644 --- 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; diff --git 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 index 30f8603e9e1..75dcdf4a619 100644 --- 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; diff --git 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 index da46149a74b..62008b68352 100644 --- 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; diff --git 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 index 94cc7628a72..ef98c956e91 100644 --- 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; diff --git 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 index 50165f1d909..a91a687444a 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 8373bd31423..68217c46230 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -95,10 +95,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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java index 7775bc94cd9..b1c6ab4f72d 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java index 60fcee4f5ec..c3715f9ce0f 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java index 685d796c2a6..ac0575a48e8 100644 --- 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; diff --git 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 index 8d13beb683d..aa7f23dab6b 100644 --- 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; diff --git 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 index 465bcd25a54..a723add6197 100644 --- 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; diff --git 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 index 6e374d700fc..1367e0f75ce 100644 --- 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; diff --git 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 index b0463e0c27d..9714141b927 100644 --- 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; diff --git 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 index 295c676dd32..4df43e21a2c 100644 --- 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; diff --git 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 index bce9091a168..e1a3461a484 100644 --- 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; diff --git 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 index bbc05274cdd..d6a2c9bf7e9 100644 --- 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; diff --git 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 index 6caf26f6118..1170c2b418a 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java index d10e6952f85..68ff467db99 100644 --- 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; /** diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java b/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java index 70cceedc7a4..b65eed73eaa 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java index 058853d1fd7..413d3fde747 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java b/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java index 7e6084a67c3..74d69492491 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index 8974e0ab77a..19ed7285010 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java index dbb08ef3abe..44e5c9f06ca 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java index 74695074204..9a847227d2e 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/view/FDialog.java b/forge-gui-desktop/src/main/java/forge/view/FDialog.java index d866626b87f..cdf9e665e1a 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java index 69ddb56bae6..fbe108c5871 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java b/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java index 44e8caef226..596792b90c6 100644 --- 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; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java index c706649eeed..235c96a12fe 100644 --- 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; diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index 265ee67b3ec..d028c2bb2d1 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/forge-gui-mobile/src/forge/GuiMobile.java @@ -24,9 +24,9 @@ import forge.gui.download.GuiDownloadService; 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.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.ISkinImage; import forge.screens.LoadingOverlay; import forge.screens.match.MatchController; import forge.screens.quest.QuestMenu; diff --git a/forge-gui-mobile/src/forge/assets/FImage.java b/forge-gui-mobile/src/forge/assets/FImage.java index ae35300d130..cd89d4ef00d 100644 --- a/forge-gui-mobile/src/forge/assets/FImage.java +++ b/forge-gui-mobile/src/forge/assets/FImage.java @@ -1,7 +1,7 @@ package forge.assets; import forge.Graphics; -import forge.localinstance.assets.ISkinImage; +import forge.localinstance.skin.ISkinImage; public interface FImage extends ISkinImage { float getWidth(); diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 9e743116802..593c5a40a06 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -15,10 +15,10 @@ import forge.Forge; import forge.assets.FSkinImage.SourceFile; import forge.card.CardFaceSymbols; import forge.gui.FThreads; -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.screens.LoadingOverlay; import forge.screens.SplashScreen; diff --git a/forge-gui-mobile/src/forge/assets/FSkinColor.java b/forge-gui-mobile/src/forge/assets/FSkinColor.java index a1b3f6052a7..ae9d69328bc 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinColor.java +++ b/forge-gui-mobile/src/forge/assets/FSkinColor.java @@ -4,7 +4,7 @@ import java.util.HashMap; import com.badlogic.gdx.graphics.Color; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.screens.match.TargetingOverlay; public class FSkinColor { diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 30e43563fdb..060797d48a5 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -10,8 +10,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.Forge; import forge.Graphics; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; import forge.util.ImageUtil; /** Properties of various components that make up the skin. diff --git a/forge-gui-mobile/src/forge/menu/FMenuItem.java b/forge-gui-mobile/src/forge/menu/FMenuItem.java index 34f98d9babb..0ecc4a57f83 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuItem.java +++ b/forge-gui-mobile/src/forge/menu/FMenuItem.java @@ -12,7 +12,7 @@ import forge.assets.FSkinFont; import forge.assets.TextRenderer; import forge.gui.UiCommand; import forge.gui.interfaces.IButton; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.screens.FScreen.Header; import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 574de88c0f4..daee6c9a07e 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -40,9 +40,9 @@ import forge.gui.GuiBase; import forge.gui.util.SGuiChoose; 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.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java index ade6173df6a..012b56df061 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java @@ -6,7 +6,7 @@ import forge.game.GameView; import forge.gamemodes.gauntlet.GauntletWinLoseController; import forge.gui.FThreads; import forge.gui.util.SOptionPane; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.util.Localizer; /** diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index 3957737fbcb..f826bb7f158 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -19,7 +19,7 @@ import forge.gui.interfaces.IWinLoseView; import forge.gui.util.SGuiChoose; import forge.gui.util.SOptionPane; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.menu.FMagnifyView; import forge.model.FModel; import forge.toolbox.FButton; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index c5bcc2e01e6..829d04eb5d2 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -15,8 +15,8 @@ import forge.gui.FThreads; import forge.gui.GuiBase; import forge.gui.interfaces.ILobbyView; import forge.gui.util.SOptionPane; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; import forge.screens.LoadingOverlay; import forge.screens.constructed.LobbyScreen; import forge.screens.online.OnlineMenu.OnlineScreen; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index c795889f4f0..44f1d05c5b9 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -32,7 +32,7 @@ import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.gamemodes.planarconquest.ConquestUtil; import forge.gamemodes.planarconquest.ConquestUtil.AEtherFilter; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.screens.FScreen; import forge.toolbox.FCardPanel; diff --git a/forge-gui-mobile/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java index 223cd816f7b..b291ddd0102 100644 --- a/forge-gui-mobile/src/forge/toolbox/FButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FButton.java @@ -13,7 +13,7 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.gui.UiCommand; import forge.gui.interfaces.IButton; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; import forge.util.TextBounds; diff --git a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java index ebba30f13af..5787180555e 100644 --- a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java +++ b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java @@ -30,8 +30,8 @@ import forge.itemmanager.AdvancedSearch.FilterOperator; import forge.itemmanager.CardManager; import forge.itemmanager.filters.AdvancedSearchFilter; import forge.itemmanager.filters.ItemFilter; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.IHasSkinProp; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.IHasSkinProp; import forge.screens.match.MatchController; import forge.screens.match.views.VAvatar; import forge.screens.match.views.VStack; diff --git a/forge-gui-mobile/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java index 467eb0240a9..15d23f80ce6 100644 --- a/forge-gui-mobile/src/forge/toolbox/FLabel.java +++ b/forge-gui-mobile/src/forge/toolbox/FLabel.java @@ -11,7 +11,7 @@ import forge.assets.FSkinFont; import forge.assets.TextRenderer; import forge.gui.UiCommand; import forge.gui.interfaces.IButton; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; import forge.util.TextBounds; diff --git a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java index cdedfc0a7a5..10b06fa06cc 100644 --- a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java @@ -19,7 +19,7 @@ import forge.card.CardRenderer; import forge.card.CardRenderer.CardStackPosition; import forge.card.CardZoom; import forge.game.card.CardView; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.screens.match.views.VPrompt; import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java index bb705a35a1b..e4994a694c5 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java @@ -10,7 +10,7 @@ import forge.game.GameView; import forge.game.player.RegisteredPlayer; import forge.gui.interfaces.IButton; import forge.gui.interfaces.IWinLoseView; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java index 4bf233f0cb3..96c0de111d9 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java @@ -42,9 +42,9 @@ import forge.item.PaperCard; import forge.item.SealedProduct; import forge.item.generation.IUnOpenedProduct; import forge.item.generation.UnOpenedProduct; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences.FPref; +import forge.localinstance.skin.FSkinProp; import forge.model.CardBlock; import forge.model.FModel; import forge.model.UnOpenedMeta; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java index 9710e4f2a70..464cadc9ed3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java @@ -29,9 +29,9 @@ import forge.gui.GuiBase; import forge.gui.interfaces.IGuiGame; import forge.gui.interfaces.IMayViewCards; import forge.interfaces.IGameController; -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.player.PlayerControllerHuman; import forge.trackable.TrackableTypes; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java b/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java index 4948a1a7e2f..dcb205c23b5 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java @@ -8,7 +8,7 @@ import forge.gamemodes.net.event.GuiGameEvent; import forge.gamemodes.net.event.ReplyEvent; import forge.gui.FThreads; import forge.gui.util.SOptionPane; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java index f9da05be6ea..f7fe756628c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java @@ -19,7 +19,7 @@ import forge.gamemodes.match.NextGameDecision; import forge.gui.GuiBase; import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; import forge.util.ITriggerEvent; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java index 4bebaf7ee93..ec1fcb99316 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java @@ -21,7 +21,7 @@ import forge.gamemodes.match.AbstractGuiGame; import forge.gamemodes.net.GameProtocolSender; import forge.gamemodes.net.ProtocolMethod; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java index 63be2255cb3..db402ad2490 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java @@ -38,8 +38,8 @@ import forge.itemmanager.ColumnDef; import forge.itemmanager.ItemColumn; import forge.itemmanager.ItemManagerConfig; import forge.localinstance.achievements.PlaneswalkerAchievements; -import forge.localinstance.assets.ISkinImage; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.ISkinImage; import forge.model.FModel; import forge.util.CardTranslation; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java index ef58ba1103c..172a775da9a 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java @@ -14,7 +14,7 @@ import forge.deck.generation.DeckGenPool; import forge.game.card.Card; import forge.gui.GuiBase; import forge.item.PaperCard; -import forge.localinstance.assets.ISkinImage; +import forge.localinstance.skin.ISkinImage; import forge.model.FModel; import forge.util.collect.FCollection; import forge.util.collect.FCollectionReader; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java index e52b066c5ca..1de751a2adc 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java @@ -34,9 +34,9 @@ import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.gamemodes.quest.QuestUtil; import forge.gui.util.SOptionPane; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.IHasSkinProp; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.IHasSkinProp; import forge.model.FModel; import forge.util.FileUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java index 853f320391d..04d12c8f13d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java @@ -22,8 +22,8 @@ import forge.gui.util.SGuiChoose; import forge.gui.util.SOptionPane; import forge.item.BoosterPack; 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.util.Localizer; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java index b211a7b431e..5c36257dc9d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java @@ -49,8 +49,8 @@ import forge.gui.util.SGuiChoose; import forge.gui.util.SOptionPane; import forge.item.IPaperCard; import forge.item.PaperToken; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences.FPref; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java index 79c89116c90..0486c50b775 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java @@ -37,8 +37,8 @@ import forge.item.TournamentPack; import forge.item.generation.BoosterSlots; import forge.item.generation.IUnOpenedProduct; import forge.item.generation.UnOpenedProduct; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences.FPref; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java index 5de342e8cea..64c557e5e76 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java @@ -19,7 +19,7 @@ package forge.gamemodes.quest.bazaar; import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.data.QuestAssets; -import forge.localinstance.assets.ISkinImage; +import forge.localinstance.skin.ISkinImage; /** * This interface defines a thing that can be sold at the Bazaar. diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java index e2bdc302a18..85f79370765 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java @@ -24,8 +24,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.data.QuestAssets; import forge.gui.GuiBase; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.ISkinImage; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.ISkinImage; /** *

diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java index 86b8b2f7d84..32bd9a95dd6 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java @@ -28,9 +28,9 @@ import forge.gamemodes.quest.data.QuestAssets; import forge.gamemodes.quest.data.QuestPreferences; import forge.gui.GuiBase; import forge.item.PaperToken; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.ISkinImage; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.ISkinImage; import forge.model.FModel; /** diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java index 4a1002d59e0..07b1e8eb0fc 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java @@ -23,7 +23,7 @@ import java.util.List; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; /** *

diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java index d5fbb68a377..77171a548ea 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java @@ -11,7 +11,7 @@ import forge.game.GameView; import forge.game.player.RegisteredPlayer; import forge.gui.interfaces.IButton; import forge.gui.interfaces.IWinLoseView; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IButton.java b/forge-gui/src/main/java/forge/gui/interfaces/IButton.java index 3150044e01c..bfc6eb0f595 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IButton.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IButton.java @@ -1,7 +1,7 @@ package forge.gui.interfaces; import forge.gui.UiCommand; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; public interface IButton extends ITextComponent { boolean isSelected(); diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java index f032085f9cf..42eb77fc3d6 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java @@ -11,8 +11,8 @@ import com.google.common.base.Function; import forge.gamemodes.match.HostedMatch; import forge.gui.download.GuiDownloadService; 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.sound.IAudioClip; import forge.sound.IAudioMusic; import forge.util.Callback; diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java index b6e62b7a1a3..82c74ab3a1a 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java @@ -22,7 +22,7 @@ import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; import forge.interfaces.IGameController; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java b/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java index b09f079bf0a..b39472fe334 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java @@ -3,7 +3,7 @@ package forge.gui.interfaces; import java.util.List; import forge.item.PaperCard; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; public interface IWinLoseView { T getBtnContinue(); diff --git a/forge-gui/src/main/java/forge/gui/util/SOptionPane.java b/forge-gui/src/main/java/forge/gui/util/SOptionPane.java index d4faca3d9fc..34c7fed6387 100644 --- a/forge-gui/src/main/java/forge/gui/util/SOptionPane.java +++ b/forge-gui/src/main/java/forge/gui/util/SOptionPane.java @@ -5,7 +5,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import forge.gui.GuiBase; -import forge.localinstance.assets.FSkinProp; +import forge.localinstance.skin.FSkinProp; import forge.util.Localizer; public class SOptionPane { diff --git a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java index b45359a5b7b..5e4ca8993df 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java @@ -14,8 +14,8 @@ import forge.deck.DeckProxy; import forge.gui.GuiBase; import forge.gui.interfaces.IComboBox; import forge.item.InventoryItem; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.IHasSkinProp; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.IHasSkinProp; import forge.util.ComparableOp; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java index 0a44a072099..5e335be056f 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java @@ -10,9 +10,9 @@ import forge.game.Game; import forge.game.player.Player; import forge.gui.GuiBase; import forge.item.IPaperCard; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.ISkinImage; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.ISkinImage; import forge.util.Lang; import forge.util.XmlUtil; diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java index 80f746225d6..5d634c020de 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java @@ -4,9 +4,9 @@ import forge.game.Game; import forge.game.player.Player; import forge.gui.GuiBase; import forge.item.IPaperCard; -import forge.localinstance.assets.FSkinProp; -import forge.localinstance.assets.ISkinImage; import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.skin.FSkinProp; +import forge.localinstance.skin.ISkinImage; import forge.model.FModel; import forge.util.CardTranslation; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java b/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java deleted file mode 100644 index 14485a817f0..00000000000 --- a/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java +++ /dev/null @@ -1,5 +0,0 @@ -package forge.localinstance.assets; - -public interface ISkinImage { - -} diff --git a/forge-gui/src/main/java/forge/localinstance/assets/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java similarity index 99% rename from forge-gui/src/main/java/forge/localinstance/assets/FSkinProp.java rename to forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java index 0a9ffd941ce..3847813761c 100644 --- a/forge-gui/src/main/java/forge/localinstance/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.localinstance.assets; +package forge.localinstance.skin; /** * Assembles settings from selected or default theme as appropriate. Saves in a diff --git a/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/IHasSkinProp.java similarity index 64% rename from forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java rename to forge-gui/src/main/java/forge/localinstance/skin/IHasSkinProp.java index b210c0f301c..db1eeabc22b 100644 --- a/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/IHasSkinProp.java @@ -1,4 +1,4 @@ -package forge.localinstance.assets; +package forge.localinstance.skin; public interface IHasSkinProp { FSkinProp getSkinProp(); diff --git a/forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java b/forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java new file mode 100644 index 00000000000..346a18dc4a2 --- /dev/null +++ b/forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java @@ -0,0 +1,5 @@ +package forge.localinstance.skin; + +public interface ISkinImage { + +} diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 8f16038c932..81e7a5080c9 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -124,9 +124,9 @@ import forge.interfaces.IMacroSystem; import forge.item.IPaperCard; import forge.item.PaperCard; import forge.localinstance.achievements.AchievementCollection; -import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences.FPref; +import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.util.CardTranslation; import forge.util.ITriggerEvent;