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

refactor: rename 'assets' package to 'skin' See merge request core-developers/forge!4223
2025-11-18 03:38:01 +00:00 · 2021-03-20 17:58:15 +00:00
parent 1dc21055f7 993fb3b518
commit 5d8bbf8687
113 changed files with 127 additions and 127 deletions
--- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java
@@ -10,7 +10,7 @@ import forge.game.GameView;
 import forge.game.player.RegisteredPlayer;
 import forge.gui.interfaces.IButton;
 import forge.gui.interfaces.IWinLoseView;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java
+++ b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java
@@ -42,9 +42,9 @@ import forge.item.PaperCard;
 import forge.item.SealedProduct;
 import forge.item.generation.IUnOpenedProduct;
 import forge.item.generation.UnOpenedProduct;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.CardBlock;
 import forge.model.FModel;
 import forge.model.UnOpenedMeta;
--- a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
@@ -29,9 +29,9 @@ import forge.gui.GuiBase;
 import forge.gui.interfaces.IGuiGame;
 import forge.gui.interfaces.IMayViewCards;
 import forge.interfaces.IGameController;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.player.PlayerControllerHuman;
 import forge.trackable.TrackableTypes;
--- a/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java
+++ b/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java
@@ -8,7 +8,7 @@ import forge.gamemodes.net.event.GuiGameEvent;
 import forge.gamemodes.net.event.ReplyEvent;
 import forge.gui.FThreads;
 import forge.gui.util.SOptionPane;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;

--- a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java
+++ b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java
@@ -19,7 +19,7 @@ import forge.gamemodes.match.NextGameDecision;
 import forge.gui.GuiBase;
 import forge.gui.interfaces.IGuiGame;
 import forge.interfaces.IGameController;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.player.PlayerZoneUpdates;
 import forge.trackable.TrackableCollection;
 import forge.util.ITriggerEvent;
--- a/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
+++ b/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
@@ -22,7 +22,7 @@ import forge.gamemodes.match.AbstractGuiGame;
 import forge.gamemodes.net.GameProtocolSender;
 import forge.gamemodes.net.ProtocolMethod;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.player.PlayerZoneUpdate;
 import forge.player.PlayerZoneUpdates;
 import forge.trackable.TrackableCollection;
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
@@ -38,8 +38,8 @@ import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemColumn;
 import forge.itemmanager.ItemManagerConfig;
 import forge.localinstance.achievements.PlaneswalkerAchievements;
-import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;
 import forge.util.CardTranslation;
 import forge.util.FileUtil;
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
@@ -14,7 +14,7 @@ import forge.deck.generation.DeckGenPool;
 import forge.game.card.Card;
 import forge.gui.GuiBase;
 import forge.item.PaperCard;
-import forge.localinstance.assets.ISkinImage;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionReader;
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
@@ -34,9 +34,9 @@ import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.IHasSkinProp;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.IHasSkinProp;
 import forge.model.FModel;
 import forge.util.FileUtil;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java
@@ -22,8 +22,8 @@ import forge.gui.util.SGuiChoose;
 import forge.gui.util.SOptionPane;
 import forge.item.BoosterPack;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.util.Localizer;
 import forge.util.TextUtil;
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java
@@ -49,8 +49,8 @@ import forge.gui.util.SGuiChoose;
 import forge.gui.util.SOptionPane;
 import forge.item.IPaperCard;
 import forge.item.PaperToken;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java
@@ -37,8 +37,8 @@ import forge.item.TournamentPack;
 import forge.item.generation.BoosterSlots;
 import forge.item.generation.IUnOpenedProduct;
 import forge.item.generation.UnOpenedProduct;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/IQuestBazaarItem.java
@@ -19,7 +19,7 @@ package forge.gamemodes.quest.bazaar;

 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.data.QuestAssets;
-import forge.localinstance.assets.ISkinImage;
+import forge.localinstance.skin.ISkinImage;

 /**
 * This interface defines a thing that can be sold at the Bazaar.
--- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java
@@ -24,8 +24,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.data.QuestAssets;
 import forge.gui.GuiBase;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;

 /**
 * <p>
--- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java
@@ -28,9 +28,9 @@ import forge.gamemodes.quest.data.QuestAssets;
 import forge.gamemodes.quest.data.QuestPreferences;
 import forge.gui.GuiBase;
 import forge.item.PaperToken;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;

 /**
--- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestStallDefinition.java
@@ -23,7 +23,7 @@ import java.util.List;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;

 /**
 * <p>
--- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java
@@ -11,7 +11,7 @@ import forge.game.GameView;
 import forge.game.player.RegisteredPlayer;
 import forge.gui.interfaces.IButton;
 import forge.gui.interfaces.IWinLoseView;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/gui/interfaces/IButton.java
+++ b/forge-gui/src/main/java/forge/gui/interfaces/IButton.java
@@ -1,7 +1,7 @@
 package forge.gui.interfaces;

 import forge.gui.UiCommand;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;

 public interface IButton extends ITextComponent {
    boolean isSelected();
--- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
+++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
@@ -11,8 +11,8 @@ import com.google.common.base.Function;
 import forge.gamemodes.match.HostedMatch;
 import forge.gui.download.GuiDownloadService;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.sound.IAudioClip;
 import forge.sound.IAudioMusic;
 import forge.util.Callback;
--- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
+++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
@@ -23,7 +23,7 @@ import forge.game.spellability.SpellAbilityView;
 import forge.game.zone.ZoneType;
 import forge.interfaces.IGameController;
 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.player.PlayerZoneUpdate;
 import forge.player.PlayerZoneUpdates;
 import forge.trackable.TrackableCollection;
--- a/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java
+++ b/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java
@@ -3,7 +3,7 @@ package forge.gui.interfaces;
 import java.util.List;

 import forge.item.PaperCard;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;

 public interface IWinLoseView<T extends IButton> {
    T getBtnContinue();
--- a/forge-gui/src/main/java/forge/gui/util/SOptionPane.java
+++ b/forge-gui/src/main/java/forge/gui/util/SOptionPane.java
@@ -5,7 +5,7 @@ import java.util.List;
 import com.google.common.collect.ImmutableList;

 import forge.gui.GuiBase;
-import forge.localinstance.assets.FSkinProp;
+import forge.localinstance.skin.FSkinProp;
 import forge.util.Localizer;

 public class SOptionPane {
--- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
@@ -14,8 +14,8 @@ import forge.deck.DeckProxy;
 import forge.gui.GuiBase;
 import forge.gui.interfaces.IComboBox;
 import forge.item.InventoryItem;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.IHasSkinProp;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.IHasSkinProp;
 import forge.util.ComparableOp;
 import forge.util.Localizer;

--- a/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java
+++ b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java
@@ -10,9 +10,9 @@ import forge.game.Game;
 import forge.game.player.Player;
 import forge.gui.GuiBase;
 import forge.item.IPaperCard;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.util.Lang;
 import forge.util.XmlUtil;

--- a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java
+++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java
@@ -4,9 +4,9 @@ import forge.game.Game;
 import forge.game.player.Player;
 import forge.gui.GuiBase;
 import forge.item.IPaperCard;
-import forge.localinstance.assets.FSkinProp;
-import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.ISkinImage;
 import forge.model.FModel;
 import forge.util.CardTranslation;
 import forge.util.Localizer;
--- a/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java
+++ b/forge-gui/src/main/java/forge/localinstance/assets/ISkinImage.java
@@ -1,5 +0,0 @@
-package forge.localinstance.assets;
-
-public interface ISkinImage {
-
-}
--- a/forge-gui/src/main/java/forge/localinstance/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 <http://www.gnu.org/licenses/>.
 */
-package forge.localinstance.assets;
+package forge.localinstance.skin;

 /**
 * Assembles settings from selected or default theme as appropriate. Saves in a
--- a/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java
+++ b/forge-gui/src/main/java/forge/localinstance/assets/IHasSkinProp.java
@@ -1,4 +1,4 @@
-package forge.localinstance.assets;
+package forge.localinstance.skin;

 public interface IHasSkinProp {
    FSkinProp getSkinProp();
--- a/forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java
+++ b/forge-gui/src/main/java/forge/localinstance/skin/ISkinImage.java
@@ -0,0 +1,5 @@
+package forge.localinstance.skin;
+
+public interface ISkinImage {
+
+}
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -124,9 +124,9 @@ import forge.interfaces.IMacroSystem;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.localinstance.achievements.AchievementCollection;
-import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.util.CardTranslation;
 import forge.util.ITriggerEvent;