external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename 'assets' package to 'skin'

Browse Source
This commit is contained in:
Leandro Doctors
2021-03-19 14:26:40 -03:00
parent 46718ff96a
commit 993fb3b518
113 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/control/FControl.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

2
forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java
View File

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VPicture.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/screens/workshop/menus/WorkshopFileMenu.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/screens/workshop/views/VCardDesigner.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
View File

@@ -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;
/**

2
forge-gui-desktop/src/main/java/forge/toolbox/FButton.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
View File

@@ -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;

4
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/view/FDialog.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/view/FView.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/view/SplashFrame.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
View File

@@ -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;