external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: group game modes-related packages

Browse Source
This commit is contained in:
Leandro Doctors
2021-03-05 11:40:44 -03:00
parent df64f5574d
commit 92110c1931
353 changed files with 833 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -5,6 +5,7 @@ import com.google.common.base.Function;
import forge.download.GuiDownloadService;
import forge.download.GuiDownloader;
import forge.error.BugReportDialog;
import forge.gamemodes.match.HostedMatch;
import forge.gui.BoxedProductCardListViewer;
import forge.gui.CardListChooser;
import forge.gui.CardListViewer;
@@ -15,7 +16,6 @@ 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;
import forge.screens.deckeditor.controllers.CEditorQuestCardShop;

6
forge-gui-desktop/src/main/java/forge/control/FControl.java
View File

@@ -44,6 +44,9 @@ import forge.GuiBase;
import forge.ImageCache;
import forge.LobbyPlayer;
import forge.Singletons;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
import forge.gamemodes.quest.io.QuestDataIO;
import forge.gui.SOverlayUtils;
import forge.gui.framework.FScreen;
import forge.gui.framework.InvalidLayoutFileException;
@@ -54,12 +57,9 @@ 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.quest.data.QuestPreferences.QPref;
import forge.quest.io.QuestDataIO;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;

8
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
View File

@@ -23,16 +23,16 @@ import forge.FThreads;
import forge.UiCommand;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestEvent;
import forge.gamemodes.quest.QuestEventChallenge;
import forge.gamemodes.quest.QuestUtil;
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.quest.QuestController;
import forge.quest.QuestEvent;
import forge.quest.QuestEventChallenge;
import forge.quest.QuestUtil;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;

8
forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java
View File

@@ -14,14 +14,14 @@ import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.gamemodes.net.ChatMessage;
import forge.gamemodes.net.IOnlineChatInterface;
import forge.gamemodes.net.IRemote;
import forge.gamemodes.net.event.MessageEvent;
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.screens.home.online.OnlineMenu;
import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;

4
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -1,12 +1,12 @@
package forge.itemmanager;
import forge.game.GameFormat;
import forge.gamemodes.quest.QuestWorld;
import forge.gamemodes.quest.data.QuestPreferences;
import forge.gui.GuiUtils;
import forge.item.PaperCard;
import forge.itemmanager.filters.*;
import forge.model.FModel;
import forge.quest.QuestWorld;
import forge.quest.data.QuestPreferences;
import forge.screens.home.quest.DialogChooseFormats;
import forge.screens.home.quest.DialogChooseSets;
import forge.screens.match.controllers.CDetailPicture;

2
forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
View File

@@ -26,6 +26,7 @@ import forge.deck.io.DeckPreferences;
import forge.game.GameFormat;
import forge.game.GameType;
import forge.game.IHasGameType;
import forge.gamemodes.quest.QuestWorld;
import forge.gui.GuiUtils;
import forge.gui.framework.FScreen;
import forge.item.InventoryItem;
@@ -43,7 +44,6 @@ 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;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.controllers.ACEditorBase;

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardQuestWorldFilter.java
View File

@@ -4,10 +4,10 @@ import java.util.HashSet;
import java.util.Set;
import forge.game.GameFormat;
import forge.gamemodes.quest.QuestWorld;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.model.FModel;
import forge.quest.QuestWorld;
public class CardQuestWorldFilter extends CardFormatFilter {

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckQuestWorldFilter.java
View File

@@ -5,9 +5,9 @@ import java.util.Set;
import forge.deck.DeckProxy;
import forge.game.GameFormat;
import forge.gamemodes.quest.QuestWorld;
import forge.itemmanager.ItemManager;
import forge.model.FModel;
import forge.quest.QuestWorld;
public class DeckQuestWorldFilter extends DeckFormatFilter {

2
forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java
View File

@@ -4,8 +4,8 @@ import javax.swing.SwingUtilities;
import com.google.common.collect.Iterables;
import forge.gamemodes.quest.bazaar.QuestBazaarManager;
import forge.gui.framework.ICDoc;
import forge.quest.bazaar.QuestBazaarManager;
import forge.toolbox.FLabel;
public enum CBazaarUI implements ICDoc {

2
forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java
View File

@@ -2,11 +2,11 @@ package forge.screens.bazaar;
import forge.GuiBase;
import forge.UiCommand;
import forge.gamemodes.quest.bazaar.QuestBazaarManager;
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;
import forge.toolbox.FLabel;
import forge.toolbox.FPanel;

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -22,13 +22,13 @@ import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.IBoosterDraft;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.limited.BoosterDraft;
import forge.limited.IBoosterDraft;
import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.views.*;

6
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -30,6 +30,8 @@ import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.data.DeckConstructionRules;
import forge.gui.GuiUtils;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
@@ -41,8 +43,6 @@ import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.views.ItemTableColumn;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.data.DeckConstructionRules;
import forge.screens.deckeditor.AddBasicLandsDialog;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.views.VAllDecks;
@@ -102,7 +102,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
* <br><br>
* Card catalog and decks are drawn from a QuestController object.
*
* @param questData0 &emsp; {@link forge.quest.QuestController}
* @param questData0 &emsp; {@link forge.gamemodes.quest.QuestController}
*/
@SuppressWarnings("serial")
public CEditorQuest(final QuestController questData0, final CDetailPicture cDetailPicture0) {

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
View File

@@ -20,6 +20,9 @@ package forge.screens.deckeditor.controllers;
import forge.UiCommand;
import forge.deck.DeckBase;
import forge.game.GameType;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestSpellShop;
import forge.gamemodes.quest.QuestUtil;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.*;
@@ -29,9 +32,6 @@ 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;
import forge.quest.QuestUtil;
import forge.screens.deckeditor.views.*;
import forge.screens.home.quest.CSubmenuQuestDecks;
import forge.screens.match.controllers.CDetailPicture;
@@ -95,7 +95,7 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
* Child controller for quest card shop UI.
*
* @param qd
* a {@link forge.quest.data.QuestData} object.
* a {@link forge.gamemodes.quest.data.QuestData} object.
*/
public CEditorQuestCardShop(final QuestController qd, final CDetailPicture cDetailPicture0) {
super(FScreen.QUEST_CARD_SHOP, cDetailPicture0, GameType.Quest);

6
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
View File

@@ -21,14 +21,14 @@ import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.IBoosterDraft;
import forge.gamemodes.quest.QuestEventDraft;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.limited.BoosterDraft;
import forge.limited.IBoosterDraft;
import forge.quest.QuestEventDraft;
import forge.screens.deckeditor.views.*;
import forge.screens.home.quest.CSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestDraft;

6
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
View File

@@ -24,6 +24,8 @@ import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestEventDraft;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.InventoryItem;
@@ -34,8 +36,6 @@ import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.views.ItemTableColumn;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestEventDraft;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
@@ -89,7 +89,7 @@ public final class CEditorQuestLimited extends CDeckEditor<DeckGroup> {
* <br><br>
* Card catalog and decks are drawn from a QuestController object.
*
* @param questData0 &emsp; {@link forge.quest.QuestController}
* @param questData0 &emsp; {@link forge.gamemodes.quest.QuestController}
*/
@SuppressWarnings("serial")
public CEditorQuestLimited(final QuestController questData0, final CDetailPicture cDetailPicture0) {

6
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java
View File

@@ -25,14 +25,14 @@ import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.IBoosterDraft;
import forge.gamemodes.limited.WinstonDraft;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
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.screens.deckeditor.CDeckEditorUI;

4
forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
View File

@@ -27,13 +27,13 @@ import forge.UiCommand;
import forge.ai.AIOption;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gamemodes.match.LobbySlot;
import forge.gamemodes.match.LobbySlotType;
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.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorVariant;

8
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -10,17 +10,17 @@ import forge.deck.*;
import forge.deckchooser.FDeckChooser;
import forge.game.GameType;
import forge.game.card.CardView;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LobbySlot;
import forge.gamemodes.match.LobbySlotType;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
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.toolbox.*;
import forge.toolbox.FSkin.SkinImage;
import forge.util.Aggregates;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
View File

@@ -13,8 +13,8 @@ import org.apache.commons.lang3.ArrayUtils;
import forge.UiCommand;
import forge.deck.Deck;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gui.framework.ICDoc;
import forge.localinstance.properties.ForgeConstants;
import forge.toolbox.FOptionPane;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletContests.java
View File

@@ -10,8 +10,8 @@ import javax.swing.SwingUtilities;
import forge.deck.Deck;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gui.SOverlayUtils;
import forge.gui.framework.ICDoc;
import forge.model.FModel;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java
View File

@@ -14,8 +14,8 @@ import forge.deck.Deck;
import forge.deck.DeckType;
import forge.deckchooser.FDeckChooser;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gui.SOverlayUtils;
import forge.gui.framework.ICDoc;
import forge.model.FModel;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java
View File

@@ -9,8 +9,8 @@ import javax.swing.SwingUtilities;
import forge.deck.DeckType;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletUtil;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletUtil;
import forge.gui.SOverlayUtils;
import forge.gui.framework.ICDoc;
import forge.player.GamePlayerUtil;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java
View File

@@ -13,8 +13,8 @@ import javax.swing.SwingConstants;
import net.miginfocom.swing.MigLayout;
import forge.UiCommand;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.toolbox.FLabel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedPanel;

6
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
View File

@@ -14,10 +14,10 @@ import javax.swing.border.Border;
import net.miginfocom.swing.MigLayout;
import forge.UiCommand;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gamemodes.quest.QuestUtil;
import forge.localinstance.assets.FSkinProp;
import forge.quest.QuestUtil;
import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane;

2
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
View File

@@ -2,7 +2,7 @@ package forge.screens.home.gauntlet;
import forge.deckchooser.FDeckChooser;
import forge.game.GameType;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;

4
forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
View File

@@ -9,14 +9,14 @@ import javax.swing.SwingUtilities;
import forge.FThreads;
import forge.error.BugReporter;
import forge.gamemodes.net.ChatMessage;
import forge.gamemodes.net.NetConnectUtil;
import forge.gui.FNetOverlay;
import forge.gui.SOverlayUtils;
import forge.gui.framework.EDocID;
import forge.gui.framework.ICDoc;
import forge.menus.IMenuProvider;
import forge.menus.MenuUtil;
import forge.net.ChatMessage;
import forge.net.NetConnectUtil;
import forge.screens.home.CHomeUI;
import forge.screens.home.CLobby;
import forge.screens.home.VLobby;

8
forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java
View File

@@ -10,6 +10,10 @@ import net.miginfocom.swing.MigLayout;
import forge.deckchooser.DecksComboBoxEvent;
import forge.deckchooser.FDeckChooser;
import forge.deckchooser.IDecksComboBoxListener;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.net.IOnlineLobby;
import forge.gamemodes.net.client.FGameClient;
import forge.gamemodes.net.server.FServerManager;
import forge.gui.FNetOverlay;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
@@ -17,10 +21,6 @@ import forge.gui.framework.EDocID;
import forge.gui.framework.FScreen;
import forge.gui.framework.IVTopLevelUI;
import forge.interfaces.ILobbyView;
import forge.match.GameLobby;
import forge.net.IOnlineLobby;
import forge.net.client.FGameClient;
import forge.net.server.FServerManager;
import forge.toolbox.FButton;
import forge.toolbox.FSkin;
import forge.util.gui.SOptionPane;

4
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java
View File

@@ -6,13 +6,13 @@ import forge.deck.Deck;
import forge.game.GameRules;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.puzzle.Puzzle;
import forge.gui.SOverlayUtils;
import forge.gui.framework.ICDoc;
import forge.match.HostedMatch;
import forge.menus.IMenuProvider;
import forge.menus.MenuUtil;
import forge.player.GamePlayerUtil;
import forge.puzzle.Puzzle;
import forge.util.gui.SGuiChoose;
import forge.util.gui.SOptionPane;
import forge.util.Localizer;

6
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
View File

@@ -6,16 +6,16 @@ import forge.deck.Deck;
import forge.game.GameRules;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.puzzle.Puzzle;
import forge.gamemodes.puzzle.PuzzleIO;
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.puzzle.Puzzle;
import forge.puzzle.PuzzleIO;
import forge.util.Localizer;
import forge.util.gui.SOptionPane;

6
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java
View File

@@ -6,16 +6,16 @@ import forge.deck.Deck;
import forge.game.GameRules;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.puzzle.Puzzle;
import forge.gamemodes.puzzle.PuzzleIO;
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.puzzle.Puzzle;
import forge.puzzle.PuzzleIO;
import forge.util.Localizer;
import forge.util.gui.SOptionPane;

6
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/VSubmenuPuzzleCreate.java
View File

@@ -1,12 +1,12 @@
package forge.screens.home.puzzle;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LocalLobby;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.interfaces.IPlayerChangeListener;
import forge.match.GameLobby;
import forge.match.LocalLobby;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.screens.home.*;
import forge.toolbox.FLabel;
import forge.util.Localizer;

6
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/VSubmenuPuzzleSolve.java
View File

@@ -1,12 +1,12 @@
package forge.screens.home.puzzle;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LocalLobby;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.interfaces.IPlayerChangeListener;
import forge.match.GameLobby;
import forge.match.LocalLobby;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.screens.home.*;
import forge.toolbox.FList;
import forge.toolbox.FScrollPane;

6
forge-gui-desktop/src/main/java/forge/screens/home/puzzle/VSubmenuTutorial.java
View File

@@ -1,12 +1,12 @@
package forge.screens.home.puzzle;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LocalLobby;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.interfaces.IPlayerChangeListener;
import forge.match.GameLobby;
import forge.match.LocalLobby;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.screens.home.*;
import forge.toolbox.FList;
import forge.toolbox.FScrollPane;

10
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java
View File

@@ -17,13 +17,13 @@ import javax.swing.border.EmptyBorder;
import forge.Singletons;
import forge.UiCommand;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestEventChallenge;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.bazaar.QuestItemType;
import forge.gamemodes.quest.bazaar.QuestPetController;
import forge.gui.framework.ICDoc;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestEventChallenge;
import forge.quest.QuestUtil;
import forge.quest.bazaar.QuestItemType;
import forge.quest.bazaar.QuestPetController;
import forge.toolbox.FLabel;
import forge.toolbox.JXButtonPanel;
import forge.util.Localizer;

8
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java
View File

@@ -1,12 +1,12 @@
package forge.screens.home.quest;
import forge.UiCommand;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestEventDuel;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.bazaar.QuestPetController;
import forge.gui.framework.ICDoc;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestEventDuel;
import forge.quest.QuestUtil;
import forge.quest.bazaar.QuestPetController;
import forge.toolbox.JXButtonPanel;
import forge.util.Localizer;

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java
View File

@@ -5,13 +5,13 @@ import javax.swing.SwingUtilities;
import forge.Singletons;
import forge.UiCommand;
import forge.deck.DeckProxy;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
import forge.gui.framework.FScreen;
import forge.gui.framework.ICDoc;
import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestUtil;
import forge.quest.data.QuestPreferences.QPref;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorQuest;
import forge.util.Localizer;

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
View File

@@ -2,8 +2,8 @@ package forge.screens.home.quest;
import forge.UiCommand;
import forge.deck.DeckGroup;
import forge.gamemodes.quest.QuestTournamentController;
import forge.gui.framework.ICDoc;
import forge.quest.QuestTournamentController;
import java.awt.event.*;

8
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java
View File

@@ -1,13 +1,13 @@
package forge.screens.home.quest;
import forge.UiCommand;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.data.QuestData;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
import forge.gamemodes.quest.io.QuestDataIO;
import forge.gui.framework.ICDoc;
import forge.localinstance.properties.ForgeConstants;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.data.QuestData;
import forge.quest.data.QuestPreferences.QPref;
import forge.quest.io.QuestDataIO;
import forge.screens.bazaar.CBazaarUI;
import java.io.File;

4
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java
View File

@@ -4,10 +4,10 @@ import javax.swing.SwingUtilities;
import com.google.common.primitives.Ints;
import forge.gamemodes.quest.data.QuestPreferences;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
import forge.gui.framework.ICDoc;
import forge.model.FModel;
import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestPreferences.QPref;
import forge.screens.home.quest.VSubmenuQuestPrefs.PrefInput;
import forge.util.Localizer;

10
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java
View File

@@ -4,14 +4,14 @@ import forge.UiCommand;
import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.game.GameFormat;
import forge.gamemodes.quest.*;
import forge.gamemodes.quest.data.DeckConstructionRules;
import forge.gamemodes.quest.data.GameFormatQuest;
import forge.gamemodes.quest.data.QuestData;
import forge.gamemodes.quest.data.QuestPreferences;
import forge.gui.framework.ICDoc;
import forge.item.PaperCard;
import forge.model.FModel;
import forge.quest.*;
import forge.quest.data.DeckConstructionRules;
import forge.quest.data.GameFormatQuest;
import forge.quest.data.QuestData;
import forge.quest.data.QuestPreferences;
import forge.screens.home.CHomeUI;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java
View File

@@ -2,9 +2,9 @@ package forge.screens.home.quest;
import forge.UiCommand;
import forge.card.MagicColor;
import forge.gamemodes.quest.StartingPoolPreferences.PoolType;
import forge.gui.SOverlayUtils;
import forge.localinstance.assets.FSkinProp;
import forge.quest.StartingPoolPreferences.PoolType;
import forge.toolbox.*;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;

4
forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java
View File

@@ -1,7 +1,7 @@
package forge.screens.home.quest;
import forge.quest.QuestEventDraft;
import forge.quest.QuestUtil;
import forge.gamemodes.quest.QuestEventDraft;
import forge.gamemodes.quest.QuestUtil;
import forge.toolbox.FRadioButton;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java
View File

@@ -1,9 +1,9 @@
package forge.screens.home.quest;
import forge.ImageCache;
import forge.gamemodes.quest.QuestEvent;
import forge.gamemodes.quest.QuestUtil;
import forge.localinstance.assets.FSkinProp;
import forge.quest.QuestEvent;
import forge.quest.QuestUtil;
import forge.toolbox.FRadioButton;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;
@@ -100,7 +100,7 @@ class PnlEvent extends JPanel {
this.add(tarDesc, "w 100% - " + (wImg + 15) + "px!, gap " + (wImg + 15) + "px 0 5px 0");
}
/** @return {@link forge.quest.QuestEvent} */
/** @return {@link forge.gamemodes.quest.QuestEvent} */
public QuestEvent getEvent() {
return event;
}

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
View File

@@ -1,11 +1,11 @@
package forge.screens.home.quest;
import forge.UiCommand;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.data.QuestData;
import forge.localinstance.assets.FSkinProp;
import forge.localinstance.properties.ForgeConstants;
import forge.model.FModel;
import forge.quest.QuestUtil;
import forge.quest.data.QuestData;
import forge.toolbox.*;
import forge.toolbox.FSkin.SkinnedButton;
import forge.toolbox.FSkin.SkinnedPanel;
@@ -62,7 +62,7 @@ public class QuestFileLister extends JPanel {
icoEditOver = FSkin.getIcon(FSkinProp.ICO_EDIT_OVER);
}
/** @param qd0 &emsp; {@link forge.quest.data.QuestData}[] */
/** @param qd0 &emsp; {@link forge.gamemodes.quest.data.QuestData}[] */
public void setQuests(List<QuestData> qd0) {
this.removeAll();
List<RowPanel> tempRows = new ArrayList<>();

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
View File

@@ -1,10 +1,10 @@
package forge.screens.home.quest;
import forge.gamemodes.quest.IVQuestStats;
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.*;
import forge.util.Localizer;

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java
View File

@@ -1,11 +1,11 @@
package forge.screens.home.quest;
import forge.gamemodes.quest.IVQuestStats;
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.*;
import net.miginfocom.swing.MigLayout;

10
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
View File

@@ -3,18 +3,18 @@ package forge.screens.home.quest;
import forge.GuiBase;
import forge.Singletons;
import forge.game.GameType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.quest.IQuestTournamentView;
import forge.gamemodes.quest.QuestEventDraft;
import forge.gamemodes.quest.QuestDraftUtils.Mode;
import forge.gamemodes.quest.data.QuestEventDraftContainer;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
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;
import forge.quest.QuestDraftUtils.Mode;
import forge.quest.data.QuestEventDraftContainer;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorQuestDraftingProcess;
import forge.screens.deckeditor.controllers.CEditorQuestLimited;

8
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
View File

@@ -1,11 +1,11 @@
package forge.screens.home.quest;
import forge.gamemodes.quest.data.QuestPreferences;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
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;
import forge.screens.home.EMenuGroup;
import forge.screens.home.IVSubmenu;
import forge.screens.home.VHomeUI;
@@ -396,7 +396,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
private boolean isFocus = false;
private String previousText = "";
/**
* @param qp0 &emsp; {@link forge.quest.data.QuestPreferences.QPref}
* @param qp0 &emsp; {@link forge.gamemodes.quest.data.QuestPreferences.QPref}
* preferences ident enum
* @param e0 &emsp; {@link forge.screens.home.quest.VSubmenuQuestPrefs.QuestPreferencesErrType}
* where error should display to
@@ -447,7 +447,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
}
});
}
/** @return {@link forge.quest.data.QuestPreferences.QPref} */
/** @return {@link forge.gamemodes.quest.data.QuestPreferences.QPref} */
public QPref getQPref() {
return this.qpref;
}

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java
View File

@@ -3,6 +3,9 @@ package forge.screens.home.quest;
import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.game.GameFormat;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestWorld;
import forge.gamemodes.quest.StartingPoolType;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
@@ -10,9 +13,6 @@ import forge.item.PreconDeck;
import forge.localinstance.properties.ForgeConstants;
import forge.model.CardCollections;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestWorld;
import forge.quest.StartingPoolType;
import forge.screens.home.EMenuGroup;
import forge.screens.home.IVSubmenu;
import forge.screens.home.VHomeUI;

10
forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java
View File

@@ -2,11 +2,11 @@ package forge.screens.home.quest;
import forge.GuiBase;
import forge.UiCommand;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.bazaar.IQuestBazaarItem;
import forge.gamemodes.quest.data.QuestAssets;
import forge.localinstance.assets.FSkinProp;
import forge.model.FModel;
import forge.quest.QuestUtil;
import forge.quest.bazaar.IQuestBazaarItem;
import forge.quest.data.QuestAssets;
import forge.screens.bazaar.VBazaarUI;
import forge.toolbox.FHtmlViewer;
import forge.toolbox.FLabel;
@@ -58,13 +58,13 @@ public class ViewItem extends FPanel {
/**
* @param i0
* &emsp; {@link forge.quest.bazaar.IQuestBazaarItem}
* &emsp; {@link forge.gamemodes.quest.bazaar.IQuestBazaarItem}
*/
public void setItem(final IQuestBazaarItem i0) {
this.item = i0;
}
/** @return {@link forge.quest.bazaar.IQuestBazaarItem} */
/** @return {@link forge.gamemodes.quest.bazaar.IQuestBazaarItem} */
public IQuestBazaarItem getItem() {
return this.item;
}

12
forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java
View File

@@ -17,12 +17,12 @@
*/
package forge.screens.home.quest;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.bazaar.IQuestBazaarItem;
import forge.gamemodes.quest.bazaar.QuestStallDefinition;
import forge.gamemodes.quest.data.QuestAssets;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestUtil;
import forge.quest.bazaar.IQuestBazaarItem;
import forge.quest.bazaar.QuestStallDefinition;
import forge.quest.data.QuestAssets;
import forge.screens.bazaar.VBazaarUI;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
@@ -128,7 +128,7 @@ public class ViewStall extends JPanel {
/**
* @param q0
* &emsp; {@link forge.quest.bazaar.QuestStallDefinition}
* &emsp; {@link forge.gamemodes.quest.bazaar.QuestStallDefinition}
*/
public void setStall(final QuestStallDefinition q0) {
this.stall = q0;

6
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
View File

@@ -8,15 +8,15 @@ import forge.deck.DeckGroup;
import forge.deck.DeckProxy;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.LimitedPoolType;
import forge.gamemodes.match.HostedMatch;
import forge.gui.GuiChoose;
import forge.gui.SOverlayUtils;
import forge.gui.framework.FScreen;
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.screens.deckeditor.CDeckEditorUI;

4
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java
View File

@@ -16,14 +16,14 @@ import forge.deck.DeckGroup;
import forge.deck.DeckProxy;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.limited.SealedCardPoolGenerator;
import forge.gamemodes.match.HostedMatch;
import forge.gui.SOverlayUtils;
import forge.gui.framework.FScreen;
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.screens.deckeditor.CDeckEditorUI;

6
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java
View File

@@ -16,15 +16,15 @@ import forge.deck.DeckGroup;
import forge.deck.DeckProxy;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.limited.LimitedPoolType;
import forge.gamemodes.limited.WinstonDraft;
import forge.gamemodes.match.HostedMatch;
import forge.gui.GuiChoose;
import forge.gui.SOverlayUtils;
import forge.gui.framework.FScreen;
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.screens.deckeditor.CDeckEditorUI;

6
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
View File

@@ -4,13 +4,13 @@ import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import forge.deckchooser.FDeckChooser;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LocalLobby;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.interfaces.IPlayerChangeListener;
import forge.match.GameLobby;
import forge.match.LocalLobby;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.screens.home.EMenuGroup;
import forge.screens.home.IVSubmenu;
import forge.screens.home.VHomeUI;

2
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
View File

@@ -5,13 +5,13 @@ import forge.ai.AiProfileUtil;
import forge.control.FControl.CloseAction;
import forge.download.AutoUpdater;
import forge.game.GameLogEntryType;
import forge.gamemodes.net.server.FServerManager;
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.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorTokenViewer;

2
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -78,6 +78,7 @@ import forge.game.spellability.SpellAbilityView;
import forge.game.spellability.StackItemView;
import forge.game.spellability.TargetChoices;
import forge.game.zone.ZoneType;
import forge.gamemodes.match.AbstractGuiGame;
import forge.gui.FNetOverlay;
import forge.gui.GuiChoose;
import forge.gui.GuiDialog;
@@ -97,7 +98,6 @@ 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;

2
forge-gui-desktop/src/main/java/forge/screens/match/ControlWinLose.java
View File

@@ -7,10 +7,10 @@ import javax.swing.JButton;
import forge.Singletons;
import forge.game.GameView;
import forge.gamemodes.match.NextGameDecision;
import forge.gui.SOverlayUtils;
import forge.gui.framework.FScreen;
import forge.interfaces.IGameController;
import forge.match.NextGameDecision;
/**
* Default controller for a ViewWinLose object. This class can

2
forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java
View File

@@ -26,7 +26,7 @@ import javax.swing.SwingConstants;
import net.miginfocom.swing.MigLayout;
import forge.game.GameView;
import forge.gauntlet.GauntletWinLoseController;
import forge.gamemodes.gauntlet.GauntletWinLoseController;
import forge.localinstance.assets.FSkinProp;
import forge.util.Localizer;
import forge.toolbox.FLabel;

2
forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java
View File

@@ -22,7 +22,7 @@ import java.awt.Dimension;
import javax.swing.SwingConstants;
import forge.game.GameView;
import forge.limited.LimitedWinLoseController;
import forge.gamemodes.limited.LimitedWinLoseController;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.Colors;
import forge.toolbox.FSkin.SkinColor;

6
forge-gui-desktop/src/main/java/forge/screens/match/QuestDraftWinLose.java
View File

@@ -20,11 +20,11 @@ import com.google.common.collect.ImmutableList;
import forge.game.GameView;
import forge.game.player.PlayerView;
import forge.gamemodes.match.NextGameDecision;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestDraftUtils;
import forge.localinstance.assets.FSkinProp;
import forge.match.NextGameDecision;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestDraftUtils;
import forge.screens.home.quest.CSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestDraft;
import forge.toolbox.FOptionPane;

2
forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java
View File

@@ -17,7 +17,7 @@
package forge.screens.match;
import forge.game.GameView;
import forge.quest.QuestWinLoseController;
import forge.gamemodes.quest.QuestWinLoseController;
import forge.screens.home.quest.CSubmenuChallenges;
import forge.screens.home.quest.CSubmenuDuels;

2
forge-gui-desktop/src/main/java/forge/view/FFrame.java
View File

@@ -20,11 +20,11 @@ import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import forge.Singletons;
import forge.gamemodes.match.HostedMatch;
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.sound.SoundSystem;
import forge.toolbox.FSkin;

2
forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
View File

@@ -6,10 +6,10 @@ import forge.deck.DeckGroup;
import forge.deck.io.DeckSerializer;
import forge.game.*;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.tournament.system.*;
import forge.localinstance.properties.ForgeConstants;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.tournament.system.*;
import forge.util.Lang;
import forge.util.TextUtil;
import forge.util.WordUtil;

4
forge-gui-desktop/src/test/java/forge/BoosterDraft1Test.java
View File

@@ -1,8 +1,8 @@
package forge;
import forge.deck.CardPool;
import forge.limited.BoosterDraft;
import forge.limited.LimitedPoolType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.LimitedPoolType;
import org.testng.annotations.Test;

2
forge-gui-desktop/src/test/java/forge/BoosterDraftTest.java
View File

@@ -3,10 +3,10 @@ package forge;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.game.card.Card;
import forge.gamemodes.limited.IBoosterDraft;
import forge.item.PaperCard;
import forge.item.SealedProduct;
import forge.item.generation.BoosterGenerator;
import forge.limited.IBoosterDraft;
import forge.model.FModel;
import org.testng.annotations.Test;

2
forge-gui-desktop/src/test/java/forge/CardRankerTest.java
View File

@@ -2,8 +2,8 @@ package forge;
import forge.card.CardRarity;
import forge.card.CardRules;
import forge.gamemodes.limited.CardRanker;
import forge.item.PaperCard;
import forge.limited.CardRanker;
import forge.localinstance.properties.ForgeConstants;
import forge.util.FileUtil;
import org.junit.Assert;

2
forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java
View File

@@ -13,8 +13,8 @@ import forge.deck.io.DeckStorage;
import forge.game.GameFormat;
import forge.game.GameRules;
import forge.game.GameType;
import forge.gamemodes.limited.CardRanker;
import forge.item.PaperCard;
import forge.limited.CardRanker;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;

10
forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java
View File

@@ -16,16 +16,16 @@ import forge.game.GameRules;
import forge.game.GameType;
import forge.game.Match;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.limited.CardRanker;
import forge.gamemodes.tournament.system.AbstractTournament;
import forge.gamemodes.tournament.system.TournamentPairing;
import forge.gamemodes.tournament.system.TournamentPlayer;
import forge.gamemodes.tournament.system.TournamentSwiss;
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.tournament.system.AbstractTournament;
import forge.tournament.system.TournamentPairing;
import forge.tournament.system.TournamentPlayer;
import forge.tournament.system.TournamentSwiss;
import forge.util.AbstractGeneticAlgorithm;
import forge.util.MyRandom;
import forge.util.TextUtil;

2
forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java
View File

@@ -13,8 +13,8 @@ import forge.deck.io.DeckStorage;
import forge.game.GameFormat;
import forge.game.GameRules;
import forge.game.GameType;
import forge.gamemodes.limited.CardRanker;
import forge.item.PaperCard;
import forge.limited.CardRanker;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;

2
forge-gui-mobile/src/forge/GuiMobile.java
View File

@@ -20,13 +20,13 @@ import forge.deck.Deck;
import forge.deck.FDeckViewer;
import forge.download.GuiDownloadService;
import forge.error.BugReportDialog;
import forge.gamemodes.match.HostedMatch;
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.screens.LoadingOverlay;
import forge.screens.match.MatchController;
import forge.screens.quest.QuestMenu;

2
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -17,12 +17,12 @@ import forge.deck.CommanderDeckGenerator;
import forge.deck.DeckProxy;
import forge.game.GameView;
import forge.game.card.CardView;
import forge.gamemodes.planarconquest.ConquestCommander;
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.screens.match.MatchController;
import forge.toolbox.FCardPanel;
import forge.toolbox.FDialog;

14
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -9,21 +9,21 @@ import forge.deck.io.DeckPreferences;
import forge.error.BugReporter;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletUtil;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletUtil;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestEvent;
import forge.gamemodes.quest.QuestEventChallenge;
import forge.gamemodes.quest.QuestUtil;
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.quest.QuestController;
import forge.quest.QuestEvent;
import forge.quest.QuestEventChallenge;
import forge.quest.QuestUtil;
import forge.screens.FScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.NewGameMenu.NewGameScreen;

4
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -20,6 +20,8 @@ import forge.card.CardEdition;
import forge.card.CardPreferences;
import forge.card.CardRulesPredicates;
import forge.deck.io.DeckPreferences;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ColumnDef;
@@ -27,7 +29,6 @@ import forge.itemmanager.ItemColumn;
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;
@@ -35,7 +36,6 @@ import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.model.FModel;
import forge.planarconquest.ConquestUtil;
import forge.screens.FScreen;
import forge.screens.TabPageScreen;
import forge.toolbox.*;

2
forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
View File

@@ -12,11 +12,11 @@ import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.ImageCache;
import forge.card.CardRenderer;
import forge.gamemodes.quest.QuestSpellShop;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.filters.AdvancedSearchFilter;
import forge.itemmanager.filters.TextSearchFilter;
import forge.quest.QuestSpellShop;
import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler;
import forge.util.Localizer;

2
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -23,6 +23,7 @@ import forge.deck.CommanderDeckGenerator;
import forge.deck.DeckProxy;
import forge.deck.FDeckViewer;
import forge.deck.io.DeckPreferences;
import forge.gamemodes.planarconquest.ConquestCommander;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.ColumnDef;
@@ -33,7 +34,6 @@ import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerModel;
import forge.itemmanager.SItemManagerUtil;
import forge.itemmanager.filters.ItemFilter;
import forge.planarconquest.ConquestCommander;
import forge.toolbox.FCardPanel;
import forge.toolbox.FComboBox;
import forge.toolbox.FDisplayObject;

4
forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java
View File

@@ -1,8 +1,8 @@
package forge.screens.constructed;
import forge.gamemodes.match.LocalLobby;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.interfaces.IPlayerChangeListener;
import forge.match.LocalLobby;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.screens.home.NewGameMenu;
public class ConstructedScreen extends LobbyScreen {

11
forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
View File

@@ -11,8 +11,6 @@ import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.deck.DeckType;
import forge.deck.FDeckChooser;
import forge.net.server.FServerManager;
import forge.util.Localizer;
import forge.util.MyRandom;
@@ -30,16 +28,17 @@ import forge.ai.AIOption;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.game.GameType;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LobbySlot;
import forge.gamemodes.match.LobbySlotType;
import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
import forge.gamemodes.net.server.FServerManager;
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.screens.FScreen;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;

4
forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
View File

@@ -28,13 +28,13 @@ import forge.deck.DeckType;
import forge.deck.FDeckChooser;
import forge.deck.FVanguardChooser;
import forge.game.GameType;
import forge.gamemodes.match.LobbySlot;
import forge.gamemodes.match.LobbySlotType;
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.toolbox.FComboBox;
import forge.toolbox.FContainer;

6
forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
View File

@@ -17,11 +17,11 @@ import forge.deck.Deck;
import forge.deck.FDeckChooser;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gamemodes.quest.QuestUtil;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.quest.QuestUtil;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.LoadGameMenu;

6
forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
View File

@@ -11,9 +11,9 @@ import forge.deck.DeckType;
import forge.deck.FDeckChooser;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gauntlet.GauntletData;
import forge.gauntlet.GauntletIO;
import forge.gauntlet.GauntletUtil;
import forge.gamemodes.gauntlet.GauntletData;
import forge.gamemodes.gauntlet.GauntletIO;
import forge.gamemodes.gauntlet.GauntletUtil;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.screens.LaunchScreen;

6
forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
View File

@@ -6,11 +6,11 @@ import forge.deck.Deck;
import forge.game.GameRules;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
import forge.gamemodes.puzzle.Puzzle;
import forge.gamemodes.puzzle.PuzzleIO;
import forge.localinstance.properties.ForgeConstants;
import forge.match.HostedMatch;
import forge.player.GamePlayerUtil;
import forge.puzzle.Puzzle;
import forge.puzzle.PuzzleIO;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.NewGameMenu;

6
forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java
View File

@@ -7,10 +7,10 @@ import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.FDeckEditor;
import forge.deck.io.DeckPreferences;
import forge.limited.BoosterDraft;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.quest.QuestEventDraft;
import forge.gamemodes.quest.QuestTournamentController;
import forge.model.FModel;
import forge.quest.QuestEventDraft;
import forge.quest.QuestTournamentController;
import forge.screens.FScreen;
import forge.screens.home.LoadGameMenu.LoadGameScreen;
import forge.toolbox.FOptionPane;

2
forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
View File

@@ -22,11 +22,11 @@ import forge.deck.FDeckEditor.EditorType;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
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.toolbox.FComboBox;

2
forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
View File

@@ -15,11 +15,11 @@ import forge.deck.FDeckEditor.EditorType;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
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.screens.LaunchScreen;

4
forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
View File

@@ -4,8 +4,8 @@ import forge.FThreads;
import forge.Forge;
import forge.assets.FSkinFont;
import forge.deck.FDeckEditor.EditorType;
import forge.limited.BoosterDraft;
import forge.limited.LimitedPoolType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.limited.LimitedPoolType;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.NewGameMenu;

2
forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java
View File

@@ -7,7 +7,7 @@ import forge.deck.DeckGroup;
import forge.deck.FDeckEditor;
import forge.deck.FDeckEditor.EditorType;
import forge.deck.io.DeckPreferences;
import forge.limited.SealedCardPoolGenerator;
import forge.gamemodes.limited.SealedCardPoolGenerator;
import forge.screens.LaunchScreen;
import forge.screens.home.NewGameMenu;
import forge.toolbox.FLabel;

4
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -36,12 +36,12 @@ import forge.game.player.IHasIcon;
import forge.game.player.PlayerView;
import forge.game.spellability.SpellAbilityView;
import forge.game.zone.ZoneType;
import forge.gamemodes.match.AbstractGuiGame;
import forge.gamemodes.match.HostedMatch;
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;

2
forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java
View File

@@ -19,7 +19,7 @@ package forge.screens.match.winlose;
import forge.FThreads;
import forge.game.GameView;
import forge.gauntlet.GauntletWinLoseController;
import forge.gamemodes.gauntlet.GauntletWinLoseController;
import forge.localinstance.assets.FSkinProp;
import forge.util.Localizer;
import forge.util.gui.SOptionPane;

2
forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java
View File

@@ -18,7 +18,7 @@ package forge.screens.match.winlose;
*/
import forge.game.GameView;
import forge.limited.LimitedWinLoseController;
import forge.gamemodes.limited.LimitedWinLoseController;
/**
* The Win/Lose handler for 'gauntlet' type tournament

6
forge-gui-mobile/src/forge/screens/match/winlose/QuestDraftWinLose.java
View File

@@ -18,10 +18,10 @@ package forge.screens.match.winlose;
import forge.game.GameView;
import forge.game.player.PlayerView;
import forge.match.NextGameDecision;
import forge.gamemodes.match.NextGameDecision;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestDraftUtils;
import forge.model.FModel;
import forge.quest.QuestController;
import forge.quest.QuestDraftUtils;
import forge.screens.match.MatchController;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;

2
forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java
View File

@@ -17,7 +17,7 @@
package forge.screens.match.winlose;
import forge.game.GameView;
import forge.quest.QuestWinLoseController;
import forge.gamemodes.quest.QuestWinLoseController;
import forge.screens.home.HomeScreen;
/**

8
forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java
View File

@@ -8,13 +8,13 @@ import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.assets.FSkinColor.Colors;
import forge.gamemodes.net.ChatMessage;
import forge.gamemodes.net.IOnlineChatInterface;
import forge.gamemodes.net.IRemote;
import forge.gamemodes.net.event.MessageEvent;
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.screens.FScreen;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;

16
forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
View File

@@ -4,17 +4,17 @@ import com.google.common.collect.ImmutableList;
import forge.FThreads;
import forge.Forge;
import forge.GuiBase;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.net.ChatMessage;
import forge.gamemodes.net.IOnlineChatInterface;
import forge.gamemodes.net.IOnlineLobby;
import forge.gamemodes.net.NetConnectUtil;
import forge.gamemodes.net.OfflineLobby;
import forge.gamemodes.net.client.FGameClient;
import forge.gamemodes.net.server.FServerManager;
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;
import forge.net.IOnlineLobby;
import forge.net.NetConnectUtil;
import forge.net.OfflineLobby;
import forge.net.client.FGameClient;
import forge.net.server.FServerManager;
import forge.screens.LoadingOverlay;
import forge.screens.constructed.LobbyScreen;
import forge.screens.online.OnlineMenu.OnlineScreen;

2
forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
View File

@@ -3,12 +3,12 @@ package forge.screens.online;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinImage;
import forge.gamemodes.net.server.FServerManager;
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.screens.FScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;

12
forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
View File

@@ -24,16 +24,16 @@ import forge.card.CardRenderer;
import forge.card.CardZoom;
import forge.card.ColorSet;
import forge.card.CardRenderer.CardStackPosition;
import forge.gamemodes.planarconquest.ConquestCommander;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.gamemodes.planarconquest.ConquestUtil.AEtherFilter;
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;
import forge.planarconquest.ConquestPlane;
import forge.planarconquest.ConquestPreferences.CQPref;
import forge.planarconquest.ConquestUtil;
import forge.planarconquest.ConquestUtil.AEtherFilter;
import forge.screens.FScreen;
import forge.toolbox.FCardPanel;
import forge.toolbox.FDisplayObject;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java
View File

@@ -7,7 +7,7 @@ import forge.Graphics;
import forge.animation.ForgeAnimation;
import forge.assets.FSkinImage;
import forge.assets.FSkinTexture;
import forge.planarconquest.ConquestEvent.ChaosWheelOutcome;
import forge.gamemodes.planarconquest.ConquestEvent.ChaosWheelOutcome;
import forge.toolbox.FOptionPane;
import forge.toolbox.FOverlay;
import forge.util.Aggregates;

10
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
View File

@@ -13,6 +13,11 @@ import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.TextRenderer;
import forge.deck.CardPool;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestPreferences;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManager;
@@ -24,11 +29,6 @@ import forge.itemmanager.filters.ItemFilter;
import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.model.FModel;
import forge.planarconquest.ConquestData;
import forge.planarconquest.ConquestPlane;
import forge.planarconquest.ConquestPreferences;
import forge.planarconquest.ConquestUtil;
import forge.planarconquest.ConquestPreferences.CQPref;
import forge.screens.TabPageScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;

8
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
View File

@@ -17,6 +17,10 @@ import forge.card.ColorSet;
import forge.deck.DeckFormat;
import forge.deck.FDeckChooser;
import forge.deck.FDeckViewer;
import forge.gamemodes.planarconquest.ConquestCommander;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestRecord;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
@@ -28,10 +32,6 @@ import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.filters.StatTypeFilter;
import forge.itemmanager.filters.TextSearchFilter;
import forge.model.FModel;
import forge.planarconquest.ConquestCommander;
import forge.planarconquest.ConquestData;
import forge.planarconquest.ConquestPlane;
import forge.planarconquest.ConquestRecord;
import forge.screens.FScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;

4
forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
View File

@@ -5,12 +5,12 @@ import java.util.Map;
import forge.deck.DeckProxy;
import forge.deck.FDeckEditor;
import forge.game.GameType;
import forge.gamemodes.planarconquest.ConquestCommander;
import forge.gamemodes.planarconquest.ConquestData;
import forge.itemmanager.ColumnDef;
import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
import forge.planarconquest.ConquestCommander;
import forge.planarconquest.ConquestData;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;

Some files were not shown because too many files have changed in this diff Show More