moved aux gui classes to a dedicated package to keep the root package clean.

.gitattributes

@@ -16289,9 +16289,6 @@ forge-gui/src/main/html/js/observable.js -text
 forge-gui/src/main/html/js/socket.js -text
 forge-gui/src/main/java/forge/FThreads.java -text
 forge-gui/src/main/java/forge/GuiBase.java -text
-forge-gui/src/main/java/forge/SGuiChoose.java -text
-forge-gui/src/main/java/forge/SGuiDialog.java -text
-forge-gui/src/main/java/forge/SOptionPane.java -text
 forge-gui/src/main/java/forge/UiCommand.java svneol=native#text/plain
 forge-gui/src/main/java/forge/assets/FSkinProp.java -text
 forge-gui/src/main/java/forge/assets/ISkinImage.java -text
@@ -16462,6 +16459,9 @@ forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text
 forge-gui/src/main/java/forge/util/OperatingSystem.java -text
 forge-gui/src/main/java/forge/util/WaitCallback.java -text
 forge-gui/src/main/java/forge/util/XmlUtil.java -text
+forge-gui/src/main/java/forge/util/gui/SGuiChoose.java -text
+forge-gui/src/main/java/forge/util/gui/SGuiDialog.java -text
+forge-gui/src/main/java/forge/util/gui/SOptionPane.java -text
 forge-gui/src/main/java/forge/util/package-info.java -text
 forge-gui/src/main/resources/proxy-template.ftl -text
 forge-gui/src/site/apt/index.apt -text

forge-gui-mobile/src/forge/GuiMobile.java

@@ -46,6 +46,7 @@ import forge.util.ITriggerEvent;
 import forge.util.ThreadUtil;
 import forge.util.WaitCallback;
 import forge.util.WaitRunnable;
+import forge.util.gui.SGuiChoose;
 
 public class GuiMobile implements IGuiBase {
     @Override

forge-gui/src/main/java/forge/card/CardScriptInfo.java

@@ -18,8 +18,8 @@
 package forge.card;
 
 import forge.CardStorageReader;
-import forge.SOptionPane;
 import forge.card.CardRules;
+import forge.util.gui.SOptionPane;
 
 import org.apache.commons.lang3.StringUtils;
 

forge-gui/src/main/java/forge/control/FControlGameEventHandler.java

@@ -4,7 +4,6 @@ import com.google.common.eventbus.Subscribe;
 
 import forge.FThreads;
 import forge.GuiBase;
-import forge.SGuiChoose;
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.event.*;
@@ -13,6 +12,7 @@ import forge.game.zone.PlayerZone;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.util.Lang;
+import forge.util.gui.SGuiChoose;
 import forge.util.maps.MapOfLists;
 
 import org.apache.commons.lang3.tuple.Pair;

forge-gui/src/main/java/forge/deck/DeckgenUtil.java

@@ -4,7 +4,6 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
-import forge.SOptionPane;
 import forge.card.CardDb;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -24,6 +23,7 @@ import forge.quest.QuestEventDuel;
 import forge.util.Aggregates;
 import forge.util.Lang;
 import forge.util.MyRandom;
+import forge.util.gui.SOptionPane;
 import forge.util.storage.IStorage;
 
 import java.util.ArrayList;

forge-gui/src/main/java/forge/deck/io/OldDeckParser.java

@@ -17,12 +17,12 @@
  */
 package forge.deck.io;
 
-import forge.SOptionPane;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.properties.ForgeConstants;
 import forge.util.FileSection;
 import forge.util.FileUtil;
+import forge.util.gui.SOptionPane;
 import forge.util.storage.IStorage;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;

forge-gui/src/main/java/forge/error/BugReporter.java

@@ -19,8 +19,8 @@ package forge.error;
 
 import forge.FThreads;
 import forge.GuiBase;
-import forge.SOptionPane;
 import forge.util.BuildInfo;
+import forge.util.gui.SOptionPane;
 
 import org.apache.commons.lang3.StringUtils;
 

forge-gui/src/main/java/forge/limited/BoosterDraft.java

@@ -19,8 +19,6 @@ package forge.limited;
 
 import com.google.common.base.Supplier;
 
-import forge.SOptionPane;
-import forge.SGuiChoose;
 import forge.card.CardEdition;
 import forge.card.IUnOpenedProduct;
 import forge.card.UnOpenedProduct;
@@ -37,6 +35,8 @@ import forge.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.HttpUtil;
 import forge.util.ItemPool;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SOptionPane;
 import forge.util.storage.IStorage;
 
 import org.apache.commons.lang3.ArrayUtils;

forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java

@@ -17,8 +17,6 @@
  */
 package forge.limited;
 
-import forge.SOptionPane;
-import forge.SGuiChoose;
 import forge.card.CardEdition;
 import forge.card.IUnOpenedProduct;
 import forge.card.UnOpenedProduct;
@@ -31,6 +29,8 @@ import forge.model.UnOpenedMeta;
 import forge.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.TextUtil;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SOptionPane;
 
 import org.apache.commons.lang3.ArrayUtils;
 

forge-gui/src/main/java/forge/match/input/InputBlock.java

@@ -18,7 +18,6 @@
 package forge.match.input;
 
 import forge.GuiBase;
-import forge.SGuiDialog;
 import forge.events.UiEventBlockerAssigned;
 import forge.game.card.Card;
 import forge.game.combat.Combat;
@@ -26,6 +25,7 @@ import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.ITriggerEvent;
+import forge.util.gui.SGuiDialog;
 
 /**
  * <p>

forge-gui/src/main/java/forge/match/input/InputConfirmMulligan.java

@@ -18,7 +18,6 @@
 package forge.match.input;
 
 import forge.GuiBase;
-import forge.SGuiDialog;
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.player.Player;
@@ -26,6 +25,7 @@ import forge.game.zone.ZoneType;
 import forge.util.ITriggerEvent;
 import forge.util.Lang;
 import forge.util.ThreadUtil;
+import forge.util.gui.SGuiDialog;
 
 import java.util.ArrayList;
 import java.util.List;

forge-gui/src/main/java/forge/match/input/InputPayMana.java

@@ -1,7 +1,6 @@
 package forge.match.input;
 
 import forge.FThreads;
-import forge.SGuiChoose;
 import forge.ai.ComputerUtilMana;
 import forge.ai.PlayerControllerAi;
 import forge.card.ColorSet;
@@ -19,6 +18,7 @@ import forge.game.spellability.SpellAbility;
 import forge.player.HumanPlay;
 import forge.util.Evaluator;
 import forge.util.ITriggerEvent;
+import forge.util.gui.SGuiChoose;
 
 import org.apache.commons.lang3.StringUtils;
 

forge-gui/src/main/java/forge/match/input/InputProliferate.java

@@ -1,11 +1,11 @@
 package forge.match.input;
 
-import forge.SGuiChoose;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.util.ITriggerEvent;
+import forge.util.gui.SGuiChoose;
 
 import java.util.*;
 import java.util.Map.Entry;

forge-gui/src/main/java/forge/match/input/InputProxy.java

@@ -19,12 +19,12 @@ package forge.match.input;
 
 import forge.FThreads;
 import forge.GuiBase;
-import forge.SOptionPane;
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.ITriggerEvent;
+import forge.util.gui.SOptionPane;
 
 import java.util.Observable;
 import java.util.Observer;

forge-gui/src/main/java/forge/match/input/InputSelectTargets.java

@@ -1,7 +1,6 @@
 package forge.match.input;
 
 import forge.GuiBase;
-import forge.SGuiChoose;
 import forge.game.GameEntity;
 import forge.game.GameObject;
 import forge.game.ability.ApiType;
@@ -10,6 +9,7 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.util.ITriggerEvent;
+import forge.util.gui.SGuiChoose;
 
 import java.util.ArrayList;
 import java.util.HashMap;

forge-gui/src/main/java/forge/model/UnOpenedMeta.java

@@ -18,11 +18,11 @@
 
 package forge.model;
 
-import forge.SGuiChoose;
 import forge.card.IUnOpenedProduct;
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
+import forge.util.gui.SGuiChoose;
 
 import java.util.ArrayList;
 import java.util.List;

forge-gui/src/main/java/forge/player/GamePlayerUtil.java

@@ -1,9 +1,9 @@
 package forge.player;
 
-import forge.SOptionPane;
 import forge.model.FModel;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
+import forge.util.gui.SOptionPane;
 
 import org.apache.commons.lang3.StringUtils;
 

forge-gui/src/main/java/forge/player/HumanCostDecision.java

@@ -4,8 +4,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.SGuiChoose;
-import forge.SGuiDialog;
 import forge.card.CardType;
 import forge.game.Game;
 import forge.game.GameEntity;
@@ -25,6 +23,8 @@ import forge.match.input.InputSelectManyBase;
 import forge.util.Aggregates;
 import forge.util.ITriggerEvent;
 import forge.util.Lang;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SGuiDialog;
 
 import java.util.*;
 import java.util.Map.Entry;

forge-gui/src/main/java/forge/player/HumanPlay.java

@@ -3,7 +3,6 @@ package forge.player;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
-import forge.SGuiChoose;
 import forge.FThreads;
 import forge.card.MagicColor;
 import forge.card.mana.ManaCost;
@@ -31,6 +30,7 @@ import forge.match.input.InputPayManaSimple;
 import forge.match.input.InputPayManaX;
 import forge.match.input.InputSelectCardsFromList;
 import forge.util.Lang;
+import forge.util.gui.SGuiChoose;
 
 import org.apache.commons.lang3.StringUtils;
 

forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

@@ -7,10 +7,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
 import forge.LobbyPlayer;
-import forge.SOptionPane;
 import forge.GuiBase;
-import forge.SGuiChoose;
-import forge.SGuiDialog;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.mana.ManaCost;
@@ -52,6 +49,9 @@ import forge.properties.ForgePreferences.FPref;
 import forge.util.ITriggerEvent;
 import forge.util.Lang;
 import forge.util.TextUtil;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SGuiDialog;
+import forge.util.gui.SOptionPane;
 
 import org.apache.commons.lang3.Range;
 import org.apache.commons.lang3.StringUtils;

forge-gui/src/main/java/forge/player/TargetSelection.java

@@ -20,7 +20,6 @@ package forge.player;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
-import forge.SGuiChoose;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.card.Card;
@@ -32,6 +31,7 @@ import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.match.input.InputSelectTargets;
 import forge.util.Aggregates;
+import forge.util.gui.SGuiChoose;
 
 import java.util.ArrayList;
 import java.util.List;

forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java

@@ -21,15 +21,15 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.SOptionPane;
 import forge.GuiBase;
-import forge.SGuiChoose;
 import forge.card.CardEdition;
 import forge.card.UnOpenedProduct;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
 import forge.model.FModel;
 import forge.quest.io.ReadPriceList;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SOptionPane;
 import forge.util.storage.IStorage;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;

forge-gui/src/main/java/forge/util/GuiDisplayUtil.java

@@ -20,10 +20,7 @@ package forge.util;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 
-import forge.SOptionPane;
 import forge.GuiBase;
-import forge.SGuiChoose;
-import forge.SGuiDialog;
 import forge.card.CardCharacteristicName;
 import forge.game.Game;
 import forge.game.GameType;
@@ -45,6 +42,9 @@ import forge.model.FModel;
 import forge.player.HumanPlay;
 import forge.properties.ForgeConstants;
 import forge.properties.ForgePreferences.FPref;
+import forge.util.gui.SGuiChoose;
+import forge.util.gui.SGuiDialog;
+import forge.util.gui.SOptionPane;
 
 import java.io.*;
 import java.util.*;

forge-gui/src/main/java/forge/util/gui/SGuiChoose.java

@@ -1,4 +1,4 @@
-package forge;
+package forge.util.gui;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,11 +6,13 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 
+import forge.GuiBase;
 import forge.game.card.Card;
 
 public class SGuiChoose {

forge-gui/src/main/java/forge/util/gui/SGuiDialog.java

@@ -1,6 +1,9 @@
-package forge;
+package forge.util.gui;
 
+import forge.FThreads;
+import forge.GuiBase;
 import forge.game.card.Card;
+
 import org.apache.commons.lang3.StringUtils;
 
 /** 

forge-gui/src/main/java/forge/util/gui/SOptionPane.java

@@ -1,5 +1,6 @@
-package forge;
+package forge.util.gui;
 
+import forge.GuiBase;
 import forge.assets.FSkinProp;