From 512bf18381ece4281136eeb73b726146c17c6ee2 Mon Sep 17 00:00:00 2001 From: paul_snoops Date: Wed, 21 Jul 2021 14:46:31 +0100 Subject: [PATCH] Net Deck Archive Pauper (Desktop & Android) --- .../java/forge/deckchooser/FDeckChooser.java | 35 ++++++++++++++----- .../src/forge/deck/FDeckChooser.java | 22 +++++++++--- .../src/main/java/forge/deck/DeckProxy.java | 17 ++++++--- .../forge/itemmanager/ItemManagerConfig.java | 20 ++++++----- .../properties/ForgeConstants.java | 6 ++-- 5 files changed, 71 insertions(+), 29 deletions(-) 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 43df1dc83ff..9aae27b1a36 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java @@ -1,8 +1,34 @@ package forge.deckchooser; +import java.awt.Dimension; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.apache.commons.lang3.StringUtils; + import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; -import forge.deck.*; + +import forge.deck.ArchetypeDeckGenerator; +import forge.deck.ColorDeckGenerator; +import forge.deck.CommanderDeckGenerator; +import forge.deck.Deck; +import forge.deck.DeckFormat; +import forge.deck.DeckProxy; +import forge.deck.DeckType; +import forge.deck.DeckgenUtil; +import forge.deck.NetDeckArchiveBlock; +import forge.deck.NetDeckArchiveLegacy; +import forge.deck.NetDeckArchiveModern; +import forge.deck.NetDeckArchivePioneer; +import forge.deck.NetDeckArchiveStandard; +import forge.deck.NetDeckArchiveVintage; +import forge.deck.NetDeckCategory; +import forge.deck.RandomDeckGenerator; import forge.game.GameFormat; import forge.game.GameType; import forge.game.player.RegisteredPlayer; @@ -24,13 +50,6 @@ import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; import forge.util.Localizer; import net.miginfocom.swing.MigLayout; -import org.apache.commons.lang3.StringUtils; - -import javax.swing.*; -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; @SuppressWarnings("serial") public class FDeckChooser extends JPanel implements IDecksComboBoxListener { diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 6e4ad10d596..9603beafdb8 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -1,7 +1,18 @@ package forge.deck; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.StringUtils; + import com.badlogic.gdx.utils.Align; import com.google.common.collect.ImmutableList; + import forge.Forge; import forge.assets.ImageCache; import forge.deck.FDeckEditor.EditorType; @@ -30,15 +41,18 @@ import forge.screens.FScreen; import forge.screens.LoadingOverlay; import forge.screens.home.NewGameMenu.NewGameScreen; import forge.screens.match.MatchController; -import forge.toolbox.*; +import forge.toolbox.FButton; +import forge.toolbox.FComboBox; +import forge.toolbox.FContainer; +import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; +import forge.toolbox.FOptionPane; +import forge.toolbox.GuiChoose; +import forge.toolbox.ListChooser; import forge.util.Callback; import forge.util.Localizer; import forge.util.Utils; import forge.util.storage.IStorage; -import org.apache.commons.lang3.StringUtils; - -import java.util.*; public class FDeckChooser extends FScreen { public static final float PADDING = Utils.scale(5); diff --git a/forge-gui/src/main/java/forge/deck/DeckProxy.java b/forge-gui/src/main/java/forge/deck/DeckProxy.java index 55a5bf65037..b4eb4e2e109 100644 --- a/forge-gui/src/main/java/forge/deck/DeckProxy.java +++ b/forge-gui/src/main/java/forge/deck/DeckProxy.java @@ -1,11 +1,22 @@ package forge.deck; +import java.util.*; +import java.util.Map.Entry; +import org.apache.commons.lang3.StringUtils; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; + import forge.StaticData; -import forge.card.*; +import forge.card.CardEdition; +import forge.card.CardRarity; +import forge.card.CardRules; +import forge.card.CardSplitType; +import forge.card.CardType; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.card.mana.ManaCostShard; import forge.deck.io.DeckPreferences; import forge.game.GameFormat; @@ -21,10 +32,6 @@ import forge.model.FModel; import forge.util.BinaryUtil; import forge.util.IHasName; import forge.util.storage.IStorage; -import org.apache.commons.lang3.StringUtils; - -import java.util.*; -import java.util.Map.Entry; // Adding a generic to this class creates compile problems in ItemManager (that I can not fix) public class DeckProxy implements InventoryItem { diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java index 6cfed22348b..6b296f72ca1 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java @@ -1,19 +1,21 @@ package forge.itemmanager; +import java.io.File; +import java.io.FileNotFoundException; +import java.util.Map; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + import forge.itemmanager.ItemColumnConfig.SortState; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.util.XmlUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Map; /** * Preferences associated with individual cards diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java index 68410a188e0..ddb3bffae67 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -17,13 +17,13 @@ */ package forge.localinstance.properties; -import forge.gui.GuiBase; -import forge.util.FileUtil; - import java.io.File; import java.util.Collections; import java.util.Map; +import forge.gui.GuiBase; +import forge.util.FileUtil; + public final class ForgeConstants { public static final String PATH_SEPARATOR = File.separator; public static final String ASSETS_DIR = GuiBase.getInterface().getAssetsDir();