diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index fa9b06a8d82..e9e0f8cb723 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java @@ -2,17 +2,18 @@ package forge; 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; +import forge.gui.FThreads; import forge.gui.GuiChoose; +import forge.gui.download.GuiDownloadService; import forge.gui.framework.FScreen; -import forge.interfaces.IGuiBase; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiBase; +import forge.gui.interfaces.IGuiGame; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.assets.ISkinImage; diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java index 7e4df457229..343ca853b22 100644 --- a/forge-gui-desktop/src/main/java/forge/ImageCache.java +++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java @@ -24,6 +24,7 @@ import com.mortennobel.imagescaling.ResampleOp; import forge.game.card.CardView; import forge.game.player.PlayerView; +import forge.gui.FThreads; import forge.item.InventoryItem; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui-desktop/src/main/java/forge/ImageLoader.java b/forge-gui-desktop/src/main/java/forge/ImageLoader.java index 15b74700baa..f29f93cfeb3 100644 --- a/forge-gui-desktop/src/main/java/forge/ImageLoader.java +++ b/forge-gui-desktop/src/main/java/forge/ImageLoader.java @@ -2,7 +2,7 @@ package forge; import com.google.common.cache.CacheLoader; -import forge.error.BugReporter; +import forge.gui.error.BugReporter; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; diff --git a/forge-gui-desktop/src/main/java/forge/Singletons.java b/forge-gui-desktop/src/main/java/forge/Singletons.java index 84d3972f765..8e1321f8611 100644 --- a/forge-gui-desktop/src/main/java/forge/Singletons.java +++ b/forge-gui-desktop/src/main/java/forge/Singletons.java @@ -18,6 +18,7 @@ package forge; import forge.control.FControl; +import forge.gui.FThreads; import forge.model.FModel; import forge.view.FView; diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java index e3f46f89a22..fb28631f2cf 100644 --- a/forge-gui-desktop/src/main/java/forge/control/FControl.java +++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java @@ -40,19 +40,20 @@ import javax.swing.WindowConstants; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -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.GuiBase; import forge.gui.SOverlayUtils; import forge.gui.framework.FScreen; import forge.gui.framework.InvalidLayoutFileException; import forge.gui.framework.SLayoutIO; import forge.gui.framework.SOverflowUtil; import forge.gui.framework.SResizingUtil; +import forge.gui.util.SOptionPane; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; @@ -65,7 +66,6 @@ import forge.toolbox.FOptionPane; import forge.toolbox.FSkin; import forge.util.Localizer; import forge.util.RestartUtil; -import forge.util.gui.SOptionPane; import forge.view.FFrame; import forge.view.FView; 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 ff86d0daa05..1d1c7e1be59 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java @@ -19,14 +19,14 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; -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.gui.FThreads; +import forge.gui.UiCommand; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerContainer; diff --git a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java index fcec51ced98..f11ce5b0b33 100644 --- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java +++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java @@ -25,8 +25,9 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import forge.UiCommand; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; +import forge.gui.download.GuiDownloadService; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FButton; import forge.toolbox.FLabel; diff --git a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java index c114918bfdb..0e5b246e9c2 100644 --- a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java @@ -40,6 +40,7 @@ import javax.swing.KeyStroke; import forge.model.FModel; import net.miginfocom.swing.MigLayout; import forge.gui.WrapLayout; +import forge.gui.error.BugReporter; import forge.localinstance.properties.ForgePreferences; /** diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java index ed08ae5effb..c758ec716d2 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java @@ -30,8 +30,6 @@ import javax.swing.border.EmptyBorder; import org.apache.commons.lang3.StringUtils; -import forge.card.CardDetailUtil; -import forge.card.CardDetailUtil.DetailColors; import forge.card.CardEdition; import forge.card.CardRarity; import forge.game.GameView; @@ -39,6 +37,8 @@ import forge.game.card.Card; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.zone.ZoneType; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; import forge.item.IPaperCard; import forge.item.InventoryItemFromSet; import forge.model.FModel; diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java index 7506748935a..6b39497080e 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java @@ -17,7 +17,6 @@ */ package forge.gui; -import forge.GuiBase; import forge.ImageCache; import forge.ImageKeys; import forge.game.card.CardView.CardStateView; diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java index 0e202b6693a..1895456ecf7 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java @@ -19,7 +19,6 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.base.Function; -import forge.FThreads; import forge.card.ICardFace; import forge.game.card.Card; import forge.game.card.CardView; diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java b/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java index 6924ba602ae..1dee99d0675 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java @@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; -import forge.FThreads; import forge.game.card.CardView; import forge.screens.match.CMatchUI; import forge.toolbox.FOptionPane; diff --git a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java index f26358243c8..8a753d90e88 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java @@ -58,9 +58,8 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; -import forge.UiCommand; -import forge.error.BugReporter; import forge.gui.ImportSourceAnalyzer.OpType; +import forge.gui.error.BugReporter; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FButton; diff --git a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java index b7cf5954534..670877951ef 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java @@ -40,7 +40,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import forge.FThreads; import forge.toolbox.FList; import forge.toolbox.FMouseAdapter; import forge.toolbox.FOptionPane; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java index 0527359adf8..487980aeab3 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java @@ -17,7 +17,7 @@ import java.util.TimerTask; import javax.swing.JPanel; import javax.swing.SwingUtilities; -import forge.FThreads; +import forge.gui.FThreads; import forge.view.FFrame; /** diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java index 3da48e447cb..7973d72b82a 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java @@ -26,9 +26,10 @@ import javax.xml.stream.events.Attribute; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; -import forge.FThreads; import forge.Singletons; +import forge.gui.FThreads; import forge.gui.SOverlayUtils; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.FileLocation; import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FAbsolutePositioner; @@ -36,7 +37,6 @@ import forge.toolbox.SaveOpenDialog; import forge.toolbox.SaveOpenDialog.Filetypes; import forge.util.CollectionSuppliers; import forge.util.ThreadUtil; -import forge.util.gui.SOptionPane; import forge.util.maps.HashMapOfLists; import forge.util.maps.MapOfLists; import forge.view.FFrame; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java index efba3454986..f3cda6bfe15 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java @@ -19,7 +19,6 @@ import forge.util.Localizer; import org.apache.commons.lang3.StringUtils; import forge.Singletons; -import forge.UiCommand; import forge.deck.DeckBase; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; @@ -28,6 +27,7 @@ import forge.game.GameType; import forge.game.IHasGameType; import forge.gamemodes.quest.QuestWorld; import forge.gui.GuiUtils; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.item.InventoryItem; import forge.itemmanager.filters.AdvancedSearchFilter; @@ -121,7 +121,7 @@ public final class DeckManager extends ItemManager implements IHasGam /** * Sets the delete command. * - * @param c0   {@link forge.UiCommand} command executed on delete. + * @param c0   {@link forge.forge.gui.UiCommand} command executed on delete. */ public void setDeleteCommand(final UiCommand c0) { this.cmdDelete = c0; @@ -130,7 +130,7 @@ public final class DeckManager extends ItemManager implements IHasGam /** * Sets the select command. * - * @param c0   {@link forge.UiCommand} command executed on row select. + * @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */ public void setSelectCommand(final UiCommand c0) { this.cmdSelect = c0; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java index a6676f568bd..954210ad429 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java @@ -42,8 +42,8 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import forge.UiCommand; import forge.gui.GuiUtils; +import forge.gui.UiCommand; import forge.item.InventoryItem; import forge.itemmanager.filters.ItemFilter; import forge.itemmanager.views.ImageView; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java index 6884c9889dc..0657953673f 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -6,9 +6,9 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.MouseEvent; -import forge.UiCommand; import forge.gui.GuiUtils; -import forge.interfaces.IButton; +import forge.gui.UiCommand; +import forge.gui.interfaces.IButton; import forge.item.InventoryItem; import forge.itemmanager.AdvancedSearch; import forge.itemmanager.ItemManager; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java index 03e5c7b9621..20364aefde2 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java @@ -2,7 +2,7 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ItemManager; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java index 775cdaf496e..c0a2ec67a66 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java @@ -2,7 +2,7 @@ package forge.itemmanager.filters; import com.google.common.base.Predicates; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.item.InventoryItem; import forge.item.ItemPredicate; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java index 735cb0e459b..0edf3a54f8f 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java @@ -7,7 +7,7 @@ import java.util.List; import javax.swing.Icon; import javax.swing.JPanel; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; import forge.toolbox.FLabel; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java index e1fd9d7c54e..947c4e0b402 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java @@ -1,7 +1,8 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; -import forge.UiCommand; + +import forge.gui.UiCommand; import forge.item.InventoryItem; import forge.item.PaperToken; import forge.itemmanager.ItemManager; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java index f1f7377d882..c8ff2130cab 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java @@ -17,7 +17,7 @@ */ package forge.itemmanager.views; -import forge.card.CardPreferences; +import forge.gui.card.CardPreferences; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.localinstance.assets.FSkinProp; diff --git a/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java b/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java index 9e15ec5e64e..5f40c414b21 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java @@ -1,8 +1,8 @@ package forge.screens.bazaar; -import forge.GuiBase; -import forge.UiCommand; import forge.gamemodes.quest.bazaar.QuestBazaarManager; +import forge.gui.GuiBase; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; import forge.localinstance.assets.FSkinProp; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java index 42147fd5769..3ea5daa06b1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java @@ -35,7 +35,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import forge.ImageCache; import forge.StaticData; -import forge.UiCommand; import forge.card.CardEdition; import forge.card.CardRules; import forge.card.mana.ManaCostShard; @@ -43,6 +42,7 @@ import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckProxy; import forge.deck.DeckgenUtil; +import forge.gui.UiCommand; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.model.FModel; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java index be7750966f8..11c4a9f2a40 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java @@ -27,10 +27,10 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import forge.Singletons; -import forge.UiCommand; import forge.deck.DeckBase; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; +import forge.gui.UiCommand; import forge.gui.framework.EDocID; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index c06569096a3..686d6a7e322 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -19,11 +19,12 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import forge.UiCommand; + import forge.deck.*; import forge.game.GameType; import forge.gui.GuiChoose; import forge.gui.GuiUtils; +import forge.gui.UiCommand; import forge.gui.framework.*; import forge.item.InventoryItem; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java index 96789fad97e..b1372fb92ef 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java @@ -11,11 +11,11 @@ import javax.swing.SwingUtilities; import javax.swing.filechooser.FileFilter; import forge.Singletons; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java index f77822b3586..708bd0bdb2a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java @@ -5,7 +5,6 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import forge.Singletons; -import forge.UiCommand; import forge.card.CardDb; import forge.card.CardRulesPredicates; import forge.card.MagicColor; @@ -17,6 +16,7 @@ import forge.deck.generation.DeckGenerator3Color; import forge.deck.generation.DeckGenerator5Color; import forge.deck.generation.DeckGeneratorBase; import forge.deck.generation.DeckGeneratorMonoColor; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java index a6aff9b7132..b5dbf1c4062 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java @@ -20,7 +20,7 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Supplier; -import forge.UiCommand; + import forge.card.CardDb; import forge.card.CardRules; import forge.card.CardRulesPredicates; @@ -28,6 +28,7 @@ import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameFormat; import forge.game.GameType; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java index ee7a4a4f4af..cb50eae61cb 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java @@ -20,13 +20,14 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Supplier; -import forge.UiCommand; + import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameType; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.item.PaperCard; import forge.itemmanager.CardManager; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java index c35e194b880..c14653f6955 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java @@ -18,13 +18,14 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Supplier; -import forge.UiCommand; + import forge.card.CardEdition; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; import forge.game.GameType; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index 57062e5df9a..3977d7bd78f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java @@ -21,7 +21,7 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Supplier; -import forge.UiCommand; + import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.card.ColorSet; @@ -33,6 +33,7 @@ import forge.game.GameType; import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.data.DeckConstructionRules; import forge.gui.GuiUtils; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.InventoryItem; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java index f99cd92bd8e..6950471e104 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java @@ -17,12 +17,12 @@ */ 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.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java index 2658dca42a3..6e17f9407d0 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java @@ -19,13 +19,14 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Function; import com.google.common.base.Supplier; -import forge.UiCommand; + 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.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.InventoryItem; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java index d1e59a6cf2c..e2d74900609 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java @@ -20,10 +20,11 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.Iterables; -import forge.UiCommand; + import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameType; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java index eb8b955f03e..33c6614d721 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java @@ -18,7 +18,6 @@ package forge.screens.deckeditor.controllers; import forge.Singletons; -import forge.UiCommand; import forge.card.MagicColor; import forge.deck.CardPool; import forge.deck.Deck; @@ -28,6 +27,7 @@ import forge.game.GameType; import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.limited.IBoosterDraft; import forge.gamemodes.limited.WinstonDraft; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java index 7a3fd676276..b70f8646192 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java @@ -7,8 +7,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import forge.UiCommand; import forge.deck.DeckBase; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java index fc2310b87a0..e0287d6c23d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java @@ -23,13 +23,14 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import forge.Singletons; -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.UiCommand; import forge.gui.framework.FScreen; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences; @@ -51,7 +52,6 @@ import forge.toolbox.FSkin.SkinImage; import forge.toolbox.FTextField; import forge.util.MyRandom; import forge.util.NameGenerator; -import forge.util.gui.SOptionPane; import forge.util.Localizer; @SuppressWarnings("serial") diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java index 900bacdc7da..e02bf2fcddd 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java @@ -285,7 +285,7 @@ public enum VHomeUI implements IVTopLevelUI { } /* (non-Javadoc) - * @see forge.gui.framework.IVTopLevelUI#onClosing(forge.control.FControl.Screens) + * @see forge.gui.framework.IVTopLevelUI#onClosing(forge.gui.control.FControl.Screens) */ @Override public boolean onClosing(FScreen screen) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 97370fd3c05..57485fc0ecf 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -3,8 +3,7 @@ package forge.screens.home; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; -import forge.UiCommand; + import forge.ai.AIOption; import forge.deck.*; import forge.deckchooser.FDeckChooser; @@ -15,7 +14,10 @@ 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.gui.GuiBase; +import forge.gui.UiCommand; +import forge.gui.interfaces.ILobbyView; +import forge.gui.util.SOptionPane; import forge.interfaces.IPlayerChangeListener; import forge.item.PaperCard; import forge.localinstance.properties.ForgePreferences; @@ -27,7 +29,6 @@ import forge.util.Aggregates; import forge.util.Lang; import forge.util.Localizer; import forge.util.NameGenerator; -import forge.util.gui.SOptionPane; import net.miginfocom.swing.MigLayout; import javax.swing.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java index 02b9febe403..047b89af095 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java @@ -11,10 +11,10 @@ import javax.swing.filechooser.FileFilter; import org.apache.commons.lang3.ArrayUtils; -import forge.UiCommand; import forge.deck.Deck; import forge.gamemodes.gauntlet.GauntletData; import forge.gamemodes.gauntlet.GauntletIO; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FOptionPane; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java index 525fa3284fa..317555851a8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java @@ -9,7 +9,6 @@ import java.util.List; import javax.swing.JButton; import javax.swing.SwingUtilities; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckType; import forge.deckchooser.FDeckChooser; @@ -17,6 +16,7 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.gauntlet.GauntletData; import forge.gamemodes.gauntlet.GauntletIO; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.model.FModel; import forge.player.GamePlayerUtil; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java index e92b1a3f20b..adfecaabc56 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java @@ -12,9 +12,9 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; -import forge.UiCommand; import forge.gamemodes.gauntlet.GauntletData; import forge.gamemodes.gauntlet.GauntletIO; +import forge.gui.UiCommand; import forge.toolbox.FLabel; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedPanel; @@ -182,7 +182,7 @@ public class ContestGauntletLister extends JPanel { return true; } - /** @param c0   {@link forge.UiCommand} command executed on row select. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */ public void setSelectCommand(final UiCommand c0) { this.cmdRowSelect = c0; } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java index 84351847eb4..18216725aea 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java @@ -13,10 +13,10 @@ import javax.swing.SwingConstants; import javax.swing.border.Border; import net.miginfocom.swing.MigLayout; -import forge.UiCommand; import forge.gamemodes.gauntlet.GauntletData; import forge.gamemodes.gauntlet.GauntletIO; import forge.gamemodes.quest.QuestUtil; +import forge.gui.UiCommand; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FLabel; import forge.toolbox.FMouseAdapter; @@ -281,17 +281,17 @@ public class QuickGauntletLister extends JPanel { return true; } - /** @param c0   {@link forge.UiCommand} command executed on row select. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */ public void setCmdSelect(final UiCommand c0) { this.cmdRowSelect = c0; } - /** @param c0   {@link forge.UiCommand} command executed on row delete. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row delete. */ public void setCmdDelete(final UiCommand c0) { this.cmdRowDelete = c0; } - /** @param c0   {@link forge.UiCommand} command executed on row activate. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row activate. */ public void setCmdActivate(final UiCommand c0) { this.cmdRowActivate = c0; } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java index ace48d1864d..e08ab28e07e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java @@ -7,21 +7,21 @@ import java.util.List; import javax.swing.JMenu; 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.FThreads; import forge.gui.SOverlayUtils; +import forge.gui.error.BugReporter; import forge.gui.framework.EDocID; import forge.gui.framework.ICDoc; +import forge.gui.util.SOptionPane; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.screens.home.CHomeUI; import forge.screens.home.CLobby; import forge.screens.home.VLobby; import forge.screens.home.sanctioned.ConstructedGameMenu; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java index 233560aab08..ec7c68b61b4 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java @@ -20,10 +20,10 @@ import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; -import forge.interfaces.ILobbyView; +import forge.gui.interfaces.ILobbyView; +import forge.gui.util.SOptionPane; import forge.toolbox.FButton; import forge.toolbox.FSkin; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public enum VSubmenuOnlineLobby implements IVSubmenu, IOnlineLobby, IVTopLevelUI { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java index 1baee6bef27..5c244263c0c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java @@ -1,20 +1,21 @@ package forge.screens.home.puzzle; import com.google.common.collect.Maps; -import forge.GuiBase; + 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.GuiBase; import forge.gui.SOverlayUtils; import forge.gui.framework.ICDoc; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.player.GamePlayerUtil; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.Localizer; import javax.swing.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java index bd2ba68ac74..69ef0003dd7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java @@ -1,7 +1,5 @@ package forge.screens.home.puzzle; -import forge.GuiBase; -import forge.UiCommand; import forge.deck.Deck; import forge.game.GameRules; import forge.game.GameType; @@ -9,15 +7,17 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; import forge.gamemodes.puzzle.Puzzle; import forge.gamemodes.puzzle.PuzzleIO; +import forge.gui.GuiBase; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; +import forge.gui.util.SOptionPane; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.player.GamePlayerUtil; import forge.util.Localizer; -import forge.util.gui.SOptionPane; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java index ea5d2bde0ca..5681491456a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java @@ -1,7 +1,5 @@ package forge.screens.home.puzzle; -import forge.GuiBase; -import forge.UiCommand; import forge.deck.Deck; import forge.game.GameRules; import forge.game.GameType; @@ -9,15 +7,17 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; import forge.gamemodes.puzzle.Puzzle; import forge.gamemodes.puzzle.PuzzleIO; +import forge.gui.GuiBase; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; +import forge.gui.util.SOptionPane; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.menus.IMenuProvider; import forge.menus.MenuUtil; import forge.player.GamePlayerUtil; import forge.util.Localizer; -import forge.util.gui.SOptionPane; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java index d55dde9e95c..46dbbaf31a3 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java @@ -16,12 +16,12 @@ import javax.swing.SwingUtilities; 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.UiCommand; import forge.gui.framework.ICDoc; import forge.model.FModel; import forge.toolbox.FLabel; @@ -43,7 +43,7 @@ public enum CSubmenuChallenges implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#initialize() + * @see forge.gui.control.home.IControlSubmenu#initialize() */ @SuppressWarnings("serial") @Override @@ -136,7 +136,7 @@ public enum CSubmenuChallenges implements ICDoc { }; /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java index af883e4e254..441a104e445 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java @@ -1,10 +1,10 @@ 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.UiCommand; import forge.gui.framework.ICDoc; import forge.model.FModel; import forge.toolbox.JXButtonPanel; @@ -28,7 +28,7 @@ public enum CSubmenuDuels implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#initialize() + * @see forge.gui.control.home.IControlSubmenu#initialize() */ @SuppressWarnings("serial") @Override @@ -160,7 +160,7 @@ public enum CSubmenuDuels implements ICDoc { }; /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java index 9f4861b91b9..78f599afb5c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java @@ -3,11 +3,11 @@ package forge.screens.home.quest; 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.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; @@ -52,7 +52,7 @@ public enum CSubmenuQuestDecks implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -71,7 +71,7 @@ public enum CSubmenuQuestDecks implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java index 1d0fa8c549c..0409e8e8b9a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java @@ -1,8 +1,8 @@ package forge.screens.home.quest; -import forge.UiCommand; import forge.deck.DeckGroup; import forge.gamemodes.quest.QuestTournamentController; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import java.awt.event.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java index d8310973cb1..003d4a10a1b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java @@ -1,10 +1,10 @@ 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.UiCommand; import forge.gui.framework.ICDoc; import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; @@ -45,14 +45,14 @@ public enum CSubmenuQuestLoadData implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java index dbbe2cb2a4c..48cd5e5bd6e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java @@ -25,14 +25,14 @@ public enum CSubmenuQuestPrefs implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java index 0d45aca5452..c1c3ec33560 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java @@ -1,6 +1,5 @@ package forge.screens.home.quest; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameFormat; @@ -9,6 +8,7 @@ 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.UiCommand; import forge.gui.framework.ICDoc; import forge.item.PaperCard; import forge.model.FModel; @@ -44,7 +44,7 @@ public enum CSubmenuQuestStart implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -143,7 +143,7 @@ public enum CSubmenuQuestStart implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java index 038795e6e66..cbabef00197 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java @@ -1,9 +1,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.gui.UiCommand; import forge.localinstance.assets.FSkinProp; import forge.toolbox.*; import forge.util.Localizer; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java index 97877e86a4f..ea80b517e2f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java @@ -1,8 +1,8 @@ package forge.screens.home.quest; -import forge.UiCommand; import forge.gamemodes.quest.QuestUtil; import forge.gamemodes.quest.data.QuestData; +import forge.gui.UiCommand; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; @@ -312,17 +312,17 @@ public class QuestFileLister extends JPanel { return false; } - /** @param c0   {@link forge.UiCommand} command executed on row select. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */ public void setSelectCommand(UiCommand c0) { this.cmdRowSelect = c0; } - /** @param c0   {@link forge.UiCommand} command executed on row edit. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row edit. */ public void setEditCommand(UiCommand c0) { this.cmdRowEdit = c0; } - /** @param c0   {@link forge.UiCommand} command executed on delete. */ + /** @param c0   {@link forge.forge.gui.UiCommand} command executed on delete. */ public void setDeleteCommand(UiCommand c0) { this.cmdRowDelete = c0; } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java index ec13160ab09..09f25ec82cc 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java @@ -4,7 +4,7 @@ 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.gui.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.screens.home.*; import forge.toolbox.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java index 16ef4fc852e..22e63fd097b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java @@ -1,6 +1,5 @@ package forge.screens.home.quest; -import forge.GuiBase; import forge.Singletons; import forge.game.GameType; import forge.gamemodes.limited.BoosterDraft; @@ -8,6 +7,7 @@ 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.GuiBase; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java index 4e09fd1c2c7..1a2c3313283 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java @@ -1,10 +1,10 @@ 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.gui.GuiBase; +import forge.gui.UiCommand; import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.screens.bazaar.VBazaarUI; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java index 8df0ec5094c..777de84a88f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java @@ -1,8 +1,6 @@ package forge.screens.home.sanctioned; -import forge.GuiBase; import forge.Singletons; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckProxy; @@ -11,8 +9,10 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.limited.LimitedPoolType; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.gui.GuiChoose; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; @@ -63,7 +63,7 @@ public enum CSubmenuDraft implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -92,7 +92,7 @@ public enum CSubmenuDraft implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java index f33321ae5cd..1274197b550 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java @@ -7,9 +7,7 @@ import java.util.List; import javax.swing.*; -import forge.GuiBase; import forge.Singletons; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckBase; import forge.deck.DeckGroup; @@ -18,7 +16,9 @@ import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.limited.SealedCardPoolGenerator; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.item.InventoryItem; @@ -62,7 +62,7 @@ public enum CSubmenuSealed implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -97,7 +97,7 @@ public enum CSubmenuSealed implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java index 53c81e277a1..d3b9c6cf52f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java @@ -8,9 +8,7 @@ import java.util.List; import javax.swing.JButton; import javax.swing.SwingUtilities; -import forge.GuiBase; import forge.Singletons; -import forge.UiCommand; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckProxy; @@ -19,8 +17,10 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.limited.LimitedPoolType; import forge.gamemodes.limited.WinstonDraft; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.gui.GuiChoose; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; @@ -54,7 +54,7 @@ public enum CSubmenuWinston implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -78,7 +78,7 @@ public enum CSubmenuWinston implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuAchievements.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuAchievements.java index 64db6524ead..b304066544e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuAchievements.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuAchievements.java @@ -13,7 +13,7 @@ public enum CSubmenuAchievements implements ICDoc { SINGLETON_INSTANCE; /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -24,7 +24,7 @@ public enum CSubmenuAchievements implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java index beb3adaeed9..9afe7adc933 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java @@ -1,9 +1,16 @@ package forge.screens.home.settings; -import forge.UiCommand; import forge.download.*; -import forge.error.BugReporter; import forge.gui.ImportDialog; +import forge.gui.UiCommand; +import forge.gui.download.GuiDownloadAchievementImages; +import forge.gui.download.GuiDownloadPicturesHQ; +import forge.gui.download.GuiDownloadPicturesLQ; +import forge.gui.download.GuiDownloadPrices; +import forge.gui.download.GuiDownloadQuestImages; +import forge.gui.download.GuiDownloadSetPicturesLQ; +import forge.gui.download.GuiDownloadSkins; +import forge.gui.error.BugReporter; import forge.gui.framework.ICDoc; import javax.swing.*; @@ -91,7 +98,7 @@ public enum CSubmenuDownloaders implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -112,7 +119,7 @@ public enum CSubmenuDownloaders implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index 4ee86ff452e..6ab74b5821e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -6,6 +6,8 @@ import forge.control.FControl.CloseAction; import forge.download.AutoUpdater; import forge.game.GameLogEntryType; import forge.gamemodes.net.server.FServerManager; +import forge.gui.GuiBase; +import forge.gui.UiCommand; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.localinstance.properties.ForgeConstants; @@ -55,7 +57,7 @@ public enum CSubmenuPreferences implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @SuppressWarnings("serial") @Override @@ -260,7 +262,7 @@ public enum CSubmenuPreferences implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java index 1b5031e1075..766a5c2c4bf 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java @@ -41,7 +41,7 @@ public enum CSubmenuReleaseNotes implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void initialize() { @@ -50,7 +50,7 @@ public enum CSubmenuReleaseNotes implements ICDoc { } /* (non-Javadoc) - * @see forge.control.home.IControlSubmenu#update() + * @see forge.gui.control.home.IControlSubmenu#update() */ @Override public void update() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java index 4b0edebe96d..71522a4acb3 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java @@ -1,6 +1,6 @@ package forge.screens.home.settings; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.gui.WrapLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java index 8ab363f706a..f786fa23cb9 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java @@ -2,11 +2,11 @@ package forge.screens.home.settings; import forge.ImageKeys; import forge.StaticData; -import forge.UiCommand; import forge.card.CardDb; import forge.card.CardEdition; import forge.card.CardEdition.CardInSet; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 573faa909a1..8373bd31423 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -45,8 +45,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import forge.FThreads; -import forge.GuiBase; import forge.ImageCache; import forge.LobbyPlayer; import forge.Singletons; @@ -80,6 +78,8 @@ import forge.game.spellability.TargetChoices; import forge.game.zone.ZoneType; import forge.gamemodes.match.AbstractGuiGame; import forge.gui.FNetOverlay; +import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.gui.GuiChoose; import forge.gui.GuiDialog; import forge.gui.GuiUtils; @@ -92,6 +92,7 @@ import forge.gui.framework.IVDoc; import forge.gui.framework.SDisplayUtil; import forge.gui.framework.SLayoutIO; import forge.gui.framework.VEmptyDoc; +import forge.gui.util.SOptionPane; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; @@ -129,7 +130,6 @@ import forge.util.ITriggerEvent; import forge.util.Localizer; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; -import forge.util.gui.SOptionPane; import forge.view.FView; import forge.view.arcane.CardPanel; import forge.view.arcane.FloatingZone; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java index 8f5d98ec1d0..1aae6107cb5 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java @@ -9,7 +9,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import forge.Singletons; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.toolbox.FButton; import forge.toolbox.FCheckBox; import forge.toolbox.FList; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java index 3799732853c..7cf2b6bee07 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java @@ -17,12 +17,12 @@ import net.miginfocom.swing.MigLayout; import org.apache.commons.lang3.StringUtils; -import forge.UiCommand; import forge.game.GameLogEntry; import forge.game.GameLogEntryType; import forge.game.GameView; import forge.gui.SOverlayUtils; -import forge.interfaces.IWinLoseView; +import forge.gui.UiCommand; +import forge.gui.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDetailPicture.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDetailPicture.java index 18ef30b7825..f2b82899bee 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDetailPicture.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDetailPicture.java @@ -3,7 +3,7 @@ package forge.screens.match.controllers; import forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; -import forge.interfaces.IMayViewCards; +import forge.gui.interfaces.IMayViewCards; import forge.item.IPaperCard; import forge.item.InventoryItem; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java index e57c4c0e3a3..8d13beb683d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java @@ -23,8 +23,8 @@ import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; import forge.Singletons; -import forge.UiCommand; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.ICDoc; import forge.gui.framework.SLayoutIO; import forge.localinstance.assets.FSkinProp; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java index a8285aa86e3..d0ff7a9bdac 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java @@ -29,10 +29,10 @@ import javax.swing.SwingUtilities; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import forge.FThreads; import forge.Singletons; import forge.game.card.CardView; import forge.game.player.PlayerView; +import forge.gui.FThreads; import forge.gui.framework.ICDoc; import forge.screens.match.CMatchUI; import forge.screens.match.views.VField; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CLog.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CLog.java index 3eff489ce66..bb84fbde87b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CLog.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CLog.java @@ -3,7 +3,7 @@ package forge.screens.match.controllers; import java.util.Observable; import java.util.Observer; -import forge.FThreads; +import forge.gui.FThreads; import forge.gui.framework.ICDoc; import forge.screens.match.CMatchUI; import forge.screens.match.views.VLog; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java index 2aa7a0fd95e..47e13c68575 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java @@ -32,9 +32,9 @@ import java.beans.PropertyChangeListener; import javax.swing.JButton; -import forge.FThreads; import forge.game.GameView; import forge.game.card.CardView; +import forge.gui.FThreads; import forge.gui.framework.ICDoc; import forge.gui.framework.SDisplayUtil; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java index 0f333438f37..ef0d72c6baf 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java @@ -17,7 +17,7 @@ */ package forge.screens.match.views; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.gui.framework.*; import forge.localinstance.assets.FSkinProp; import forge.screens.match.controllers.CDock; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java index 86db942e4c6..ff5f2c09a6d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java @@ -18,11 +18,11 @@ package forge.screens.match.views; import forge.CachedCardImage; -import forge.card.CardDetailUtil; -import forge.card.CardDetailUtil.DetailColors; import forge.game.GameView; import forge.game.card.CardView.CardStateView; import forge.game.spellability.StackItemView; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; diff --git a/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java b/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java index 215e5942666..189e2ef4732 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java +++ b/forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java @@ -16,9 +16,9 @@ import com.google.common.collect.ImmutableList; import forge.Singletons; import forge.card.CardDb; import forge.card.CardRules; -import forge.card.CardScriptInfo; -import forge.card.CardScriptParser; import forge.game.card.Card; +import forge.gui.card.CardScriptInfo; +import forge.gui.card.CardScriptParser; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.item.PaperCard; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java b/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java index 6a600b8bbf7..70cceedc7a4 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FButton.java @@ -35,9 +35,9 @@ import java.awt.event.MouseEvent; import javax.swing.BorderFactory; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.gui.framework.ILocalRepaint; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin.Colors; import forge.toolbox.FSkin.SkinImage; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBox.java b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBox.java index a67d68f0e6d..0b5aa10017f 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBox.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBox.java @@ -1,6 +1,6 @@ package forge.toolbox; -import forge.interfaces.ICheckBox; +import forge.gui.interfaces.ICheckBox; import forge.toolbox.FSkin.SkinnedCheckBox; /** diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBox.java b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBox.java index f83a0e32852..52fb618a47b 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBox.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBox.java @@ -22,7 +22,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.plaf.basic.BasicComboBoxUI; import javax.swing.plaf.basic.ComboPopup; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.IComboBox; import forge.toolbox.FSkin.SkinFont; import forge.toolbox.FSkin.SkinnedComboBox; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java index 3f5ce9cbfb8..facd738b918 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java @@ -13,7 +13,7 @@ import javax.swing.ListCellRenderer; import com.google.common.collect.ObjectArrays; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.IComboBox; import forge.toolbox.FComboBox.TextAlignment; import forge.toolbox.FSkin.SkinFont; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FHyperlink.java b/forge-gui-desktop/src/main/java/forge/toolbox/FHyperlink.java index afc3c08fc49..340b9f91c2d 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FHyperlink.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FHyperlink.java @@ -9,7 +9,7 @@ import java.net.URISyntaxException; import javax.swing.SwingWorker; -import forge.UiCommand; +import forge.gui.UiCommand; @SuppressWarnings("serial") diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java index a36906fbdd1..175e166b69b 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java @@ -18,9 +18,9 @@ import javax.swing.Timer; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.gui.framework.ILocalRepaint; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FSkin.Colors; import forge.toolbox.FSkin.SkinColor; @@ -125,7 +125,7 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton { * @return {@link forge.toolbox.FLabel.Builder} */ public Builder useSkinColors(final boolean b0) { bldUseSkinColors = b0; return this; } - /**@param c0   {@link forge.UiCommand} to execute if clicked + /**@param c0   {@link forge.forge.gui.UiCommand} to execute if clicked * @return {@link forge.toolbox.FLabel.Builder} */ public Builder cmdClick(final UiCommand c0) { this.bldCmd = c0; return this; } @@ -458,12 +458,12 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton { return this.resizeTimer; } - /** @return {@link forge.UiCommand} */ + /** @return {@link forge.forge.gui.UiCommand} */ public Runnable getCommand() { return this.cmdClick; } - /** @return {@link forge.UiCommand} */ + /** @return {@link forge.forge.gui.UiCommand} */ public Runnable getRightClickCommand() { return this.cmdRightClick; } @@ -500,12 +500,12 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton { } } - /** @param c0   {@link forge.UiCommand} on click */ + /** @param c0   {@link forge.forge.gui.UiCommand} on click */ public void setCommand(final Runnable c0) { this.cmdClick = c0; } - /** @param c0   {@link forge.UiCommand} on right-click */ + /** @param c0   {@link forge.forge.gui.UiCommand} on right-click */ public void setRightClickCommand(final Runnable c0) { this.cmdRightClick = c0; } diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java index 5d6946e78d2..e1eb657532a 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java @@ -32,7 +32,7 @@ import java.util.List; import javax.swing.SwingConstants; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.gui.framework.ILocalRepaint; import forge.toolbox.FSkin.FPanelBase; import forge.toolbox.FSkin.SkinColor; @@ -115,12 +115,12 @@ public class FPanel extends FPanelBase implements ILocalRepaint { this.cornerDiameter = (int0 <= 0 ? 0 : int0); } - /** @param cmd0   {@link forge.UiCommand} on click */ + /** @param cmd0   {@link forge.forge.gui.UiCommand} on click */ public void setCommand(final UiCommand cmd0) { this.cmdClick = cmd0; } - /** @return {@link forge.UiCommand} */ + /** @return {@link forge.forge.gui.UiCommand} */ public UiCommand getCommand() { return this.cmdClick; } diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FPasswordField.java b/forge-gui-desktop/src/main/java/forge/toolbox/FPasswordField.java index 941e9426e36..fe89e55fb20 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FPasswordField.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FPasswordField.java @@ -14,7 +14,7 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import forge.gui.MouseUtil; -import forge.interfaces.ITextField; +import forge.gui.interfaces.ITextField; import forge.toolbox.FSkin.SkinnedPasswordField; /** diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FProgressBar.java b/forge-gui-desktop/src/main/java/forge/toolbox/FProgressBar.java index c977e4318de..839448a7c85 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FProgressBar.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FProgressBar.java @@ -1,8 +1,9 @@ package forge.toolbox; -import forge.interfaces.IProgressBar; - import javax.swing.*; + +import forge.gui.interfaces.IProgressBar; + import java.util.Date; /** diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index f93ee6c21b7..a694dc06a8d 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -17,8 +17,8 @@ */ package forge.toolbox; -import forge.FThreads; import forge.Singletons; +import forge.gui.FThreads; import forge.gui.GuiUtils; import forge.gui.framework.ILocalRepaint; import forge.localinstance.assets.FSkinProp; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FTextField.java b/forge-gui-desktop/src/main/java/forge/toolbox/FTextField.java index 506dd809bd3..f96725c540e 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FTextField.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FTextField.java @@ -17,7 +17,7 @@ import javax.swing.text.BadLocationException; import javax.swing.text.PlainDocument; import forge.gui.MouseUtil; -import forge.interfaces.ITextField; +import forge.gui.interfaces.ITextField; import forge.toolbox.FSkin.SkinnedTextField; /** diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java index 69a68c2f541..2867a012361 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FView.java +++ b/forge-gui-desktop/src/main/java/forge/view/FView.java @@ -2,9 +2,9 @@ package forge.view; import com.google.common.collect.Lists; import forge.Singletons; -import forge.UiCommand; import forge.gui.ImportDialog; import forge.gui.SOverlayUtils; +import forge.gui.UiCommand; import forge.gui.framework.*; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui-desktop/src/main/java/forge/view/Main.java b/forge-gui-desktop/src/main/java/forge/view/Main.java index b4fa85c8968..0a9fb687588 100644 --- a/forge-gui-desktop/src/main/java/forge/view/Main.java +++ b/forge-gui-desktop/src/main/java/forge/view/Main.java @@ -17,11 +17,11 @@ */ package forge.view; -import forge.GuiBase; import forge.GuiDesktop; import forge.Singletons; -import forge.card.CardReaderExperiments; import forge.error.ExceptionHandler; +import forge.gui.GuiBase; +import forge.gui.card.CardReaderExperiments; import forge.util.BuildInfo; import io.sentry.Sentry; import io.sentry.SentryClient; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index 28829859770..0b9bac9e9e6 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -18,7 +18,6 @@ package forge.view.arcane; import forge.CachedCardImage; -import forge.FThreads; import forge.StaticData; import forge.card.CardEdition; import forge.card.mana.ManaCost; @@ -29,6 +28,7 @@ import forge.game.keyword.Keyword; import forge.game.card.CounterType; import forge.game.zone.ZoneType; import forge.gui.CardContainer; +import forge.gui.FThreads; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants.CounterDisplayType; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java index 7547f2d1878..2eb4cb07258 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java @@ -29,8 +29,8 @@ import java.util.List; import javax.swing.SwingUtilities; -import forge.FThreads; import forge.game.card.CardView; +import forge.gui.FThreads; import forge.screens.match.CMatchUI; import forge.toolbox.FScrollPane; import forge.toolbox.FSkin.SkinnedPanel; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java index 2b7d7a7c5f0..5a467a4b18a 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java @@ -17,10 +17,10 @@ */ package forge.view.arcane; -import forge.FThreads; import forge.game.card.CardView; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.gui.FThreads; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences.FPref; import forge.screens.match.CMatchUI; diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java index 9c5cd9217d5..b0312ce053c 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java @@ -27,11 +27,11 @@ import java.util.List; import com.google.common.collect.Lists; -import forge.FThreads; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.gui.FThreads; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.screens.match.CMatchUI; diff --git a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java index aa4d43f5a4e..b07acad7afc 100644 --- a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java +++ b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java @@ -3,6 +3,7 @@ package forge; import forge.card.CardRarity; import forge.card.CardRules; import forge.gamemodes.limited.CardRanker; +import forge.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; diff --git a/forge-gui-desktop/src/test/java/forge/GuiDownloadPicturesLQTest.java b/forge-gui-desktop/src/test/java/forge/GuiDownloadPicturesLQTest.java index 1adf82ce61d..2cb7e79b9af 100644 --- a/forge-gui-desktop/src/test/java/forge/GuiDownloadPicturesLQTest.java +++ b/forge-gui-desktop/src/test/java/forge/GuiDownloadPicturesLQTest.java @@ -2,8 +2,8 @@ package forge; import org.testng.annotations.Test; -import forge.download.GuiDownloadPicturesLQ; import forge.download.GuiDownloader; +import forge.gui.download.GuiDownloadPicturesLQ; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui-desktop/src/test/java/forge/GuiDownloadSetPicturesLQTest.java b/forge-gui-desktop/src/test/java/forge/GuiDownloadSetPicturesLQTest.java index 05341e657b2..eb96ce38d47 100644 --- a/forge-gui-desktop/src/test/java/forge/GuiDownloadSetPicturesLQTest.java +++ b/forge-gui-desktop/src/test/java/forge/GuiDownloadSetPicturesLQTest.java @@ -2,8 +2,8 @@ package forge; import org.testng.annotations.Test; -import forge.download.GuiDownloadSetPicturesLQ; import forge.download.GuiDownloader; +import forge.gui.download.GuiDownloadSetPicturesLQ; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui-desktop/src/test/java/forge/PanelTest.java b/forge-gui-desktop/src/test/java/forge/PanelTest.java index e192f5def14..29f38fcfcbb 100644 --- a/forge-gui-desktop/src/test/java/forge/PanelTest.java +++ b/forge-gui-desktop/src/test/java/forge/PanelTest.java @@ -1,9 +1,9 @@ package forge; -import forge.error.BugReporter; - import org.testng.annotations.Test; +import forge.gui.error.BugReporter; + import javax.swing.*; import java.awt.*; diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java index f08fec5d8ff..cb53e4a7707 100644 --- a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java +++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTestCase.java @@ -7,7 +7,6 @@ import java.util.Set; import com.google.common.base.Function; import com.google.common.collect.Lists; -import forge.GuiBase; import forge.GuiDesktop; import forge.StaticData; import forge.ai.AIOption; @@ -25,6 +24,7 @@ import forge.game.player.Player; import forge.game.player.RegisteredPlayer; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import forge.gui.GuiBase; import forge.item.IPaperCard; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java index 4a2ca5c8d69..c96df69b0c5 100644 --- a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java +++ b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java @@ -10,11 +10,11 @@ import junit.framework.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import forge.GuiBase; import forge.GuiDesktop; import forge.card.CardRarity; import forge.card.CardRules; import forge.card.DeckHints; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java index 9fcb2112a4a..950fb47920b 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java @@ -4,7 +4,7 @@ import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; + import forge.GuiDesktop; import forge.StaticData; import forge.card.CardRulesPredicates; @@ -14,6 +14,7 @@ import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; import forge.gamemodes.limited.CardRanker; +import forge.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java index 2f7eee789c2..13c99b4d9b6 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java @@ -4,7 +4,7 @@ import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; + import forge.GuiDesktop; import forge.LobbyPlayer; import forge.StaticData; @@ -21,6 +21,7 @@ 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.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java index 241372740f2..103a45fcbeb 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAModern.java @@ -1,7 +1,7 @@ package forge.planarconquestgenerate; import com.google.common.base.Function; -import forge.GuiBase; + import forge.GuiDesktop; import forge.deck.Deck; import forge.deck.DeckFormat; @@ -10,6 +10,7 @@ import forge.deck.io.DeckStorage; import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; +import forge.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java index fd0dbc66ae9..6f5ce0d0961 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java @@ -1,13 +1,14 @@ package forge.planarconquestgenerate; import com.google.common.base.Function; -import forge.GuiBase; + import forge.GuiDesktop; import forge.deck.*; import forge.deck.io.DeckStorage; import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; +import forge.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java index 485dea7a1d6..81c1e8e7d69 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java @@ -4,7 +4,7 @@ import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; + import forge.GuiDesktop; import forge.StaticData; import forge.card.CardRulesPredicates; @@ -14,6 +14,7 @@ import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; import forge.gamemodes.limited.CardRanker; +import forge.gui.GuiBase; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-mobile/src/forge/CachedCardImage.java b/forge-gui-mobile/src/forge/CachedCardImage.java index 29ad190f341..7919d23d762 100644 --- a/forge-gui-mobile/src/forge/CachedCardImage.java +++ b/forge-gui-mobile/src/forge/CachedCardImage.java @@ -3,6 +3,7 @@ package forge; import com.badlogic.gdx.graphics.Texture; import forge.assets.ImageCache; import forge.game.card.CardView; +import forge.gui.GuiBase; import forge.item.InventoryItem; import forge.screens.match.MatchController; import forge.util.ImageFetcher; diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 745afb1f252..bc0cc0fac2b 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -11,8 +11,10 @@ import forge.assets.AssetsDownloader; import forge.assets.FSkin; import forge.assets.FSkinFont; import forge.assets.ImageCache; -import forge.error.BugReporter; import forge.error.ExceptionHandler; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.error.BugReporter; import forge.interfaces.IDeviceAdapter; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index 43b21c25407..265ee67b3ec 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/forge-gui-mobile/src/forge/GuiMobile.java @@ -18,11 +18,11 @@ import forge.assets.ImageCache; import forge.card.CardRenderer; 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.gui.download.GuiDownloadService; +import forge.gui.interfaces.IGuiBase; +import forge.gui.interfaces.IGuiGame; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.assets.ISkinImage; diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index fdd8a3858ad..c824cbbbe8c 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -3,13 +3,15 @@ package forge.assets; import com.badlogic.gdx.Application.ApplicationType; import com.badlogic.gdx.Gdx; import com.google.common.collect.ImmutableList; -import forge.FThreads; + import forge.Forge; -import forge.download.GuiDownloadZipService; +import forge.gui.FThreads; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgeConstants; import forge.screens.SplashScreen; import forge.util.FileUtil; -import forge.util.gui.SOptionPane; + import org.apache.commons.lang3.StringUtils; import java.io.File; diff --git a/forge-gui-mobile/src/forge/assets/FBufferedImage.java b/forge-gui-mobile/src/forge/assets/FBufferedImage.java index fa6ccd48a38..92d289ea148 100644 --- a/forge-gui-mobile/src/forge/assets/FBufferedImage.java +++ b/forge-gui-mobile/src/forge/assets/FBufferedImage.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.glutils.FrameBuffer; import com.badlogic.gdx.math.Matrix4; -import forge.FThreads; import forge.Graphics; +import forge.gui.FThreads; //Special graphics object for rendering to a texture public abstract class FBufferedImage extends FImageComplex { diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 0e4a13ca28f..27ddeec0e51 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -14,9 +14,9 @@ import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; -import forge.FThreads; import forge.assets.FSkinImage.SourceFile; import forge.card.CardFaceSymbols; +import forge.gui.FThreads; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java index 5bb946f7748..7eea723e7cc 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinFont.java +++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java @@ -26,8 +26,8 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFont import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.utils.Array; -import forge.FThreads; import forge.Forge; +import forge.gui.FThreads; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.LineReader; diff --git a/forge-gui-mobile/src/forge/assets/ImageLoader.java b/forge-gui-mobile/src/forge/assets/ImageLoader.java index 8579d1952ea..55e2de81fd2 100644 --- a/forge-gui-mobile/src/forge/assets/ImageLoader.java +++ b/forge-gui-mobile/src/forge/assets/ImageLoader.java @@ -10,10 +10,10 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.TextureData; import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.google.common.cache.CacheLoader; -import forge.FThreads; import forge.Forge; import forge.ImageKeys; +import forge.gui.FThreads; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java index a26bc910f45..e11169f396c 100644 --- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java +++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java @@ -21,7 +21,8 @@ import forge.Graphics; import forge.assets.FSkinImage; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; -import forge.error.BugReporter; +import forge.gui.error.BugReporter; + import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 8608a48bbaa..dff156230b7 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -15,13 +15,14 @@ import forge.assets.FSkinImage; import forge.assets.FSkinTexture; import forge.assets.ImageCache; import forge.assets.TextRenderer; -import forge.card.CardDetailUtil.DetailColors; import forge.card.CardRenderer.CardStackPosition; import forge.card.mana.ManaCost; import forge.game.GameView; import forge.game.card.CardView.CardStateView; import forge.game.card.CardView; import forge.game.zone.ZoneType; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 318c9f50c6e..12ed7b937c9 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -17,7 +17,6 @@ import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import forge.CachedCardImage; import forge.Forge; -import forge.FThreads; import forge.Graphics; import forge.assets.FImage; import forge.assets.FImageComplex; @@ -28,13 +27,15 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.assets.FTextureRegionImage; import forge.assets.ImageCache; -import forge.card.CardDetailUtil.DetailColors; import forge.card.CardZoom.ActivateHandler; import forge.card.mana.ManaCost; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.card.CounterType; import forge.game.zone.ZoneType; +import forge.gui.FThreads; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 971e562e541..fd1ccf5cfc3 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -1,12 +1,9 @@ package forge.deck; -import forge.FThreads; import forge.Forge; -import forge.GuiBase; import forge.assets.ImageCache; import forge.deck.FDeckEditor.EditorType; import forge.deck.io.DeckPreferences; -import forge.error.BugReporter; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.gauntlet.GauntletData; @@ -16,7 +13,10 @@ 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.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.error.BugReporter; +import forge.gui.interfaces.IGuiGame; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 20e30f0a929..0deec005e4f 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -17,11 +17,11 @@ import forge.assets.FTextureRegionImage; import forge.Graphics; import forge.card.CardDb; 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.gui.card.CardPreferences; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ColumnDef; diff --git a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java index 36cb44c6a51..a28ba25d567 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java +++ b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java @@ -21,10 +21,11 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.deck.DeckRecognizer.TokenType; +import forge.gui.FThreads; +import forge.gui.util.SOptionPane; import forge.toolbox.FCheckBox; import forge.toolbox.FComboBox; import forge.toolbox.FDialog; @@ -34,7 +35,6 @@ import forge.toolbox.FOptionPane; import forge.toolbox.FTextArea; import forge.util.Callback; import forge.util.Localizer; -import forge.util.gui.SOptionPane; public class FDeckImportDialog extends FDialog { diff --git a/forge-gui-mobile/src/forge/error/BugReportDialog.java b/forge-gui-mobile/src/forge/error/BugReportDialog.java index 3393413a27a..70d937a67c0 100644 --- a/forge-gui-mobile/src/forge/error/BugReportDialog.java +++ b/forge-gui-mobile/src/forge/error/BugReportDialog.java @@ -6,6 +6,7 @@ import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinColor.Colors; +import forge.gui.error.BugReporter; import forge.screens.FScreen; import forge.toolbox.FButton; import forge.toolbox.FEvent; diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 373da380dc8..1b3c1064d1a 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -25,13 +25,13 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.card.CardZoom.ActivateHandler; +import forge.gui.FThreads; import forge.item.InventoryItem; import forge.itemmanager.filters.AdvancedSearchFilter; import forge.itemmanager.filters.ItemFilter; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index d99ee726106..4f1b1d62959 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -7,7 +7,7 @@ import com.google.common.collect.Iterables; import forge.Forge; import forge.assets.FSkinImage; import forge.assets.TextRenderer; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; import forge.item.InventoryItem; import forge.itemmanager.AdvancedSearch; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/menu/FMenuItem.java b/forge-gui-mobile/src/forge/menu/FMenuItem.java index 3508963cd48..98baff9636b 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuItem.java +++ b/forge-gui-mobile/src/forge/menu/FMenuItem.java @@ -5,13 +5,13 @@ import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; import forge.Graphics; -import forge.UiCommand; import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; -import forge.interfaces.IButton; +import forge.gui.UiCommand; +import forge.gui.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.screens.FScreen.Header; import forge.toolbox.FDisplayObject; diff --git a/forge-gui-mobile/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java index 7ceece302c6..c4f9bbdd5cf 100644 --- a/forge-gui-mobile/src/forge/screens/FScreen.java +++ b/forge-gui-mobile/src/forge/screens/FScreen.java @@ -8,10 +8,10 @@ import com.badlogic.gdx.utils.Align; import forge.Forge; import forge.Graphics; -import forge.GuiBase; import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.gui.GuiBase; import forge.assets.FSkinFont; import forge.assets.FSkinTexture; import forge.menu.FPopupMenu; diff --git a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java index 04b086866df..c9a2fe31bb1 100644 --- a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java +++ b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java @@ -3,12 +3,12 @@ package forge.screens; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.assets.FSkin; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.gui.FThreads; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.toolbox.FOverlay; diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index a71531e1ae8..c7d4e1b2469 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.ArrayList; import java.util.List; -import forge.GuiBase; import forge.assets.ImageCache; import forge.deck.CardPool; import forge.deck.Deck; @@ -21,7 +20,6 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; import com.google.common.collect.Iterables; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.ai.AIOption; @@ -33,7 +31,9 @@ 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.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.ILobbyView; import forge.interfaces.IPlayerChangeListener; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java index dfc40b0f34e..34af617ac22 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -8,7 +8,6 @@ import java.util.Comparator; import java.util.List; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -20,6 +19,8 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.gauntlet.GauntletData; import forge.gamemodes.gauntlet.GauntletIO; import forge.gamemodes.quest.QuestUtil; +import forge.gui.FThreads; +import forge.gui.util.SOptionPane; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.screens.LaunchScreen; @@ -35,7 +36,6 @@ import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; import forge.util.ThreadUtil; import forge.util.Utils; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class LoadGauntletScreen extends LaunchScreen { diff --git a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java index 6cbeafa8c2e..2c32fc9530f 100644 --- a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java @@ -1,6 +1,5 @@ package forge.screens.home.puzzle; -import forge.GuiBase; import forge.assets.FSkinFont; import forge.deck.Deck; import forge.game.GameRules; @@ -9,6 +8,7 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; import forge.gamemodes.puzzle.Puzzle; import forge.gamemodes.puzzle.PuzzleIO; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgeConstants; import forge.player.GamePlayerUtil; import forge.screens.LaunchScreen; diff --git a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java index d23e7e416f8..e3c38719e01 100644 --- a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java @@ -2,7 +2,6 @@ package forge.screens.limited; import org.apache.commons.lang3.StringUtils; -import forge.FThreads; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.FDeckEditor; @@ -10,6 +9,7 @@ import forge.deck.io.DeckPreferences; import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.quest.QuestEventDraft; import forge.gamemodes.quest.QuestTournamentController; +import forge.gui.FThreads; import forge.model.FModel; import forge.screens.FScreen; import forge.screens.home.LoadGameMenu.LoadGameScreen; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java index e14c84fc1c8..63f03734bf9 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java @@ -2,9 +2,7 @@ package forge.screens.limited; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; -import forge.GuiBase; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; import forge.screens.home.LoadGameMenu; @@ -23,6 +21,9 @@ import forge.deck.io.DeckPreferences; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.util.SGuiChoose; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; @@ -31,7 +32,7 @@ import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.toolbox.FComboBox; import forge.util.Localizer; -import forge.util.gui.SGuiChoose; + import java.util.ArrayList; import java.util.List; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java index e40dd2ce6cc..ddd3342d684 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java @@ -1,10 +1,8 @@ package forge.screens.limited; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; -import forge.GuiBase; import forge.assets.FSkinFont; import forge.deck.Deck; import forge.deck.DeckGroup; @@ -16,6 +14,9 @@ import forge.deck.io.DeckPreferences; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.util.SGuiChoose; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; @@ -30,7 +31,6 @@ import forge.toolbox.FEvent; import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; import forge.toolbox.FEvent.FEventHandler; -import forge.util.gui.SGuiChoose; import forge.util.Localizer; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java index b51c3818426..6b00a198d84 100644 --- a/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java @@ -1,11 +1,12 @@ package forge.screens.limited; -import forge.FThreads; import forge.Forge; import forge.assets.FSkinFont; import forge.deck.FDeckEditor.EditorType; import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.limited.LimitedPoolType; +import forge.gui.FThreads; +import forge.gui.util.SGuiChoose; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; import forge.screens.home.NewGameMenu; @@ -14,7 +15,6 @@ import forge.toolbox.FTextArea; import forge.util.Localizer; import forge.util.ThreadUtil; import forge.util.Utils; -import forge.util.gui.SGuiChoose; public class NewDraftScreen extends LaunchScreen { private static final float PADDING = Utils.scale(10); diff --git a/forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java index 456b89665bd..e1ec02ce806 100644 --- a/forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java @@ -1,6 +1,5 @@ package forge.screens.limited; -import forge.FThreads; import forge.Forge; import forge.assets.FSkinFont; import forge.deck.DeckGroup; @@ -8,6 +7,7 @@ import forge.deck.FDeckEditor; import forge.deck.FDeckEditor.EditorType; import forge.deck.io.DeckPreferences; import forge.gamemodes.limited.SealedCardPoolGenerator; +import forge.gui.FThreads; import forge.screens.LaunchScreen; import forge.screens.home.NewGameMenu; import forge.toolbox.FLabel; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 6d7b3bcd666..9eb1eabe430 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.FThreads; import forge.assets.FSkinImage; import forge.util.Localizer; import org.apache.commons.lang3.StringUtils; @@ -18,7 +17,6 @@ import com.google.common.collect.Maps; import forge.Forge; import forge.Graphics; -import forge.GuiBase; import forge.LobbyPlayer; import forge.assets.FImage; import forge.assets.FSkin; @@ -38,6 +36,10 @@ import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; import forge.gamemodes.match.AbstractGuiGame; import forge.gamemodes.match.HostedMatch; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgePreferences; @@ -60,8 +62,6 @@ import forge.util.collect.FCollectionView; import forge.util.ITriggerEvent; import forge.util.MessageUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; public class MatchController extends AbstractGuiGame { private MatchController() { } diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java index e09c7cf4eb5..a18136d825f 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java @@ -21,7 +21,6 @@ import com.google.common.collect.Maps; import forge.Forge; import forge.Forge.KeyInputAdapter; import forge.Graphics; -import forge.GuiBase; import forge.animation.AbilityEffect; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -33,6 +32,7 @@ import forge.game.combat.CombatView; import forge.game.phase.PhaseType; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.gui.GuiBase; import forge.interfaces.IGameController; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java index 6af3cc4c31f..cb798b04e37 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java @@ -8,13 +8,13 @@ import java.util.Map; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Vector2; -import forge.FThreads; import forge.Graphics; -import forge.GuiBase; import forge.card.CardZoom; import forge.card.CardRenderer.CardStackPosition; import forge.card.CardZoom.ActivateHandler; import forge.game.card.CardView; +import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.screens.match.MatchController; import forge.toolbox.FCardPanel; import forge.toolbox.FDisplayObject; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java index da3d6587707..b1c20e3d80f 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VField.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java @@ -3,10 +3,10 @@ package forge.screens.match.views; import java.util.ArrayList; import java.util.List; -import forge.FThreads; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.player.PlayerView; +import forge.gui.FThreads; import forge.screens.match.views.VCardDisplayArea.CardAreaPanel; import forge.toolbox.FContainer; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index 5cd99ead01e..167d1151019 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -14,18 +14,18 @@ import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.TextRenderer; -import forge.card.CardDetailUtil; import forge.card.CardRenderer; import forge.card.CardZoom; -import forge.card.CardDetailUtil.DetailColors; import forge.card.CardRenderer.CardStackPosition; import forge.game.GameView; import forge.game.card.CardView; import forge.game.player.PlayerView; import forge.game.spellability.StackItemView; import forge.game.zone.ZoneType; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; import forge.menu.FCheckBoxMenuItem; import forge.menu.FDropDown; import forge.menu.FMenuItem; diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java index 46134e39b23..fc3be9d2483 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java @@ -1,28 +1,11 @@ package forge.screens.match.winlose; -/** Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import forge.FThreads; import forge.game.GameView; import forge.gamemodes.gauntlet.GauntletWinLoseController; +import forge.gui.FThreads; +import forge.gui.util.SOptionPane; import forge.localinstance.assets.FSkinProp; import forge.util.Localizer; -import forge.util.gui.SOptionPane; import java.util.List; diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index 49eed38bc72..ce8e2f0a405 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -2,7 +2,7 @@ package forge.screens.match.winlose; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Align; -import forge.FThreads; + import forge.Forge; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -10,7 +10,10 @@ import forge.assets.FSkinFont; import forge.game.GameLogEntry; import forge.game.GameLogEntryType; import forge.game.GameView; -import forge.interfaces.IWinLoseView; +import forge.gui.FThreads; +import forge.gui.interfaces.IWinLoseView; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.menu.FMagnifyView; @@ -25,8 +28,7 @@ import forge.toolbox.FOverlay; import forge.toolbox.FTextArea; import forge.util.Localizer; import forge.util.Utils; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; + import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index 46cf5a34506..c5bcc2e01e6 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -1,9 +1,8 @@ package forge.screens.online; 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; @@ -12,13 +11,15 @@ 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.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.ILobbyView; +import forge.gui.util.SOptionPane; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.screens.LoadingOverlay; import forge.screens.constructed.LobbyScreen; import forge.screens.online.OnlineMenu.OnlineScreen; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby { diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java index a5e51bc03c3..5a6123c493c 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java @@ -6,7 +6,6 @@ import java.util.Map.Entry; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; -import forge.FThreads; import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; @@ -18,6 +17,7 @@ import forge.gamemodes.planarconquest.ConquestPlane; import forge.gamemodes.planarconquest.ConquestPreferences; import forge.gamemodes.planarconquest.ConquestUtil; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; +import forge.gui.FThreads; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index 837a14f5472..8bbb6679422 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -9,7 +9,6 @@ import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; @@ -19,13 +18,11 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.assets.FSkinTexture; import forge.card.CardAvatarImage; -import forge.card.CardDetailUtil; import forge.card.CardFaceSymbols; import forge.card.CardImageRenderer; import forge.card.CardRenderer; import forge.card.CardZoom; import forge.card.ColorSet; -import forge.card.CardDetailUtil.DetailColors; import forge.gamemodes.planarconquest.ConquestAwardPool; import forge.gamemodes.planarconquest.ConquestBattle; import forge.gamemodes.planarconquest.ConquestChaosBattle; @@ -40,6 +37,9 @@ import forge.gamemodes.planarconquest.ConquestUtil; import forge.gamemodes.planarconquest.ConquestEvent.ChaosWheelOutcome; import forge.gamemodes.planarconquest.ConquestEvent.ConquestEventRecord; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; +import forge.gui.FThreads; +import forge.gui.card.CardDetailUtil; +import forge.gui.card.CardDetailUtil.DetailColors; import forge.item.PaperCard; import forge.model.FModel; import forge.screens.FScreen; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java index 501b630835c..8115d039dbc 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java @@ -8,7 +8,7 @@ import forge.assets.FSkinImage; import forge.gamemodes.planarconquest.ConquestData; import forge.gamemodes.planarconquest.ConquestPlane; import forge.gamemodes.planarconquest.IVConquestStats; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; import forge.model.FModel; import forge.screens.FScreen; import forge.toolbox.FComboBox; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index db7ded4a0ec..7a6e95bdcc6 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -11,7 +11,6 @@ import java.util.Map; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -21,6 +20,8 @@ import forge.gamemodes.planarconquest.ConquestData; import forge.gamemodes.planarconquest.ConquestPreferences; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.gamemodes.quest.QuestUtil; +import forge.gui.FThreads; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgeConstants; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -38,7 +39,6 @@ import forge.toolbox.FEvent.FEventHandler; import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.Utils; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class LoadConquestScreen extends LaunchScreen { diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index f5d03d6855c..323a2863c8e 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -2,7 +2,6 @@ package forge.screens.planarconquest; import com.google.common.collect.Iterables; -import forge.FThreads; import forge.assets.FImage; import forge.card.CardImage; import forge.card.CardListPreview; @@ -10,6 +9,7 @@ import forge.gamemodes.planarconquest.ConquestController; import forge.gamemodes.planarconquest.ConquestData; import forge.gamemodes.planarconquest.ConquestUtil; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; +import forge.gui.FThreads; import forge.item.PaperCard; import forge.localinstance.achievements.PlaneswalkerAchievements; import forge.model.FModel; diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index 0633c4feecd..5866c245b97 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -12,7 +12,7 @@ import java.util.Map; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; -import forge.FThreads; + import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -23,6 +23,8 @@ import forge.gamemodes.quest.data.DeckConstructionRules; import forge.gamemodes.quest.data.QuestData; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.QuestDataIO; +import forge.gui.FThreads; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgeConstants; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -39,7 +41,6 @@ import forge.toolbox.FTextArea; import forge.toolbox.FEvent.FEventHandler; import forge.util.ThreadUtil; import forge.util.Utils; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class LoadQuestScreen extends LaunchScreen { diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java index 5519b9ac428..6f5f4ee21db 100644 --- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java @@ -2,9 +2,7 @@ package forge.screens.quest; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; -import forge.UiCommand; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.card.MagicColor; @@ -22,6 +20,9 @@ import forge.gamemodes.quest.StartingPoolPreferences.PoolType; import forge.gamemodes.quest.data.DeckConstructionRules; import forge.gamemodes.quest.data.GameFormatQuest; import forge.gamemodes.quest.data.QuestPreferences.QPref; +import forge.gui.FThreads; +import forge.gui.UiCommand; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.item.PreconDeck; import forge.itemmanager.filters.HistoricFormatSelect; @@ -46,7 +47,6 @@ import forge.toolbox.FScrollPane; import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.Utils; -import forge.util.gui.SOptionPane; import forge.util.Localizer; import java.util.ArrayList; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java index e559a958dee..26de38bae66 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.utils.Align; import forge.Forge; import forge.Graphics; -import forge.GuiBase; import forge.assets.FImage; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -18,6 +17,7 @@ import forge.gamemodes.quest.bazaar.IQuestBazaarItem; import forge.gamemodes.quest.bazaar.QuestBazaarManager; import forge.gamemodes.quest.bazaar.QuestStallDefinition; import forge.gamemodes.quest.data.QuestAssets; +import forge.gui.GuiBase; import forge.model.FModel; import forge.screens.TabPageScreen; import forge.toolbox.FContainer; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java index bac1e06937a..cb84d55ff21 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java @@ -4,7 +4,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; import forge.assets.FSkinFont; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; import forge.model.FModel; import forge.toolbox.FLabel; import forge.util.Localizer; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java index 063a9a32c67..f2dc4f98457 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java @@ -1,7 +1,7 @@ package forge.screens.quest; import com.badlogic.gdx.utils.Align; -import forge.FThreads; + import forge.Forge; import forge.assets.FSkinFont; import forge.assets.ImageCache; @@ -13,6 +13,7 @@ import forge.game.GameType; import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.QuestUtil; import forge.gamemodes.quest.data.QuestPreferences.QPref; +import forge.gui.FThreads; import forge.itemmanager.DeckManager; import forge.itemmanager.ItemManagerConfig; import forge.model.FModel; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java index 5d9d05122ca..484ee29f8d3 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java @@ -2,10 +2,11 @@ package forge.screens.quest; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; -import forge.FThreads; + import forge.assets.FSkinFont; import forge.gamemodes.quest.QuestEventDuel; -import forge.interfaces.IButton; +import forge.gui.FThreads; +import forge.gui.interfaces.IButton; import forge.model.FModel; import forge.screens.LoadingOverlay; import forge.screens.home.HomeScreen; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java index 9d37c134ed8..353612e646f 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java @@ -1,7 +1,7 @@ package forge.screens.quest; -import forge.FThreads; import forge.gamemodes.quest.QuestUtil; +import forge.gui.FThreads; import forge.model.FModel; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java index f72f26a260a..57e267296d8 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java @@ -3,7 +3,6 @@ package forge.screens.quest; import java.io.File; import java.io.IOException; -import forge.FThreads; import forge.Forge; import forge.assets.FSkinImage; import forge.deck.Deck; @@ -14,9 +13,10 @@ import forge.gamemodes.quest.IVQuestStats; import forge.gamemodes.quest.QuestUtil; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.QuestDataIO; -import forge.interfaces.IButton; -import forge.interfaces.ICheckBox; -import forge.interfaces.IComboBox; +import forge.gui.FThreads; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.ICheckBox; +import forge.gui.interfaces.IComboBox; import forge.localinstance.properties.ForgeConstants; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java index d789bf45d67..5cf3b8192a0 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java @@ -1,13 +1,14 @@ package forge.screens.quest; import com.badlogic.gdx.utils.Align; -import forge.FThreads; + import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.gamemodes.quest.QuestSpellShop; import forge.gamemodes.quest.QuestUtil; +import forge.gui.FThreads; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ColumnDef; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java index ed045d09804..503ae6e57ca 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java @@ -8,9 +8,9 @@ import forge.assets.FSkinImage; import forge.gamemodes.quest.QuestUtil; import forge.gamemodes.quest.bazaar.QuestItemType; import forge.gamemodes.quest.bazaar.QuestPetController; -import forge.interfaces.IButton; -import forge.interfaces.ICheckBox; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.ICheckBox; +import forge.gui.interfaces.IComboBox; import forge.model.FModel; import forge.screens.FScreen; import forge.toolbox.FCheckBox; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 2117740b565..24cf048357f 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -3,9 +3,7 @@ package forge.screens.quest; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; -import forge.FThreads; import forge.Forge; -import forge.GuiBase; import forge.assets.FSkin; import forge.assets.FSkinColor; import forge.assets.FSkinFont; @@ -23,6 +21,8 @@ import forge.gamemodes.quest.QuestEventDraft; import forge.gamemodes.quest.QuestTournamentController; import forge.gamemodes.quest.QuestDraftUtils.Mode; import forge.gamemodes.quest.data.QuestEventDraftContainer; +import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.filters.ItemFilter; diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java index bfc99edac90..082b702cdd2 100644 --- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -27,6 +27,13 @@ import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinImage; +import forge.gui.download.GuiDownloadAchievementImages; +import forge.gui.download.GuiDownloadPicturesLQ; +import forge.gui.download.GuiDownloadPrices; +import forge.gui.download.GuiDownloadQuestImages; +import forge.gui.download.GuiDownloadService; +import forge.gui.download.GuiDownloadSetPicturesLQ; +import forge.gui.download.GuiDownloadSkins; import forge.screens.TabPageScreen.TabPage; import forge.toolbox.FFileChooser; import forge.toolbox.FFileChooser.ChoiceType; diff --git a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java index ccb08b3310a..537f0d64819 100644 --- a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java +++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java @@ -20,9 +20,9 @@ package forge.screens.settings; import java.net.Proxy; import forge.Forge; -import forge.UiCommand; -import forge.download.GuiDownloadService; -import forge.download.GuiDownloadZipService; +import forge.gui.UiCommand; +import forge.gui.download.GuiDownloadService; +import forge.gui.download.GuiDownloadZipService; import forge.toolbox.FDialog; import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index ead74e8a1f8..fb6235bdd64 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -3,7 +3,6 @@ package forge.screens.settings; import com.badlogic.gdx.utils.Align; import forge.Forge; import forge.Graphics; -import forge.GuiBase; import forge.MulliganDefs; import forge.StaticData; import forge.ai.AiProfileUtil; @@ -14,6 +13,7 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.assets.ImageCache; import forge.game.GameLogEntryType; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-mobile/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java index 07da657eca7..dfe0fc0b11b 100644 --- a/forge-gui-mobile/src/forge/toolbox/FButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FButton.java @@ -6,12 +6,12 @@ import org.apache.commons.lang3.StringUtils; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Align; import forge.Graphics; -import forge.UiCommand; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.gui.UiCommand; +import forge.gui.interfaces.IButton; import forge.assets.FSkinFont; import forge.assets.FSkinImage; -import forge.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; diff --git a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java index 3da8bf5da2f..fd7d6438737 100644 --- a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java @@ -6,7 +6,7 @@ import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; -import forge.interfaces.ICheckBox; +import forge.gui.interfaces.ICheckBox; import forge.util.Utils; public class FCheckBox extends FLabel implements ICheckBox { diff --git a/forge-gui-mobile/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java index 63339d015dc..4adcf772ffc 100644 --- a/forge-gui-mobile/src/forge/toolbox/FComboBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FComboBox.java @@ -7,7 +7,7 @@ import java.util.List; import com.badlogic.gdx.utils.Align; import forge.Graphics; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.IComboBox; import forge.menu.FDropDownMenu; import forge.menu.FMenuItem; import forge.toolbox.FEvent.FEventHandler; diff --git a/forge-gui-mobile/src/forge/toolbox/FContainer.java b/forge-gui-mobile/src/forge/toolbox/FContainer.java index 32fcf2ea0ab..838a7414dba 100644 --- a/forge-gui-mobile/src/forge/toolbox/FContainer.java +++ b/forge-gui-mobile/src/forge/toolbox/FContainer.java @@ -7,7 +7,7 @@ import java.util.List; import com.badlogic.gdx.math.Vector2; import forge.Graphics; -import forge.error.BugReporter; +import forge.gui.error.BugReporter; public abstract class FContainer extends FDisplayObject { private final List children = new ArrayList<>(); diff --git a/forge-gui-mobile/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java index 51f37a63663..1539f232d7e 100644 --- a/forge-gui-mobile/src/forge/toolbox/FLabel.java +++ b/forge-gui-mobile/src/forge/toolbox/FLabel.java @@ -4,13 +4,13 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; import forge.Graphics; -import forge.UiCommand; import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.TextRenderer; import forge.assets.FSkinColor.Colors; +import forge.gui.UiCommand; +import forge.gui.interfaces.IButton; import forge.assets.FSkinFont; -import forge.interfaces.IButton; import forge.localinstance.assets.FSkinProp; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; diff --git a/forge-gui-mobile/src/forge/toolbox/FOverlay.java b/forge-gui-mobile/src/forge/toolbox/FOverlay.java index e5f36a8b292..7dd5911e493 100644 --- a/forge-gui-mobile/src/forge/toolbox/FOverlay.java +++ b/forge-gui-mobile/src/forge/toolbox/FOverlay.java @@ -8,11 +8,11 @@ import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; +import forge.gui.FThreads; import forge.screens.FScreen; import forge.screens.match.MatchController; diff --git a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java index 160cf0bcd89..862a3eabfa6 100644 --- a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java +++ b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; import forge.Graphics; import forge.assets.FSkinFont; -import forge.interfaces.IProgressBar; +import forge.gui.interfaces.IProgressBar; import forge.util.Utils; import org.apache.commons.lang3.tuple.Pair; diff --git a/forge-gui-mobile/src/forge/toolbox/FTextField.java b/forge-gui-mobile/src/forge/toolbox/FTextField.java index f427385706d..3b79c643626 100644 --- a/forge-gui-mobile/src/forge/toolbox/FTextField.java +++ b/forge-gui-mobile/src/forge/toolbox/FTextField.java @@ -8,7 +8,7 @@ import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinColor.Colors; -import forge.interfaces.ITextField; +import forge.gui.interfaces.ITextField; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.toolbox.FEvent.FEventHandler; diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java index 065e9dce99e..718ec5d1c7f 100644 --- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java @@ -24,11 +24,11 @@ import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; import forge.assets.FSkinImage; +import forge.gui.FThreads; import forge.item.InventoryItem; import forge.itemmanager.filters.AdvancedSearchFilter; import forge.itemmanager.filters.ItemFilter; diff --git a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java index 9d2429b97e8..56348532c25 100644 --- a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java +++ b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java @@ -2,7 +2,7 @@ package forge.util; import com.badlogic.gdx.files.FileHandle; import forge.Forge; -import forge.GuiBase; +import forge.gui.GuiBase; import java.io.FileOutputStream; import java.io.IOException; diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java index 5a4e7130875..eaceb2205b9 100644 --- a/forge-gui/src/main/java/forge/deck/DeckImportController.java +++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java @@ -8,11 +8,11 @@ import java.util.List; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; -import forge.interfaces.ICheckBox; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.ICheckBox; +import forge.gui.interfaces.IComboBox; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.model.FModel; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class DeckImportController { diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java index 658340ecfb3..b1e5e0febdf 100644 --- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java @@ -24,6 +24,7 @@ import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.QuestEvent; import forge.gamemodes.quest.QuestEventChallenge; import forge.gamemodes.quest.QuestEventDuel; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.itemmanager.IItemManager; import forge.localinstance.properties.ForgePreferences.FPref; @@ -31,7 +32,6 @@ import forge.model.FModel; import forge.util.Aggregates; import forge.util.Lang; import forge.util.MyRandom; -import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; import org.apache.commons.lang3.tuple.Pair; diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java index 5e6bdcf35d4..18660c39d82 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java @@ -5,15 +5,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckArchiveLegacy extends StorageBase { diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java index eb93e35b6e9..3d921451d19 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java @@ -5,15 +5,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckArchiveModern extends StorageBase { diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java index e667fded18c..66264c7f499 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java @@ -5,15 +5,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckArchivePioneer extends StorageBase { diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java index 0600221af07..484a9a317ef 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java @@ -5,15 +5,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckArchiveStandard extends StorageBase { diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java index 27d3057d483..bc0a34c9c0e 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java @@ -5,15 +5,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckArchiveVintage extends StorageBase { diff --git a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java index 1d8b9fb34ef..2faddf428c3 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java @@ -8,15 +8,15 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import forge.GuiBase; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.download.GuiDownloadZipService; import forge.game.GameType; +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SGuiChoose; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.WaitCallback; -import forge.util.gui.SGuiChoose; import forge.util.storage.StorageBase; public class NetDeckCategory extends StorageBase { diff --git a/forge-gui/src/main/java/forge/download/AutoUpdater.java b/forge-gui/src/main/java/forge/download/AutoUpdater.java index a33179ed2ad..cc6cca4ad7a 100644 --- a/forge-gui/src/main/java/forge/download/AutoUpdater.java +++ b/forge-gui/src/main/java/forge/download/AutoUpdater.java @@ -1,14 +1,17 @@ package forge.download; import com.google.common.collect.ImmutableList; -import forge.GuiBase; + +import forge.gui.GuiBase; +import forge.gui.download.GuiDownloadZipService; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.util.BuildInfo; import forge.util.FileUtil; import forge.util.Localizer; import forge.util.WaitCallback; -import forge.util.gui.SOptionPane; + import org.apache.commons.lang3.StringUtils; import javax.swing.*; diff --git a/forge-gui/src/main/java/forge/error/ExceptionHandler.java b/forge-gui/src/main/java/forge/error/ExceptionHandler.java index 19eeb7d24de..57802b34c31 100644 --- a/forge-gui/src/main/java/forge/error/ExceptionHandler.java +++ b/forge-gui/src/main/java/forge/error/ExceptionHandler.java @@ -29,6 +29,7 @@ import java.lang.Thread.UncaughtExceptionHandler; import com.esotericsoftware.minlog.Log; import forge.FTrace; +import forge.gui.error.BugReporter; import forge.localinstance.properties.ForgeConstants; import forge.util.MultiplexOutputStream; diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletData.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletData.java index 6b57a79e963..097fdff80e6 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletData.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletData.java @@ -2,11 +2,11 @@ package forge.gamemodes.gauntlet; import com.thoughtworks.xstream.annotations.XStreamOmitField; -import forge.GuiBase; import forge.deck.Deck; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgeConstants; import java.io.File; diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java index de65914f895..cba8b733b6d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java @@ -22,7 +22,8 @@ import com.thoughtworks.xstream.security.NullPermission; import com.thoughtworks.xstream.security.PrimitiveTypePermission; import forge.deck.Deck; import forge.deck.DeckSection; -import forge.error.BugReporter; +import forge.gui.error.BugReporter; + import org.apache.commons.lang3.StringUtils; import com.thoughtworks.xstream.XStream; diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java index 70486da312e..bb705a35a1b 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java @@ -8,8 +8,8 @@ import forge.LobbyPlayer; import forge.deck.Deck; import forge.game.GameView; import forge.game.player.RegisteredPlayer; -import forge.interfaces.IButton; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IWinLoseView; import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java index 40e8a11722b..852d9924c45 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java @@ -24,6 +24,8 @@ import forge.StaticData; import forge.card.CardEdition; import forge.deck.CardPool; import forge.deck.Deck; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.item.generation.ChaosBoosterSupplier; @@ -36,8 +38,6 @@ import forge.model.FModel; import forge.util.FileUtil; import forge.util.ItemPool; import forge.util.TextUtil; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; import forge.util.Localizer; import org.apache.commons.lang3.ArrayUtils; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java index ae093bd402f..56b8fcda000 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java @@ -2,7 +2,11 @@ package forge.gamemodes.limited; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import forge.card.*; + +import forge.card.ColorSet; +import forge.card.DeckHints; +import forge.card.MagicColor; +import forge.gui.card.*; import forge.item.PaperCard; import org.apache.commons.lang3.tuple.Pair; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java index e9dadbaca5c..9d3e68ad844 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java @@ -5,7 +5,11 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.StaticData; -import forge.card.*; +import forge.card.CardEdition; +import forge.card.CardRules; +import forge.card.CardRulesPredicates; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.deck.CardPool; @@ -16,6 +20,7 @@ import forge.deck.generation.DeckGenPool; import forge.deck.generation.DeckGeneratorBase; import forge.deck.generation.IDeckGenPool; import forge.game.GameFormat; +import forge.gui.card.*; import forge.item.IPaperCard; import forge.item.PaperCard; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java b/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java index 62997adef14..72b906a4d66 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java @@ -20,11 +20,11 @@ package forge.gamemodes.limited; import java.util.ArrayList; import java.util.List; -import forge.GuiBase; import forge.deck.Deck; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java index c1fbbc34f6a..69a5ee01eef 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java @@ -1,8 +1,8 @@ package forge.gamemodes.limited; import forge.game.GameView; -import forge.interfaces.IButton; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IWinLoseView; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java index 93573fdc2d8..359b5e44d20 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java @@ -25,6 +25,8 @@ import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.item.generation.IUnOpenedProduct; @@ -38,8 +40,6 @@ import forge.model.UnOpenedMeta; import forge.util.FileUtil; import forge.util.MyRandom; import forge.util.TextUtil; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; import forge.util.Localizer; import org.apache.commons.lang3.ArrayUtils; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java index 65837e9bee8..9710e4f2a70 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java @@ -17,8 +17,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import forge.FThreads; -import forge.GuiBase; import forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; @@ -26,9 +24,11 @@ import forge.game.card.CardView.CardStateView; import forge.game.event.GameEventSpellAbilityCast; import forge.game.event.GameEventSpellRemovedFromStack; import forge.game.player.PlayerView; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; +import forge.gui.interfaces.IMayViewCards; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; -import forge.interfaces.IMayViewCards; import forge.localinstance.assets.FSkinProp; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java b/forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java index 49bca8ce43d..b7f1a6350bb 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java @@ -16,7 +16,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; -import forge.GuiBase; import forge.LobbyPlayer; import forge.ai.AIOption; import forge.deck.CardPool; @@ -29,8 +28,10 @@ import forge.game.IHasGameType; import forge.game.player.Player; import forge.game.player.RegisteredPlayer; import forge.gamemodes.net.event.UpdateLobbyPlayerEvent; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; +import forge.gui.util.SOptionPane; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; import forge.interfaces.IUpdateable; import forge.item.PaperCard; import forge.localinstance.properties.ForgePreferences.FPref; @@ -38,7 +39,6 @@ import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; import forge.util.NameGenerator; -import forge.util.gui.SOptionPane; public abstract class GameLobby implements IHasGameType { private final static int MAX_PLAYERS = 8; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java index 278963468ae..9418a87e396 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java @@ -19,16 +19,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.eventbus.Subscribe; -import forge.FThreads; -import forge.GuiBase; -import forge.control.FControlGameEventHandler; -import forge.control.FControlGamePlayback; -import forge.control.WatchLocalGame; -import forge.events.IUiEventVisitor; -import forge.events.UiEvent; -import forge.events.UiEventAttackerDeclared; -import forge.events.UiEventBlockerAssigned; -import forge.events.UiEventNextGameDecision; import forge.game.Game; import forge.game.GameRules; import forge.game.GameType; @@ -39,7 +29,17 @@ import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.player.RegisteredPlayer; import forge.gamemodes.quest.QuestController; -import forge.interfaces.IGuiGame; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.control.FControlGameEventHandler; +import forge.gui.control.FControlGamePlayback; +import forge.gui.control.WatchLocalGame; +import forge.gui.events.IUiEventVisitor; +import forge.gui.events.UiEvent; +import forge.gui.events.UiEventAttackerDeclared; +import forge.gui.events.UiEventBlockerAssigned; +import forge.gui.events.UiEventNextGameDecision; +import forge.gui.interfaces.IGuiGame; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/LocalLobby.java b/forge-gui/src/main/java/forge/gamemodes/match/LocalLobby.java index 868c3349dda..65c20c4a74b 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/LocalLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/LocalLobby.java @@ -2,8 +2,8 @@ package forge.gamemodes.match; import java.util.Collections; -import forge.GuiBase; -import forge.interfaces.IGuiGame; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; public final class LocalLobby extends GameLobby { diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java index 8c896fa1583..aa5ece42e65 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java @@ -18,7 +18,7 @@ package forge.gamemodes.match.input; import com.google.common.collect.Sets; -import forge.events.UiEventAttackerDeclared; + import forge.game.GameEntity; import forge.game.GameEntityView; import forge.game.card.*; @@ -31,6 +31,7 @@ import forge.game.keyword.Keyword; import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; +import forge.gui.events.UiEventAttackerDeclared; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; import forge.util.collect.FCollectionView; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java index 06a66e91a94..8e99b9c2abc 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java @@ -17,8 +17,6 @@ */ package forge.gamemodes.match.input; -import forge.FThreads; -import forge.events.UiEventBlockerAssigned; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; @@ -29,6 +27,8 @@ import forge.game.event.GameEventCombatChanged; import forge.game.event.GameEventCombatUpdate; import forge.game.player.Player; import forge.game.zone.ZoneType; +import forge.gui.FThreads; +import forge.gui.events.UiEventBlockerAssigned; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; import forge.util.ThreadUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputConfirm.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputConfirm.java index 4b8d0a8f055..d785d5e3519 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputConfirm.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputConfirm.java @@ -21,10 +21,10 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import forge.GuiBase; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.spellability.SpellAbility; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputLockUI.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputLockUI.java index 4dc68e07feb..b1b4847fb7f 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputLockUI.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputLockUI.java @@ -3,11 +3,11 @@ package forge.gamemodes.match.input; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import forge.FThreads; import forge.game.card.Card; import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.spellability.SpellAbility; +import forge.gui.FThreads; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; import forge.util.ThreadUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java index a4422d40eae..c0f2003da76 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java @@ -2,14 +2,14 @@ package forge.gamemodes.match.input; import java.util.*; -import forge.GuiBase; import forge.game.spellability.SpellAbilityView; +import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; -import forge.FThreads; import forge.ai.ComputerUtilMana; import forge.ai.PlayerControllerAi; import forge.card.ColorSet; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java index 9eebdf6e7bc..06ed7c70539 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java @@ -1,9 +1,9 @@ package forge.gamemodes.match.input; -import forge.control.FControlGamePlayback; import forge.game.Game; import forge.game.card.Card; import forge.game.phase.PhaseHandler; +import forge.gui.control.FControlGamePlayback; public class InputPlaybackControl extends InputSyncronizedBase { private static final long serialVersionUID = 7979208993306642072L; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputProxy.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputProxy.java index 139be85d511..a71cbdfefad 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputProxy.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputProxy.java @@ -23,12 +23,12 @@ import java.util.Observable; import java.util.Observer; import java.util.concurrent.atomic.AtomicReference; -import forge.FThreads; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.spellability.SpellAbility; +import forge.gui.FThreads; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java index 021c92c668c..f3c7a05b06e 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java @@ -1,12 +1,12 @@ package forge.gamemodes.match.input; -import forge.FThreads; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.Zone; +import forge.gui.FThreads; import forge.player.PlayerControllerHuman; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java index 761f3ac4eb7..1bf5054e97b 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java @@ -4,7 +4,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import forge.FThreads; import forge.game.GameEntity; import forge.game.GameObject; import forge.game.ability.ApiType; @@ -14,6 +13,7 @@ import forge.game.card.CardView; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import forge.gui.FThreads; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java index 1a46abe15cb..df10c4fc797 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java @@ -2,8 +2,8 @@ package forge.gamemodes.match.input; import java.util.concurrent.CountDownLatch; -import forge.FThreads; -import forge.error.BugReporter; +import forge.gui.FThreads; +import forge.gui.error.BugReporter; import forge.player.PlayerControllerHuman; public abstract class InputSyncronizedBase extends InputBase implements InputSynchronized { diff --git a/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectDecoder.java b/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectDecoder.java index 4110f9d1486..cfd004eb8c0 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectDecoder.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectDecoder.java @@ -1,6 +1,5 @@ package forge.gamemodes.net; -import forge.GuiBase; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.netty.channel.ChannelHandlerContext; @@ -11,6 +10,8 @@ import net.jpountz.lz4.LZ4BlockInputStream; import java.io.ObjectInputStream; import java.io.StreamCorruptedException; +import forge.gui.GuiBase; + public class CompatibleObjectDecoder extends LengthFieldBasedFrameDecoder { private final ClassResolver classResolver; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectEncoder.java b/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectEncoder.java index 9cf17f0b1b8..945b0732fce 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectEncoder.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectEncoder.java @@ -1,6 +1,5 @@ package forge.gamemodes.net; -import forge.GuiBase; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.channel.ChannelHandlerContext; @@ -10,6 +9,8 @@ import net.jpountz.lz4.LZ4BlockOutputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import forge.gui.GuiBase; + public class CompatibleObjectEncoder extends MessageToByteEncoder { private static final byte[] LENGTH_PLACEHOLDER = new byte[4]; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java b/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java index 59179d1e12b..8dcbb0f39d7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java @@ -1,10 +1,10 @@ package forge.gamemodes.net; -import forge.FThreads; 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.util.gui.SOptionPane; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/IOnlineLobby.java b/forge-gui/src/main/java/forge/gamemodes/net/IOnlineLobby.java index 26637b2fd48..5160e98cb06 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/IOnlineLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/IOnlineLobby.java @@ -2,7 +2,7 @@ package forge.gamemodes.net; import forge.gamemodes.match.GameLobby; import forge.gamemodes.net.client.FGameClient; -import forge.interfaces.ILobbyView; +import forge.gui.interfaces.ILobbyView; public interface IOnlineLobby { ILobbyView setLobby(GameLobby lobby); diff --git a/forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java b/forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java index d2c0c2bc3e9..30294e9a3f2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java @@ -2,7 +2,6 @@ package forge.gamemodes.net; import org.apache.commons.lang3.StringUtils; -import forge.GuiBase; import forge.gamemodes.match.LobbySlotType; import forge.gamemodes.match.GameLobby.GameLobbyData; import forge.gamemodes.net.client.ClientGameLobby; @@ -13,9 +12,11 @@ import forge.gamemodes.net.event.NetEvent; import forge.gamemodes.net.event.UpdateLobbyPlayerEvent; import forge.gamemodes.net.server.FServerManager; import forge.gamemodes.net.server.ServerGameLobby; -import forge.interfaces.IGuiGame; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; +import forge.gui.interfaces.ILobbyView; +import forge.gui.util.SOptionPane; import forge.interfaces.ILobbyListener; -import forge.interfaces.ILobbyView; import forge.interfaces.IPlayerChangeListener; import forge.interfaces.IUpdateable; import forge.localinstance.properties.ForgeConstants; @@ -23,7 +24,6 @@ import forge.localinstance.properties.ForgeProfileProperties; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.util.gui.SOptionPane; import forge.util.Localizer; public class NetConnectUtil { diff --git a/forge-gui/src/main/java/forge/gamemodes/net/OfflineLobby.java b/forge-gui/src/main/java/forge/gamemodes/net/OfflineLobby.java index ad21bbb8cd8..68f4b20c7d2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/OfflineLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/OfflineLobby.java @@ -5,7 +5,7 @@ import java.util.Collections; import forge.gamemodes.match.GameLobby; import forge.gamemodes.match.LobbySlot; import forge.gamemodes.match.LobbySlotType; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiGame; //Temporary lobby instance to use for OnlineLobby before connecting to a server public final class OfflineLobby extends GameLobby { diff --git a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java index e7b2c622bc2..a7494f1d8a7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java @@ -1,7 +1,7 @@ package forge.gamemodes.net; import com.google.common.base.Function; -import forge.GuiBase; + import forge.deck.CardPool; import forge.game.GameEntityView; import forge.game.GameView; @@ -11,8 +11,9 @@ import forge.game.player.DelayedReveal; import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.gamemodes.match.NextGameDecision; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; import forge.localinstance.assets.FSkinProp; import forge.player.PlayerZoneUpdates; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/client/ClientGameLobby.java b/forge-gui/src/main/java/forge/gamemodes/net/client/ClientGameLobby.java index a5cbce01ce1..d8eb799db12 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/client/ClientGameLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/client/ClientGameLobby.java @@ -1,7 +1,7 @@ package forge.gamemodes.net.client; import forge.gamemodes.match.GameLobby; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiGame; public final class ClientGameLobby extends GameLobby { private int localPlayer = -1; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/client/FGameClient.java b/forge-gui/src/main/java/forge/gamemodes/net/client/FGameClient.java index 074ebe318be..a39cd3504f0 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/client/FGameClient.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/client/FGameClient.java @@ -26,7 +26,7 @@ import forge.gamemodes.net.event.IdentifiableNetEvent; import forge.gamemodes.net.event.LobbyUpdateEvent; import forge.gamemodes.net.event.MessageEvent; import forge.gamemodes.net.event.NetEvent; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.ILobbyListener; public class FGameClient implements IToServer { diff --git a/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java b/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java index db52bbcddbc..8097999a053 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java @@ -10,6 +10,7 @@ import forge.gamemodes.net.IRemote; import forge.gamemodes.net.ProtocolMethod; import forge.gamemodes.net.ReplyPool; import forge.gamemodes.net.event.LoginEvent; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.ILobbyListener; import forge.localinstance.properties.ForgePreferences.FPref; import forge.player.LobbyPlayerHuman; @@ -20,7 +21,6 @@ import forge.trackable.TrackableTypes; import forge.trackable.Tracker; import io.netty.channel.ChannelHandlerContext; import forge.game.player.PlayerView; -import forge.interfaces.IGuiGame; import forge.model.FModel; import forge.trackable.TrackableCollection; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java b/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java index e3c59cf040c..a48d090d06d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java @@ -1,6 +1,5 @@ package forge.gamemodes.net.server; -import forge.GuiBase; import forge.gamemodes.match.LobbySlot; import forge.gamemodes.match.LobbySlotType; import forge.gamemodes.net.CompatibleObjectDecoder; @@ -11,8 +10,9 @@ import forge.gamemodes.net.event.LogoutEvent; import forge.gamemodes.net.event.MessageEvent; import forge.gamemodes.net.event.NetEvent; import forge.gamemodes.net.event.UpdateLobbyPlayerEvent; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; import forge.interfaces.ILobbyListener; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/server/ServerGameLobby.java b/forge-gui/src/main/java/forge/gamemodes/net/server/ServerGameLobby.java index 3ee3916608e..44369085159 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/server/ServerGameLobby.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/server/ServerGameLobby.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; import forge.gamemodes.match.GameLobby; import forge.gamemodes.match.LobbySlot; import forge.gamemodes.match.LobbySlotType; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiGame; public final class ServerGameLobby extends GameLobby { diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestBattle.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestBattle.java index 8fb89403ae4..b99f74fd33b 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestBattle.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestBattle.java @@ -6,9 +6,9 @@ import forge.LobbyPlayer; import forge.deck.Deck; import forge.game.GameType; import forge.game.GameView; -import forge.interfaces.IButton; -import forge.interfaces.IGuiGame; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IGuiGame; +import forge.gui.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestChaosBattle.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestChaosBattle.java index 694984777bc..665160d0f03 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestChaosBattle.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestChaosBattle.java @@ -13,9 +13,9 @@ import forge.gamemodes.quest.QuestEventDifficulty; import forge.gamemodes.quest.QuestEventDuel; import forge.gamemodes.quest.QuestEventDuelManager; import forge.gamemodes.quest.QuestWorld; -import forge.interfaces.IButton; -import forge.interfaces.IGuiGame; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IGuiGame; +import forge.gui.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java index 2d164da59ae..1984c2a3d1d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import forge.FThreads; -import forge.GuiBase; import forge.LobbyPlayer; import forge.card.CardType; import forge.deck.CardPool; @@ -37,9 +35,11 @@ import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.gamemodes.quest.BoosterUtils; -import forge.interfaces.IButton; -import forge.interfaces.IGuiGame; -import forge.interfaces.IWinLoseView; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IGuiGame; +import forge.gui.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java index bf3923020db..91fc3dfdeeb 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java @@ -21,6 +21,7 @@ import com.google.common.base.Function; import forge.card.CardDb; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; +import forge.gui.util.SOptionPane; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ColumnDef; @@ -33,7 +34,6 @@ import forge.model.FModel; import forge.util.FileUtil; import forge.util.XmlReader; import forge.util.XmlWriter; -import forge.util.gui.SOptionPane; import forge.util.Localizer; import forge.util.CardTranslation; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestEvent.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestEvent.java index 55b0fc09fe6..d2de58e5327 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestEvent.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestEvent.java @@ -8,7 +8,7 @@ import forge.LobbyPlayer; import forge.deck.Deck; import forge.deck.io.DeckSerializer; import forge.game.GameType; -import forge.interfaces.IGuiGame; +import forge.gui.interfaces.IGuiGame; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java index b38d08cbed8..ef58ba1103c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java @@ -8,11 +8,11 @@ import java.util.Set; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import forge.GuiBase; import forge.card.CardRulesPredicates; import forge.card.ColorSet; 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.model.FModel; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java index 9178010506e..b359b3199d2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java @@ -6,7 +6,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import forge.card.*; +import forge.card.CardEdition; +import forge.card.CardRarity; +import forge.card.CardRules; +import forge.card.CardType; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.card.CardType.CoreType; import forge.card.mana.ManaCostShard; import forge.deck.CardPool; @@ -16,6 +21,8 @@ import forge.deck.DeckSection; import forge.deck.generation.*; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.gamemodes.quest.QuestUtil; +import forge.gui.card.*; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.assets.IHasSkinProp; @@ -24,7 +31,6 @@ import forge.model.FModel; import forge.util.FileUtil; import forge.util.Localizer; import forge.util.MyRandom; -import forge.util.gui.SOptionPane; import java.util.EnumSet; import java.util.List; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/IVConquestStats.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/IVConquestStats.java index 3034a8c5984..3ab3f537d06 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/IVConquestStats.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/IVConquestStats.java @@ -1,6 +1,6 @@ package forge.gamemodes.planarconquest; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; public interface IVConquestStats { IButton getLblAEtherShards(); diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java index 7f8e6e216cf..a648e3d3575 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java @@ -21,9 +21,15 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.*; + +import forge.card.CardEdition; +import forge.card.CardRules; +import forge.card.CardRulesPredicates; +import forge.card.MagicColor; +import forge.card.PrintSheet; import forge.game.GameFormat; import forge.gamemodes.quest.data.QuestPreferences.QPref; +import forge.gui.card.*; import forge.item.*; import forge.item.IPaperCard.Predicates.Presets; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/IQuestTournamentView.java b/forge-gui/src/main/java/forge/gamemodes/quest/IQuestTournamentView.java index cd7b46734b2..411cf1ca772 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/IQuestTournamentView.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/IQuestTournamentView.java @@ -3,7 +3,7 @@ package forge.gamemodes.quest; import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.quest.QuestDraftUtils.Mode; import forge.gamemodes.quest.data.QuestEventDraftContainer; -import forge.interfaces.IButton; +import forge.gui.interfaces.IButton; public interface IQuestTournamentView { Mode getMode(); diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/IVQuestStats.java b/forge-gui/src/main/java/forge/gamemodes/quest/IVQuestStats.java index 3b4c8a048af..dd621419279 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/IVQuestStats.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/IVQuestStats.java @@ -1,8 +1,8 @@ package forge.gamemodes.quest; -import forge.interfaces.IButton; -import forge.interfaces.ICheckBox; -import forge.interfaces.IComboBox; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.ICheckBox; +import forge.gui.interfaces.IComboBox; /** Dictates methods required for a panel with stats/pet display. */ diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java index bd6cfb4d7d1..c5add0e3384 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java @@ -2,7 +2,6 @@ package forge.gamemodes.quest; import com.google.common.collect.Lists; -import forge.GuiBase; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; @@ -17,7 +16,8 @@ import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.tournament.system.TournamentBracket; import forge.gamemodes.tournament.system.TournamentPairing; import forge.gamemodes.tournament.system.TournamentPlayer; -import forge.interfaces.IGuiGame; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java index 776633aa61a..e95337bfd68 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java @@ -17,7 +17,6 @@ */ package forge.gamemodes.quest; -import forge.GuiBase; import forge.card.CardEdition; import forge.card.CardEdition.CardInSet; import forge.card.CardRarity; @@ -31,6 +30,7 @@ import forge.gamemodes.quest.io.ReadPriceList; import forge.gamemodes.tournament.system.TournamentBracket; import forge.gamemodes.tournament.system.TournamentPairing; import forge.gamemodes.tournament.system.TournamentPlayer; +import forge.gui.GuiBase; import forge.item.BoosterPack; import forge.item.PaperCard; import forge.model.CardBlock; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java index cda0191ca65..953ab94c0e9 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java @@ -1,20 +1,22 @@ package forge.gamemodes.quest; import com.google.common.base.Function; -import forge.GuiBase; + import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckFormat; import forge.deck.DeckSection; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.ReadPriceList; +import forge.gui.GuiBase; +import forge.gui.util.SOptionPane; import forge.item.*; import forge.itemmanager.IItemManager; import forge.itemmanager.SItemManagerUtil; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.util.ItemPool; -import forge.util.gui.SOptionPane; + import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java index e937ae4c9f3..1a3b3bc198c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java @@ -6,7 +6,6 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import forge.GuiBase; import forge.deck.DeckGroup; import forge.game.GameType; import forge.gamemodes.limited.BoosterDraft; @@ -17,7 +16,10 @@ import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.tournament.system.TournamentBracket; import forge.gamemodes.tournament.system.TournamentPairing; import forge.gamemodes.tournament.system.TournamentPlayer; -import forge.interfaces.IGuiGame; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.BoosterPack; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; @@ -25,8 +27,6 @@ import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.util.TextUtil; import forge.util.ThreadUtil; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java index 9efd1a0d816..3c512709054 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java @@ -19,8 +19,6 @@ package forge.gamemodes.quest; import com.google.common.collect.ImmutableMap; -import forge.FThreads; -import forge.GuiBase; import forge.LobbyPlayer; import forge.card.CardDb.SetPreference; import forge.card.CardEdition; @@ -36,8 +34,12 @@ import forge.gamemodes.quest.bazaar.QuestPetController; import forge.gamemodes.quest.data.DeckConstructionRules; import forge.gamemodes.quest.data.QuestAchievements; import forge.gamemodes.quest.data.QuestAssets; -import forge.interfaces.IButton; -import forge.interfaces.IGuiGame; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IGuiGame; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.IPaperCard; import forge.item.PaperToken; import forge.localinstance.assets.FSkinProp; @@ -45,8 +47,6 @@ import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.GamePlayerUtil; import forge.util.Localizer; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java index d965977f588..89ec386e287 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java @@ -23,6 +23,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import forge.card.CardEdition; import forge.card.CardRarity; import forge.card.ICardDatabase; @@ -36,6 +37,7 @@ import forge.gamemodes.quest.data.QuestAssets; import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs; import forge.gamemodes.quest.data.QuestPreferences.QPref; +import forge.gui.card.*; import forge.item.*; import forge.item.SealedProduct.Template; import forge.item.generation.BoosterSlots; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java index 7f64be4ec92..88a6541c6ad 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java @@ -31,16 +31,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; import forge.card.CardEdition; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.ReadPriceList; +import forge.gui.GuiBase; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.item.generation.UnOpenedProduct; import forge.model.FModel; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; /** diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java index 5508ef16f10..83df7e5b011 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java @@ -12,8 +12,9 @@ import forge.gamemodes.quest.bazaar.QuestItemType; import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs; import forge.gamemodes.quest.data.QuestPreferences.QPref; -import forge.interfaces.IButton; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IWinLoseView; +import forge.gui.util.SGuiChoose; import forge.item.*; import forge.item.IPaperCard.Predicates; import forge.item.generation.BoosterSlots; @@ -26,7 +27,7 @@ import forge.player.GamePlayerUtil; import forge.util.Localizer; import forge.util.MyRandom; import forge.util.TextUtil; -import forge.util.gui.SGuiChoose; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolPreferences.java b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolPreferences.java index 7da42a6690a..ffdf164a0be 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolPreferences.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolPreferences.java @@ -50,7 +50,7 @@ public final class StartingPoolPreferences { * Creates a new StartingPoolPreferences instance. * @param poolType The type of card pool to generate. * @param preferredColors A list of preferred colors to use when generating the card pool. - * See {@link forge.card.MagicColor} for allowed values. + * See {@link forge.gui.card.MagicColor} for allowed values. * @param includeArtifacts If true, artifacts will be included in the pool regardless of selected colors. This * mimics the old quest pool generation. * @param completeSet If true, four of each card in the starting pool will be generated. @@ -73,7 +73,7 @@ public final class StartingPoolPreferences { } /** - * @return A list of colors to use when generating the card pool. See {@link forge.card.MagicColor} for allowed values. + * @return A list of colors to use when generating the card pool. See {@link forge.gui.card.MagicColor} for allowed values. */ public List getPreferredColors() { return preferredColors; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java index 098ffaf2baa..e2bdc302a18 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestItemBasic.java @@ -21,9 +21,9 @@ import org.apache.commons.lang3.StringUtils; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import forge.GuiBase; 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; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java index 4060c06d747..86b8b2f7d84 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetController.java @@ -23,10 +23,10 @@ import java.util.List; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import forge.GuiBase; import forge.gamemodes.quest.QuestController; 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; diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentData.java b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentData.java index e7085f5af8f..dfaa8672039 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentData.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentData.java @@ -1,11 +1,12 @@ package forge.gamemodes.tournament; import com.thoughtworks.xstream.annotations.XStreamOmitField; -import forge.GuiBase; + import forge.deck.Deck; import forge.game.GameType; import forge.game.player.RegisteredPlayer; import forge.gamemodes.match.HostedMatch; +import forge.gui.GuiBase; import forge.localinstance.properties.ForgeConstants; import java.io.File; diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java index 2007bae14ed..d75fee33a17 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java @@ -6,8 +6,8 @@ import forge.LobbyPlayer; import forge.deck.Deck; import forge.game.GameView; import forge.game.player.RegisteredPlayer; -import forge.interfaces.IButton; -import forge.interfaces.IWinLoseView; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IWinLoseView; import forge.localinstance.assets.FSkinProp; import forge.model.FModel; import forge.player.GamePlayerUtil; diff --git a/forge-gui/src/main/java/forge/FThreads.java b/forge-gui/src/main/java/forge/gui/FThreads.java similarity index 99% rename from forge-gui/src/main/java/forge/FThreads.java rename to forge-gui/src/main/java/forge/gui/FThreads.java index e065cf85079..f90221c0c0e 100644 --- a/forge-gui/src/main/java/forge/FThreads.java +++ b/forge-gui/src/main/java/forge/gui/FThreads.java @@ -1,4 +1,4 @@ -package forge; +package forge.gui; import forge.util.ThreadUtil; diff --git a/forge-gui/src/main/java/forge/GuiBase.java b/forge-gui/src/main/java/forge/gui/GuiBase.java similarity index 96% rename from forge-gui/src/main/java/forge/GuiBase.java rename to forge-gui/src/main/java/forge/gui/GuiBase.java index 482904aea3e..1294f7c7228 100644 --- a/forge-gui/src/main/java/forge/GuiBase.java +++ b/forge-gui/src/main/java/forge/gui/GuiBase.java @@ -1,6 +1,6 @@ -package forge; +package forge.gui; -import forge.interfaces.IGuiBase; +import forge.gui.interfaces.IGuiBase; public class GuiBase { private static IGuiBase guiInterface; diff --git a/forge-gui/src/main/java/forge/UiCommand.java b/forge-gui/src/main/java/forge/gui/UiCommand.java similarity index 97% rename from forge-gui/src/main/java/forge/UiCommand.java rename to forge-gui/src/main/java/forge/gui/UiCommand.java index 3b320a5f2d7..ceb94ff2fc7 100644 --- a/forge-gui/src/main/java/forge/UiCommand.java +++ b/forge-gui/src/main/java/forge/gui/UiCommand.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.gui; /** *

diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java similarity index 99% rename from forge-gui/src/main/java/forge/card/CardDetailUtil.java rename to forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java index 1cd0d23bfd5..ab65a97d2d0 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java @@ -1,6 +1,12 @@ -package forge.card; +package forge.gui.card; import com.google.common.collect.Sets; + +import forge.card.CardRarity; +import forge.card.CardStateName; +import forge.card.CardType; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.card.mana.ManaCostShard; import forge.game.GameView; import forge.game.card.Card; diff --git a/forge-gui/src/main/java/forge/card/CardPreferences.java b/forge-gui/src/main/java/forge/gui/card/CardPreferences.java similarity index 99% rename from forge-gui/src/main/java/forge/card/CardPreferences.java rename to forge-gui/src/main/java/forge/gui/card/CardPreferences.java index a7bc5a007a1..cc7e22ea405 100644 --- a/forge-gui/src/main/java/forge/card/CardPreferences.java +++ b/forge-gui/src/main/java/forge/gui/card/CardPreferences.java @@ -1,4 +1,4 @@ -package forge.card; +package forge.gui.card; import forge.item.IPaperCard; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java b/forge-gui/src/main/java/forge/gui/card/CardReaderExperiments.java similarity index 99% rename from forge-gui/src/main/java/forge/card/CardReaderExperiments.java rename to forge-gui/src/main/java/forge/gui/card/CardReaderExperiments.java index 4a1439f3513..9b30e8262ef 100644 --- a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java +++ b/forge-gui/src/main/java/forge/gui/card/CardReaderExperiments.java @@ -1,6 +1,7 @@ -package forge.card; +package forge.gui.card; import forge.CardStorageReader; +import forge.card.CardRules; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/card/CardScriptInfo.java b/forge-gui/src/main/java/forge/gui/card/CardScriptInfo.java similarity index 99% rename from forge-gui/src/main/java/forge/card/CardScriptInfo.java rename to forge-gui/src/main/java/forge/gui/card/CardScriptInfo.java index 7a44e55ab9d..73700303006 100644 --- a/forge-gui/src/main/java/forge/card/CardScriptInfo.java +++ b/forge-gui/src/main/java/forge/gui/card/CardScriptInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card; +package forge.gui.card; import java.io.File; import java.io.PrintWriter; diff --git a/forge-gui/src/main/java/forge/card/CardScriptParser.java b/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java similarity index 99% rename from forge-gui/src/main/java/forge/card/CardScriptParser.java rename to forge-gui/src/main/java/forge/gui/card/CardScriptParser.java index 02c877af4b2..d65aadfce23 100644 --- a/forge-gui/src/main/java/forge/card/CardScriptParser.java +++ b/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java @@ -1,4 +1,4 @@ -package forge.card; +package forge.gui.card; import java.util.List; import java.util.Map; @@ -13,6 +13,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import forge.card.CardType; import forge.game.ability.ApiType; import forge.game.trigger.TriggerType; diff --git a/forge-gui/src/main/java/forge/control/ChatArea.java b/forge-gui/src/main/java/forge/gui/control/ChatArea.java similarity index 83% rename from forge-gui/src/main/java/forge/control/ChatArea.java rename to forge-gui/src/main/java/forge/gui/control/ChatArea.java index 98ee707a2eb..bfd112ccf12 100644 --- a/forge-gui/src/main/java/forge/control/ChatArea.java +++ b/forge-gui/src/main/java/forge/gui/control/ChatArea.java @@ -1,4 +1,4 @@ -package forge.control; +package forge.gui.control; /** How 'loudly' the message should sound */ public enum ChatArea { diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java similarity index 99% rename from forge-gui/src/main/java/forge/control/FControlGameEventHandler.java rename to forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java index e3e85dbf5ac..21d9bd72394 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java @@ -1,4 +1,4 @@ -package forge.control; +package forge.gui.control; import java.util.Collection; import java.util.HashSet; @@ -9,7 +9,6 @@ import java.util.Set; import com.google.common.collect.Lists; import com.google.common.eventbus.Subscribe; -import forge.GuiBase; import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardCollection; @@ -19,7 +18,8 @@ import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.zone.Zone; import forge.game.zone.ZoneType; -import forge.interfaces.IGuiGame; +import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.player.PlayerControllerHuman; diff --git a/forge-gui/src/main/java/forge/control/FControlGamePlayback.java b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java similarity index 99% rename from forge-gui/src/main/java/forge/control/FControlGamePlayback.java rename to forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java index 07430bada16..6ce805877d6 100644 --- a/forge-gui/src/main/java/forge/control/FControlGamePlayback.java +++ b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java @@ -1,4 +1,4 @@ -package forge.control; +package forge.gui.control; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; @@ -6,7 +6,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.eventbus.Subscribe; -import forge.FThreads; import forge.game.Game; import forge.game.card.CardView; import forge.game.event.GameEvent; @@ -20,6 +19,7 @@ import forge.game.event.GameEventSpellResolved; import forge.game.event.GameEventTurnPhase; import forge.game.event.IGameEventVisitor; import forge.gamemodes.match.input.InputPlaybackControl; +import forge.gui.FThreads; import forge.player.PlayerControllerHuman; public class FControlGamePlayback extends IGameEventVisitor.Base { diff --git a/forge-gui/src/main/java/forge/control/WatchLocalGame.java b/forge-gui/src/main/java/forge/gui/control/WatchLocalGame.java similarity index 97% rename from forge-gui/src/main/java/forge/control/WatchLocalGame.java rename to forge-gui/src/main/java/forge/gui/control/WatchLocalGame.java index 59452fcb344..d568fa526cd 100644 --- a/forge-gui/src/main/java/forge/control/WatchLocalGame.java +++ b/forge-gui/src/main/java/forge/gui/control/WatchLocalGame.java @@ -1,7 +1,7 @@ /** * */ -package forge.control; +package forge.gui.control; import java.util.List; @@ -12,8 +12,8 @@ import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.gamemodes.match.input.Input; import forge.gamemodes.match.input.InputPlaybackControl; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.IDevModeCheats; -import forge.interfaces.IGuiGame; import forge.player.PlayerControllerHuman; import forge.util.ITriggerEvent; diff --git a/forge-gui/src/main/java/forge/control/package-info.java b/forge-gui/src/main/java/forge/gui/control/package-info.java similarity index 68% rename from forge-gui/src/main/java/forge/control/package-info.java rename to forge-gui/src/main/java/forge/gui/control/package-info.java index b409b506609..2821d72fcd8 100644 --- a/forge-gui/src/main/java/forge/control/package-info.java +++ b/forge-gui/src/main/java/forge/gui/control/package-info.java @@ -1,3 +1,3 @@ /** Controller (as in model-view-controller) for Forge. */ -package forge.control; +package forge.gui.control; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadAchievementImages.java similarity index 97% rename from forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadAchievementImages.java index 532ecfe9090..6bf24143028 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadAchievementImages.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadAchievementImages.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import java.util.Map; import java.util.TreeMap; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java similarity index 99% rename from forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java index 776c6a5a166..2519533adae 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java similarity index 99% rename from forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java index a005eac42a4..ad7b3b46f58 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import forge.StaticData; import forge.item.PaperCard; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java similarity index 97% rename from forge-gui/src/main/java/forge/download/GuiDownloadPrices.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java index 1e483f1ff72..f30a6cce352 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPrices.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import java.util.Map; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java similarity index 98% rename from forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java index 2be134a4696..3ec18989453 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadQuestImages.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import java.util.Map; import java.util.TreeMap; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadService.java similarity index 98% rename from forge-gui/src/main/java/forge/download/GuiDownloadService.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadService.java index 4656032b252..772e8e2232f 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadService.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import java.io.File; import java.io.FileNotFoundException; @@ -41,13 +41,13 @@ import org.apache.commons.lang3.tuple.Pair; import com.esotericsoftware.minlog.Log; -import forge.FThreads; -import forge.GuiBase; -import forge.UiCommand; -import forge.error.BugReporter; -import forge.interfaces.IButton; -import forge.interfaces.IProgressBar; -import forge.interfaces.ITextField; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.UiCommand; +import forge.gui.error.BugReporter; +import forge.gui.interfaces.IButton; +import forge.gui.interfaces.IProgressBar; +import forge.gui.interfaces.ITextField; import forge.localinstance.properties.ForgeConstants; import forge.util.FileUtil; import forge.util.HttpUtil; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java similarity index 99% rename from forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java index 3cfc87a09b2..c4f29070e9d 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.gui.download; import com.google.common.collect.Iterables; import forge.StaticData; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSkins.java similarity index 95% rename from forge-gui/src/main/java/forge/download/GuiDownloadSkins.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadSkins.java index af0e061ae62..c062e531f9b 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSkins.java @@ -1,4 +1,4 @@ -package forge.download; +package forge.gui.download; import java.util.Map; import java.util.TreeMap; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java similarity index 98% rename from forge-gui/src/main/java/forge/download/GuiDownloadZipService.java rename to forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java index dd142b04cf4..411bc63460c 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java @@ -1,4 +1,4 @@ -package forge.download; +package forge.gui.download; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -18,9 +18,9 @@ import java.util.zip.ZipFile; import com.esotericsoftware.minlog.Log; import com.google.common.io.Files; -import forge.FThreads; -import forge.GuiBase; -import forge.interfaces.IProgressBar; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.interfaces.IProgressBar; import forge.util.FileUtil; public class GuiDownloadZipService extends GuiDownloadService { diff --git a/forge-gui/src/main/java/forge/error/BugReporter.java b/forge-gui/src/main/java/forge/gui/error/BugReporter.java similarity index 98% rename from forge-gui/src/main/java/forge/error/BugReporter.java rename to forge-gui/src/main/java/forge/gui/error/BugReporter.java index f4a850e3d51..6a1e0e1d929 100644 --- a/forge-gui/src/main/java/forge/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/gui/error/BugReporter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.error; +package forge.gui.error; import java.io.BufferedWriter; import java.io.File; @@ -24,11 +24,11 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import forge.FThreads; -import forge.GuiBase; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; -import forge.util.gui.SOptionPane; import forge.util.Localizer; import io.sentry.Sentry; import io.sentry.event.BreadcrumbBuilder; diff --git a/forge-gui/src/main/java/forge/events/IUiEventVisitor.java b/forge-gui/src/main/java/forge/gui/events/IUiEventVisitor.java similarity index 86% rename from forge-gui/src/main/java/forge/events/IUiEventVisitor.java rename to forge-gui/src/main/java/forge/gui/events/IUiEventVisitor.java index 6634d081ded..29c8d35984d 100644 --- a/forge-gui/src/main/java/forge/events/IUiEventVisitor.java +++ b/forge-gui/src/main/java/forge/gui/events/IUiEventVisitor.java @@ -1,4 +1,4 @@ -package forge.events; +package forge.gui.events; public interface IUiEventVisitor { T visit(UiEventBlockerAssigned event); diff --git a/forge-gui/src/main/java/forge/events/UiEvent.java b/forge-gui/src/main/java/forge/gui/events/UiEvent.java similarity index 84% rename from forge-gui/src/main/java/forge/events/UiEvent.java rename to forge-gui/src/main/java/forge/gui/events/UiEvent.java index 2a5fa6b98f0..5d809973830 100644 --- a/forge-gui/src/main/java/forge/events/UiEvent.java +++ b/forge-gui/src/main/java/forge/gui/events/UiEvent.java @@ -1,4 +1,4 @@ -package forge.events; +package forge.gui.events; import forge.game.event.Event; diff --git a/forge-gui/src/main/java/forge/events/UiEventAttackerDeclared.java b/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java similarity index 96% rename from forge-gui/src/main/java/forge/events/UiEventAttackerDeclared.java rename to forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java index d6f1fae2182..a90cc213417 100644 --- a/forge-gui/src/main/java/forge/events/UiEventAttackerDeclared.java +++ b/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java @@ -1,4 +1,4 @@ -package forge.events; +package forge.gui.events; import forge.game.GameEntityView; import forge.game.card.CardView; diff --git a/forge-gui/src/main/java/forge/events/UiEventBlockerAssigned.java b/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java similarity index 94% rename from forge-gui/src/main/java/forge/events/UiEventBlockerAssigned.java rename to forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java index c17d7b9be73..c169140285c 100644 --- a/forge-gui/src/main/java/forge/events/UiEventBlockerAssigned.java +++ b/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java @@ -1,4 +1,4 @@ -package forge.events; +package forge.gui.events; import forge.game.card.CardView; diff --git a/forge-gui/src/main/java/forge/events/UiEventNextGameDecision.java b/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java similarity index 96% rename from forge-gui/src/main/java/forge/events/UiEventNextGameDecision.java rename to forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java index 20b5243a005..e4d6ed80044 100644 --- a/forge-gui/src/main/java/forge/events/UiEventNextGameDecision.java +++ b/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java @@ -1,4 +1,4 @@ -package forge.events; +package forge.gui.events; import forge.gamemodes.match.NextGameDecision; import forge.player.PlayerControllerHuman; diff --git a/forge-gui/src/main/java/forge/interfaces/IButton.java b/forge-gui/src/main/java/forge/gui/interfaces/IButton.java similarity index 84% rename from forge-gui/src/main/java/forge/interfaces/IButton.java rename to forge-gui/src/main/java/forge/gui/interfaces/IButton.java index 583dae0820e..3150044e01c 100644 --- a/forge-gui/src/main/java/forge/interfaces/IButton.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IButton.java @@ -1,6 +1,6 @@ -package forge.interfaces; +package forge.gui.interfaces; -import forge.UiCommand; +import forge.gui.UiCommand; import forge.localinstance.assets.FSkinProp; public interface IButton extends ITextComponent { diff --git a/forge-gui/src/main/java/forge/interfaces/ICheckBox.java b/forge-gui/src/main/java/forge/gui/interfaces/ICheckBox.java similarity index 78% rename from forge-gui/src/main/java/forge/interfaces/ICheckBox.java rename to forge-gui/src/main/java/forge/gui/interfaces/ICheckBox.java index a8fa52c12d7..4579943747a 100644 --- a/forge-gui/src/main/java/forge/interfaces/ICheckBox.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/ICheckBox.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface ICheckBox extends IComponent { boolean isSelected(); diff --git a/forge-gui/src/main/java/forge/interfaces/IComboBox.java b/forge-gui/src/main/java/forge/gui/interfaces/IComboBox.java similarity index 88% rename from forge-gui/src/main/java/forge/interfaces/IComboBox.java rename to forge-gui/src/main/java/forge/gui/interfaces/IComboBox.java index 9aa609a0185..1147feca7c8 100644 --- a/forge-gui/src/main/java/forge/interfaces/IComboBox.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IComboBox.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface IComboBox extends IComponent { void setSelectedItem(E item); diff --git a/forge-gui/src/main/java/forge/interfaces/IComponent.java b/forge-gui/src/main/java/forge/gui/interfaces/IComponent.java similarity index 87% rename from forge-gui/src/main/java/forge/interfaces/IComponent.java rename to forge-gui/src/main/java/forge/gui/interfaces/IComponent.java index e9dd9faf9cc..4113d9e7228 100644 --- a/forge-gui/src/main/java/forge/interfaces/IComponent.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IComponent.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface IComponent { boolean isEnabled(); diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java similarity index 97% rename from forge-gui/src/main/java/forge/interfaces/IGuiBase.java rename to forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java index 68ffe5d1e19..f032085f9cf 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import java.util.List; import com.google.common.base.Function; -import forge.download.GuiDownloadService; import forge.gamemodes.match.HostedMatch; +import forge.gui.download.GuiDownloadService; import forge.item.PaperCard; import forge.localinstance.assets.FSkinProp; import forge.localinstance.assets.ISkinImage; diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java similarity index 99% rename from forge-gui/src/main/java/forge/interfaces/IGuiGame.java rename to forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java index a503de1daca..b6e62b7a1a3 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; import java.util.Collection; import java.util.List; @@ -20,6 +20,7 @@ import forge.game.player.IHasIcon; import forge.game.player.PlayerView; 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.player.PlayerZoneUpdate; diff --git a/forge-gui/src/main/java/forge/interfaces/ILobbyView.java b/forge-gui/src/main/java/forge/gui/interfaces/ILobbyView.java similarity index 53% rename from forge-gui/src/main/java/forge/interfaces/ILobbyView.java rename to forge-gui/src/main/java/forge/gui/interfaces/ILobbyView.java index 34d88893172..f3878a76499 100644 --- a/forge-gui/src/main/java/forge/interfaces/ILobbyView.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/ILobbyView.java @@ -1,4 +1,7 @@ -package forge.interfaces; +package forge.gui.interfaces; + +import forge.interfaces.IPlayerChangeListener; +import forge.interfaces.IUpdateable; public interface ILobbyView extends IUpdateable { void setPlayerChangeListener(IPlayerChangeListener iPlayerChangeListener); diff --git a/forge-gui/src/main/java/forge/interfaces/IMayViewCards.java b/forge-gui/src/main/java/forge/gui/interfaces/IMayViewCards.java similarity index 96% rename from forge-gui/src/main/java/forge/interfaces/IMayViewCards.java rename to forge-gui/src/main/java/forge/gui/interfaces/IMayViewCards.java index ec84e61ab54..30f9607e6ca 100644 --- a/forge-gui/src/main/java/forge/interfaces/IMayViewCards.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IMayViewCards.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; import forge.game.card.CardView; diff --git a/forge-gui/src/main/java/forge/interfaces/IProgressBar.java b/forge-gui/src/main/java/forge/gui/interfaces/IProgressBar.java similarity index 90% rename from forge-gui/src/main/java/forge/interfaces/IProgressBar.java rename to forge-gui/src/main/java/forge/gui/interfaces/IProgressBar.java index 22604caf4c1..87d3fd9c1d1 100644 --- a/forge-gui/src/main/java/forge/interfaces/IProgressBar.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IProgressBar.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface IProgressBar { void setDescription(String s0); diff --git a/forge-gui/src/main/java/forge/interfaces/ITextComponent.java b/forge-gui/src/main/java/forge/gui/interfaces/ITextComponent.java similarity index 78% rename from forge-gui/src/main/java/forge/interfaces/ITextComponent.java rename to forge-gui/src/main/java/forge/gui/interfaces/ITextComponent.java index 663f0dc589e..9157fd16331 100644 --- a/forge-gui/src/main/java/forge/interfaces/ITextComponent.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/ITextComponent.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface ITextComponent extends IComponent { String getText(); diff --git a/forge-gui/src/main/java/forge/interfaces/ITextField.java b/forge-gui/src/main/java/forge/gui/interfaces/ITextField.java similarity index 75% rename from forge-gui/src/main/java/forge/interfaces/ITextField.java rename to forge-gui/src/main/java/forge/gui/interfaces/ITextField.java index 0c67145eb0f..613ad6575c8 100644 --- a/forge-gui/src/main/java/forge/interfaces/ITextField.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/ITextField.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; public interface ITextField extends ITextComponent { boolean requestFocusInWindow(); diff --git a/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java b/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java similarity index 93% rename from forge-gui/src/main/java/forge/interfaces/IWinLoseView.java rename to forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java index fc3dd3590b9..b09f079bf0a 100644 --- a/forge-gui/src/main/java/forge/interfaces/IWinLoseView.java +++ b/forge-gui/src/main/java/forge/gui/interfaces/IWinLoseView.java @@ -1,4 +1,4 @@ -package forge.interfaces; +package forge.gui.interfaces; import java.util.List; diff --git a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java b/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java similarity index 99% rename from forge-gui/src/main/java/forge/util/gui/SGuiChoose.java rename to forge-gui/src/main/java/forge/gui/util/SGuiChoose.java index 4b8fcb3d860..81f7e76ec0a 100644 --- a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java +++ b/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java @@ -1,4 +1,4 @@ -package forge.util.gui; +package forge.gui.util; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import forge.GuiBase; +import forge.gui.GuiBase; public class SGuiChoose { diff --git a/forge-gui/src/main/java/forge/util/gui/SOptionPane.java b/forge-gui/src/main/java/forge/gui/util/SOptionPane.java similarity index 98% rename from forge-gui/src/main/java/forge/util/gui/SOptionPane.java rename to forge-gui/src/main/java/forge/gui/util/SOptionPane.java index 1b1ac10d84c..d4faca3d9fc 100644 --- a/forge-gui/src/main/java/forge/util/gui/SOptionPane.java +++ b/forge-gui/src/main/java/forge/gui/util/SOptionPane.java @@ -1,10 +1,10 @@ -package forge.util.gui; +package forge.gui.util; import java.util.List; import com.google.common.collect.ImmutableList; -import forge.GuiBase; +import forge.gui.GuiBase; import forge.localinstance.assets.FSkinProp; import forge.util.Localizer; diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java index c1723ec13d5..b78deedfa8f 100644 --- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java +++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java @@ -8,9 +8,6 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import forge.FThreads; -import forge.GuiBase; -import forge.UiCommand; import forge.card.CardEdition; import forge.card.CardRarity; import forge.card.CardRules; @@ -28,13 +25,16 @@ import forge.gamemodes.planarconquest.ConquestPlane; import forge.gamemodes.planarconquest.ConquestRegion; import forge.gamemodes.quest.QuestSpellShop; import forge.gamemodes.quest.QuestWorld; -import forge.interfaces.IButton; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.UiCommand; +import forge.gui.interfaces.IButton; +import forge.gui.util.SGuiChoose; +import forge.gui.util.SOptionPane; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.model.FModel; -import forge.util.gui.SGuiChoose; -import forge.util.gui.SOptionPane; import forge.util.Localizer; import forge.util.CardTranslation; diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 8190ea419b2..a50e3bcc802 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java @@ -18,12 +18,22 @@ package forge.itemmanager; import com.google.common.base.Function; -import forge.card.*; + +import forge.card.CardAiHints; +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.ICardFace; +import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.deck.DeckProxy; import forge.deck.io.DeckPreferences; import forge.game.GameFormat; import forge.gamemodes.limited.DraftRankCache; +import forge.gui.card.*; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.item.InventoryItemFromSet; diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index 1e0fa5ea57c..0bacfd9d9e3 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -3,11 +3,16 @@ package forge.itemmanager; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import forge.StaticData; -import forge.card.*; +import forge.card.CardEdition; +import forge.card.CardRules; +import forge.card.CardRulesPredicates; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.deck.DeckProxy; import forge.game.GameFormat; import forge.gamemodes.quest.data.StarRating; -import forge.interfaces.IButton; +import forge.gui.card.*; +import forge.gui.interfaces.IButton; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.SItemManagerUtil.StatTypes; diff --git a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java index 0c9d1702be5..0caca0cee3b 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java @@ -1,11 +1,12 @@ package forge.itemmanager; import com.google.common.base.Predicate; -import forge.GuiBase; + import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.deck.DeckProxy; -import forge.interfaces.IComboBox; +import forge.gui.GuiBase; +import forge.gui.interfaces.IComboBox; import forge.item.InventoryItem; import forge.localinstance.assets.FSkinProp; import forge.localinstance.assets.IHasSkinProp; diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java index bf60ddf11be..0a44a072099 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java @@ -6,9 +6,9 @@ import java.util.Locale; import org.w3c.dom.Element; -import forge.GuiBase; 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; diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java index 0d42d4828bb..1481162b20d 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java @@ -1,6 +1,5 @@ package forge.localinstance.achievements; -import forge.GuiBase; import java.io.File; import java.io.FileNotFoundException; import java.util.Iterator; @@ -21,7 +20,8 @@ import com.google.common.collect.Maps; import forge.game.GameType; import forge.game.Match; import forge.game.player.Player; -import forge.interfaces.IComboBox; +import forge.gui.GuiBase; +import forge.gui.interfaces.IComboBox; import forge.localinstance.properties.ForgeConstants; import forge.model.FModel; import forge.player.PlayerControllerHuman; diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java index 23713fac42b..4e143e8f908 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java @@ -1,8 +1,8 @@ package forge.localinstance.achievements; -import forge.GuiBase; 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; 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 570cb61acd7..6fba61b02a1 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -17,7 +17,7 @@ */ package forge.localinstance.properties; -import forge.GuiBase; +import forge.gui.GuiBase; import forge.util.FileUtil; import java.io.File; diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java index 3ec66112c7d..bfdb65efdf0 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java @@ -27,7 +27,7 @@ import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import forge.GuiBase; +import forge.gui.GuiBase; import forge.util.FileSection; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 690502d68c8..0449c876b30 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -22,7 +22,6 @@ import com.google.common.collect.Maps; import forge.*; import forge.CardStorageReader.ProgressObserver; import forge.ai.AiProfileUtil; -import forge.card.CardPreferences; import forge.card.CardType; import forge.deck.CardArchetypeLDAGenerator; import forge.deck.CardRelationMatrixGenerator; @@ -43,7 +42,10 @@ import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.QuestWorld; import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.tournament.TournamentData; -import forge.interfaces.IProgressBar; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.card.CardPreferences; +import forge.gui.interfaces.IProgressBar; import forge.itemmanager.ItemManagerConfig; import forge.localinstance.achievements.*; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java index b704188dc4a..4c2d14c3076 100644 --- a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java +++ b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java @@ -18,11 +18,11 @@ package forge.model; +import forge.gui.util.SGuiChoose; import forge.item.PaperCard; import forge.item.generation.IUnOpenedProduct; import forge.util.MyRandom; import forge.util.TextUtil; -import forge.util.gui.SGuiChoose; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java index 80a658c7c03..a87837c4209 100644 --- a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java +++ b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java @@ -5,16 +5,16 @@ import java.util.Set; import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; -import forge.GuiBase; import forge.LobbyPlayer; import forge.ai.AIOption; import forge.ai.AiProfileUtil; import forge.ai.LobbyPlayerAi; +import forge.gui.GuiBase; +import forge.gui.util.SOptionPane; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.util.GuiDisplayUtil; import forge.util.MyRandom; -import forge.util.gui.SOptionPane; public final class GamePlayerUtil { private GamePlayerUtil() { } diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 2e589bce30e..ebabe6e5bf6 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -36,10 +36,10 @@ import forge.game.zone.ZoneType; import forge.gamemodes.match.input.InputConfirm; import forge.gamemodes.match.input.InputSelectCardsFromList; import forge.gamemodes.match.input.InputSelectManyBase; +import forge.gui.util.SGuiChoose; import forge.util.Aggregates; import forge.util.TextUtil; import forge.util.collect.FCollectionView; -import forge.util.gui.SGuiChoose; import forge.util.ITriggerEvent; import forge.util.Localizer; import forge.util.CardTranslation; diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index b43a133d838..07d56089446 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -2,7 +2,7 @@ package forge.player; import com.google.common.collect.Iterables; -import forge.FThreads; + import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.GameActionUtil; @@ -25,9 +25,10 @@ import forge.game.zone.ZoneType; import forge.gamemodes.match.input.InputPayMana; import forge.gamemodes.match.input.InputPayManaOfCostPayment; import forge.gamemodes.match.input.InputSelectCardsFromList; +import forge.gui.FThreads; +import forge.gui.util.SGuiChoose; import forge.util.TextUtil; import forge.util.collect.FCollectionView; -import forge.util.gui.SGuiChoose; import forge.util.Localizer; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 1599820d63e..2e1411261c1 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -23,19 +23,20 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import forge.FThreads; -import forge.GuiBase; import forge.LobbyPlayer; import forge.StaticData; import forge.ai.GameState; -import forge.card.*; +import forge.card.CardDb; +import forge.card.CardStateName; +import forge.card.CardType; +import forge.card.ColorSet; +import forge.card.ICardFace; +import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; -import forge.control.FControlGamePlayback; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; -import forge.events.UiEventNextGameDecision; import forge.game.*; import forge.game.ability.AbilityKey; import forge.game.ability.ApiType; @@ -63,9 +64,15 @@ import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gamemodes.match.NextGameDecision; import forge.gamemodes.match.input.*; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.card.*; +import forge.gui.control.FControlGamePlayback; +import forge.gui.events.UiEventNextGameDecision; +import forge.gui.interfaces.IGuiGame; +import forge.gui.util.SOptionPane; import forge.interfaces.IDevModeCheats; import forge.interfaces.IGameController; -import forge.interfaces.IGuiGame; import forge.interfaces.IMacroSystem; import forge.item.IPaperCard; import forge.item.PaperCard; @@ -82,7 +89,6 @@ import forge.util.MessageUtil; import forge.util.TextUtil; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; -import forge.util.gui.SOptionPane; import io.sentry.Sentry; /** @@ -618,7 +624,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont * (non-Javadoc) * * @see - * forge.game.player.PlayerController#confirmAction(forge.card.spellability. + * forge.game.player.PlayerController#confirmAction(forge.gui.card.spellability. * SpellAbility, java.lang.String, java.lang.String) */ @Override @@ -1067,8 +1073,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont * (non-Javadoc) * * @see - * forge.game.player.PlayerController#chooseTargets(forge.card.spellability. - * SpellAbility, forge.card.spellability.SpellAbilityStackInstance) + * forge.game.player.PlayerController#chooseTargets(forge.gui.card.spellability. + * SpellAbility, forge.gui.card.spellability.SpellAbilityStackInstance) */ @Override public TargetChoices chooseNewTargetsFor(final SpellAbility ability, Predicate filter, boolean optional) { @@ -1093,7 +1099,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont * * @see * forge.game.player.PlayerController#chooseCardsToDiscardUnlessType(int, - * java.lang.String, forge.card.spellability.SpellAbility) + * java.lang.String, forge.gui.card.spellability.SpellAbility) */ @Override public CardCollectionView chooseCardsToDiscardUnlessType(final int num, final CardCollectionView hand, @@ -1265,8 +1271,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont * (non-Javadoc) * * @see - * forge.game.player.PlayerController#confirmReplacementEffect(forge.card. - * replacement.ReplacementEffect, forge.card.spellability.SpellAbility, + * forge.game.player.PlayerController#confirmReplacementEffect(forge.gui.card. + * replacement.ReplacementEffect, forge.gui.card.spellability.SpellAbility, * java.lang.String) */ @Override @@ -1571,7 +1577,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont /* * (non-Javadoc) * - * @see forge.game.player.PlayerController#chooseModeForAbility(forge.card. + * @see forge.game.player.PlayerController#chooseModeForAbility(forge.gui.card. * spellability.SpellAbility, java.util.List, int, int) */ @Override diff --git a/forge-gui/src/main/java/forge/sound/EventVisualizer.java b/forge-gui/src/main/java/forge/sound/EventVisualizer.java index 1269c80fe6a..7351795d281 100644 --- a/forge-gui/src/main/java/forge/sound/EventVisualizer.java +++ b/forge-gui/src/main/java/forge/sound/EventVisualizer.java @@ -3,10 +3,6 @@ package forge.sound; import java.util.Collection; import forge.LobbyPlayer; -import forge.events.IUiEventVisitor; -import forge.events.UiEventAttackerDeclared; -import forge.events.UiEventBlockerAssigned; -import forge.events.UiEventNextGameDecision; import forge.game.card.Card; import forge.game.event.EventValueChangeType; import forge.game.event.GameEvent; @@ -36,6 +32,10 @@ import forge.game.event.IGameEventVisitor; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import forge.gui.events.IUiEventVisitor; +import forge.gui.events.UiEventAttackerDeclared; +import forge.gui.events.UiEventBlockerAssigned; +import forge.gui.events.UiEventNextGameDecision; import forge.util.TextUtil; import forge.util.maps.MapOfLists; diff --git a/forge-gui/src/main/java/forge/sound/SoundSystem.java b/forge-gui/src/main/java/forge/sound/SoundSystem.java index 42d8940d812..77bd17b7100 100644 --- a/forge-gui/src/main/java/forge/sound/SoundSystem.java +++ b/forge-gui/src/main/java/forge/sound/SoundSystem.java @@ -6,9 +6,9 @@ import java.util.Map; import com.google.common.eventbus.Subscribe; -import forge.GuiBase; -import forge.events.UiEvent; import forge.game.event.GameEvent; +import forge.gui.GuiBase; +import forge.gui.events.UiEvent; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java index b04d0828519..bc4633774cf 100644 --- a/forge-gui/src/main/java/forge/util/ImageFetcher.java +++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java @@ -9,9 +9,10 @@ import java.util.concurrent.Executors; import java.util.regex.Matcher; import java.util.regex.Pattern; -import forge.FThreads; import forge.ImageKeys; import forge.StaticData; +import forge.gui.FThreads; + import org.apache.commons.lang3.tuple.Pair; import forge.item.PaperCard; diff --git a/forge-gui/src/main/java/forge/util/OperatingSystem.java b/forge-gui/src/main/java/forge/util/OperatingSystem.java index b8780fad281..933f2a77886 100644 --- a/forge-gui/src/main/java/forge/util/OperatingSystem.java +++ b/forge-gui/src/main/java/forge/util/OperatingSystem.java @@ -1,6 +1,6 @@ package forge.util; -import forge.FThreads; +import forge.gui.FThreads; public class OperatingSystem { private static String os = System.getProperty("os.name").toLowerCase(); diff --git a/forge-gui/src/main/java/forge/util/WaitCallback.java b/forge-gui/src/main/java/forge/util/WaitCallback.java index 773aed41e25..95c7c0d4573 100644 --- a/forge-gui/src/main/java/forge/util/WaitCallback.java +++ b/forge-gui/src/main/java/forge/util/WaitCallback.java @@ -1,6 +1,6 @@ package forge.util; -import forge.FThreads; +import forge.gui.FThreads; public abstract class WaitCallback extends Callback implements Runnable { public class Lock { diff --git a/forge-gui/src/main/java/forge/util/WaitRunnable.java b/forge-gui/src/main/java/forge/util/WaitRunnable.java index 89a4f114f07..b12b4b39b04 100644 --- a/forge-gui/src/main/java/forge/util/WaitRunnable.java +++ b/forge-gui/src/main/java/forge/util/WaitRunnable.java @@ -1,6 +1,6 @@ package forge.util; -import forge.FThreads; +import forge.gui.FThreads; public abstract class WaitRunnable implements Runnable { public class Lock {