refactor: group local instance-related packages

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

forge-gui/src/main/java/forge/assets/ISkinImage.java

@@ -1,5 +0,0 @@
-package forge.assets;
-
-public interface ISkinImage {
-
-}

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;

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;

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.*;

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 {

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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.

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;

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;

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() {

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;

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;
 

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

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() {

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;
 

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;

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() {

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;

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

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;

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 {

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;

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();

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;

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;

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 extends IButton> {
     T getBtnContinue();

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;

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;

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;
 

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;

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

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.*;

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;
 

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;

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;

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;
 

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;

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;
 

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;

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;

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 {

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() {

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;

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;

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() {

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;

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;

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;

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;

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;

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;

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;

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 {

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 {

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 {

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;

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() {

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;
 

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;

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;

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() {

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() {

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;

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() {

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;

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;
 

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;

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;

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;

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;

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 <http://www.gnu.org/licenses/>.
  */
-package forge.assets;
+package forge.localinstance.assets;
 
 /**
  * Assembles settings from selected or default theme as appropriate. Saves in a

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();

forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java

@@ -0,0 +1,5 @@
+package forge.localinstance.assets;
+
+public interface ISkinImage {
+
+}

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 <http://www.gnu.org/licenses/>.
  */
-package forge.properties;
+package forge.localinstance.properties;
 
 public final class FileLocation {
     public final String defaultLoc;

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 <http://www.gnu.org/licenses/>.
  */
-package forge.properties;
+package forge.localinstance.properties;
 
 import forge.GuiBase;
 import forge.util.FileUtil;

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 <http://www.gnu.org/licenses/>.
  */
-package forge.properties;
+package forge.localinstance.properties;
 
 import forge.MulliganDefs;
 import forge.game.GameLogEntryType;

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 <http://www.gnu.org/licenses/>.
  */
-package forge.properties;
+package forge.localinstance.properties;
 
 import java.io.File;
 import java.io.FileInputStream;

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 <http://www.gnu.org/licenses/>.
  */
-package forge.properties;
+package forge.localinstance.properties;
 
 import forge.util.FileUtil;
 

forge-gui/src/main/java/forge/localinstance/properties/package-info.java

@@ -0,0 +1,3 @@
+/** Forge Card Game. */
+package forge.localinstance.properties;
+

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;
 

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;

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;

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;
 

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

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;

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;
 

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;
 

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<T extends GameEntity> extends InputSyncronizedBase {
     private static final long serialVersionUID = -2305549394512889450L;

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;