diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index 95c7a8a6308..f99c8459ed5 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java @@ -1,8 +1,7 @@ package forge; import com.google.common.base.Function; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; + import forge.download.GuiDownloadService; import forge.download.GuiDownloader; import forge.error.BugReportDialog; @@ -14,6 +13,8 @@ import forge.gui.framework.FScreen; import forge.interfaces.IGuiBase; import forge.interfaces.IGuiGame; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; import forge.match.HostedMatch; import forge.model.FModel; import forge.screens.deckeditor.CDeckEditorUI; diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java index 5e2b6253ae4..7e4df457229 100644 --- a/forge-gui-desktop/src/main/java/forge/ImageCache.java +++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java @@ -21,14 +21,15 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader.InvalidCacheLoadException; import com.google.common.cache.LoadingCache; import com.mortennobel.imagescaling.ResampleOp; -import forge.assets.FSkinProp; + import forge.game.card.CardView; import forge.game.player.PlayerView; import forge.item.InventoryItem; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinIcon; import forge.util.ImageUtil; diff --git a/forge-gui-desktop/src/main/java/forge/ImageLoader.java b/forge-gui-desktop/src/main/java/forge/ImageLoader.java index d910c0c2179..15b74700baa 100644 --- a/forge-gui-desktop/src/main/java/forge/ImageLoader.java +++ b/forge-gui-desktop/src/main/java/forge/ImageLoader.java @@ -3,8 +3,8 @@ package forge; import com.google.common.cache.CacheLoader; import forge.error.BugReporter; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import javax.imageio.ImageIO; 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 99b9316813d..4651b74c37c 100644 --- a/forge-gui-desktop/src/main/java/forge/control/FControl.java +++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java @@ -44,20 +44,20 @@ import forge.GuiBase; import forge.ImageCache; import forge.LobbyPlayer; import forge.Singletons; -import forge.assets.FSkinProp; import forge.gui.SOverlayUtils; import forge.gui.framework.FScreen; import forge.gui.framework.InvalidLayoutFileException; import forge.gui.framework.SLayoutIO; import forge.gui.framework.SOverflowUtil; import forge.gui.framework.SResizingUtil; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.menus.ForgeMenu; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.quest.data.QuestPreferences.QPref; import forge.quest.io.QuestDataIO; import forge.screens.deckeditor.CDeckEditorUI; diff --git a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java index 25e76e0169e..2e8a95b4d01 100644 --- a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java +++ b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java @@ -21,9 +21,9 @@ import forge.Singletons; import forge.game.spellability.StackItemView; import forge.gui.framework.EDocID; import forge.gui.framework.SDisplayUtil; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.settings.VSubmenuPreferences.KeyboardShortcutField; import forge.screens.match.CMatchUI; import forge.util.Localizer; diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java index 02bb77dbb86..4a3c2019ba3 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java @@ -26,9 +26,9 @@ import forge.game.player.RegisteredPlayer; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerContainer; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.quest.QuestEventChallenge; diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java index ff7e0418e06..4e0de164b98 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java @@ -13,8 +13,8 @@ import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerContainer; import forge.itemmanager.ItemManagerModel; import forge.itemmanager.views.ImageView; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.toolbox.FButton; import forge.toolbox.FOptionPane; import forge.util.Localizer; 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 35c2ac36bfd..fcec51ced98 100644 --- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java +++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java @@ -26,8 +26,8 @@ import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.SOverlayUtils; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FButton; import forge.toolbox.FLabel; import forge.toolbox.FOverlay; diff --git a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java index 1f06e198b63..c114918bfdb 100644 --- a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java @@ -38,9 +38,9 @@ import javax.swing.JTextArea; import javax.swing.KeyStroke; import forge.model.FModel; -import forge.properties.ForgePreferences; import net.miginfocom.swing.MigLayout; import forge.gui.WrapLayout; +import forge.localinstance.properties.ForgePreferences; /** * The class BugReportDialog. Enables showing and saving error messages that diff --git a/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java b/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java index d62d8bd0f62..041f816ba41 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java +++ b/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java @@ -33,8 +33,8 @@ import javax.swing.event.ListSelectionListener; import forge.game.card.CardView; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FButton; import forge.toolbox.FLabel; import forge.toolbox.FScrollPane; diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java index 068ef7e4598..bd4f0b7145f 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java @@ -20,8 +20,8 @@ package forge.gui; import forge.game.card.CardView; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FButton; import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java b/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java index 795afe64f69..f0ce2223073 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java @@ -34,8 +34,8 @@ import javax.swing.event.ListSelectionListener; import forge.game.card.CardView; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FButton; import forge.toolbox.FLabel; import forge.toolbox.FScrollPane; diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java index 6b67da64af5..7506748935a 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java @@ -23,8 +23,8 @@ import forge.ImageKeys; import forge.game.card.CardView.CardStateView; import forge.item.InventoryItem; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.CardFaceSymbols; import forge.toolbox.imaging.FImagePanel; import forge.toolbox.imaging.FImagePanel.AutoSizeImageMode; diff --git a/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java b/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java index ea8771bb3ee..e587ccc69c7 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java +++ b/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java @@ -15,13 +15,13 @@ import org.apache.commons.lang3.StringUtils; import forge.Singletons; import forge.gui.framework.SDisplayUtil; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.net.ChatMessage; import forge.net.IOnlineChatInterface; import forge.net.IRemote; import forge.net.event.MessageEvent; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.online.OnlineMenu; import forge.toolbox.FLabel; import forge.toolbox.FMouseAdapter; diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiUtils.java b/forge-gui-desktop/src/main/java/forge/gui/GuiUtils.java index c26c02f3537..e538f184e4d 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiUtils.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiUtils.java @@ -32,8 +32,8 @@ import javax.swing.JPopupMenu; import javax.swing.JSeparator; import javax.swing.KeyStroke; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; /** *

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 0b4880b2f3f..f26358243c8 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java @@ -59,10 +59,10 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.error.BugReporter; import forge.gui.ImportSourceAnalyzer.OpType; -import forge.properties.ForgeConstants; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FButton; import forge.toolbox.FCheckBox; import forge.toolbox.FComboBoxWrapper; diff --git a/forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java b/forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java index c19d9c5b10f..8932830996b 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java @@ -22,8 +22,8 @@ import com.google.common.collect.Iterables; import forge.card.CardEdition; import forge.item.IPaperCard; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.ImageUtil; import org.apache.commons.lang3.StringUtils; 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 caf0994501e..43b981bc342 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java +++ b/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java @@ -11,7 +11,7 @@ import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; import forge.Singletons; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FLabel; import forge.toolbox.FOverlay; import forge.toolbox.FPanel; 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 cd127e8f352..3b33b7cc86f 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 @@ -17,10 +17,10 @@ import net.miginfocom.swing.MigLayout; import com.google.common.collect.Lists; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FPanel; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinImage; 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 357c436ee10..e515ae47950 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 @@ -1,9 +1,9 @@ package forge.gui.framework; import forge.Singletons; -import forge.assets.FSkinProp; -import forge.properties.FileLocation; -import forge.properties.ForgeConstants; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.FileLocation; +import forge.localinstance.properties.ForgeConstants; import forge.screens.bazaar.CBazaarUI; import forge.screens.bazaar.VBazaarUI; import forge.screens.deckeditor.CDeckEditorUI; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java index 8c2f6a38f3e..3da48e447cb 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java @@ -29,8 +29,8 @@ import javax.xml.stream.events.XMLEvent; import forge.FThreads; import forge.Singletons; import forge.gui.SOverlayUtils; -import forge.properties.FileLocation; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.FileLocation; +import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FAbsolutePositioner; import forge.toolbox.SaveOpenDialog; import forge.toolbox.SaveOpenDialog.Filetypes; 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 0f779013499..18d28e74651 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 @@ -1,7 +1,7 @@ package forge.gui.framework; -import forge.assets.FSkinProp; import forge.gui.MouseUtil; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinCursor; import forge.toolbox.FSkin.SkinnedLayeredPane; 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 6cca4b8c04f..28af9eb3623 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java @@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils; import forge.Singletons; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.deck.DeckBase; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; @@ -42,6 +41,7 @@ import forge.itemmanager.filters.ItemFilter; import forge.itemmanager.views.ItemCellRenderer; import forge.itemmanager.views.ItemListView; import forge.itemmanager.views.ItemTableColumn; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.QuestWorld; import forge.screens.deckeditor.CDeckEditorUI; 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 28d1f766f68..a6676f568bd 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java @@ -43,7 +43,6 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.GuiUtils; import forge.item.InventoryItem; import forge.itemmanager.filters.ItemFilter; @@ -51,6 +50,7 @@ import forge.itemmanager.views.ImageView; import forge.itemmanager.views.ItemListView; import forge.itemmanager.views.ItemTableColumn; import forge.itemmanager.views.ItemView; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.controllers.CDetailPicture; import forge.toolbox.ContextMenuBuilder; import forge.toolbox.FComboBox; 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 825187db064..d8f9df359e4 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 @@ -17,8 +17,8 @@ */ package forge.itemmanager.views; -import forge.assets.FSkinProp; import forge.item.InventoryItem; +import forge.localinstance.assets.FSkinProp; import forge.screens.deckeditor.CDeckEditorUI; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinImage; 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 4ae9918a928..35d1571da66 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 @@ -17,10 +17,10 @@ */ package forge.itemmanager.views; -import forge.assets.FSkinProp; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; import forge.item.InventoryItem; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinImage; import forge.util.Localizer; 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 589b6ba8bbe..a51a1a514dd 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 @@ -1,7 +1,36 @@ package forge.itemmanager.views; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Polygon; +import java.awt.Rectangle; +import java.awt.RenderingHints; +import java.awt.Shape; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionAdapter; +import java.awt.event.MouseWheelEvent; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TreeMap; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JViewport; +import javax.swing.ScrollPaneConstants; +import javax.swing.SwingUtilities; + import forge.ImageCache; -import forge.assets.FSkinProp; import forge.card.ColorSet; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; @@ -11,30 +40,32 @@ import forge.gui.framework.ILocalRepaint; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.item.PaperCard; -import forge.itemmanager.*; +import forge.itemmanager.ColumnDef; +import forge.itemmanager.GroupDef; +import forge.itemmanager.ItemManager; +import forge.itemmanager.ItemManagerConfig; +import forge.itemmanager.ItemManagerModel; +import forge.itemmanager.SItemManagerUtil; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.match.controllers.CDetailPicture; -import forge.toolbox.*; +import forge.toolbox.CardFaceSymbols; +import forge.toolbox.FComboBoxWrapper; +import forge.toolbox.FLabel; +import forge.toolbox.FMouseAdapter; +import forge.toolbox.FScrollPane; +import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinColor; import forge.toolbox.FSkin.SkinFont; import forge.toolbox.FSkin.SkinImage; +import forge.toolbox.FTextField; import forge.toolbox.special.CardZoomer; import forge.util.ImageUtil; import forge.util.Localizer; import forge.view.arcane.CardPanel; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - public class ImageView extends ItemView { private static final int PADDING = 5; private static final float PILE_SPACING_Y = 0.1f; 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 8f56579a5f0..d14f8f48bfa 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 @@ -67,7 +67,6 @@ import javax.swing.table.TableColumnModel; import org.apache.commons.lang3.StringUtils; -import forge.assets.FSkinProp; import forge.gui.MouseUtil; import forge.item.InventoryItem; import forge.itemmanager.ColumnDef; @@ -76,6 +75,7 @@ import forge.itemmanager.ItemColumnConfig; import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerModel; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FCheckBox; import forge.toolbox.FMouseAdapter; import forge.toolbox.FSkin; 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 c6d27df5bc9..f1f7377d882 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 @@ -17,10 +17,10 @@ */ package forge.itemmanager.views; -import forge.assets.FSkinProp; import forge.card.CardPreferences; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinImage; import forge.util.CardTranslation; diff --git a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java index 9d430b660c8..a41b424e70b 100644 --- a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java +++ b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java @@ -1,6 +1,6 @@ package forge.menus; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FOptionPane; import forge.util.BuildInfo; import forge.util.FileUtil; 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 7a5711e163e..3b363fb70cc 100644 --- a/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java +++ b/forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java @@ -14,14 +14,14 @@ import javax.swing.JRadioButtonMenuItem; import javax.swing.KeyStroke; import forge.Singletons; -import forge.assets.FSkinProp; import forge.gui.GuiChoose; import forge.gui.MouseUtil; import forge.gui.framework.FScreen; import forge.gui.framework.SLayoutIO; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedMenuItem; import forge.view.FFrame; 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 27ff8a2092d..5e91f2ab3ee 100644 --- a/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java +++ b/forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java @@ -1,7 +1,7 @@ package forge.menus; import forge.Singletons; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.imaging.FImageUtil; 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 8ce5ad6f72b..0aad8c587cc 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 @@ -2,9 +2,9 @@ package forge.screens.bazaar; import forge.GuiBase; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.bazaar.QuestBazaarManager; import forge.screens.home.quest.ViewStall; 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 a8adb56bea9..42147fd5769 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 @@ -36,7 +36,6 @@ import com.google.common.collect.Iterables; import forge.ImageCache; import forge.StaticData; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.card.CardEdition; import forge.card.CardRules; import forge.card.mana.ManaCostShard; @@ -45,6 +44,7 @@ import forge.deck.Deck; import forge.deck.DeckProxy; import forge.deck.DeckgenUtil; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.toolbox.FComboBox; import forge.toolbox.FComboBoxPanel; 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 2ad7fa6106f..c06569096a3 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 @@ -20,7 +20,6 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.deck.*; import forge.game.GameType; import forge.gui.GuiChoose; @@ -31,9 +30,10 @@ import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManager; import forge.itemmanager.SItemManagerUtil; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menus.IMenuProvider; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.menus.CDeckEditorUIMenus; import forge.screens.deckeditor.views.VCardCatalog; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java index 32bef0c5c29..96789fad97e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java @@ -18,7 +18,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.DeckImport; import forge.screens.deckeditor.SEditorIO; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java index 0f88b567ae5..f77822b3586 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java @@ -20,8 +20,8 @@ import forge.deck.generation.DeckGeneratorMonoColor; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.SEditorIO; import forge.screens.deckeditor.views.VDeckgen; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java index bf84c8450f8..ee7a4a4f4af 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java @@ -31,8 +31,8 @@ import forge.gui.framework.FScreen; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManagerConfig; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.AddBasicLandsDialog; import forge.screens.deckeditor.SEditorIO; import forge.screens.match.controllers.CDetailPicture; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index 9294853a1e9..c842ec24e2a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java @@ -39,8 +39,8 @@ import forge.itemmanager.CardManager; import forge.itemmanager.ColumnDef; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.views.ItemTableColumn; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.data.DeckConstructionRules; import forge.screens.deckeditor.AddBasicLandsDialog; 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 c730d6595c9..9a88115a5a7 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 @@ -18,7 +18,6 @@ package forge.screens.deckeditor.controllers; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.deck.DeckBase; import forge.game.GameType; import forge.gui.framework.DragCell; @@ -28,6 +27,7 @@ import forge.itemmanager.ColumnDef; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.SpellShopManager; import forge.itemmanager.views.ItemTableColumn; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.QuestController; import forge.quest.QuestSpellShop; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java index 3b34554ccf9..7b8bf23eb26 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java @@ -32,8 +32,8 @@ import forge.itemmanager.CardManager; import forge.itemmanager.ColumnDef; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.views.ItemTableColumn; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestEventDraft; import forge.screens.deckeditor.SEditorIO; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java index 6f09ba6e073..d1e59a6cf2c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java @@ -29,8 +29,8 @@ import forge.gui.framework.FScreen; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManagerConfig; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.SEditorIO; import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VDeckgen; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java index 2a2926dfcfc..3500a17c1fc 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java @@ -33,8 +33,8 @@ import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.limited.IBoosterDraft; import forge.limited.WinstonDraft; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VCurrentDeck; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java index 0a362185574..c50718fd36f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java @@ -2,7 +2,7 @@ package forge.screens.deckeditor.controllers; import forge.deck.Deck; import forge.item.PaperCard; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.ImageUtil; import freemarker.template.Configuration; import freemarker.template.DefaultObjectWrapper; 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 1b104cf5112..2b643acd42d 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 @@ -1,6 +1,6 @@ package forge.screens.deckeditor.menus; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.menus.MenuUtil; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.views.VCurrentDeck; 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 c4448e2360c..4f26a5d48b7 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 @@ -5,7 +5,6 @@ import javax.swing.SwingConstants; import forge.util.Localizer; import net.miginfocom.swing.MigLayout; -import forge.assets.FSkinProp; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -13,6 +12,7 @@ import forge.gui.framework.IVDoc; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManagerContainer; +import forge.localinstance.assets.FSkinProp; import forge.screens.deckeditor.controllers.CCurrentDeck; import forge.toolbox.FLabel; import forge.toolbox.FSkin; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java index 6249fc710ab..9442e4cff03 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java @@ -7,11 +7,11 @@ import javax.swing.JMenu; import forge.Singletons; import forge.gui.framework.EDocID; import forge.gui.framework.ICDoc; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.sanctioned.VSubmenuConstructed; import forge.toolbox.FAbsolutePositioner; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java index 1c20478ef49..7c9cd1a8fa1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java @@ -12,9 +12,9 @@ import com.google.common.collect.Iterables; import forge.deck.DeckProxy; import forge.deck.DeckType; import forge.deckchooser.FDeckChooser; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FList; public class CLobby { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java b/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java index 69f92f1353d..e3f8d3fd8c1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java @@ -1,8 +1,8 @@ package forge.screens.home; import forge.gui.framework.ILocalRepaint; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinColor; import forge.toolbox.FSkin.SkinnedLabel; 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 dd1639b12ee..9a540f8c32e 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 @@ -25,16 +25,16 @@ import com.google.common.collect.ImmutableSet; import forge.Singletons; import forge.UiCommand; import forge.ai.AIOption; -import forge.assets.FSkinProp; import forge.deck.DeckSection; import forge.game.GameType; import forge.gui.framework.FScreen; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.LobbySlot; import forge.match.LobbySlotType; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.CEditorVariant; import forge.screens.home.sanctioned.AvatarSelector; 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 a3014a20488..e2444608a89 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 @@ -1,6 +1,6 @@ package forge.screens.home; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedButton; 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 882b8377429..38a8ea614b4 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 @@ -1,6 +1,6 @@ package forge.screens.home; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedButton; 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 f0dc9136e10..900bacdc7da 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 @@ -18,10 +18,10 @@ package forge.screens.home; import forge.Singletons; -import forge.assets.FSkinProp; import forge.gui.framework.*; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.gauntlet.VSubmenuGauntletBuild; import forge.screens.home.gauntlet.VSubmenuGauntletContests; import forge.screens.home.gauntlet.VSubmenuGauntletLoad; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 07704e1cac0..d93989ea97e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -14,13 +14,13 @@ import forge.gui.CardDetailPanel; import forge.interfaces.ILobbyView; import forge.interfaces.IPlayerChangeListener; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.GameLobby; import forge.match.LobbySlot; import forge.match.LobbySlotType; import forge.model.FModel; import forge.net.event.UpdateLobbyPlayerEvent; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.*; import forge.toolbox.FSkin.SkinImage; import forge.util.Aggregates; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java index 3d25bcd2d51..b74f9f53273 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java @@ -16,7 +16,7 @@ import forge.deck.Deck; import forge.gauntlet.GauntletData; import forge.gauntlet.GauntletIO; import forge.gui.framework.ICDoc; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FOptionPane; /** 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 6028c92228e..57e299e094c 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 @@ -14,9 +14,9 @@ import javax.swing.border.Border; import net.miginfocom.swing.MigLayout; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gauntlet.GauntletData; import forge.gauntlet.GauntletIO; +import forge.localinstance.assets.FSkinProp; import forge.quest.QuestUtil; import forge.toolbox.FLabel; import forge.toolbox.FMouseAdapter; 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 af3822a7f84..8acb590c42d 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 @@ -1,12 +1,12 @@ package forge.screens.home.gauntlet; -import forge.assets.FSkinProp; import forge.deckchooser.FDeckChooser; import forge.game.GameType; import forge.gauntlet.GauntletIO; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; +import forge.localinstance.assets.FSkinProp; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; 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 ddfb8583b0d..c212aa65336 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 @@ -2,18 +2,18 @@ package forge.screens.home.puzzle; import forge.GuiBase; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.deck.Deck; import forge.game.GameRules; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gui.SOverlayUtils; import forge.gui.framework.ICDoc; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; import forge.puzzle.Puzzle; import forge.puzzle.PuzzleIO; import forge.util.Localizer; 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 9ef4597861e..dc808d86439 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 @@ -2,18 +2,18 @@ package forge.screens.home.puzzle; import forge.GuiBase; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.deck.Deck; import forge.game.GameRules; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gui.SOverlayUtils; import forge.gui.framework.ICDoc; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; import forge.puzzle.Puzzle; import forge.puzzle.PuzzleIO; import forge.util.Localizer; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/PuzzleGameMenu.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/PuzzleGameMenu.java index e9a9e0cc28c..1b78b6f81d7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/PuzzleGameMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/PuzzleGameMenu.java @@ -1,7 +1,7 @@ package forge.screens.home.puzzle; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.Localizer; import javax.swing.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java index af69b15b5dd..facd79e0e41 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java @@ -2,8 +2,8 @@ package forge.screens.home.quest; import forge.UiCommand; import forge.gui.framework.ICDoc; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.data.QuestData; import forge.quest.data.QuestPreferences.QPref; 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 18806949fdc..f00893b6fd2 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 @@ -1,8 +1,8 @@ package forge.screens.home.quest; -import forge.assets.FSkinProp; import forge.game.GameFormat; import forge.gui.SOverlayUtils; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.toolbox.*; import forge.util.Localizer; 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 3e851a280ae..7eb18d6377a 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 @@ -1,9 +1,9 @@ package forge.screens.home.quest; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.card.MagicColor; import forge.gui.SOverlayUtils; +import forge.localinstance.assets.FSkinProp; import forge.quest.StartingPoolPreferences.PoolType; import forge.toolbox.*; import forge.util.Localizer; 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 e6bad94d6ae..da0fbb9a413 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 @@ -1,9 +1,9 @@ package forge.screens.home.quest; -import forge.assets.FSkinProp; import forge.card.CardEdition; import forge.game.GameFormat; import forge.gui.SOverlayUtils; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.toolbox.*; import forge.util.TextUtil; 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 96b4d20336c..4b01b530015 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 @@ -1,7 +1,7 @@ package forge.screens.home.quest; import forge.ImageCache; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.quest.QuestEvent; import forge.quest.QuestUtil; import forge.toolbox.FRadioButton; 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 b64f55f0d26..6d423017c5f 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 @@ -1,9 +1,9 @@ package forge.screens.home.quest; import forge.UiCommand; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestUtil; import forge.quest.data.QuestData; import forge.toolbox.*; 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 4c8ad44cf77..8a9ac0d5205 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 @@ -1,9 +1,9 @@ package forge.screens.home.quest; -import forge.assets.FSkinProp; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; +import forge.localinstance.assets.FSkinProp; import forge.quest.IVQuestStats; import forge.screens.home.*; import forge.toolbox.*; 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 31bf71a7494..b811deb75d4 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 @@ -1,10 +1,10 @@ package forge.screens.home.quest; -import forge.assets.FSkinProp; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.interfaces.IButton; +import forge.localinstance.assets.FSkinProp; import forge.quest.IVQuestStats; import forge.screens.home.*; import forge.toolbox.*; 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 c7b1b231800..8b2e4d4383d 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 @@ -2,7 +2,6 @@ package forge.screens.home.quest; import forge.GuiBase; import forge.Singletons; -import forge.assets.FSkinProp; import forge.game.GameType; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -10,6 +9,7 @@ import forge.gui.framework.EDocID; import forge.gui.framework.FScreen; import forge.itemmanager.DeckManager; import forge.limited.BoosterDraft; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.IQuestTournamentView; import forge.quest.QuestEventDraft; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestLoadData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestLoadData.java index 74d5515d1de..fc07dd599a7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestLoadData.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestLoadData.java @@ -3,7 +3,7 @@ package forge.screens.home.quest; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; 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 fb9d77463e6..c7204899da2 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 @@ -1,8 +1,8 @@ package forge.screens.home.quest; -import forge.assets.FSkinProp; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.QPref; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java index 7ee5e243675..dd584e7d6ca 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java @@ -7,9 +7,9 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.item.PreconDeck; +import forge.localinstance.properties.ForgeConstants; import forge.model.CardCollections; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.QuestWorld; import forge.quest.StartingPoolType; 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 31b8aa1a43b..dd1312ba2a2 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 @@ -2,7 +2,7 @@ package forge.screens.home.quest; import forge.GuiBase; import forge.UiCommand; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.quest.QuestUtil; import forge.quest.bazaar.IQuestBazaarItem; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java index fc6762d4dcf..db2cb2b6266 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java @@ -15,10 +15,10 @@ import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.limited.LimitedPoolType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.CEditorDraftingProcess; import forge.screens.deckeditor.views.VProbabilities; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java index 22535e37f10..c8a4bc239ac 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java @@ -22,10 +22,10 @@ import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.itemmanager.ItemManagerConfig; import forge.limited.SealedCardPoolGenerator; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.ACEditorBase; import forge.screens.deckeditor.controllers.CEditorLimited; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java index 85cfe525d19..bc91e4d3e65 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java @@ -23,10 +23,10 @@ import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; import forge.limited.LimitedPoolType; import forge.limited.WinstonDraft; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.CEditorWinstonProcess; import forge.toolbox.FOptionPane; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/ConstructedGameMenu.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/ConstructedGameMenu.java index 7643bc86ee6..4f9d5b57bb5 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/ConstructedGameMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/ConstructedGameMenu.java @@ -1,9 +1,9 @@ package forge.screens.home.sanctioned; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menus.MenuUtil; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.util.Localizer; import javax.swing.*; 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 81a0f124a76..b355d667191 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 @@ -14,7 +14,6 @@ import javax.swing.text.StyledDocument; import forge.toolbox.*; import forge.util.Localizer; import net.miginfocom.swing.MigLayout; -import forge.assets.FSkinProp; import forge.game.GameType; import forge.gui.SOverlayUtils; import forge.gui.framework.DragCell; @@ -22,6 +21,7 @@ import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerContainer; +import forge.localinstance.assets.FSkinProp; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index 94076064dcf..85f793a607a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -7,12 +7,12 @@ import forge.download.AutoUpdater; import forge.game.GameLogEntryType; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.net.server.FServerManager; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.CEditorTokenViewer; import forge.sound.SoundSystem; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java index df968fb0831..1b5031e1075 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java @@ -19,7 +19,7 @@ package forge.screens.home.settings; import forge.gui.framework.ICDoc; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; /** 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 0e075972619..da2314619ba 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 @@ -13,14 +13,14 @@ import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; -import forge.achievement.Achievement; -import forge.achievement.AchievementCollection; -import forge.assets.FSkinProp; import forge.game.card.CardView; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.item.IPaperCard; +import forge.localinstance.achievements.Achievement; +import forge.localinstance.achievements.AchievementCollection; +import forge.localinstance.assets.FSkinProp; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java index e5b4f6a30f1..4b0edebe96d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java @@ -5,8 +5,8 @@ import forge.gui.WrapLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; 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 e379817f514..8ab363f706a 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 @@ -3,7 +3,6 @@ package forge.screens.home.settings; import forge.ImageKeys; import forge.StaticData; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.card.CardDb; import forge.card.CardEdition; import forge.card.CardEdition.CardInSet; @@ -13,7 +12,8 @@ import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.item.PaperCard; import forge.item.PaperToken; -import forge.properties.ForgeConstants; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java index 28dae081699..c837ab93581 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java @@ -7,8 +7,8 @@ import forge.game.GameLogEntryType; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; 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 d5c952cb15f..b05edf49903 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 @@ -51,7 +51,6 @@ import forge.ImageCache; import forge.LobbyPlayer; import forge.Singletons; import forge.StaticData; -import forge.assets.FSkinProp; import forge.card.CardStateName; import forge.control.KeyboardShortcuts; import forge.deck.CardPool; @@ -94,14 +93,15 @@ import forge.gui.framework.SLayoutIO; import forge.gui.framework.VEmptyDoc; import forge.item.InventoryItem; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.AbstractGuiGame; import forge.menus.IMenuProvider; import forge.model.FModel; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.controllers.CAntes; import forge.screens.match.controllers.CCombat; import forge.screens.match.controllers.CDetailPicture; 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 21ad9b319b7..ef484bd3a19 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 @@ -25,9 +25,9 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; -import forge.assets.FSkinProp; import forge.game.GameView; import forge.gauntlet.GauntletWinLoseController; +import forge.localinstance.assets.FSkinProp; import forge.util.Localizer; import forge.toolbox.FLabel; import forge.toolbox.FSkin; 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 04036b38864..39aec567ade 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 @@ -17,9 +17,10 @@ package forge.screens.match; import com.google.common.collect.ImmutableList; -import forge.assets.FSkinProp; + import forge.game.GameView; import forge.game.player.PlayerView; +import forge.localinstance.assets.FSkinProp; import forge.match.NextGameDecision; import forge.model.FModel; import forge.quest.QuestController; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java index 6f09994f068..ce29d01b7d2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java @@ -30,8 +30,8 @@ import forge.game.card.CardView; import forge.gui.CardDetailPanel; import forge.gui.CardPicturePanel; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FList; import forge.toolbox.FPanel; import forge.toolbox.FScrollPane; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java index 922f4b6f5f2..29be76083fc 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java @@ -43,8 +43,8 @@ import forge.game.card.CardView; import forge.game.combat.CombatView; import forge.game.player.PlayerView; import forge.game.spellability.StackItemView; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.controllers.CDock.ArcState; import forge.screens.match.views.VField; import forge.screens.match.views.VStack.StackInstanceTextArea; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java index 9ff1370c329..ffdc1e31730 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java @@ -12,7 +12,7 @@ import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; import forge.gui.framework.SRearrangingUtil; import forge.gui.framework.VEmptyDoc; -import forge.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences; import forge.screens.match.views.VDev; import forge.screens.match.views.VField; import forge.screens.match.views.VHand; 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 3b8d132f024..3799732853c 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 @@ -18,15 +18,15 @@ import net.miginfocom.swing.MigLayout; import org.apache.commons.lang3.StringUtils; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.game.GameLogEntry; import forge.game.GameLogEntryType; import forge.game.GameView; import forge.gui.SOverlayUtils; import forge.interfaces.IWinLoseView; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FButton; import forge.toolbox.FLabel; import forge.toolbox.FOverlay; 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 e86867647a2..e57c4c0e3a3 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 @@ -24,12 +24,12 @@ import com.google.common.primitives.Ints; import forge.Singletons; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.SOverlayUtils; import forge.gui.framework.ICDoc; import forge.gui.framework.SLayoutIO; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.screens.match.views.VDock; import forge.toolbox.FSkin; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java index 929ecc13467..2aa7a0fd95e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java @@ -37,8 +37,8 @@ import forge.game.GameView; import forge.game.card.CardView; import forge.gui.framework.ICDoc; import forge.gui.framework.SDisplayUtil; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.screens.match.CMatchUI; import forge.screens.match.views.VPrompt; import forge.toolbox.FSkin; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CMatchUIMenus.java b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CMatchUIMenus.java index 13ea2636aca..167a4f8a87e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CMatchUIMenus.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CMatchUIMenus.java @@ -6,7 +6,7 @@ import javax.swing.JMenu; import com.google.common.collect.Lists; -import forge.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences; import forge.screens.match.CMatchUI; /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java index 6fdd326e220..7b6ce891df7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java @@ -1,9 +1,9 @@ package forge.screens.match.menus; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menus.MenuUtil; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.util.Localizer; 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 c241a6113b2..1fb9197325a 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 @@ -9,11 +9,11 @@ import javax.swing.ButtonGroup; import javax.swing.JMenu; import javax.swing.JPopupMenu; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menus.MenuUtil; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.screens.match.VAutoYields; import forge.screens.match.controllers.CDock.ArcState; 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 4ca3b7f0e3e..39e8d3677e3 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 @@ -17,13 +17,13 @@ */ package forge.screens.match.views; -import forge.assets.FSkinProp; import forge.game.GameView; import forge.gui.CardDetailPanel; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.controllers.CDetail; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedLabel; 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 addecfac226..0f333438f37 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 @@ -18,8 +18,8 @@ package forge.screens.match.views; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.framework.*; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.controllers.CDock; import forge.toolbox.FLabel; import forge.toolbox.FMouseAdapter; 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 308b8e73f5e..38aa07175ef 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 @@ -28,7 +28,6 @@ import javax.swing.border.Border; import javax.swing.border.LineBorder; import net.miginfocom.swing.MigLayout; -import forge.assets.FSkinProp; import forge.game.card.CounterEnumType; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; @@ -36,6 +35,7 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.CMatchUI; import forge.screens.match.controllers.CField; import forge.toolbox.FLabel; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java index e21dfdb1dd2..5c5821b8529 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java @@ -33,8 +33,8 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.GameLogPanel; import forge.screens.match.controllers.CLog; import forge.toolbox.FSkin; 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 733c242cf26..93a468b0cf7 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 @@ -17,12 +17,12 @@ */ package forge.screens.match.views; -import forge.assets.FSkinProp; import forge.gui.CardPicturePanel; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.controllers.CPicture; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedLabel; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java index c9081919200..75907440730 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java @@ -22,9 +22,9 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.controllers.CPrompt; import forge.toolbox.*; import forge.util.Localizer; diff --git a/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java b/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java index dd73e6a7d17..215e5942666 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java +++ b/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java @@ -22,8 +22,8 @@ import forge.game.card.Card; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.workshop.menus.WorkshopFileMenu; import forge.screens.workshop.views.VCardDesigner; import forge.screens.workshop.views.VCardScript; 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 ca4a3ebed84..2990bd1b758 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 @@ -1,6 +1,6 @@ package forge.screens.workshop.menus; -import forge.assets.FSkinProp; +import forge.localinstance.assets.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 9641e857f94..06b791ee743 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 @@ -1,10 +1,10 @@ package forge.screens.workshop.views; -import forge.assets.FSkinProp; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.localinstance.assets.FSkinProp; import forge.screens.workshop.controllers.CCardDesigner; import forge.toolbox.FLabel; import forge.toolbox.FSkin; diff --git a/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java b/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java index 6aa3f61dd51..cfbd61194a3 100644 --- a/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java +++ b/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java @@ -22,7 +22,8 @@ import javax.sound.sampled.*; import com.google.common.io.Files; import com.sipgate.mp3wav.Converter; -import forge.properties.ForgeConstants; + +import forge.localinstance.properties.ForgeConstants; import java.io.ByteArrayInputStream; import java.io.File; 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 e98756648fa..d10e6952f85 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java @@ -1,34 +1,18 @@ -/* - * Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ package forge.toolbox; -import com.esotericsoftware.minlog.Log; -import forge.assets.FSkinProp; -import forge.card.ColorSet; -import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostShard; -import forge.toolbox.FSkin.SkinImage; - -import java.awt.*; +import java.awt.Graphics; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; +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.toolbox.FSkin.SkinImage; + /** *

* CardFaceSymbols class. 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 6a8fd406275..6a600b8bbf7 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java @@ -36,9 +36,9 @@ import java.awt.event.MouseEvent; import javax.swing.BorderFactory; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.framework.ILocalRepaint; import forge.interfaces.IButton; +import forge.localinstance.assets.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 0a13e07ba2f..a36906fbdd1 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java @@ -19,9 +19,9 @@ import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.framework.ILocalRepaint; import forge.interfaces.IButton; +import forge.localinstance.assets.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 91878621f24..c2f6ee9e6d4 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.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin.SkinImage; import forge.view.FDialog; import forge.view.FView; 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 a57f30d8d7b..f93ee6c21b7 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -19,14 +19,14 @@ package forge.toolbox; import forge.FThreads; import forge.Singletons; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; 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.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.util.OperatingSystem; import forge.util.WordUtil; import forge.view.FView; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImageUtil.java b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImageUtil.java index dda59e4f5e6..37a1bd7e9ee 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImageUtil.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImageUtil.java @@ -30,8 +30,8 @@ import javax.imageio.ImageIO; import forge.ImageCache; import forge.ImageKeys; import forge.game.card.CardView.CardStateView; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.toolbox.CardFaceSymbols; import forge.toolbox.FSkin.SkinIcon; import forge.util.ImageUtil; 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 d4faf0cb0d8..eda3262526b 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 @@ -19,12 +19,12 @@ package forge.toolbox.special; import forge.StaticData; -import forge.assets.FSkinProp; import forge.game.card.Card; 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.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 396e8ae8bd1..1712be704be 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 @@ -1,9 +1,10 @@ package forge.toolbox.special; import com.google.common.base.Function; -import forge.assets.FSkinProp; + import forge.card.mana.ManaAtom; import forge.game.player.PlayerView; +import forge.localinstance.assets.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 76dfd9069af..b374d0cf49a 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FDialog.java +++ b/forge-gui-desktop/src/main/java/forge/view/FDialog.java @@ -37,7 +37,7 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import forge.Singletons; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FMouseAdapter; import forge.toolbox.FPanel; import forge.toolbox.FSkin; diff --git a/forge-gui-desktop/src/main/java/forge/view/FFrame.java b/forge-gui-desktop/src/main/java/forge/view/FFrame.java index c660fbdcae0..783cccfb144 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FFrame.java +++ b/forge-gui-desktop/src/main/java/forge/view/FFrame.java @@ -22,10 +22,10 @@ import javax.swing.border.Border; import forge.Singletons; import forge.gui.framework.SDisplayUtil; import forge.gui.framework.SResizingUtil; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.sound.SoundSystem; import forge.toolbox.FSkin; import forge.toolbox.FSkin.Colors; diff --git a/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java b/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java index 06c0883873c..2c7a12aeec3 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java +++ b/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java @@ -28,9 +28,9 @@ import com.google.common.collect.Lists; import forge.Singletons; import forge.gui.framework.FScreen; import forge.gui.framework.ILocalRepaint; +import forge.localinstance.properties.ForgePreferences; import forge.menus.ForgeMenu; import forge.menus.LayoutMenu; -import forge.properties.ForgePreferences; import forge.toolbox.FButton; import forge.toolbox.FDigitalClock; 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 2f9bb499825..69a68c2f541 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FView.java +++ b/forge-gui-desktop/src/main/java/forge/view/FView.java @@ -3,13 +3,13 @@ package forge.view; import com.google.common.collect.Lists; import forge.Singletons; import forge.UiCommand; -import forge.assets.FSkinProp; import forge.gui.ImportDialog; import forge.gui.SOverlayUtils; import forge.gui.framework.*; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.screens.bazaar.VBazaarUI; import forge.screens.deckeditor.VDeckEditorUI; import forge.screens.home.VHomeUI; diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java index aaaada19b0b..9551d91ffd9 100644 --- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java +++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java @@ -6,9 +6,9 @@ import forge.deck.DeckGroup; import forge.deck.io.DeckSerializer; import forge.game.*; import forge.game.player.RegisteredPlayer; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; import forge.tournament.system.*; import forge.util.Lang; import forge.util.TextUtil; 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 431b1588e19..8b30b2e0c51 100644 --- a/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java +++ b/forge-gui-desktop/src/main/java/forge/view/SplashFrame.java @@ -17,9 +17,9 @@ */ package forge.view; -import forge.assets.FSkinProp; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; 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/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index 90888aec06f..28829859770 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -30,10 +30,10 @@ import forge.game.card.CounterType; import forge.game.zone.ZoneType; import forge.gui.CardContainer; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants.CounterDisplayType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgeConstants.CounterDisplayType; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.toolbox.CardFaceSymbols; import forge.toolbox.FSkin.SkinnedPanel; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java index c5282b053b5..a0177d15854 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java @@ -20,9 +20,9 @@ package forge.view.arcane; import forge.Singletons; import forge.game.card.CardView; import forge.gui.framework.SDisplayUtil; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.toolbox.FMouseAdapter; import forge.toolbox.FScrollPane; 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 f713c50098e..2b7d7a7c5f0 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 @@ -18,11 +18,11 @@ package forge.view.arcane; import forge.FThreads; -import forge.assets.FSkinProp; import forge.game.card.CardView; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; -import forge.properties.ForgePreferences.FPref; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.toolbox.FMouseAdapter; import forge.toolbox.FScrollPane; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java index a2a030e361b..9c5cd9217d5 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java @@ -32,8 +32,8 @@ import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; import forge.toolbox.FScrollPane; import forge.toolbox.MouseTriggerEvent; diff --git a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java index 3ab71d505a0..9c7b955748c 100644 --- a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java +++ b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java @@ -4,7 +4,7 @@ import forge.card.CardRarity; import forge.card.CardRules; import forge.item.PaperCard; import forge.limited.CardRanker; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import org.junit.Assert; import org.testng.annotations.BeforeTest; diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java index a253dc8391c..f08fec5d8ff 100644 --- a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java +++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java @@ -26,10 +26,9 @@ import forge.game.player.RegisteredPlayer; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.item.IPaperCard; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; - import junit.framework.TestCase; public class SimulationTestCase extends TestCase { diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java index 4e3560a0603..81d479a2818 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java +++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java @@ -7,8 +7,9 @@ import forge.gamesimulationtests.util.GameWrapper; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; import forge.gamesimulationtests.util.playeractions.testactions.AssertAction; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; + import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.testng.PowerMockTestCase; diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/CardDatabaseHelper.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/CardDatabaseHelper.java index 5b34a476e55..3d6db3a3a84 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/CardDatabaseHelper.java +++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/CardDatabaseHelper.java @@ -3,9 +3,9 @@ package forge.gamesimulationtests.util; import forge.CardStorageReader; import forge.StaticData; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; public class CardDatabaseHelper { private static StaticData staticData; diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java index 2e0c1b8ab31..e73df34bcfd 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java +++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java @@ -19,8 +19,8 @@ import forge.gamesimulationtests.util.player.PlayerSpecificationBuilder; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; import forge.gamesimulationtests.util.playeractions.PlayerActions; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import java.util.*; diff --git a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java index 0569a0e343e..4a2ca5c8d69 100644 --- a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java +++ b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java @@ -15,7 +15,7 @@ import forge.GuiDesktop; import forge.card.CardRarity; import forge.card.CardRules; import forge.card.DeckHints; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; /** diff --git a/forge-gui-desktop/src/test/java/forge/model/FModelTest.java b/forge-gui-desktop/src/test/java/forge/model/FModelTest.java index 786b96493b5..bac8942a6fc 100644 --- a/forge-gui-desktop/src/test/java/forge/model/FModelTest.java +++ b/forge-gui-desktop/src/test/java/forge/model/FModelTest.java @@ -1,7 +1,7 @@ package forge.model; import forge.error.ExceptionHandler; -import forge.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences; import forge.util.BuildInfo; import org.testng.Assert; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java index d74ac25ac6d..64bf58ed525 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java @@ -15,9 +15,9 @@ import forge.game.GameRules; import forge.game.GameType; import forge.item.PaperCard; import forge.limited.CardRanker; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import java.io.File; import java.util.ArrayList; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java index 5d352e0d51a..e72caac572d 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java @@ -18,10 +18,10 @@ import forge.game.Match; import forge.game.player.RegisteredPlayer; import forge.item.PaperCard; import forge.limited.CardRanker; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.tournament.system.AbstractTournament; import forge.tournament.system.TournamentPairing; import forge.tournament.system.TournamentPlayer; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java index 901fb33de59..241372740f2 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java @@ -11,9 +11,9 @@ import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import java.io.File; import java.util.List; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java index 4d6a459d1d5..fd0dbc66ae9 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java @@ -9,9 +9,10 @@ import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; + import java.io.File; import java.util.List; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java index 1e904285971..bb31c767c85 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java @@ -15,9 +15,9 @@ import forge.game.GameRules; import forge.game.GameType; import forge.item.PaperCard; import forge.limited.CardRanker; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import java.io.File; import java.util.ArrayList; diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index fb86479e7c3..38ee6a75495 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.backends.lwjgl.LwjglClipboard; import forge.Forge; import forge.assets.AssetsDownloader; import forge.interfaces.IDeviceAdapter; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.FileUtil; import forge.util.OperatingSystem; import forge.util.RestartUtil; diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index ae6a4c14e83..745afb1f252 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -14,10 +14,10 @@ import forge.assets.ImageCache; import forge.error.BugReporter; import forge.error.ExceptionHandler; import forge.interfaces.IDeviceAdapter; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.SplashScreen; import forge.screens.home.HomeScreen; diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index c277edc066c..6651b510882 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/forge-gui-mobile/src/forge/GuiMobile.java @@ -13,9 +13,7 @@ import forge.assets.FBufferedImage; import forge.assets.FDelayLoadImage; import forge.assets.FImage; import forge.assets.FSkin; -import forge.assets.FSkinProp; import forge.assets.FTextureImage; -import forge.assets.ISkinImage; import forge.assets.ImageCache; import forge.card.CardRenderer; import forge.deck.Deck; @@ -25,8 +23,10 @@ import forge.error.BugReportDialog; import forge.interfaces.IGuiBase; import forge.interfaces.IGuiGame; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; -import forge.properties.ForgeConstants; import forge.screens.LoadingOverlay; import forge.screens.match.MatchController; import forge.screens.quest.QuestMenu; diff --git a/forge-gui-mobile/src/forge/animation/AbilityEffect.java b/forge-gui-mobile/src/forge/animation/AbilityEffect.java index cb96ab59f30..bda4ca6a8cc 100644 --- a/forge-gui-mobile/src/forge/animation/AbilityEffect.java +++ b/forge-gui-mobile/src/forge/animation/AbilityEffect.java @@ -1,9 +1,9 @@ package forge.animation; import forge.Graphics; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.sound.AudioClip; public enum AbilityEffect { diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index 5bbc2be0dcd..fdd8a3858ad 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableList; import forge.FThreads; import forge.Forge; import forge.download.GuiDownloadZipService; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.screens.SplashScreen; import forge.util.FileUtil; import forge.util.gui.SOptionPane; diff --git a/forge-gui-mobile/src/forge/assets/FImage.java b/forge-gui-mobile/src/forge/assets/FImage.java index 7e6e8425292..ae35300d130 100644 --- a/forge-gui-mobile/src/forge/assets/FImage.java +++ b/forge-gui-mobile/src/forge/assets/FImage.java @@ -1,6 +1,7 @@ package forge.assets; import forge.Graphics; +import forge.localinstance.assets.ISkinImage; public interface FImage extends ISkinImage { float getWidth(); diff --git a/forge-gui-mobile/src/forge/assets/FLanguage.java b/forge-gui-mobile/src/forge/assets/FLanguage.java index 1fbd146f352..7f3fac71bb4 100644 --- a/forge-gui-mobile/src/forge/assets/FLanguage.java +++ b/forge-gui-mobile/src/forge/assets/FLanguage.java @@ -2,10 +2,11 @@ package forge.assets; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; + +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 48544a63648..0e4a13ca28f 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -17,10 +17,11 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.FThreads; import forge.assets.FSkinImage.SourceFile; import forge.card.CardFaceSymbols; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.LoadingOverlay; import forge.screens.SplashScreen; import forge.toolbox.FProgressBar; diff --git a/forge-gui-mobile/src/forge/assets/FSkinColor.java b/forge-gui-mobile/src/forge/assets/FSkinColor.java index 883088687f3..a1b3f6052a7 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinColor.java +++ b/forge-gui-mobile/src/forge/assets/FSkinColor.java @@ -4,6 +4,7 @@ import java.util.HashMap; import com.badlogic.gdx.graphics.Color; +import forge.localinstance.assets.FSkinProp; import forge.screens.match.TargetingOverlay; public class FSkinColor { diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java index b568835d639..5bb946f7748 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinFont.java +++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java @@ -1,5 +1,15 @@ package forge.assets; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; @@ -18,22 +28,12 @@ import com.badlogic.gdx.utils.Array; import forge.FThreads; import forge.Forge; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.LineReader; import forge.util.TextBounds; import forge.util.Utils; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class FSkinFont { private static final int MIN_FONT_SIZE = 8; private static int MAX_FONT_SIZE = 72; diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 9d85caa38c9..30e43563fdb 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -10,7 +10,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.Forge; import forge.Graphics; -import forge.properties.ForgeConstants; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.util.ImageUtil; /** Properties of various components that make up the skin. diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java index 772d897cb24..6161619e91d 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java +++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture.TextureWrap; import forge.Graphics; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import java.util.ArrayList; import java.util.Collections; diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java index d127987c96f..f4706a3e7f4 100644 --- a/forge-gui-mobile/src/forge/assets/ImageCache.java +++ b/forge-gui-mobile/src/forge/assets/ImageCache.java @@ -36,9 +36,9 @@ import forge.game.card.CardView; import forge.game.player.IHasIcon; import forge.item.InventoryItem; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.ImageUtil; import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui-mobile/src/forge/assets/ImageLoader.java b/forge-gui-mobile/src/forge/assets/ImageLoader.java index 78e72f75c63..8579d1952ea 100644 --- a/forge-gui-mobile/src/forge/assets/ImageLoader.java +++ b/forge-gui-mobile/src/forge/assets/ImageLoader.java @@ -14,9 +14,9 @@ import forge.FThreads; import forge.Forge; import forge.ImageKeys; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.FileUtil; import forge.util.TextUtil; import org.apache.commons.lang3.tuple.Pair; diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java index 30bed5b800c..ce7fdfb3006 100644 --- a/forge-gui-mobile/src/forge/assets/TextRenderer.java +++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java @@ -13,9 +13,9 @@ import com.badlogic.gdx.utils.Align; import forge.Forge; import forge.Graphics; import forge.card.CardFaceSymbols; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.util.TextBounds; //Encodes text for drawing with symbols and reminder text diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 69cbf3d34fe..8608a48bbaa 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -22,9 +22,9 @@ import forge.game.GameView; import forge.game.card.CardView.CardStateView; import forge.game.card.CardView; import forge.game.zone.ZoneType; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.screens.FScreen; import forge.screens.match.MatchController; import forge.util.CardTranslation; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 2bc7cb3c18a..318c9f50c6e 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -37,11 +37,11 @@ import forge.game.card.CounterType; import forge.game.zone.ZoneType; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgeConstants.CounterDisplayType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgeConstants.CounterDisplayType; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.MatchController; import forge.toolbox.FList; import forge.util.CardTranslation; diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java index e0b72fea7ec..c94882c07a6 100644 --- a/forge-gui-mobile/src/forge/card/CardZoom.java +++ b/forge-gui-mobile/src/forge/card/CardZoom.java @@ -19,10 +19,10 @@ import forge.game.GameView; import forge.game.card.CardView; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.planarconquest.ConquestCommander; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.MatchController; import forge.toolbox.FCardPanel; import forge.toolbox.FDialog; diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index e796873698b..83a875629e5 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -15,11 +15,11 @@ import forge.interfaces.IGuiGame; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.quest.QuestEventChallenge; diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index dbf29308dcc..f87d7e812f6 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -9,8 +9,12 @@ import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import forge.Forge; import forge.Forge.KeyInputAdapter; +import forge.assets.FImage; +import forge.assets.FSkin; +import forge.assets.FSkinFont; +import forge.assets.FSkinImage; +import forge.assets.FTextureRegionImage; import forge.Graphics; -import forge.assets.*; import forge.card.CardDb; import forge.card.CardEdition; import forge.card.CardPreferences; @@ -24,13 +28,14 @@ import forge.itemmanager.ItemManager.ContextMenuBuilder; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; import forge.limited.BoosterDraft; +import forge.localinstance.assets.*; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FCheckBoxMenuItem; import forge.menu.FDropDownMenu; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.model.FModel; import forge.planarconquest.ConquestUtil; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.TabPageScreen; import forge.toolbox.*; diff --git a/forge-gui-mobile/src/forge/menu/FMenuItem.java b/forge-gui-mobile/src/forge/menu/FMenuItem.java index 041c2b86a8e..3508963cd48 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuItem.java +++ b/forge-gui-mobile/src/forge/menu/FMenuItem.java @@ -11,8 +11,8 @@ import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; -import forge.assets.FSkinProp; import forge.interfaces.IButton; +import forge.localinstance.assets.FSkinProp; import forge.screens.FScreen.Header; import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/screens/TabPageScreen.java b/forge-gui-mobile/src/forge/screens/TabPageScreen.java index 64ab47cdb69..963b8c50f40 100644 --- a/forge-gui-mobile/src/forge/screens/TabPageScreen.java +++ b/forge-gui-mobile/src/forge/screens/TabPageScreen.java @@ -8,9 +8,9 @@ import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinColor.Colors; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FPopupMenu; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FContainer; import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java index 5740d1b9973..c90ec8f6930 100644 --- a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java +++ b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java @@ -6,8 +6,6 @@ import com.badlogic.gdx.utils.Align; import forge.Forge; import forge.Graphics; -import forge.achievement.Achievement; -import forge.achievement.AchievementCollection; import forge.assets.FBufferedImage; import forge.assets.FImage; import forge.assets.FSkinColor; @@ -16,6 +14,8 @@ import forge.assets.FSkinImage; import forge.assets.FSkinTexture; import forge.card.CardZoom; import forge.item.IPaperCard; +import forge.localinstance.achievements.Achievement; +import forge.localinstance.achievements.AchievementCollection; import forge.menu.FDropDown; import forge.screens.FScreen; import forge.toolbox.FComboBox; diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index 876528b4dd3..3149f18029b 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -32,14 +32,14 @@ import forge.assets.FSkinFont; import forge.game.GameType; import forge.interfaces.ILobbyView; import forge.interfaces.IPlayerChangeListener; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.GameLobby; import forge.match.LobbySlot; import forge.match.LobbySlotType; import forge.menu.FPopupMenu; import forge.model.FModel; import forge.net.event.UpdateLobbyPlayerEvent; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java index c573649ccfd..e109d452bd2 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java @@ -31,11 +31,11 @@ import forge.game.GameType; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.DeckManager; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.LobbySlot; import forge.match.LobbySlotType; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.toolbox.FComboBox; import forge.toolbox.FContainer; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/screens/home/LoadGameMenu.java b/forge-gui-mobile/src/forge/screens/home/LoadGameMenu.java index a875ea6c3ec..40082ecf6a4 100644 --- a/forge-gui-mobile/src/forge/screens/home/LoadGameMenu.java +++ b/forge-gui-mobile/src/forge/screens/home/LoadGameMenu.java @@ -3,11 +3,11 @@ package forge.screens.home; import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinImage; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.gauntlet.LoadGauntletScreen; import forge.screens.limited.LoadDraftScreen; diff --git a/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java b/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java index af3cb2e1b74..44ad3f5d7b8 100644 --- a/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java +++ b/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java @@ -3,11 +3,11 @@ package forge.screens.home; import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinImage; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.constructed.ConstructedScreen; import forge.screens.gauntlet.NewGauntletScreen; diff --git a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java index 6736c54b96c..2f026e7195d 100644 --- a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java @@ -6,9 +6,9 @@ import forge.deck.Deck; import forge.game.GameRules; import forge.game.GameType; import forge.game.player.RegisteredPlayer; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; import forge.puzzle.Puzzle; import forge.puzzle.PuzzleIO; import forge.screens.LaunchScreen; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java index 0e0d3da2fbe..38dac09e413 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.utils.Align; import forge.FThreads; import forge.Forge; import forge.GuiBase; -import forge.properties.ForgePreferences.FPref; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; import forge.screens.home.LoadGameMenu; @@ -26,6 +25,7 @@ import forge.game.player.RegisteredPlayer; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java index bb3e373dcd3..46ef83d4fe6 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java @@ -18,10 +18,10 @@ import forge.game.player.RegisteredPlayer; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; import forge.screens.home.LoadGameMenu; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 51c1ffafe75..ab1f6a8f49c 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -22,7 +22,6 @@ import forge.GuiBase; import forge.LobbyPlayer; import forge.assets.FImage; import forge.assets.FSkin; -import forge.assets.FSkinProp; import forge.assets.FTextureRegionImage; import forge.assets.ImageCache; import forge.card.CardAvatarImage; @@ -38,13 +37,14 @@ import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.AbstractGuiGame; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.views.VAssignCombatDamage; import forge.screens.match.views.VPhaseIndicator; import forge.screens.match.views.VPhaseIndicator.PhaseLabel; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java index 903b796ed80..e09c7cf4eb5 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java @@ -34,6 +34,8 @@ import forge.game.phase.PhaseType; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; import forge.interfaces.IGameController; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FDropDown; import forge.menu.FDropDownMenu; import forge.menu.FMenuBar; @@ -41,8 +43,6 @@ import forge.menu.FMenuItem; import forge.menu.FMenuTab; import forge.model.FModel; import forge.player.PlayerZoneUpdate; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.match.views.VAvatar; import forge.screens.match.views.VCardDisplayArea.CardAreaPanel; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VLog.java b/forge-gui-mobile/src/forge/screens/match/views/VLog.java index 98e8cb49981..1183e70a561 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VLog.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VLog.java @@ -11,9 +11,9 @@ import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; import forge.game.GameLogEntry; import forge.game.GameLogEntryType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FDropDown; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.MatchController; import forge.toolbox.FDisplayObject; import forge.util.Utils; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index 0917068fc34..da658f0f4ed 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -19,8 +19,8 @@ import forge.game.card.CardView; import forge.game.card.CounterEnumType; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.match.MatchController; import forge.screens.match.MatchScreen; import forge.toolbox.FCardPanel; 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 2ec95f48e13..75ac2706e33 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java @@ -18,9 +18,9 @@ package forge.screens.match.winlose; */ import forge.FThreads; -import forge.assets.FSkinProp; import forge.game.GameView; import forge.gauntlet.GauntletWinLoseController; +import forge.localinstance.assets.FSkinProp; import forge.util.Localizer; import forge.util.gui.SOptionPane; 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 3bf59a0a19e..49eed38bc72 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -7,12 +7,12 @@ import forge.Forge; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; -import forge.assets.FSkinProp; import forge.game.GameLogEntry; import forge.game.GameLogEntryType; import forge.game.GameView; import forge.interfaces.IWinLoseView; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; import forge.menu.FMagnifyView; import forge.model.FModel; import forge.toolbox.FButton; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java index 7cad5dc8b2e..6708d3a729c 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java @@ -8,13 +8,13 @@ import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.net.ChatMessage; import forge.net.IOnlineChatInterface; import forge.net.IRemote; import forge.net.event.MessageEvent; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index 7240b6e6a5b..c3730d290cb 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -4,8 +4,9 @@ import com.google.common.collect.ImmutableList; import forge.FThreads; import forge.Forge; import forge.GuiBase; -import forge.assets.FSkinProp; import forge.interfaces.ILobbyView; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.match.GameLobby; import forge.net.ChatMessage; import forge.net.IOnlineChatInterface; @@ -14,7 +15,6 @@ import forge.net.NetConnectUtil; import forge.net.OfflineLobby; import forge.net.client.FGameClient; import forge.net.server.FServerManager; -import forge.properties.ForgeConstants; import forge.screens.LoadingOverlay; import forge.screens.constructed.LobbyScreen; import forge.screens.online.OnlineMenu.OnlineScreen; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java index dc9cbf1a33c..b2859443c6a 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java @@ -3,12 +3,12 @@ package forge.screens.online; import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinImage; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.model.FModel; import forge.net.server.FServerManager; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index f94277d86fa..df6ed919610 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -17,7 +17,6 @@ import forge.animation.ForgeAnimation; import forge.assets.FSkin; import forge.assets.FSkinColor; import forge.assets.FSkinFont; -import forge.assets.FSkinProp; import forge.assets.FSkinTexture; import forge.assets.TextRenderer; import forge.card.CardRarity; @@ -27,6 +26,7 @@ import forge.card.ColorSet; import forge.card.CardRenderer.CardStackPosition; import forge.card.ColorSetImage; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.planarconquest.ConquestCommander; import forge.planarconquest.ConquestData; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java index e8568fb8112..18f5b638de4 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java @@ -1,11 +1,11 @@ package forge.screens.planarconquest; import forge.Forge; -import forge.achievement.PlaneswalkerAchievements; import forge.assets.FImage; import forge.card.CardListPreview; import forge.deck.FDeckChooser; import forge.item.PaperCard; +import forge.localinstance.achievements.PlaneswalkerAchievements; import forge.model.FModel; import forge.planarconquest.ConquestData; import forge.screens.FScreen; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index 916062c22bd..c97603cfcad 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -16,6 +16,7 @@ import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.localinstance.properties.ForgeConstants; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.model.FModel; @@ -23,7 +24,6 @@ import forge.planarconquest.ConquestController; import forge.planarconquest.ConquestData; import forge.planarconquest.ConquestPreferences; import forge.planarconquest.ConquestPreferences.CQPref; -import forge.properties.ForgeConstants; import forge.quest.QuestUtil; import forge.screens.LaunchScreen; import forge.screens.home.LoadGameMenu; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index ba3fda7341a..094d08db6d5 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -3,11 +3,11 @@ package forge.screens.planarconquest; import com.google.common.collect.Iterables; import forge.FThreads; -import forge.achievement.PlaneswalkerAchievements; import forge.assets.FImage; import forge.card.CardImage; import forge.card.CardListPreview; import forge.item.PaperCard; +import forge.localinstance.achievements.PlaneswalkerAchievements; import forge.model.FModel; import forge.planarconquest.ConquestController; import forge.planarconquest.ConquestData; diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index 0d1c40ca817..901b6adb063 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -17,10 +17,10 @@ import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.localinstance.properties.ForgeConstants; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.QuestUtil; import forge.quest.data.DeckConstructionRules; diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java index 098f56b96ea..1b9f977d895 100644 --- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java @@ -15,9 +15,9 @@ import forge.game.GameFormat; import forge.item.PaperCard; import forge.item.PreconDeck; import forge.itemmanager.filters.HistoricFormatSelect; +import forge.localinstance.properties.ForgeConstants; import forge.model.CardCollections; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.QuestMode; import forge.quest.QuestUtil; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java index e99dfcf2538..fdbde6e354e 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java @@ -13,10 +13,10 @@ import forge.deck.FDeckEditor.EditorType; import forge.interfaces.IButton; import forge.interfaces.ICheckBox; import forge.interfaces.IComboBox; +import forge.localinstance.properties.ForgeConstants; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.IVQuestStats; import forge.quest.QuestUtil; import forge.quest.data.QuestPreferences.QPref; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 8b96b79da03..9dacdee15ee 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -20,8 +20,8 @@ import forge.itemmanager.CardManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; import forge.limited.BoosterDraft; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.IQuestTournamentView; import forge.quest.QuestDraftUtils; import forge.quest.QuestEventDraft; diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java index ebc224e9cfd..bfc99edac90 100644 --- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -16,6 +16,7 @@ import forge.download.GuiDownloadSkins; import forge.download.GuiDownloadZipService; import forge.properties.ForgeConstants; import forge.util.FileUtil; +import forge.localinstance.properties.ForgeProfileProperties; import forge.util.Localizer; import org.apache.commons.lang3.StringUtils; @@ -26,7 +27,6 @@ import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinImage; -import forge.properties.ForgeProfileProperties; import forge.screens.TabPageScreen.TabPage; import forge.toolbox.FFileChooser; import forge.toolbox.FFileChooser.ChoiceType; diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 417880b7ddc..ead74e8a1f8 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -14,10 +14,10 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.assets.ImageCache; import forge.game.GameLogEntryType; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.screens.TabPageScreen; import forge.screens.TabPageScreen.TabPage; diff --git a/forge-gui-mobile/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java index ac07cfe6e43..07da657eca7 100644 --- a/forge-gui-mobile/src/forge/toolbox/FButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FButton.java @@ -11,8 +11,8 @@ import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; import forge.assets.FSkinImage; -import forge.assets.FSkinProp; import forge.interfaces.IButton; +import forge.localinstance.assets.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 5cd93132579..debb33b79c0 100644 --- a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java +++ b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java @@ -9,8 +9,6 @@ import forge.Graphics; import forge.assets.FSkin; import forge.assets.FSkinColor; import forge.assets.FSkinFont; -import forge.assets.FSkinProp; -import forge.assets.IHasSkinProp; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; import forge.card.CardFaceSymbols; @@ -29,6 +27,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.screens.match.MatchController; import forge.screens.match.views.VAvatar; import forge.screens.match.views.VStack; diff --git a/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java b/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java index ec4d73f8cb5..eb26327f83b 100644 --- a/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java +++ b/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java @@ -6,8 +6,8 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.util.Utils; public abstract class FGestureAdapter extends InputAdapter { diff --git a/forge-gui-mobile/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java index 24b0cfbaea6..51f37a63663 100644 --- a/forge-gui-mobile/src/forge/toolbox/FLabel.java +++ b/forge-gui-mobile/src/forge/toolbox/FLabel.java @@ -7,11 +7,11 @@ import forge.Graphics; import forge.UiCommand; import forge.assets.FImage; import forge.assets.FSkinColor; -import forge.assets.FSkinProp; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; import forge.interfaces.IButton; +import forge.localinstance.assets.FSkinProp; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; import forge.util.TextBounds; diff --git a/forge-gui-mobile/src/forge/toolbox/FList.java b/forge-gui-mobile/src/forge/toolbox/FList.java index c6c3f80cc74..60508287064 100644 --- a/forge-gui-mobile/src/forge/toolbox/FList.java +++ b/forge-gui-mobile/src/forge/toolbox/FList.java @@ -12,8 +12,8 @@ import forge.assets.FSkinTexture; import forge.assets.FSkinColor.Colors; import forge.item.InventoryItem; import forge.itemmanager.filters.AdvancedSearchFilter; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; import forge.util.Utils; diff --git a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java index cce5b77445e..778387b4a8d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java @@ -17,11 +17,11 @@ import forge.assets.FImage; import forge.assets.FSkin; import forge.assets.FSkinFont; import forge.assets.FSkinImage; -import forge.assets.FSkinProp; 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.screens.match.views.VPrompt; import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; diff --git a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java index cb60e76e3d3..5a3dd1190c2 100644 --- a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.math.Vector2; import forge.Graphics; import forge.animation.ForgeAnimation; import forge.assets.FSkinColor; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.PhysicsObject; import forge.util.Utils; diff --git a/forge-gui/src/main/java/forge/assets/ISkinImage.java b/forge-gui/src/main/java/forge/assets/ISkinImage.java deleted file mode 100644 index b6c6cd720d2..00000000000 --- a/forge-gui/src/main/java/forge/assets/ISkinImage.java +++ /dev/null @@ -1,5 +0,0 @@ -package forge.assets; - -public interface ISkinImage { - -} diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java index 0fe7ba5c0b0..1cd0d23bfd5 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java @@ -11,9 +11,9 @@ import forge.item.InventoryItemFromSet; import forge.item.PaperCard; import forge.item.PreconDeck; import forge.item.SealedProduct; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.CardTranslation; import forge.util.Lang; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui/src/main/java/forge/card/CardPreferences.java b/forge-gui/src/main/java/forge/card/CardPreferences.java index ffda9881370..a7bc5a007a1 100644 --- a/forge-gui/src/main/java/forge/card/CardPreferences.java +++ b/forge-gui/src/main/java/forge/card/CardPreferences.java @@ -1,8 +1,8 @@ package forge.card; import forge.item.IPaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.XmlUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java index 00acd98e5fa..4a1439f3513 100644 --- a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java +++ b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java @@ -1,7 +1,7 @@ package forge.card; import forge.CardStorageReader; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import java.io.*; diff --git a/forge-gui/src/main/java/forge/card/CardScriptInfo.java b/forge-gui/src/main/java/forge/card/CardScriptInfo.java index 4025ea8a6e4..7a44e55ab9d 100644 --- a/forge-gui/src/main/java/forge/card/CardScriptInfo.java +++ b/forge-gui/src/main/java/forge/card/CardScriptInfo.java @@ -22,7 +22,7 @@ import java.io.PrintWriter; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; public final class CardScriptInfo { diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index d07e5a7c9b7..e3e85dbf5ac 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -20,11 +20,11 @@ import forge.game.player.PlayerView; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.interfaces.IGuiGame; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.PlayerControllerHuman; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; -import forge.properties.ForgePreferences.FPref; import forge.util.Lang; import forge.util.maps.MapOfLists; diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java index 0898e16d672..ce57898b58f 100644 --- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java @@ -10,8 +10,8 @@ import forge.deck.io.CardThemedMatrixIO; import forge.deck.io.DeckStorage; import forge.game.GameFormat; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.storage.IStorage; import forge.util.storage.StorageImmediatelySerialized; import org.apache.commons.lang3.ArrayUtils; diff --git a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java index 8cc0a5c94f5..a9ce3e2bc4d 100644 --- a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java +++ b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java @@ -19,7 +19,7 @@ package forge.deck; import forge.deck.generation.DeckGeneratorBase; import forge.deck.generation.IDeckGenPool; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/deck/DeckProxy.java b/forge-gui/src/main/java/forge/deck/DeckProxy.java index c61965aaae2..452827530a1 100644 --- a/forge-gui/src/main/java/forge/deck/DeckProxy.java +++ b/forge-gui/src/main/java/forge/deck/DeckProxy.java @@ -31,9 +31,9 @@ import forge.game.GameType; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.item.PreconDeck; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.util.BinaryUtil; diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java index 575aa7031b8..55f80947db9 100644 --- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java @@ -22,8 +22,8 @@ import forge.limited.ArchetypeDeckBuilder; import forge.limited.CardThemedCommanderDeckBuilder; import forge.limited.CardThemedConquestDeckBuilder; import forge.limited.CardThemedDeckBuilder; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.quest.QuestEventChallenge; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java index c55b9053f0b..5e6bdcf35d4 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java @@ -10,7 +10,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java index 05a599cf966..eb93e35b6e9 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java @@ -10,7 +10,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java index 335ce095849..e667fded18c 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java @@ -10,7 +10,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java index e9ecd622765..0600221af07 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java @@ -10,7 +10,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java index 5554925a960..27d3057d483 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java @@ -10,7 +10,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java index cce8444cbae..1d8b9fb34ef 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java @@ -13,7 +13,7 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.download.GuiDownloadZipService; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; import forge.util.gui.SGuiChoose; diff --git a/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java b/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java index 56d281f79e4..24c719efd28 100644 --- a/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java +++ b/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java @@ -1,7 +1,8 @@ package forge.deck.io; import forge.game.GameFormat; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; + import org.apache.commons.lang3.tuple.Pair; import java.io.*; diff --git a/forge-gui/src/main/java/forge/deck/io/CardThemedMatrixIO.java b/forge-gui/src/main/java/forge/deck/io/CardThemedMatrixIO.java index 0536e70e32e..1c5cff0bf84 100644 --- a/forge-gui/src/main/java/forge/deck/io/CardThemedMatrixIO.java +++ b/forge-gui/src/main/java/forge/deck/io/CardThemedMatrixIO.java @@ -12,7 +12,7 @@ import java.util.Map; import forge.game.GameFormat; import forge.item.PaperCard; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; /** * Created by maustin on 11/05/2017. diff --git a/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java b/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java index cb5c58ccab5..d1354acb247 100644 --- a/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java +++ b/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java @@ -2,7 +2,7 @@ package forge.deck.io; import forge.deck.DeckProxy; import forge.deck.DeckType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.XmlUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/download/AutoUpdater.java b/forge-gui/src/main/java/forge/download/AutoUpdater.java index 99ce308bd8c..a33179ed2ad 100644 --- a/forge-gui/src/main/java/forge/download/AutoUpdater.java +++ b/forge-gui/src/main/java/forge/download/AutoUpdater.java @@ -2,8 +2,8 @@ package forge.download; import com.google.common.collect.ImmutableList; import forge.GuiBase; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.BuildInfo; import forge.util.FileUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java b/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java index 66e6eb9ccc9..532ecfe9090 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java @@ -17,11 +17,11 @@ */ package forge.download; -import forge.properties.ForgeConstants; - import java.util.Map; import java.util.TreeMap; +import forge.localinstance.properties.ForgeConstants; + public class GuiDownloadAchievementImages extends GuiDownloadService { @Override public String getTitle() { diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java index 7783f2872de..776c6a5a166 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java @@ -18,8 +18,8 @@ package forge.download; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.ImageUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java index bf9987fbc87..a005eac42a4 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java @@ -19,8 +19,8 @@ package forge.download; import forge.StaticData; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.ImageUtil; import forge.ImageKeys; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java b/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java index ec0ed17a8ab..1e483f1ff72 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java @@ -21,7 +21,7 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class GuiDownloadPrices extends GuiDownloadService { @Override diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java b/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java index 06161bc453f..2be134a4696 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java @@ -17,11 +17,11 @@ */ package forge.download; -import forge.properties.ForgeConstants; - import java.util.Map; import java.util.TreeMap; +import forge.localinstance.properties.ForgeConstants; + public class GuiDownloadQuestImages extends GuiDownloadService { @Override public String getTitle() { diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/download/GuiDownloadService.java index 07cdf8afa79..4656032b252 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadService.java @@ -48,7 +48,7 @@ import forge.error.BugReporter; import forge.interfaces.IButton; import forge.interfaces.IProgressBar; import forge.interfaces.ITextField; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.HttpUtil; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java index b74442bc8cc..3cfc87a09b2 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java @@ -21,8 +21,8 @@ import com.google.common.collect.Iterables; import forge.StaticData; import forge.card.CardEdition; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.ImageUtil; import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java b/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java index 502c057f710..af0e061ae62 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java @@ -1,10 +1,10 @@ package forge.download; -import forge.properties.ForgeConstants; - import java.util.Map; import java.util.TreeMap; +import forge.localinstance.properties.ForgeConstants; + public class GuiDownloadSkins extends GuiDownloadService { @Override public String getTitle() { diff --git a/forge-gui/src/main/java/forge/error/BugReporter.java b/forge-gui/src/main/java/forge/error/BugReporter.java index 50400492010..f4a850e3d51 100644 --- a/forge-gui/src/main/java/forge/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/error/BugReporter.java @@ -26,8 +26,8 @@ import java.io.StringWriter; import forge.FThreads; import forge.GuiBase; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.gui.SOptionPane; import forge.util.Localizer; import io.sentry.Sentry; diff --git a/forge-gui/src/main/java/forge/error/ExceptionHandler.java b/forge-gui/src/main/java/forge/error/ExceptionHandler.java index 1851ab83937..19eeb7d24de 100644 --- a/forge-gui/src/main/java/forge/error/ExceptionHandler.java +++ b/forge-gui/src/main/java/forge/error/ExceptionHandler.java @@ -29,7 +29,7 @@ import java.lang.Thread.UncaughtExceptionHandler; import com.esotericsoftware.minlog.Log; import forge.FTrace; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.MultiplexOutputStream; /** diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java index e9b470cf10a..3f9f6d66c9a 100644 --- a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java +++ b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java @@ -6,8 +6,8 @@ import forge.GuiBase; import forge.deck.Deck; import forge.game.GameType; import forge.game.player.RegisteredPlayer; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; -import forge.properties.ForgeConstants; import java.io.File; import java.text.DateFormat; diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java b/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java index 721e4bd3298..c47ff5d4c00 100644 --- a/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java +++ b/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java @@ -34,8 +34,8 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import forge.deck.CardPool; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.IgnoringXStream; public class GauntletIO { diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletWinLoseController.java b/forge-gui/src/main/java/forge/gauntlet/GauntletWinLoseController.java index 5f8b4386a71..7e4310d565f 100644 --- a/forge-gui/src/main/java/forge/gauntlet/GauntletWinLoseController.java +++ b/forge-gui/src/main/java/forge/gauntlet/GauntletWinLoseController.java @@ -5,12 +5,12 @@ import java.util.List; import com.google.common.collect.Lists; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.deck.Deck; import forge.game.GameView; import forge.game.player.RegisteredPlayer; import forge.interfaces.IButton; import forge.interfaces.IWinLoseView; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/interfaces/IButton.java b/forge-gui/src/main/java/forge/interfaces/IButton.java index f964c1a6120..583dae0820e 100644 --- a/forge-gui/src/main/java/forge/interfaces/IButton.java +++ b/forge-gui/src/main/java/forge/interfaces/IButton.java @@ -1,7 +1,7 @@ package forge.interfaces; import forge.UiCommand; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; public interface IButton extends ITextComponent { boolean isSelected(); diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/interfaces/IGuiBase.java index 78605c2ba63..029676c0496 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java +++ b/forge-gui/src/main/java/forge/interfaces/IGuiBase.java @@ -8,10 +8,10 @@ import java.util.List; import com.google.common.base.Function; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; import forge.download.GuiDownloadService; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; import forge.match.HostedMatch; import forge.sound.IAudioClip; import forge.sound.IAudioMusic; diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java index ded3b8b5963..a503de1daca 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java +++ b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java @@ -7,7 +7,6 @@ import java.util.Map; import com.google.common.base.Function; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.deck.CardPool; import forge.game.GameEntityView; import forge.game.GameView; @@ -22,6 +21,7 @@ import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java b/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java index bf650e8757a..fc3dd3590b9 100644 --- a/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java +++ b/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java @@ -2,8 +2,8 @@ package forge.interfaces; import java.util.List; -import forge.assets.FSkinProp; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; public interface IWinLoseView { T getBtnContinue(); diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java index 43896e63dea..0a41ae100cd 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java @@ -1,9 +1,9 @@ package forge.itemmanager; import forge.itemmanager.ItemColumnConfig.SortState; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; import forge.util.XmlUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index d0b49c98364..d44f68f540c 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -10,8 +10,8 @@ import forge.interfaces.IButton; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.SItemManagerUtil.StatTypes; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.quest.data.StarRating; import forge.util.BinaryUtil; import forge.util.PredicateString.StringOp; diff --git a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java index 5aeba9487cb..0c9d1702be5 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java @@ -2,13 +2,13 @@ package forge.itemmanager; import com.google.common.base.Predicate; import forge.GuiBase; -import forge.assets.FSkinProp; -import forge.assets.IHasSkinProp; import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.deck.DeckProxy; import forge.interfaces.IComboBox; import forge.item.InventoryItem; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.IHasSkinProp; import forge.util.ComparableOp; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index 099fc628b81..e6cf6d207e6 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -29,10 +29,10 @@ import forge.item.SealedProduct; import forge.item.generation.ChaosBoosterSupplier; import forge.item.generation.IUnOpenedProduct; import forge.item.generation.UnOpenedProduct; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.CardBlock; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.FileUtil; import forge.util.ItemPool; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java index 86f83429d97..fdb89d30e4f 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java @@ -23,7 +23,7 @@ import java.util.List; import forge.card.ColorSet; import forge.deck.Deck; import forge.item.PaperCard; -import forge.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences; /** *

diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java index fe572df8845..2107d945159 100644 --- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java @@ -18,8 +18,8 @@ import forge.deck.generation.IDeckGenPool; import forge.game.GameFormat; import forge.item.IPaperCard; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.util.MyRandom; import java.util.*; diff --git a/forge-gui/src/main/java/forge/limited/LimitedPlayerAI.java b/forge-gui/src/main/java/forge/limited/LimitedPlayerAI.java index 89d24d32cff..be81398d911 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedPlayerAI.java +++ b/forge-gui/src/main/java/forge/limited/LimitedPlayerAI.java @@ -5,7 +5,7 @@ import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; import forge.item.PaperCard; -import forge.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences; import java.util.List; diff --git a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java index 81b117adb39..d2f485d3628 100644 --- a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java +++ b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java @@ -1,6 +1,6 @@ package forge.limited; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import java.util.HashMap; diff --git a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java index ca513569a66..20b89dbfd28 100644 --- a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java @@ -19,7 +19,6 @@ package forge.limited; import com.google.common.collect.Lists; import forge.StaticData; -import forge.assets.FSkinProp; import forge.card.CardEdition; import forge.card.MagicColor; import forge.deck.CardPool; @@ -30,11 +29,12 @@ 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.model.CardBlock; import forge.model.FModel; import forge.model.UnOpenedMeta; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; import forge.util.FileUtil; import forge.util.MyRandom; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/achievement/Achievement.java b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Achievement.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java index 90467301f4c..bf60ddf11be 100644 --- a/forge-gui/src/main/java/forge/achievement/Achievement.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import java.text.DateFormat; import java.util.Date; @@ -7,12 +7,12 @@ import java.util.Locale; import org.w3c.dom.Element; import forge.GuiBase; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; import forge.game.Game; import forge.game.player.Player; import forge.item.IPaperCard; -import forge.properties.ForgeConstants; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; +import forge.localinstance.properties.ForgeConstants; import forge.util.Lang; import forge.util.XmlUtil; diff --git a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java similarity index 98% rename from forge-gui/src/main/java/forge/achievement/AchievementCollection.java rename to forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java index 355bc0cd4a8..0d42d4828bb 100644 --- a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.GuiBase; import java.io.File; @@ -22,9 +22,9 @@ import forge.game.GameType; import forge.game.Match; import forge.game.player.Player; import forge.interfaces.IComboBox; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.XmlUtil; diff --git a/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/AltWinAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java index 02da7141241..93b37d337c3 100644 --- a/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java @@ -1,12 +1,12 @@ -package forge.achievement; +package forge.localinstance.achievements; import org.apache.commons.lang3.StringUtils; import forge.game.Game; import forge.game.player.Player; import forge.item.IPaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.Localizer; import forge.util.CardTranslation; diff --git a/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java b/forge-gui/src/main/java/forge/localinstance/achievements/ArcaneMaster.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/ArcaneMaster.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ArcaneMaster.java index a2c35c81e9f..a19b28d50e1 100644 --- a/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ArcaneMaster.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.GameType; diff --git a/forge-gui/src/main/java/forge/achievement/Blackjack.java b/forge-gui/src/main/java/forge/localinstance/achievements/Blackjack.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Blackjack.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Blackjack.java index 4fbb18ec821..51a45e3e780 100644 --- a/forge-gui/src/main/java/forge/achievement/Blackjack.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Blackjack.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.card.Card; diff --git a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java index 29fbcfadcb8..3989a7ad663 100644 --- a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java @@ -1,10 +1,10 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.deck.Deck; import forge.game.Game; import forge.game.GameType; import forge.game.player.Player; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.Localizer; public class ChallengeAchievements extends AchievementCollection { diff --git a/forge-gui/src/main/java/forge/achievement/ConstructedAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/ConstructedAchievements.java similarity index 91% rename from forge-gui/src/main/java/forge/achievement/ConstructedAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ConstructedAchievements.java index afa48da8c5d..ff99e7cf459 100644 --- a/forge-gui/src/main/java/forge/achievement/ConstructedAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ConstructedAchievements.java @@ -1,7 +1,7 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class ConstructedAchievements extends AchievementCollection { public ConstructedAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/DeckedOut.java b/forge-gui/src/main/java/forge/localinstance/achievements/DeckedOut.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/DeckedOut.java rename to forge-gui/src/main/java/forge/localinstance/achievements/DeckedOut.java index 95b5ab0d74d..8bb431b7a58 100644 --- a/forge-gui/src/main/java/forge/achievement/DeckedOut.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/DeckedOut.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.GameLossReason; diff --git a/forge-gui/src/main/java/forge/achievement/Domain.java b/forge-gui/src/main/java/forge/localinstance/achievements/Domain.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Domain.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Domain.java index 68c09f616a0..2ed10062c79 100644 --- a/forge-gui/src/main/java/forge/achievement/Domain.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Domain.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.GameType; diff --git a/forge-gui/src/main/java/forge/achievement/DraftAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/DraftAchievements.java similarity index 78% rename from forge-gui/src/main/java/forge/achievement/DraftAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/DraftAchievements.java index 1945eef0f8e..e820f907e9b 100644 --- a/forge-gui/src/main/java/forge/achievement/DraftAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/DraftAchievements.java @@ -1,6 +1,6 @@ -package forge.achievement; +package forge.localinstance.achievements; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class DraftAchievements extends AchievementCollection { public DraftAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/GameWinStreak.java b/forge-gui/src/main/java/forge/localinstance/achievements/GameWinStreak.java similarity index 95% rename from forge-gui/src/main/java/forge/achievement/GameWinStreak.java rename to forge-gui/src/main/java/forge/localinstance/achievements/GameWinStreak.java index c1e3c4e60f5..f9e936a50cb 100644 --- a/forge-gui/src/main/java/forge/achievement/GameWinStreak.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/GameWinStreak.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/Hellbent.java b/forge-gui/src/main/java/forge/localinstance/achievements/Hellbent.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Hellbent.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Hellbent.java index 38693fa4df4..5e6dcfb4b47 100644 --- a/forge-gui/src/main/java/forge/achievement/Hellbent.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Hellbent.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/LifeToSpare.java b/forge-gui/src/main/java/forge/localinstance/achievements/LifeToSpare.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/LifeToSpare.java rename to forge-gui/src/main/java/forge/localinstance/achievements/LifeToSpare.java index b7c21fe336a..09c75eb82fa 100644 --- a/forge-gui/src/main/java/forge/achievement/LifeToSpare.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/LifeToSpare.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/ManaFlooded.java b/forge-gui/src/main/java/forge/localinstance/achievements/ManaFlooded.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/ManaFlooded.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ManaFlooded.java index eb58c2e4274..1a940a6ef44 100644 --- a/forge-gui/src/main/java/forge/achievement/ManaFlooded.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ManaFlooded.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.GameType; diff --git a/forge-gui/src/main/java/forge/achievement/ManaScrewed.java b/forge-gui/src/main/java/forge/localinstance/achievements/ManaScrewed.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/ManaScrewed.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ManaScrewed.java index 0a30fb60b32..6c26e39b858 100644 --- a/forge-gui/src/main/java/forge/achievement/ManaScrewed.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ManaScrewed.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java b/forge-gui/src/main/java/forge/localinstance/achievements/MatchWinStreak.java similarity index 95% rename from forge-gui/src/main/java/forge/achievement/MatchWinStreak.java rename to forge-gui/src/main/java/forge/localinstance/achievements/MatchWinStreak.java index 024bf47d484..b79972e0bb9 100644 --- a/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/MatchWinStreak.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java b/forge-gui/src/main/java/forge/localinstance/achievements/NeedForSpeed.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/NeedForSpeed.java rename to forge-gui/src/main/java/forge/localinstance/achievements/NeedForSpeed.java index e5f48b19bd0..b953eb37ac3 100644 --- a/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/NeedForSpeed.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/NoCreatures.java b/forge-gui/src/main/java/forge/localinstance/achievements/NoCreatures.java similarity index 84% rename from forge-gui/src/main/java/forge/achievement/NoCreatures.java rename to forge-gui/src/main/java/forge/localinstance/achievements/NoCreatures.java index 9eea8bbf086..724af517a9f 100644 --- a/forge-gui/src/main/java/forge/achievement/NoCreatures.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/NoCreatures.java @@ -1,10 +1,10 @@ -package forge.achievement; +package forge.localinstance.achievements; import java.util.Map.Entry; -import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.deck.Deck; import forge.item.PaperCard; +import forge.localinstance.achievements.ChallengeAchievements.DeckChallengeAchievement; import forge.util.Localizer; public class NoCreatures extends DeckChallengeAchievement { diff --git a/forge-gui/src/main/java/forge/achievement/NoLands.java b/forge-gui/src/main/java/forge/localinstance/achievements/NoLands.java similarity index 84% rename from forge-gui/src/main/java/forge/achievement/NoLands.java rename to forge-gui/src/main/java/forge/localinstance/achievements/NoLands.java index 89e28fb9d55..f8588cc32b5 100644 --- a/forge-gui/src/main/java/forge/achievement/NoLands.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/NoLands.java @@ -1,10 +1,10 @@ -package forge.achievement; +package forge.localinstance.achievements; import java.util.Map.Entry; -import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.deck.Deck; import forge.item.PaperCard; +import forge.localinstance.achievements.ChallengeAchievements.DeckChallengeAchievement; import forge.util.Localizer; public class NoLands extends DeckChallengeAchievement { diff --git a/forge-gui/src/main/java/forge/achievement/NoSpells.java b/forge-gui/src/main/java/forge/localinstance/achievements/NoSpells.java similarity index 85% rename from forge-gui/src/main/java/forge/achievement/NoSpells.java rename to forge-gui/src/main/java/forge/localinstance/achievements/NoSpells.java index 96765abf828..3e225447b8f 100644 --- a/forge-gui/src/main/java/forge/achievement/NoSpells.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/NoSpells.java @@ -1,11 +1,11 @@ -package forge.achievement; +package forge.localinstance.achievements; import java.util.Map.Entry; -import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.card.CardType; import forge.deck.Deck; import forge.item.PaperCard; +import forge.localinstance.achievements.ChallengeAchievements.DeckChallengeAchievement; import forge.util.Localizer; public class NoSpells extends DeckChallengeAchievement { diff --git a/forge-gui/src/main/java/forge/achievement/Overkill.java b/forge-gui/src/main/java/forge/localinstance/achievements/Overkill.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Overkill.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Overkill.java index eff0ea61bb3..755a4298785 100644 --- a/forge-gui/src/main/java/forge/achievement/Overkill.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Overkill.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/PlanarConquestAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PlanarConquestAchievements.java similarity index 89% rename from forge-gui/src/main/java/forge/achievement/PlanarConquestAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/PlanarConquestAchievements.java index b9ef1f573ab..a967174b51b 100644 --- a/forge-gui/src/main/java/forge/achievement/PlanarConquestAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlanarConquestAchievements.java @@ -1,7 +1,7 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.GameType; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class PlanarConquestAchievements extends AchievementCollection { public PlanarConquestAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java similarity index 93% rename from forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java index 6aa4f852474..23713fac42b 100644 --- a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java @@ -1,13 +1,13 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.GuiBase; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; import forge.game.Game; import forge.game.player.Player; import forge.item.IPaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.Localizer; import forge.util.CardTranslation; diff --git a/forge-gui/src/main/java/forge/achievement/Poisoned.java b/forge-gui/src/main/java/forge/localinstance/achievements/Poisoned.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/Poisoned.java rename to forge-gui/src/main/java/forge/localinstance/achievements/Poisoned.java index 4afe8801224..090a51ae547 100644 --- a/forge-gui/src/main/java/forge/achievement/Poisoned.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Poisoned.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.GameLossReason; diff --git a/forge-gui/src/main/java/forge/achievement/ProgressiveAchievement.java b/forge-gui/src/main/java/forge/localinstance/achievements/ProgressiveAchievement.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/ProgressiveAchievement.java rename to forge-gui/src/main/java/forge/localinstance/achievements/ProgressiveAchievement.java index 7f7b356b115..87164fb39d7 100644 --- a/forge-gui/src/main/java/forge/achievement/ProgressiveAchievement.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ProgressiveAchievement.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/PuzzleAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java similarity index 84% rename from forge-gui/src/main/java/forge/achievement/PuzzleAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java index 2556ab38db7..b9c886d1e23 100644 --- a/forge-gui/src/main/java/forge/achievement/PuzzleAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java @@ -1,6 +1,6 @@ -package forge.achievement; +package forge.localinstance.achievements; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class PuzzleAchievements extends AchievementCollection { public PuzzleAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/QuestAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/QuestAchievements.java similarity index 81% rename from forge-gui/src/main/java/forge/achievement/QuestAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/QuestAchievements.java index a7ff1218190..ee1863d1fc5 100644 --- a/forge-gui/src/main/java/forge/achievement/QuestAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/QuestAchievements.java @@ -1,6 +1,6 @@ -package forge.achievement; +package forge.localinstance.achievements; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class QuestAchievements extends AchievementCollection { public QuestAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/RagsToRiches.java b/forge-gui/src/main/java/forge/localinstance/achievements/RagsToRiches.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/RagsToRiches.java rename to forge-gui/src/main/java/forge/localinstance/achievements/RagsToRiches.java index f7e96e42829..bdb9cbd77bd 100644 --- a/forge-gui/src/main/java/forge/achievement/RagsToRiches.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/RagsToRiches.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/SealedAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/SealedAchievements.java similarity index 78% rename from forge-gui/src/main/java/forge/achievement/SealedAchievements.java rename to forge-gui/src/main/java/forge/localinstance/achievements/SealedAchievements.java index fc099fec5b5..c02c290faad 100644 --- a/forge-gui/src/main/java/forge/achievement/SealedAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/SealedAchievements.java @@ -1,6 +1,6 @@ -package forge.achievement; +package forge.localinstance.achievements; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; public class SealedAchievements extends AchievementCollection { public SealedAchievements() { diff --git a/forge-gui/src/main/java/forge/achievement/StormChaser.java b/forge-gui/src/main/java/forge/localinstance/achievements/StormChaser.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/StormChaser.java rename to forge-gui/src/main/java/forge/localinstance/achievements/StormChaser.java index ab4dda64919..7fd33cbc609 100644 --- a/forge-gui/src/main/java/forge/achievement/StormChaser.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/StormChaser.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/StreakAchievement.java b/forge-gui/src/main/java/forge/localinstance/achievements/StreakAchievement.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/StreakAchievement.java rename to forge-gui/src/main/java/forge/localinstance/achievements/StreakAchievement.java index 829c06b1d94..0c1b383544c 100644 --- a/forge-gui/src/main/java/forge/achievement/StreakAchievement.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/StreakAchievement.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import org.w3c.dom.Element; diff --git a/forge-gui/src/main/java/forge/achievement/TotalGameWins.java b/forge-gui/src/main/java/forge/localinstance/achievements/TotalGameWins.java similarity index 95% rename from forge-gui/src/main/java/forge/achievement/TotalGameWins.java rename to forge-gui/src/main/java/forge/localinstance/achievements/TotalGameWins.java index 66e0c0f8c3b..404bcf74ac4 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalGameWins.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/TotalGameWins.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java b/forge-gui/src/main/java/forge/localinstance/achievements/TotalMatchWins.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/TotalMatchWins.java rename to forge-gui/src/main/java/forge/localinstance/achievements/TotalMatchWins.java index c675128e7c5..e7ee51f5ed2 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/TotalMatchWins.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java b/forge-gui/src/main/java/forge/localinstance/achievements/TotalPuzzlesSolved.java similarity index 96% rename from forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java rename to forge-gui/src/main/java/forge/localinstance/achievements/TotalPuzzlesSolved.java index fe3760e5c28..adba307a5d2 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/TotalPuzzlesSolved.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.player.Player; diff --git a/forge-gui/src/main/java/forge/achievement/VariantWins.java b/forge-gui/src/main/java/forge/localinstance/achievements/VariantWins.java similarity index 97% rename from forge-gui/src/main/java/forge/achievement/VariantWins.java rename to forge-gui/src/main/java/forge/localinstance/achievements/VariantWins.java index 9355dd4ee4b..00d70e07968 100644 --- a/forge-gui/src/main/java/forge/achievement/VariantWins.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/VariantWins.java @@ -1,4 +1,4 @@ -package forge.achievement; +package forge.localinstance.achievements; import forge.game.Game; import forge.game.GameType; diff --git a/forge-gui/src/main/java/forge/assets/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/assets/FSkinProp.java similarity index 99% rename from forge-gui/src/main/java/forge/assets/FSkinProp.java rename to forge-gui/src/main/java/forge/localinstance/assets/FSkinProp.java index de19ea39020..0a9ffd941ce 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/assets/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.assets; +package forge.localinstance.assets; /** * Assembles settings from selected or default theme as appropriate. Saves in a diff --git a/forge-gui/src/main/java/forge/assets/IHasSkinProp.java b/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java similarity index 64% rename from forge-gui/src/main/java/forge/assets/IHasSkinProp.java rename to forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java index 7270d24bf77..b210c0f301c 100644 --- a/forge-gui/src/main/java/forge/assets/IHasSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java @@ -1,4 +1,4 @@ -package forge.assets; +package forge.localinstance.assets; public interface IHasSkinProp { FSkinProp getSkinProp(); diff --git a/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java b/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java new file mode 100644 index 00000000000..14485a817f0 --- /dev/null +++ b/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java @@ -0,0 +1,5 @@ +package forge.localinstance.assets; + +public interface ISkinImage { + +} diff --git a/forge-gui/src/main/java/forge/properties/FileLocation.java b/forge-gui/src/main/java/forge/localinstance/properties/FileLocation.java similarity index 96% rename from forge-gui/src/main/java/forge/properties/FileLocation.java rename to forge-gui/src/main/java/forge/localinstance/properties/FileLocation.java index e406a7c9d7c..49c1f60ddf0 100644 --- a/forge-gui/src/main/java/forge/properties/FileLocation.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/FileLocation.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.properties; +package forge.localinstance.properties; public final class FileLocation { public final String defaultLoc; diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java similarity index 99% rename from forge-gui/src/main/java/forge/properties/ForgeConstants.java rename to forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java index 7939cbf7a95..570cb61acd7 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.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.properties; +package forge.localinstance.properties; import forge.GuiBase; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java similarity index 99% rename from forge-gui/src/main/java/forge/properties/ForgePreferences.java rename to forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java index a3a75c0cbc5..6be464f5103 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.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.properties; +package forge.localinstance.properties; import forge.MulliganDefs; import forge.game.GameLogEntryType; diff --git a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java similarity index 99% rename from forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java rename to forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java index 8ad8dff029e..3ec66112c7d 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.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.properties; +package forge.localinstance.properties; import java.io.File; import java.io.FileInputStream; diff --git a/forge-gui/src/main/java/forge/properties/PreferencesStore.java b/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java similarity index 98% rename from forge-gui/src/main/java/forge/properties/PreferencesStore.java rename to forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java index 302fdd663da..9c160aa29f6 100644 --- a/forge-gui/src/main/java/forge/properties/PreferencesStore.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.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.properties; +package forge.localinstance.properties; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/localinstance/properties/package-info.java b/forge-gui/src/main/java/forge/localinstance/properties/package-info.java new file mode 100644 index 00000000000..e03abed9d35 --- /dev/null +++ b/forge-gui/src/main/java/forge/localinstance/properties/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.localinstance.properties; + diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index 6dcbc848854..43bfc04a7ce 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -19,7 +19,6 @@ import com.google.common.collect.Sets; import forge.FThreads; import forge.GuiBase; -import forge.assets.FSkinProp; import forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; @@ -30,10 +29,11 @@ import forge.game.player.PlayerView; import forge.interfaces.IGameController; import forge.interfaces.IGuiGame; import forge.interfaces.IMayViewCards; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.trackable.TrackableTypes; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/match/GameLobby.java b/forge-gui/src/main/java/forge/match/GameLobby.java index 63fde98d9c2..62edfb8bb98 100644 --- a/forge-gui/src/main/java/forge/match/GameLobby.java +++ b/forge-gui/src/main/java/forge/match/GameLobby.java @@ -32,10 +32,10 @@ import forge.interfaces.IGameController; import forge.interfaces.IGuiGame; import forge.interfaces.IUpdateable; import forge.item.PaperCard; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.net.event.UpdateLobbyPlayerEvent; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.util.Localizer; import forge.util.NameGenerator; import forge.util.gui.SOptionPane; diff --git a/forge-gui/src/main/java/forge/match/HostedMatch.java b/forge-gui/src/main/java/forge/match/HostedMatch.java index ba2bd1f9c10..6a7261cd028 100644 --- a/forge-gui/src/main/java/forge/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/match/HostedMatch.java @@ -39,13 +39,13 @@ import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.player.RegisteredPlayer; import forge.interfaces.IGuiGame; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.player.LobbyPlayerHuman; import forge.player.PlayerControllerHuman; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.sound.MusicPlaylist; import forge.sound.SoundSystem; diff --git a/forge-gui/src/main/java/forge/match/input/InputBase.java b/forge-gui/src/main/java/forge/match/input/InputBase.java index ecac955ded0..dc688b7d533 100644 --- a/forge-gui/src/main/java/forge/match/input/InputBase.java +++ b/forge-gui/src/main/java/forge/match/input/InputBase.java @@ -27,9 +27,9 @@ import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityView; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgePreferences; import forge.util.ITriggerEvent; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/match/input/InputConfirm.java b/forge-gui/src/main/java/forge/match/input/InputConfirm.java index 33f8d2f665f..cea8f93683c 100644 --- a/forge-gui/src/main/java/forge/match/input/InputConfirm.java +++ b/forge-gui/src/main/java/forge/match/input/InputConfirm.java @@ -25,9 +25,9 @@ import forge.GuiBase; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.spellability.SpellAbility; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgePreferences; import forge.util.Localizer; /** diff --git a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java index 8db90702482..1dc10eaebdb 100644 --- a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java +++ b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java @@ -25,10 +25,10 @@ import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.LandAbility; import forge.game.spellability.SpellAbility; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.player.PlayerControllerHuman; -import forge.properties.ForgePreferences.FPref; import forge.util.ITriggerEvent; import forge.util.Localizer; import forge.util.ThreadUtil; diff --git a/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java b/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java index a3828e5370d..fb3c521ae87 100644 --- a/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java +++ b/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java @@ -7,9 +7,9 @@ import forge.game.mana.ManaConversionMatrix; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgePreferences; import forge.util.ITriggerEvent; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java index bfe0d22beb8..1a52a9a421c 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java @@ -10,7 +10,6 @@ import forge.util.TextUtil; import org.apache.commons.lang3.tuple.ImmutablePair; import forge.model.FModel; -import forge.properties.ForgePreferences; import forge.card.ColorSet; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; @@ -20,6 +19,7 @@ import forge.game.card.CardUtil; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.localinstance.properties.ForgePreferences; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java index 8521f938406..68101b1a8c0 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java @@ -8,9 +8,9 @@ import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.spellability.SpellAbility; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.properties.ForgePreferences; public abstract class InputSelectManyBase extends InputSyncronizedBase { private static final long serialVersionUID = -2305549394512889450L; diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java index 0a125b1e4ff..47521326548 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java @@ -14,12 +14,12 @@ import forge.game.card.CardView; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.Aggregates; import forge.util.ITriggerEvent; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/model/CardCollections.java b/forge-gui/src/main/java/forge/model/CardCollections.java index 9f310a48477..f971d215e8e 100644 --- a/forge-gui/src/main/java/forge/model/CardCollections.java +++ b/forge-gui/src/main/java/forge/model/CardCollections.java @@ -23,7 +23,7 @@ import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.io.DeckGroupSerializer; import forge.deck.io.DeckStorage; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.storage.IStorage; import forge.util.storage.StorageImmediatelySerialized; diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 5638d6b17b5..6fb3b17efe3 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -21,7 +21,6 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; import forge.*; import forge.CardStorageReader.ProgressObserver; -import forge.achievement.*; import forge.ai.AiProfileUtil; import forge.card.CardPreferences; import forge.card.CardType; @@ -38,14 +37,15 @@ import forge.interfaces.IProgressBar; import forge.itemmanager.ItemManagerConfig; import forge.limited.GauntletMini; import forge.limited.ThemedChaosDraft; +import forge.localinstance.achievements.*; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.planarconquest.ConquestController; import forge.planarconquest.ConquestPlane; import forge.planarconquest.ConquestPreferences; import forge.planarconquest.ConquestUtil; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestWorld; import forge.quest.data.QuestPreferences; diff --git a/forge-gui/src/main/java/forge/model/MetaSet.java b/forge-gui/src/main/java/forge/model/MetaSet.java index ee881f7e512..9b977d4e647 100644 --- a/forge-gui/src/main/java/forge/model/MetaSet.java +++ b/forge-gui/src/main/java/forge/model/MetaSet.java @@ -27,7 +27,7 @@ import forge.item.generation.IUnOpenedProduct; import forge.item.generation.UnOpenedProduct; import forge.limited.CustomLimited; import forge.limited.SealedCardPoolGenerator; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/net/ChatMessage.java b/forge-gui/src/main/java/forge/net/ChatMessage.java index 4174afc7afc..4f140cf5fe3 100644 --- a/forge-gui/src/main/java/forge/net/ChatMessage.java +++ b/forge-gui/src/main/java/forge/net/ChatMessage.java @@ -3,9 +3,9 @@ package forge.net; import java.text.SimpleDateFormat; import java.util.Date; +import forge.localinstance.properties.ForgePreferences; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; public class ChatMessage { private static final ForgePreferences prefs = FModel.getPreferences(); diff --git a/forge-gui/src/main/java/forge/net/GameProtocolHandler.java b/forge-gui/src/main/java/forge/net/GameProtocolHandler.java index d22fc8bdf33..727e8c37400 100644 --- a/forge-gui/src/main/java/forge/net/GameProtocolHandler.java +++ b/forge-gui/src/main/java/forge/net/GameProtocolHandler.java @@ -1,7 +1,7 @@ package forge.net; import forge.FThreads; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.net.event.GuiGameEvent; import forge.net.event.ReplyEvent; import forge.util.gui.SOptionPane; diff --git a/forge-gui/src/main/java/forge/net/NetConnectUtil.java b/forge-gui/src/main/java/forge/net/NetConnectUtil.java index 029c64671c8..4e1a309a5f7 100644 --- a/forge-gui/src/main/java/forge/net/NetConnectUtil.java +++ b/forge-gui/src/main/java/forge/net/NetConnectUtil.java @@ -1,7 +1,7 @@ package forge.net; import forge.match.LobbySlotType; -import forge.properties.ForgeConstants; + import org.apache.commons.lang3.StringUtils; import forge.GuiBase; @@ -10,6 +10,9 @@ import forge.interfaces.ILobbyListener; import forge.interfaces.ILobbyView; import forge.interfaces.IPlayerChangeListener; import forge.interfaces.IUpdateable; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgeProfileProperties; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.GameLobby.GameLobbyData; import forge.model.FModel; import forge.net.client.ClientGameLobby; @@ -21,8 +24,6 @@ import forge.net.event.UpdateLobbyPlayerEvent; import forge.net.server.FServerManager; import forge.net.server.ServerGameLobby; import forge.player.GamePlayerUtil; -import forge.properties.ForgeProfileProperties; -import forge.properties.ForgePreferences.FPref; import forge.util.gui.SOptionPane; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/net/ProtocolMethod.java index 3411eec5b06..fe7f697de6d 100644 --- a/forge-gui/src/main/java/forge/net/ProtocolMethod.java +++ b/forge-gui/src/main/java/forge/net/ProtocolMethod.java @@ -2,7 +2,6 @@ package forge.net; import com.google.common.base.Function; import forge.GuiBase; -import forge.assets.FSkinProp; import forge.deck.CardPool; import forge.game.GameEntityView; import forge.game.GameView; @@ -13,6 +12,7 @@ import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.interfaces.IGameController; import forge.interfaces.IGuiGame; +import forge.localinstance.assets.FSkinProp; import forge.match.NextGameDecision; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/net/client/GameClientHandler.java b/forge-gui/src/main/java/forge/net/client/GameClientHandler.java index 094123fe56a..f93ef631051 100644 --- a/forge-gui/src/main/java/forge/net/client/GameClientHandler.java +++ b/forge-gui/src/main/java/forge/net/client/GameClientHandler.java @@ -5,6 +5,7 @@ import forge.LobbyPlayer; import forge.game.*; import forge.game.player.RegisteredPlayer; import forge.interfaces.ILobbyListener; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.LobbySlot; import forge.player.LobbyPlayerHuman; import forge.player.PlayerZoneUpdate; @@ -21,7 +22,6 @@ import forge.net.IRemote; import forge.net.ProtocolMethod; import forge.net.ReplyPool; import forge.net.event.LoginEvent; -import forge.properties.ForgePreferences.FPref; import forge.trackable.TrackableCollection; import java.util.*; diff --git a/forge-gui/src/main/java/forge/net/server/NetGuiGame.java b/forge-gui/src/main/java/forge/net/server/NetGuiGame.java index 902ec236091..91f71ab42f5 100644 --- a/forge-gui/src/main/java/forge/net/server/NetGuiGame.java +++ b/forge-gui/src/main/java/forge/net/server/NetGuiGame.java @@ -2,7 +2,6 @@ package forge.net.server; import com.google.common.base.Function; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.deck.CardPool; import forge.game.GameEntityView; import forge.game.GameView; @@ -14,6 +13,7 @@ import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; import forge.match.AbstractGuiGame; import forge.net.GameProtocolSender; import forge.net.ProtocolMethod; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java index a3797dda638..ae99050a606 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java @@ -12,9 +12,9 @@ import forge.interfaces.IButton; import forge.interfaces.IGuiGame; import forge.interfaces.IWinLoseView; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.planarconquest.ConquestPreferences.CQPref; -import forge.properties.ForgeConstants; import forge.quest.QuestEventDifficulty; import forge.quest.QuestEventDuel; import forge.quest.QuestEventDuelManager; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java index 19d10ebd25c..035aba2cb6b 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java @@ -38,13 +38,13 @@ import forge.interfaces.IButton; import forge.interfaces.IGuiGame; import forge.interfaces.IWinLoseView; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.planarconquest.ConquestPreferences.CQPref; import forge.player.GamePlayerUtil; import forge.player.LobbyPlayerHuman; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; import forge.quest.BoosterUtils; import forge.util.Aggregates; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 01de8f2a783..039037f3c13 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -18,17 +18,18 @@ package forge.planarconquest; import com.google.common.base.Function; -import forge.achievement.PlaneswalkerAchievements; -import forge.assets.ISkinImage; + import forge.card.CardDb; import forge.item.InventoryItem; import forge.item.PaperCard; 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.model.FModel; import forge.planarconquest.ConquestPreferences.CQPref; -import forge.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.XmlReader; import forge.util.XmlWriter; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java index c6429798245..133cf6d67e9 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java @@ -10,8 +10,8 @@ import forge.deck.io.DeckSerializer; import forge.game.GameType; import forge.interfaces.IGuiGame; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.Aggregates; import forge.util.XmlReader; import forge.util.XmlWriter; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java index 4415fec32fc..2022cab112a 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java @@ -31,8 +31,8 @@ import forge.card.CardEdition.CardInSet; import forge.deck.generation.DeckGenPool; import forge.game.GameType; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java index e5878551219..9bec3994f99 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java @@ -17,11 +17,11 @@ */ package forge.planarconquest; -import forge.properties.ForgeConstants; -import forge.properties.PreferencesStore; - import java.io.Serializable; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.PreferencesStore; + @SuppressWarnings("serial") public class ConquestPreferences extends PreferencesStore implements Serializable { /** diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java index 9ec964e16bf..f413a4dc4b8 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java @@ -9,12 +9,12 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import forge.GuiBase; -import forge.assets.ISkinImage; import forge.card.CardRulesPredicates; import forge.card.ColorSet; import forge.deck.generation.DeckGenPool; import forge.game.card.Card; import forge.item.PaperCard; +import forge.localinstance.assets.ISkinImage; import forge.model.FModel; import forge.util.collect.FCollection; import forge.util.collect.FCollectionReader; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java index 906a1837309..e06c8d24ac9 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java @@ -5,8 +5,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import forge.assets.FSkinProp; -import forge.assets.IHasSkinProp; + import forge.card.*; import forge.card.CardType.CoreType; import forge.card.mana.ManaCostShard; @@ -16,9 +15,11 @@ import forge.deck.DeckFormat; import forge.deck.DeckSection; import forge.deck.generation.*; import forge.item.PaperCard; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.IHasSkinProp; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.planarconquest.ConquestPreferences.CQPref; -import forge.properties.ForgeConstants; import forge.quest.QuestUtil; import forge.util.FileUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java index dbf46332ca5..80a658c7c03 100644 --- a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java +++ b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java @@ -10,8 +10,8 @@ import forge.LobbyPlayer; import forge.ai.AIOption; import forge.ai.AiProfileUtil; import forge.ai.LobbyPlayerAi; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.util.GuiDisplayUtil; import forge.util.MyRandom; import forge.util.gui.SOptionPane; diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index e8444f0bacb..39ee45e5cb1 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -27,9 +27,7 @@ import forge.FThreads; import forge.GuiBase; import forge.LobbyPlayer; import forge.StaticData; -import forge.achievement.AchievementCollection; import forge.ai.GameState; -import forge.assets.FSkinProp; import forge.card.*; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; @@ -69,11 +67,13 @@ import forge.interfaces.IGuiGame; 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.match.NextGameDecision; import forge.match.input.*; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; import forge.util.CardTranslation; import forge.util.ITriggerEvent; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/properties/package-info.java b/forge-gui/src/main/java/forge/properties/package-info.java deleted file mode 100644 index 3a5d9380489..00000000000 --- a/forge-gui/src/main/java/forge/properties/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.properties; - diff --git a/forge-gui/src/main/java/forge/puzzle/Puzzle.java b/forge-gui/src/main/java/forge/puzzle/Puzzle.java index 7a8375b5450..007fb690d6c 100644 --- a/forge-gui/src/main/java/forge/puzzle/Puzzle.java +++ b/forge-gui/src/main/java/forge/puzzle/Puzzle.java @@ -13,8 +13,8 @@ import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import java.io.File; import java.io.IOException; diff --git a/forge-gui/src/main/java/forge/puzzle/PuzzleIO.java b/forge-gui/src/main/java/forge/puzzle/PuzzleIO.java index 2f230c0c808..c433ed807f6 100644 --- a/forge-gui/src/main/java/forge/puzzle/PuzzleIO.java +++ b/forge-gui/src/main/java/forge/puzzle/PuzzleIO.java @@ -1,7 +1,8 @@ package forge.puzzle; import com.google.common.collect.Lists; -import forge.properties.ForgeConstants; + +import forge.localinstance.properties.ForgeConstants; import forge.util.FileSection; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java index be65ab4074e..5775d1f546a 100644 --- a/forge-gui/src/main/java/forge/quest/QuestController.java +++ b/forge-gui/src/main/java/forge/quest/QuestController.java @@ -36,9 +36,9 @@ import forge.game.GameFormat; import forge.game.event.GameEvent; import forge.game.event.GameEventMulligan; import forge.item.PreconDeck; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; import forge.quest.bazaar.QuestBazaarManager; import forge.quest.bazaar.QuestItemType; import forge.quest.bazaar.QuestPetStorage; diff --git a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java index 68b63ad1846..6bc8342c624 100644 --- a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java +++ b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java @@ -13,10 +13,10 @@ import forge.game.Match; import forge.game.player.RegisteredPlayer; import forge.interfaces.IGuiGame; import forge.limited.LimitedDeckEvaluator; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.quest.data.QuestPreferences; import forge.tournament.system.TournamentBracket; import forge.tournament.system.TournamentPairing; diff --git a/forge-gui/src/main/java/forge/quest/QuestSpellShop.java b/forge-gui/src/main/java/forge/quest/QuestSpellShop.java index e3f49e70786..318b689bedd 100644 --- a/forge-gui/src/main/java/forge/quest/QuestSpellShop.java +++ b/forge-gui/src/main/java/forge/quest/QuestSpellShop.java @@ -9,8 +9,8 @@ import forge.deck.DeckSection; import forge.item.*; import forge.itemmanager.IItemManager; import forge.itemmanager.SItemManagerUtil; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.data.QuestPreferences.QPref; import forge.quest.io.ReadPriceList; import forge.util.ItemPool; diff --git a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java index 9357e4a2c58..b718fd9cd83 100644 --- a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java +++ b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java @@ -7,15 +7,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import forge.GuiBase; -import forge.assets.FSkinProp; import forge.deck.DeckGroup; import forge.game.GameType; import forge.interfaces.IGuiGame; import forge.item.BoosterPack; import forge.item.PaperCard; import forge.limited.BoosterDraft; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.QuestDraftUtils.Mode; import forge.quest.QuestEventDraft.QuestDraftFormat; import forge.quest.data.QuestAchievements; diff --git a/forge-gui/src/main/java/forge/quest/QuestUtil.java b/forge-gui/src/main/java/forge/quest/QuestUtil.java index 03b336a36cf..5f67620fb5b 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtil.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtil.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap; import forge.FThreads; import forge.GuiBase; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.card.CardDb.SetPreference; import forge.card.CardEdition; import forge.card.CardRules; @@ -34,10 +33,11 @@ import forge.interfaces.IButton; import forge.interfaces.IGuiGame; import forge.item.IPaperCard; import forge.item.PaperToken; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.match.HostedMatch; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.quest.bazaar.IQuestBazaarItem; import forge.quest.bazaar.QuestItemType; import forge.quest.bazaar.QuestPetController; diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java index a0048b88292..a780157ab74 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java @@ -34,8 +34,8 @@ import forge.item.*; import forge.item.SealedProduct.Template; import forge.item.generation.BoosterSlots; import forge.item.generation.UnOpenedProduct; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.quest.bazaar.QuestItemType; import forge.quest.data.GameFormatQuest; import forge.quest.data.QuestAssets; diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 63ad1f0f292..8b07f978a41 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -2,7 +2,6 @@ package forge.quest; import com.google.common.collect.ImmutableList; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.card.CardEdition; import forge.game.GameEndReason; import forge.game.GameFormat; @@ -16,9 +15,10 @@ import forge.item.IPaperCard.Predicates; 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.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgePreferences.FPref; import forge.quest.bazaar.QuestItemType; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.DifficultyPrefs; diff --git a/forge-gui/src/main/java/forge/quest/bazaar/IQuestBazaarItem.java b/forge-gui/src/main/java/forge/quest/bazaar/IQuestBazaarItem.java index 0efd1135578..721989f3b30 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/IQuestBazaarItem.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/IQuestBazaarItem.java @@ -17,7 +17,7 @@ */ package forge.quest.bazaar; -import forge.assets.ISkinImage; +import forge.localinstance.assets.ISkinImage; import forge.quest.QuestController; import forge.quest.data.QuestAssets; diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java index e1989f51c1d..2c1a291228a 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java @@ -22,8 +22,8 @@ import org.apache.commons.lang3.StringUtils; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import forge.GuiBase; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; import forge.quest.QuestController; import forge.quest.data.QuestAssets; diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java index 0b84a69e5b0..cf2e129582f 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java @@ -24,11 +24,11 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import forge.GuiBase; -import forge.assets.FSkinProp; -import forge.assets.ISkinImage; import forge.item.PaperToken; +import forge.localinstance.assets.FSkinProp; +import forge.localinstance.assets.ISkinImage; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.data.QuestAssets; import forge.quest.data.QuestPreferences; diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java index b510cc921cc..35091dabd40 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java @@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import forge.card.CardEdition; import forge.card.CardRules; import forge.item.PaperToken; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java index af107ee7355..fbeec5ac344 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java +++ b/forge-gui/src/main/java/forge/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.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; /** *

diff --git a/forge-gui/src/main/java/forge/quest/data/QuestData.java b/forge-gui/src/main/java/forge/quest/data/QuestData.java index 1d41cc4b013..c50a93ad720 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestData.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestData.java @@ -18,8 +18,8 @@ package forge.quest.data; import forge.game.GameFormat; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestMode; import forge.quest.io.QuestDataIO; diff --git a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java index 8611560a5de..a1e7df1a795 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java @@ -17,8 +17,8 @@ */ package forge.quest.data; -import forge.properties.ForgeConstants; -import forge.properties.PreferencesStore; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.PreferencesStore; import forge.util.Localizer; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java b/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java index 2aebea27992..71e2737dc0d 100644 --- a/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java +++ b/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java @@ -33,8 +33,8 @@ import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; import forge.item.*; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.quest.QuestController; import forge.quest.QuestEventDraft; import forge.quest.QuestMode; diff --git a/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java b/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java index b8dc00929d4..60458bde657 100644 --- a/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java +++ b/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java @@ -18,7 +18,7 @@ package forge.quest.io; import forge.card.MagicColor; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/sound/MusicPlaylist.java b/forge-gui/src/main/java/forge/sound/MusicPlaylist.java index 2d69cdb330e..8211c4e3e6e 100644 --- a/forge-gui/src/main/java/forge/sound/MusicPlaylist.java +++ b/forge-gui/src/main/java/forge/sound/MusicPlaylist.java @@ -3,7 +3,7 @@ package forge.sound; import java.io.File; import java.io.FilenameFilter; -import forge.properties.ForgeConstants; +import forge.localinstance.properties.ForgeConstants; import forge.util.MyRandom; public enum MusicPlaylist { diff --git a/forge-gui/src/main/java/forge/sound/SoundSystem.java b/forge-gui/src/main/java/forge/sound/SoundSystem.java index 92f7dfb1498..42d8940d812 100644 --- a/forge-gui/src/main/java/forge/sound/SoundSystem.java +++ b/forge-gui/src/main/java/forge/sound/SoundSystem.java @@ -9,10 +9,10 @@ import com.google.common.eventbus.Subscribe; import forge.GuiBase; import forge.events.UiEvent; import forge.game.event.GameEvent; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences.FPref; /** * Manages playback of all sounds for the client. diff --git a/forge-gui/src/main/java/forge/tournament/TournamentData.java b/forge-gui/src/main/java/forge/tournament/TournamentData.java index 7064ce4b024..4574ecd7884 100644 --- a/forge-gui/src/main/java/forge/tournament/TournamentData.java +++ b/forge-gui/src/main/java/forge/tournament/TournamentData.java @@ -5,8 +5,8 @@ import forge.GuiBase; import forge.deck.Deck; import forge.game.GameType; import forge.game.player.RegisteredPlayer; +import forge.localinstance.properties.ForgeConstants; import forge.match.HostedMatch; -import forge.properties.ForgeConstants; import java.io.File; import java.text.DateFormat; diff --git a/forge-gui/src/main/java/forge/tournament/TournamentIO.java b/forge-gui/src/main/java/forge/tournament/TournamentIO.java index ab906dd5443..6a0a90c2726 100644 --- a/forge-gui/src/main/java/forge/tournament/TournamentIO.java +++ b/forge-gui/src/main/java/forge/tournament/TournamentIO.java @@ -11,8 +11,8 @@ import com.thoughtworks.xstream.security.NullPermission; import com.thoughtworks.xstream.security.PrimitiveTypePermission; import forge.deck.CardPool; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; -import forge.properties.ForgeConstants; import forge.util.IgnoringXStream; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui/src/main/java/forge/tournament/TournamentWinLoseController.java b/forge-gui/src/main/java/forge/tournament/TournamentWinLoseController.java index b4949ac626a..ecdefdd6388 100644 --- a/forge-gui/src/main/java/forge/tournament/TournamentWinLoseController.java +++ b/forge-gui/src/main/java/forge/tournament/TournamentWinLoseController.java @@ -3,12 +3,12 @@ package forge.tournament; import com.google.common.collect.Lists; import forge.LobbyPlayer; -import forge.assets.FSkinProp; import forge.deck.Deck; import forge.game.GameView; import forge.game.player.RegisteredPlayer; import forge.interfaces.IButton; import forge.interfaces.IWinLoseView; +import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/util/GuiDisplayUtil.java b/forge-gui/src/main/java/forge/util/GuiDisplayUtil.java index 6b040a232cd..e449028d486 100644 --- a/forge-gui/src/main/java/forge/util/GuiDisplayUtil.java +++ b/forge-gui/src/main/java/forge/util/GuiDisplayUtil.java @@ -17,8 +17,8 @@ */ package forge.util; +import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; public final class GuiDisplayUtil { diff --git a/forge-gui/src/main/java/forge/util/HttpUtil.java b/forge-gui/src/main/java/forge/util/HttpUtil.java index 9acc274576e..38a5afd958e 100644 --- a/forge-gui/src/main/java/forge/util/HttpUtil.java +++ b/forge-gui/src/main/java/forge/util/HttpUtil.java @@ -17,14 +17,14 @@ */ package forge.util; -import forge.properties.ForgePreferences; - import java.io.*; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; +import forge.localinstance.properties.ForgePreferences; + public class HttpUtil { private static final String BOUNDARY = "--7d021a37605f0"; diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java index bea9dc4f290..b04d0828519 100644 --- a/forge-gui/src/main/java/forge/util/ImageFetcher.java +++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java @@ -15,9 +15,9 @@ import forge.StaticData; import org.apache.commons.lang3.tuple.Pair; import forge.item.PaperCard; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; public abstract class ImageFetcher { private static final ExecutorService threadPool = Executors.newCachedThreadPool(); diff --git a/forge-gui/src/main/java/forge/util/gui/SOptionPane.java b/forge-gui/src/main/java/forge/util/gui/SOptionPane.java index 376fd90ef39..1b1ac10d84c 100644 --- a/forge-gui/src/main/java/forge/util/gui/SOptionPane.java +++ b/forge-gui/src/main/java/forge/util/gui/SOptionPane.java @@ -5,7 +5,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import forge.GuiBase; -import forge.assets.FSkinProp; +import forge.localinstance.assets.FSkinProp; import forge.util.Localizer; public class SOptionPane {