diff --git a/src/main/java/forge/gui/home/multiplayer/CSubmenuMultiTest.java b/src/main/java/forge/gui/home/multiplayer/CSubmenuMultiTest.java index 83457d7bd36..ab629f2b976 100644 --- a/src/main/java/forge/gui/home/multiplayer/CSubmenuMultiTest.java +++ b/src/main/java/forge/gui/home/multiplayer/CSubmenuMultiTest.java @@ -35,6 +35,7 @@ public enum CSubmenuMultiTest implements ICDoc { */ @Override public void initialize() { + view.getDcHuman().initialize(); // Checkbox event handling view.getBtnStart().addActionListener(new ActionListener() { @Override @@ -79,7 +80,7 @@ public enum CSubmenuMultiTest implements ICDoc { final SwingWorker worker = new SwingWorker() { @Override public Object doInBackground() { - Deck humanDeck = DeckgenUtil.getRandomColorDeck(PlayerType.HUMAN); + Deck humanDeck = view.getDcHuman().getDeck(); MatchStartHelper starter = new MatchStartHelper(); Lobby lobby = Singletons.getControl().getLobby(); diff --git a/src/main/java/forge/gui/home/multiplayer/VSubmenuMultiTest.java b/src/main/java/forge/gui/home/multiplayer/VSubmenuMultiTest.java index eb98cf764d5..adeda7c3429 100644 --- a/src/main/java/forge/gui/home/multiplayer/VSubmenuMultiTest.java +++ b/src/main/java/forge/gui/home/multiplayer/VSubmenuMultiTest.java @@ -9,6 +9,7 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import net.miginfocom.swing.MigLayout; +import forge.game.player.PlayerType; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -16,6 +17,7 @@ import forge.gui.home.EMenuGroup; import forge.gui.home.IVSubmenu; import forge.gui.home.StartButton; import forge.gui.home.VHomeUI; +import forge.gui.toolbox.FDeckChooser; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FRadioButton; @@ -39,6 +41,8 @@ public enum VSubmenuMultiTest implements IVSubmenu { private final List fieldRadios = new ArrayList(); private final StartButton btnStart = new StartButton(); private final ButtonGroup grpFields = new ButtonGroup(); + + private final FDeckChooser dcHuman = new FDeckChooser("Choose your deck", PlayerType.HUMAN); private VSubmenuMultiTest() { FRadioButton temp; @@ -82,10 +86,9 @@ public enum VSubmenuMultiTest implements IVSubmenu { VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().setLayout(new MigLayout("insets 0, gap 0, wrap 2")); VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(pnlFields, "w 41%!, gap 6% 6% 50px 0, growy, pushy"); - VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(new FLabel.Builder() - .text("Doublestrike, please make a choice of decks for human here") - .build(), "gap 0 0 50px 5px, ax center, span 2"); - + dcHuman.populate(); + VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(dcHuman, "w 41%!, gap 0 0 50px 0, growy, pushy"); + VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(new FLabel.Builder() .text("Starts a new game with preconstructed 2 color decks for each field.") .build(), "gap 0 0 50px 5px, ax center, span 2"); @@ -160,4 +163,8 @@ public enum VSubmenuMultiTest implements IVSubmenu { public DragCell getParentCell() { return parentCell; } + + public final FDeckChooser getDcHuman() { + return dcHuman; + } } diff --git a/src/main/java/forge/gui/toolbox/FDeckChooser.java b/src/main/java/forge/gui/toolbox/FDeckChooser.java index b8e8bed1188..98b13585f84 100644 --- a/src/main/java/forge/gui/toolbox/FDeckChooser.java +++ b/src/main/java/forge/gui/toolbox/FDeckChooser.java @@ -27,7 +27,6 @@ import forge.deck.Deck; import forge.deck.DeckgenUtil; import forge.deck.generate.GenerateThemeDeck; import forge.game.player.PlayerType; -import forge.gui.home.VHomeUI; import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.util.IStorage;