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

Organize imports

Browse Source
This commit is contained in:
Leandro Doctors
2021-03-17 11:52:50 -03:00
parent f3fd57c014
commit 0978162bf5
994 changed files with 6511 additions and 3770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-mobile/src/forge/CachedCardImage.java
View File

@@ -1,6 +1,7 @@
package forge;
import com.badlogic.gdx.graphics.Texture;
import forge.assets.ImageCache;
import forge.game.card.CardView;
import forge.gui.GuiBase;

13
forge-gui-mobile/src/forge/Forge.java
View File

@@ -1,11 +1,18 @@
package forge;
import java.io.File;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.utils.Clipboard;
import forge.animation.ForgeAnimation;
import forge.assets.AssetsDownloader;
import forge.assets.FSkin;
@@ -38,12 +45,6 @@ import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.Utils;
import java.io.File;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.39.001";

9
forge-gui-mobile/src/forge/Graphics.java
View File

@@ -1,5 +1,8 @@
package forge;
import java.util.ArrayDeque;
import java.util.Deque;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20;
@@ -14,15 +17,13 @@ import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
import forge.assets.FImage;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.toolbox.FDisplayObject;
import forge.util.Utils;
import forge.util.TextBounds;
import java.util.ArrayDeque;
import java.util.Deque;
import forge.util.Utils;
public class Graphics {
private static final int GL_BLEND = GL20.GL_BLEND;

2
forge-gui-mobile/src/forge/animation/GifDecoder.java
View File

@@ -9,10 +9,10 @@ import java.io.InputStream;
import java.util.Vector;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Animation;
import com.badlogic.gdx.graphics.g2d.Animation.PlayMode;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
public class GifDecoder {

14
forge-gui-mobile/src/forge/assets/AssetsDownloader.java
View File

@@ -1,5 +1,12 @@
package forge.assets;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Gdx;
import com.google.common.collect.ImmutableList;
@@ -12,13 +19,6 @@ import forge.localinstance.properties.ForgeConstants;
import forge.screens.SplashScreen;
import forge.util.FileUtil;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.List;
public class AssetsDownloader {
public static final boolean SHARE_DESKTOP_ASSETS = true; //change to false to test downloading separate assets for desktop version

1
forge-gui-mobile/src/forge/assets/BitmapFontWriter.java
View File

@@ -23,6 +23,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont.BitmapFontData;
import com.badlogic.gdx.graphics.g2d.BitmapFont.Glyph;
import com.badlogic.gdx.graphics.g2d.PixmapPacker.Page;
import com.badlogic.gdx.utils.Array;
import forge.util.TextUtil;
/**

2
forge-gui-mobile/src/forge/assets/FBufferedImage.java
View File

@@ -2,8 +2,8 @@ package forge.assets;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.glutils.FrameBuffer;
import com.badlogic.gdx.math.Matrix4;

6
forge-gui-mobile/src/forge/assets/FLanguage.java
View File

@@ -1,5 +1,8 @@
package forge.assets;
import java.util.ArrayList;
import java.util.List;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
@@ -8,9 +11,6 @@ import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import java.util.ArrayList;
import java.util.List;
public class FLanguage {
public static void changeLanguage(final String languageName) {

1
forge-gui-mobile/src/forge/assets/FRotatedImage.java
View File

@@ -1,6 +1,7 @@
package forge.assets;
import com.badlogic.gdx.graphics.Texture;
import forge.Graphics;
public class FRotatedImage extends FImageComplex {

7
forge-gui-mobile/src/forge/assets/FSkin.java
View File

@@ -3,17 +3,15 @@ package forge.assets;
import java.util.HashMap;
import java.util.Map;
import forge.util.WordUtil;
import com.badlogic.gdx.utils.Array;
import forge.Forge;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array;
import forge.Forge;
import forge.assets.FSkinImage.SourceFile;
import forge.card.CardFaceSymbols;
import forge.gui.FThreads;
@@ -25,6 +23,7 @@ import forge.model.FModel;
import forge.screens.LoadingOverlay;
import forge.screens.SplashScreen;
import forge.toolbox.FProgressBar;
import forge.util.WordUtil;
public class FSkin {
private static final Map<FSkinProp, FSkinImage> images = new HashMap<>(512);

8
forge-gui-mobile/src/forge/assets/FSkinTexture.java
View File

@@ -1,5 +1,9 @@
package forge.assets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Texture.TextureWrap;
@@ -7,10 +11,6 @@ import com.badlogic.gdx.graphics.Texture.TextureWrap;
import forge.Graphics;
import forge.localinstance.properties.ForgeConstants;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public enum FSkinTexture implements FImage {
BG_TEXTURE(ForgeConstants.TEXTURE_BG_FILE, true, false),
BG_MATCH(ForgeConstants.MATCH_BG_FILE, false, false),

20
forge-gui-mobile/src/forge/assets/ImageCache.java
View File

@@ -17,6 +17,16 @@
*/
package forge.assets;
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap.Format;
@@ -27,6 +37,7 @@ import com.google.common.cache.LoadingCache;
import com.google.common.cache.RemovalCause;
import com.google.common.cache.RemovalListener;
import com.google.common.cache.RemovalNotification;
import forge.Forge;
import forge.ImageKeys;
import forge.card.CardEdition;
@@ -41,15 +52,6 @@ import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import forge.util.ImageUtil;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
* This class stores ALL card images in a cache with soft values. this means

7
forge-gui-mobile/src/forge/assets/ImageLoader.java
View File

@@ -1,8 +1,12 @@
package forge.assets;
import static forge.assets.ImageCache.croppedBorderImage;
import java.io.File;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
@@ -19,9 +23,6 @@ import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import forge.util.FileUtil;
import forge.util.TextUtil;
import org.apache.commons.lang3.tuple.Pair;
import static forge.assets.ImageCache.croppedBorderImage;
final class ImageLoader extends CacheLoader<String, Texture> {
private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);

8
forge-gui-mobile/src/forge/card/CardFaceSymbols.java
View File

@@ -17,16 +17,16 @@
*/
package forge.card;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
import forge.Graphics;
import forge.assets.FSkinImage;
import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostShard;
import forge.gui.error.BugReporter;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
public class CardFaceSymbols {
public static final float FONT_SIZE_FACTOR = 0.85f;

18
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -1,9 +1,18 @@
package forge.card;
import static forge.card.CardRenderer.CROP_MULTIPLIER;
import static forge.card.CardRenderer.isModernFrame;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList;
import forge.Forge;
import forge.Graphics;
import forge.assets.FBufferedImage;
@@ -18,8 +27,8 @@ import forge.assets.TextRenderer;
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.card.CardView.CardStateView;
import forge.game.zone.ZoneType;
import forge.gui.card.CardDetailUtil;
import forge.gui.card.CardDetailUtil.DetailColors;
@@ -30,13 +39,6 @@ import forge.screens.FScreen;
import forge.screens.match.MatchController;
import forge.util.CardTranslation;
import forge.util.Utils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import static forge.card.CardRenderer.CROP_MULTIPLIER;
import static forge.card.CardRenderer.isModernFrame;
public class CardImageRenderer {
private static final float BASE_IMAGE_WIDTH = 360;

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

@@ -1,7 +1,7 @@
package forge.card;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import forge.item.PaperCard;
import forge.toolbox.FChoiceList;

22
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -1,5 +1,14 @@
package forge.card;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
@@ -15,6 +24,7 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFont
import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import forge.CachedCardImage;
import forge.Forge;
import forge.Graphics;
@@ -39,23 +49,15 @@ import forge.gui.card.CardDetailUtil.DetailColors;
import forge.item.IPaperCard;
import forge.item.InventoryItem;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgeConstants.CounterDisplayType;
import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.screens.match.MatchController;
import forge.toolbox.FList;
import forge.util.CardTranslation;
import forge.util.Utils;
import org.apache.commons.lang3.StringUtils;
import forge.util.TextBounds;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import forge.util.Utils;
public class CardRenderer {
public enum CardStackPosition {

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

@@ -28,8 +28,8 @@ import forge.toolbox.FCardPanel;
import forge.toolbox.FDialog;
import forge.toolbox.FOverlay;
import forge.util.Localizer;
import forge.util.collect.FCollectionView;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
public class CardZoom extends FOverlay {
private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH;

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

@@ -17,9 +17,9 @@ import forge.screens.FScreen;
import forge.screens.TabPageScreen;
import forge.toolbox.FChoiceList;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Localizer;

6
forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
View File

@@ -18,9 +18,12 @@
package forge.deck;
import java.text.NumberFormat;
import java.util.Map;
import java.util.Map.Entry;
import com.badlogic.gdx.utils.Align;
import com.google.common.collect.Iterables;
import forge.Forge;
import forge.Graphics;
import forge.StaticData;
@@ -49,9 +52,6 @@ import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import com.badlogic.gdx.utils.Align;
import java.util.Map;
public class AddBasicLandsDialog extends FDialog {
private static final float ADD_BTN_SIZE = Utils.AVG_FINGER_HEIGHT * 0.75f;

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

@@ -1,5 +1,18 @@
package forge.deck;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList;
import forge.Forge;
import forge.assets.ImageCache;
import forge.deck.FDeckEditor.EditorType;
@@ -32,28 +45,15 @@ import forge.toolbox.FButton;
import forge.toolbox.FComboBox;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.GuiChoose;
import forge.toolbox.ListChooser;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.GuiChoose;
import forge.toolbox.ListChooser;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.storage.IStorage;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class FDeckChooser extends FScreen {
public static final float PADDING = Utils.scale(5);

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

@@ -1,5 +1,14 @@
package forge.deck;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
@@ -7,14 +16,15 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import forge.Forge;
import forge.Forge.KeyInputAdapter;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkin;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.FTextureRegionImage;
import forge.Graphics;
import forge.card.CardDb;
import forge.card.CardEdition;
import forge.card.CardRulesPredicates;
@@ -29,7 +39,6 @@ import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManager.ContextMenuBuilder;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.filters.ItemFilter;
import forge.localinstance.assets.*;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.menu.FCheckBoxMenuItem;
import forge.menu.FDropDownMenu;
@@ -38,15 +47,19 @@ import forge.menu.FPopupMenu;
import forge.model.FModel;
import forge.screens.FScreen;
import forge.screens.TabPageScreen;
import forge.toolbox.*;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType;
import forge.util.*;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.ItemPool;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.storage.IStorage;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
import java.util.Map.Entry;
public class FDeckEditor extends TabPageScreen<FDeckEditor> {
public static FSkinImage MAIN_DECK_ICON = Forge.hdbuttons ? FSkinImage.HDLIBRARY :FSkinImage.DECKLIST;

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

@@ -1,5 +1,7 @@
package forge.deck;
import java.util.Map.Entry;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkin;
@@ -19,8 +21,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import java.util.Map.Entry;
public class FDeckViewer extends FScreen {
private static FDeckViewer deckViewer;
private static FPopupMenu menu = new FPopupMenu() {

6
forge-gui-mobile/src/forge/deck/FSideboardDialog.java
View File

@@ -2,23 +2,23 @@ package forge.deck;
import java.util.List;
import forge.util.Localizer;
import org.apache.commons.lang3.StringUtils;
import forge.assets.FImage;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManager.ContextMenuBuilder;
import forge.itemmanager.ItemManagerConfig;
import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.screens.FScreen;
import forge.screens.TabPageScreen;
import forge.toolbox.FDialog;
import forge.toolbox.FEvent;
import forge.toolbox.GuiChoose;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.Localizer;
public class FSideboardDialog extends FDialog {
private final SideboardTabs tabs;

3
forge-gui-mobile/src/forge/error/BugReportDialog.java
View File

@@ -1,11 +1,12 @@
package forge.error;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.gui.error.BugReporter;
import forge.screens.FScreen;
import forge.toolbox.FButton;

8
forge-gui-mobile/src/forge/itemmanager/DeckManager.java
View File

@@ -1,5 +1,9 @@
package forge.itemmanager;
import java.util.Map.Entry;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
@@ -22,10 +26,6 @@ import forge.toolbox.FList.CompactModeHandler;
import forge.util.Localizer;
import forge.util.Utils;
import com.badlogic.gdx.utils.Align;
import java.util.Map.Entry;
/**
* ItemManager for decks
*/

20
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -17,6 +17,16 @@
*/
package forge.itemmanager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Align;
@@ -55,16 +65,6 @@ import forge.util.ItemPool;
import forge.util.LayoutHelper;
import forge.util.Localizer;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public abstract class ItemManager<T extends InventoryItem> extends FContainer implements IItemManager<T>, ActivateHandler {
private ItemPool<T> pool;

6
forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@@ -10,8 +10,8 @@ import forge.assets.TextRenderer;
import forge.gui.interfaces.IButton;
import forge.item.InventoryItem;
import forge.itemmanager.AdvancedSearch;
import forge.itemmanager.ItemManager;
import forge.itemmanager.AdvancedSearch.IFilterControl;
import forge.itemmanager.ItemManager;
import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.menu.FTooltip;
@@ -19,11 +19,11 @@ import forge.screens.FScreen;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Callback;
import forge.util.Localizer;

6
forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
View File

@@ -1,5 +1,8 @@
package forge.itemmanager.filters;
import java.util.ArrayList;
import java.util.List;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -8,9 +11,6 @@ import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import java.util.ArrayList;
import java.util.List;
public class CardTypeFilter extends StatTypeFilter<PaperCard> {
public CardTypeFilter(ItemManager<? super PaperCard> itemManager0) {

6
forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
View File

@@ -1,13 +1,13 @@
package forge.itemmanager.filters;
import java.util.HashSet;
import java.util.Set;
import com.google.common.base.Predicate;
import forge.deck.DeckProxy;
import forge.itemmanager.ItemManager;
import java.util.HashSet;
import java.util.Set;
public class DeckFolderFilter extends ListLabelFilter<DeckProxy> {
protected final Set<String> folders = new HashSet<>();

18
forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
View File

@@ -1,5 +1,13 @@
package forge.itemmanager.filters;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
@@ -15,22 +23,14 @@ import forge.toolbox.FCheckBox;
import forge.toolbox.FComboBox;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FGroupList;
import forge.toolbox.FList;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.badlogic.gdx.utils.Align;
public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> {
protected GameFormat format;

9
forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
View File

@@ -1,6 +1,11 @@
package forge.itemmanager.filters;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
@@ -15,10 +20,6 @@ import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
/**
* Created by maustin on 16/04/2018.
*/

1
forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java
View File

@@ -1,6 +1,7 @@
package forge.itemmanager.filters;
import com.badlogic.gdx.utils.Align;
import forge.assets.FSkinFont;
import forge.item.InventoryItem;
import forge.itemmanager.ItemManager;

5
forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
View File

@@ -1,5 +1,8 @@
package forge.itemmanager.filters;
import java.util.HashMap;
import java.util.Map;
import forge.assets.FSkin;
import forge.item.InventoryItem;
import forge.item.ItemPredicate;
@@ -10,8 +13,6 @@ import forge.itemmanager.SItemManagerUtil.StatTypes;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import java.util.HashMap;
import java.util.Map;
public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButtonsFilter<T> {
protected final Map<SItemManagerUtil.StatTypes, FLabel> buttonMap;

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

@@ -1,6 +1,18 @@
package forge.itemmanager.views;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Forge.KeyInputAdapter;
import forge.Graphics;
@@ -8,9 +20,9 @@ import forge.assets.FImage;
import forge.assets.FImageComplex;
import forge.assets.FSkin;
import forge.assets.FSkinColor;
import forge.assets.FSkinImage;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.ImageCache;
import forge.card.CardFaceSymbols;
import forge.card.CardRenderer;
@@ -38,26 +50,14 @@ import forge.toolbox.FCardPanel;
import forge.toolbox.FComboBox;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FTextField;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final float PADDING = Utils.scale(5);
private static final float PILE_SPACING_Y = 0.1f;

16
forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
View File

@@ -17,6 +17,14 @@
*/
package forge.itemmanager.views;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.badlogic.gdx.math.Rectangle;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
@@ -32,16 +40,8 @@ import forge.itemmanager.ItemManagerModel;
import forge.toolbox.FCheckBox;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FList;
import com.badlogic.gdx.math.Rectangle;
import forge.util.Localizer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
private static final FSkinColor ROW_COLOR = FSkinColor.get(Colors.CLR_ZEBRA);

14
forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
View File

@@ -1,5 +1,12 @@
package forge.itemmanager.views;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.math.Rectangle;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
@@ -15,13 +22,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventType;
import forge.toolbox.FScrollPane;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.math.Rectangle;
public abstract class ItemView<T extends InventoryItem> {
protected static final float UNOWNED_ALPHA_COMPOSITE = 0.35f;
private static final FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_TEXT);

2
forge-gui-mobile/src/forge/menu/FDropDown.java
View File

@@ -5,8 +5,8 @@ import com.badlogic.gdx.math.Rectangle;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinTexture;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinTexture;
import forge.screens.FScreen;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;

1
forge-gui-mobile/src/forge/menu/FMagnifyView.java
View File

@@ -1,6 +1,7 @@
package forge.menu;
import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;

2
forge-gui-mobile/src/forge/menu/FMenuItem.java
View File

@@ -7,9 +7,9 @@ import com.badlogic.gdx.utils.Timer.Task;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.assets.FSkinColor.Colors;
import forge.gui.UiCommand;
import forge.gui.interfaces.IButton;
import forge.localinstance.assets.FSkinProp;

2
forge-gui-mobile/src/forge/menu/FMenuTab.java
View File

@@ -4,8 +4,8 @@ import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.toolbox.FDisplayObject;
import forge.util.Utils;

3
forge-gui-mobile/src/forge/menu/FTooltip.java
View File

@@ -1,11 +1,12 @@
package forge.menu;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.screens.FScreen;
import forge.toolbox.FDisplayObject;
import forge.util.TextBounds;

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

@@ -11,9 +11,9 @@ import forge.Graphics;
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.gui.GuiBase;
import forge.menu.FPopupMenu;
import forge.screens.home.HomeScreen;
import forge.screens.settings.SettingsScreen;

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

@@ -8,9 +8,9 @@ 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.gui.FThreads;
import forge.toolbox.FOverlay;
import forge.util.ThreadUtil;
import forge.util.Utils;

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

@@ -6,16 +6,16 @@ import forge.Forge;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.menu.FPopupMenu;
import forge.model.FModel;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Utils;

4
forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
View File

@@ -20,11 +20,11 @@ import forge.menu.FDropDown;
import forge.screens.FScreen;
import forge.toolbox.FComboBox;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class AchievementsScreen extends FScreen {
private static final float TROPHY_PADDING = 45;

12
forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
View File

@@ -1,5 +1,11 @@
package forge.screens.constructed;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkin;
@@ -16,12 +22,6 @@ import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
public class AvatarSelector extends FScreen {
public static int getRandomAvatar(List<Integer> usedAvatars) {
int random = 0;

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

@@ -1,19 +1,9 @@
package forge.screens.constructed;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import forge.assets.ImageCache;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.deck.DeckType;
import forge.deck.FDeckChooser;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Gdx;
@@ -25,6 +15,12 @@ import forge.Graphics;
import forge.ai.AIOption;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.ImageCache;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.deck.DeckType;
import forge.deck.FDeckChooser;
import forge.game.GameType;
import forge.gamemodes.match.GameLobby;
import forge.gamemodes.match.LobbySlot;
@@ -46,11 +42,14 @@ import forge.screens.settings.SettingsScreen;
import forge.toolbox.FCheckBox;
import forge.toolbox.FComboBox;
import forge.toolbox.FEvent;
import forge.toolbox.FList;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.TextUtil;
import forge.util.Utils;
public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {

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

@@ -4,13 +4,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import forge.util.Callback;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.NameGenerator;
import forge.util.TextUtil;
import forge.util.Utils;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -39,12 +34,18 @@ import forge.model.FModel;
import forge.toolbox.FComboBox;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField;
import forge.toolbox.FToggleSwitch;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.NameGenerator;
import forge.util.TextUtil;
import forge.util.Utils;
public class PlayerPanel extends FContainer {
private static final ForgePreferences prefs = FModel.getPreferences();

14
forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java
View File

@@ -1,5 +1,11 @@
package forge.screens.constructed;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkin;
@@ -12,15 +18,9 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
import forge.util.Localizer;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
public class SleevesSelector extends FScreen {
public static int getRandomSleeves(List<Integer> usedSleeves) {

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

@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Graphics;
@@ -30,13 +31,13 @@ import forge.screens.home.NewGameMenu.NewGameScreen;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
import forge.util.Localizer;
public class LoadGauntletScreen extends LaunchScreen {
private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT;

1
forge-gui-mobile/src/forge/screens/home/HomeScreen.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FImage;

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

@@ -1,5 +1,9 @@
package forge.screens.home.puzzle;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import forge.assets.FSkinFont;
import forge.deck.Deck;
import forge.game.GameRules;
@@ -22,10 +26,6 @@ import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class PuzzleScreen extends LaunchScreen {
private static final float PADDING = Utils.scale(10);

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

@@ -1,15 +1,11 @@
package forge.screens.limited;
import java.util.ArrayList;
import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.LoadGameMenu;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.assets.FSkinFont;
import forge.deck.Deck;
import forge.deck.DeckGroup;
@@ -30,12 +26,16 @@ import forge.itemmanager.filters.ItemFilter;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.screens.home.LoadGameMenu;
import forge.toolbox.FComboBox;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import java.util.ArrayList;
import java.util.List;
public class LoadDraftScreen extends LaunchScreen {
private final DeckManager lstDecks = add(new DeckManager(GameType.Draft));
private final FLabel lblTip = add(new FLabel.Builder()

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

@@ -1,5 +1,8 @@
package forge.screens.limited;
import java.util.ArrayList;
import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
@@ -28,12 +31,10 @@ import forge.screens.LoadingOverlay;
import forge.screens.home.LoadGameMenu;
import forge.toolbox.FComboBox;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
import java.util.ArrayList;
import java.util.List;
public class LoadSealedScreen extends LaunchScreen {
private final DeckManager lstDecks = add(new DeckManager(GameType.Draft));

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

@@ -6,8 +6,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import forge.assets.FSkinImage;
import forge.util.Localizer;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
@@ -20,6 +18,7 @@ import forge.Graphics;
import forge.LobbyPlayer;
import forge.assets.FImage;
import forge.assets.FSkin;
import forge.assets.FSkinImage;
import forge.assets.FTextureRegionImage;
import forge.assets.ImageCache;
import forge.card.CardAvatarImage;
@@ -58,10 +57,11 @@ import forge.toolbox.FButton;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FOptionPane;
import forge.trackable.TrackableCollection;
import forge.util.collect.FCollectionView;
import forge.util.ITriggerEvent;
import forge.util.Localizer;
import forge.util.MessageUtil;
import forge.util.WaitCallback;
import forge.util.collect.FCollectionView;
public class MatchController extends AbstractGuiGame {
private MatchController() { }

8
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -7,14 +7,10 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.badlogic.gdx.graphics.Color;
import forge.screens.match.winlose.ViewWinLose;
import forge.util.Localizer;
import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Rectangle;
import com.google.common.collect.Maps;
@@ -56,6 +52,7 @@ import forge.screens.match.views.VPlayerPanel.InfoTab;
import forge.screens.match.views.VPlayers;
import forge.screens.match.views.VPrompt;
import forge.screens.match.views.VStack;
import forge.screens.match.winlose.ViewWinLose;
import forge.sound.MusicPlaylist;
import forge.sound.SoundSystem;
import forge.toolbox.FCardPanel;
@@ -63,6 +60,7 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
public class MatchScreen extends FScreen {
public static FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_BORDERS);

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

@@ -17,6 +17,9 @@
*/
package forge.screens.match;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
@@ -26,9 +29,6 @@ import forge.screens.match.views.VCardDisplayArea.CardAreaPanel;
import forge.toolbox.FDisplayObject;
import forge.util.Utils;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
public class TargetingOverlay {
private static final float BORDER_THICKNESS = Utils.scale(1);
private static final float ARROW_THICKNESS = Utils.scale(5);

20
forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
View File

@@ -17,13 +17,20 @@
*/
package forge.screens.match.views;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.FSkinColor.Colors;
import forge.card.CardZoom;
import forge.game.GameEntityView;
import forge.game.card.CardView;
@@ -40,18 +47,11 @@ import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.CardTranslation;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import forge.util.WaitCallback;
import forge.util.Localizer;
import forge.util.CardTranslation;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.badlogic.gdx.utils.Align;
public class VAssignCombatDamage extends FDialog {
private static final float CARD_GAP_X = Utils.scale(10);

2
forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
View File

@@ -10,8 +10,8 @@ import forge.toolbox.FDialog;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.util.TextBounds;
import forge.util.Localizer;
import forge.util.TextBounds;
public class VAutoYields extends FDialog {
private final FChoiceList<String> lstAutoYields;

2
forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
View File

@@ -9,8 +9,8 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
import forge.Graphics;
import forge.card.CardZoom;
import forge.card.CardRenderer.CardStackPosition;
import forge.card.CardZoom;
import forge.card.CardZoom.ActivateHandler;
import forge.game.card.CardView;
import forge.gui.FThreads;

2
forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
View File

@@ -6,8 +6,8 @@ import forge.menu.FMenuItem;
import forge.screens.match.MatchController;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.ThreadUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class VDevMenu extends FDropDownMenu {
@Override

2
forge-gui-mobile/src/forge/screens/match/views/VLog.java
View File

@@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.assets.FSkinColor.Colors;
import forge.game.GameLogEntry;
import forge.game.GameLogEntryType;
import forge.localinstance.properties.ForgePreferences.FPref;

2
forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
View File

@@ -8,9 +8,9 @@ import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.FSkinColor.Colors;
import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
import forge.game.player.PlayerView;

2
forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
View File

@@ -8,8 +8,8 @@ import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.game.phase.PhaseType;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;

2
forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
View File

@@ -12,9 +12,9 @@ import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.FSkinColor.Colors;
import forge.game.card.CardView;
import forge.game.card.CounterEnumType;
import forge.game.player.PlayerView;

3
forge-gui-mobile/src/forge/screens/match/views/VPrompt.java
View File

@@ -3,10 +3,11 @@ package forge.screens.match.views;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.card.CardZoom;
import forge.game.card.CardView;

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

@@ -15,8 +15,8 @@ import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.card.CardRenderer;
import forge.card.CardZoom;
import forge.card.CardRenderer.CardStackPosition;
import forge.card.CardZoom;
import forge.game.GameView;
import forge.game.card.CardView;
import forge.game.player.PlayerView;
@@ -41,8 +41,8 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.collect.FCollectionView;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
public class VStack extends FDropDown {
public static final float CARD_WIDTH = Utils.AVG_FINGER_WIDTH;

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

@@ -1,5 +1,7 @@
package forge.screens.match.winlose;
import java.util.List;
import forge.game.GameView;
import forge.gamemodes.gauntlet.GauntletWinLoseController;
import forge.gui.FThreads;
@@ -7,8 +9,6 @@ import forge.gui.util.SOptionPane;
import forge.localinstance.assets.FSkinProp;
import forge.util.Localizer;
import java.util.List;
/**
* The Win/Lose handler for 'gauntlet' type tournament
* games.

8
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
View File

@@ -1,5 +1,9 @@
package forge.screens.match.winlose;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
@@ -29,10 +33,6 @@ import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.Utils;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
private static final float INSETS_FACTOR = 0.025f;
private static final float GAP_Y_FACTOR = 0.02f;

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

@@ -5,9 +5,9 @@ import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.TextRenderer;
import forge.assets.FSkinColor.Colors;
import forge.gamemodes.net.ChatMessage;
import forge.gamemodes.net.IOnlineChatInterface;
import forge.gamemodes.net.IRemote;
@@ -21,8 +21,8 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class OnlineChatScreen extends FScreen implements IOnlineChatInterface {
private static final float PADDING = Utils.scale(5);

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

@@ -1,5 +1,7 @@
package forge.screens.online;
import static forge.screens.online.OnlineLobbyScreen.getGameLobby;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinImage;
@@ -16,8 +18,6 @@ import forge.toolbox.FOptionPane;
import forge.util.Callback;
import forge.util.Localizer;
import static forge.screens.online.OnlineLobbyScreen.getGameLobby;
public class OnlineMenu extends FPopupMenu {
public enum OnlineScreen {
Lobby("lblLobby", FSkinImage.FAVICON, OnlineLobbyScreen.class),

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

@@ -21,16 +21,16 @@ import forge.assets.FSkinTexture;
import forge.assets.TextRenderer;
import forge.card.CardRarity;
import forge.card.CardRenderer;
import forge.card.CardRenderer.CardStackPosition;
import forge.card.CardZoom;
import forge.card.ColorSet;
import forge.card.CardRenderer.CardStackPosition;
import forge.card.ColorSetImage;
import forge.gamemodes.planarconquest.ConquestCommander;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestUtil.AEtherFilter;
import forge.card.ColorSetImage;
import forge.item.PaperCard;
import forge.localinstance.assets.FSkinProp;
import forge.model.FModel;
@@ -38,14 +38,14 @@ import forge.screens.FScreen;
import forge.toolbox.FCardPanel;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.GuiChoose;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.GuiChoose;
import forge.util.Aggregates;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
import forge.util.Localizer;
public class ConquestAEtherScreen extends FScreen {
public static final Color FILTER_BUTTON_COLOR = ConquestMultiverseScreen.LOCATION_BAR_COLOR;

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

@@ -1,8 +1,8 @@
package forge.screens.planarconquest;
import com.badlogic.gdx.math.Vector2;
import forge.Forge;
import forge.Forge;
import forge.Graphics;
import forge.animation.ForgeAnimation;
import forge.assets.FSkinImage;

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

@@ -15,8 +15,8 @@ import forge.deck.CardPool;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestPreferences;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gui.FThreads;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
@@ -31,8 +31,8 @@ import forge.menu.FMenuItem;
import forge.model.FModel;
import forge.screens.TabPageScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionScreen> {

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

@@ -35,11 +35,11 @@ import forge.model.FModel;
import forge.screens.FScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList.CompactModeHandler;
import forge.util.Callback;
import forge.util.Localizer;

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

@@ -28,15 +28,15 @@ import forge.gamemodes.planarconquest.ConquestBattle;
import forge.gamemodes.planarconquest.ConquestChaosBattle;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestEvent;
import forge.gamemodes.planarconquest.ConquestEvent.ChaosWheelOutcome;
import forge.gamemodes.planarconquest.ConquestEvent.ConquestEventRecord;
import forge.gamemodes.planarconquest.ConquestLocation;
import forge.gamemodes.planarconquest.ConquestPlane;
import forge.gamemodes.planarconquest.ConquestPlaneData;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.gamemodes.planarconquest.ConquestRegion;
import forge.gamemodes.planarconquest.ConquestReward;
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;
@@ -48,13 +48,13 @@ import forge.toolbox.FButton;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FList;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
public class ConquestMultiverseScreen extends FScreen {

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

@@ -24,9 +24,9 @@ import forge.toolbox.FDisplayObject;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTimer;
import forge.toolbox.GuiDialog;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
import forge.util.Localizer;
public class ConquestPlaneSelector extends FDisplayObject {
private static final FSkinFont PLANE_NAME_FONT = FSkinFont.get(30);

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

@@ -14,9 +14,9 @@ import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.model.FModel;
import forge.screens.FScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FList;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
public class ConquestPlaneswalkScreen extends FScreen {
private static final float PADDING = FList.PADDING;

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

@@ -16,8 +16,8 @@ import forge.toolbox.FNumericTextField;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestPrefsScreen extends FScreen {
private static final float PADDING = Utils.scale(5);

5
forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.ImageKeys;
@@ -13,8 +14,8 @@ import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.ImageCache;
import forge.card.CardRenderer;
import forge.card.CardZoom;
import forge.card.CardRenderer.CardStackPosition;
import forge.card.CardZoom;
import forge.gamemodes.planarconquest.ConquestReward;
import forge.item.PaperCard;
import forge.toolbox.FCardPanel;
@@ -23,8 +24,8 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestRewardDialog extends FScrollPane {
private static final float PADDING = Utils.scale(5);

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

@@ -17,8 +17,8 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestStatsScreen extends FScreen implements IVConquestStats {
private static final float PADDING = Utils.scale(5f);

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

@@ -15,6 +15,8 @@ import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.gamemodes.planarconquest.ConquestController;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestPreferences;
@@ -23,8 +25,6 @@ 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;
import forge.model.FModel;
import forge.screens.LaunchScreen;
import forge.screens.home.LoadGameMenu;
@@ -33,13 +33,13 @@ import forge.screens.planarconquest.ConquestMenu.LaunchReason;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FTextArea;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
import forge.util.Localizer;
public class LoadConquestScreen extends LaunchScreen {
private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT;

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

@@ -7,8 +7,8 @@ import forge.card.CardImage;
import forge.card.CardListPreview;
import forge.gamemodes.planarconquest.ConquestController;
import forge.gamemodes.planarconquest.ConquestData;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gui.FThreads;
import forge.item.PaperCard;
import forge.localinstance.achievements.PlaneswalkerAchievements;
@@ -19,8 +19,8 @@ import forge.screens.home.NewGameMenu;
import forge.screens.planarconquest.ConquestMenu.LaunchReason;
import forge.toolbox.FChoiceList;
import forge.toolbox.FOptionPane;
import forge.util.ThreadUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenModel> {
private static final float PADDING = FOptionPane.PADDING;

8
forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
View File

@@ -17,6 +17,8 @@ import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.gamemodes.quest.QuestController;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.data.DeckConstructionRules;
@@ -26,8 +28,6 @@ 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;
import forge.model.FModel;
import forge.screens.LaunchScreen;
import forge.screens.home.LoadGameMenu;
@@ -36,12 +36,12 @@ import forge.screens.quest.QuestMenu.LaunchReason;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FTextArea;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
import forge.util.Localizer;
public class LoadQuestScreen extends LaunchScreen {
private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT;

16
forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
View File

@@ -1,5 +1,11 @@
package forge.screens.quest;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
@@ -15,8 +21,8 @@ import forge.gamemodes.quest.QuestMode;
import forge.gamemodes.quest.QuestUtil;
import forge.gamemodes.quest.QuestWorld;
import forge.gamemodes.quest.StartingPoolPreferences;
import forge.gamemodes.quest.StartingPoolType;
import forge.gamemodes.quest.StartingPoolPreferences.PoolType;
import forge.gamemodes.quest.StartingPoolType;
import forge.gamemodes.quest.data.DeckConstructionRules;
import forge.gamemodes.quest.data.GameFormatQuest;
import forge.gamemodes.quest.data.QuestPreferences.QPref;
@@ -45,15 +51,9 @@ import forge.toolbox.FRadioButton;
import forge.toolbox.FRadioButton.RadioButtonGroup;
import forge.toolbox.FScrollPane;
import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
import forge.util.Localizer;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
public class NewQuestScreen extends FScreen {

2
forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java
View File

@@ -28,8 +28,8 @@ import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextArea;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestBazaarScreen extends TabPageScreen<QuestBazaarScreen> {
private static final Localizer localizer = Localizer.getInstance();

1
forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java
View File

@@ -2,6 +2,7 @@ package forge.screens.quest;
import java.util.HashMap;
import java.util.Map;
import forge.deck.DeckProxy;
import forge.deck.FDeckEditor;
import forge.gamemodes.quest.QuestSpellShop;

4
forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java
View File

@@ -20,11 +20,11 @@ import forge.model.FModel;
import forge.screens.FScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FTextField;
import forge.util.ThreadUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class QuestDecksScreen extends FScreen {
private static final float PADDING = FDeckChooser.PADDING;

4
forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
View File

@@ -1,5 +1,7 @@
package forge.screens.quest;
import java.util.List;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
@@ -15,8 +17,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
import java.util.List;
public class QuestDuelsScreen extends QuestLaunchScreen {
private final FLabel lblInfo = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectNextDuel"))

3
forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java
View File

@@ -2,14 +2,15 @@ package forge.screens.quest;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Align;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
import forge.gamemodes.quest.IQuestEvent;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.ImageCache;
import forge.gamemodes.quest.IQuestEvent;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;

2
forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
View File

@@ -28,8 +28,8 @@ import forge.screens.home.LoadGameMenu.LoadGameScreen;
import forge.screens.home.NewGameMenu.NewGameScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.ThreadUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class QuestMenu extends FPopupMenu implements IVQuestStats {

2
forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java
View File

@@ -16,8 +16,8 @@ import forge.toolbox.FNumericTextField;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestPrefsScreen extends FScreen {
private static final float PADDING = Utils.scale(5);

18
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
View File

@@ -1,5 +1,11 @@
package forge.screens.quest;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
@@ -21,19 +27,17 @@ import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.model.FModel;
import forge.screens.TabPageScreen;
import forge.toolbox.*;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FTextArea;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.ItemPool;
import forge.util.Localizer;
import forge.util.Utils;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
private final SpellShopPage spellShopPage;
private final InventoryPage inventoryPage;

2
forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java
View File

@@ -21,8 +21,8 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Utils;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestStatsScreen extends FScreen {
private static final float PADDING = FOptionPane.PADDING;

9
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
View File

@@ -1,5 +1,7 @@
package forge.screens.quest;
import java.util.Arrays;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
@@ -17,9 +19,9 @@ import forge.deck.FDeckEditor.EditorType;
import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.quest.IQuestTournamentView;
import forge.gamemodes.quest.QuestDraftUtils;
import forge.gamemodes.quest.QuestDraftUtils.Mode;
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;
@@ -33,12 +35,11 @@ import forge.screens.limited.DraftingProcessScreen;
import forge.toolbox.FButton;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FTextField;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Utils;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import java.util.Arrays;
import forge.util.Utils;
public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestTournamentView {
//Select Tournament panel

9
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View File

@@ -1,6 +1,11 @@
package forge.screens.settings;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.MulliganDefs;
@@ -31,10 +36,6 @@ import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class SettingsPage extends TabPage<SettingsScreen> {
private final FGroupList<Setting> lstSettings = add(new FGroupList<>());
private final CustomSelectSetting settingSkins;

2
forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java
View File

@@ -2,8 +2,8 @@ package forge.screens.settings;
import forge.Forge;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont;
import forge.screens.FScreen;
import forge.screens.TabPageScreen;
import forge.screens.home.HomeScreen;

2
forge-gui-mobile/src/forge/sound/AudioClip.java
View File

@@ -18,8 +18,8 @@
package forge.sound;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.files.FileHandle;
public class AudioClip implements IAudioClip {

8
forge-gui-mobile/src/forge/toolbox/DualListBox.java
View File

@@ -1,15 +1,15 @@
package forge.toolbox;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType;
import forge.util.Callback;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType;
import forge.util.Callback;
import forge.util.Localizer;
// An input box for handling the order of choices.

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