diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java index e3e7e598f82..5cfdf01f0fa 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java @@ -3,8 +3,6 @@ package forge.adventure.editor; import forge.adventure.data.BiomeData; import javax.swing.*; -import java.awt.*; -import java.util.Arrays; public class BiomeEdit extends FormPanel { BiomeData currentData; diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java b/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java index 39c1c2cbca8..9ff1938ecf3 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java @@ -2,7 +2,6 @@ package forge.adventure.editor; import forge.adventure.data.BiomeStructureData; import forge.adventure.util.Config; -import forge.adventure.world.BiomeStructure; import javax.swing.*; import java.awt.*; diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java index 3d55f5f7a51..3682fede08c 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java @@ -6,8 +6,6 @@ import forge.adventure.data.BiomeStructureData; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; -import java.awt.image.BufferedImage; public class BiomeStructureEdit extends FormPanel { private boolean updating=false; @@ -21,6 +19,7 @@ public class BiomeStructureEdit extends FormPanel { public JCheckBox randomPosition=new JCheckBox(); public IntSpinner N= new IntSpinner(); public JTextField sourcePath= new JTextField(); + public JTextField maskPath= new JTextField(); public JCheckBox periodicInput= new JCheckBox(); public IntSpinner ground= new IntSpinner(); public IntSpinner symmetry= new IntSpinner(); @@ -37,6 +36,7 @@ public class BiomeStructureEdit extends FormPanel { center.add("height:",height); center.add("N:",N); center.add("sourcePath:",sourcePath); + center.add("maskPath:",maskPath); center.add("periodicInput:",periodicInput); center.add("ground:",ground); center.add("symmetry:",symmetry); @@ -56,6 +56,7 @@ public class BiomeStructureEdit extends FormPanel { N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure())); + maskPath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure())); periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); @@ -78,6 +79,7 @@ public class BiomeStructureEdit extends FormPanel { randomPosition.setSelected(currentData.randomPosition); N.setValue(currentData.N); sourcePath.setText(currentData.sourcePath); + maskPath.setText(currentData.maskPath); periodicInput.setSelected(currentData.periodicInput); ground.setValue(currentData.ground); symmetry.setValue(currentData.symmetry); @@ -105,6 +107,7 @@ public class BiomeStructureEdit extends FormPanel { currentData.N= N.intValue(); currentData.sourcePath= sourcePath.getText(); + currentData.maskPath= maskPath.getText(); currentData.periodicInput= periodicInput.isSelected(); currentData.ground= ground.intValue(); currentData.symmetry= symmetry.intValue(); diff --git a/forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java index 88bde85698f..86698e0fcdf 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java @@ -6,7 +6,6 @@ import forge.adventure.data.BiomeTerrainData; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; public class BiomeTerrainEdit extends FormPanel { SwingAtlasPreview preview=new SwingAtlasPreview(128); diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java b/forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java index 1221e41a7a4..656e79651a1 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java @@ -5,7 +5,6 @@ import forge.adventure.data.EffectData; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; public class EffectEditor extends JComponent { EffectData currentData; diff --git a/forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java index 1375670a00d..9e328887297 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java @@ -3,7 +3,6 @@ package forge.adventure.editor; import forge.adventure.data.EnemyData; import javax.swing.*; -import java.awt.*; /** * Editor class to edit configuration, maybe moved or removed diff --git a/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java index cc7daa8ce70..2f883dae9db 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java @@ -3,7 +3,6 @@ package forge.adventure.editor; import forge.adventure.data.PointOfInterestData; import javax.swing.*; -import java.awt.*; public class PointOfInterestEdit extends JComponent { diff --git a/forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java index 076261013ce..a5fe5e4fd83 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java @@ -7,7 +7,6 @@ import forge.game.keyword.Keyword; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; import java.util.Arrays; /** diff --git a/forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java b/forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java index 9181f6392df..36c99614196 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java @@ -2,7 +2,6 @@ package forge.adventure.editor; import forge.adventure.data.BiomeData; import forge.adventure.data.BiomeStructureData; -import forge.adventure.data.WorldData; import forge.adventure.util.Config; import forge.adventure.world.BiomeStructure; @@ -83,13 +82,14 @@ public class StructureEditor extends JComponent{ private void test() { if (list.isSelectionEmpty()) return; + long start = System.currentTimeMillis(); BiomeStructureData data = model.get(list.getSelectedIndex()); try { BiomeStructure struct = new BiomeStructure(data, System.currentTimeMillis(), - (int) (currentData.width * EditorMainWindow.worldEditor.width.intValue() * data.width), - (int) (currentData.width * EditorMainWindow.worldEditor.height.intValue() * data.height)); + (int) (currentData.width * EditorMainWindow.worldEditor.width.intValue() ), + (int) (currentData.width * EditorMainWindow.worldEditor.height.intValue())); struct.initialize(); JLabel label = new JLabel(); BufferedImage image = struct.image; @@ -111,11 +111,14 @@ public class StructureEditor extends JComponent{ } label.setIcon(new ImageIcon(image)); label.setSize(640, 640); - JOptionPane.showMessageDialog(this, label); + + + + JOptionPane.showMessageDialog(this, label,"Calculating took "+ ((System.currentTimeMillis() - start)/1000)+" seconds",JOptionPane.PLAIN_MESSAGE); } catch (Exception e) { - JOptionPane.showMessageDialog(this, "WaveFunctionCollapse was not successful"); + JOptionPane.showMessageDialog(this, "WaveFunctionCollapse was not successful","can not calculate function "+e.getMessage(),JOptionPane.ERROR_MESSAGE); } } diff --git a/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java b/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java index 943e3df96e4..6241b824add 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java @@ -55,15 +55,25 @@ public class SwingAtlas { } private ImageIcon spriteToImage(TextureAtlas.TextureAtlasData.Region sprite) throws IOException { - BufferedImage img = ImageIO.read(sprite.page.textureFile.file()); - if(sprite.width== sprite.height) - return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize,imageSize,SCALE_FAST)); - if(sprite.width>sprite.height) - return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize, (int) (imageSize*(sprite.height/(float)sprite.width)),SCALE_FAST)); - return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance((int) (imageSize*(sprite.width/(float)sprite.height)),imageSize,SCALE_FAST)); - } + try + { + BufferedImage img = ImageIO.read(sprite.page.textureFile.file()); + if(sprite.width== sprite.height) + return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize,imageSize,SCALE_FAST)); + if(sprite.width>sprite.height) + return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize, (int) (imageSize*(sprite.height/(float)sprite.width)),SCALE_FAST)); + return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance((int) (imageSize*(sprite.width/(float)sprite.height)),imageSize,SCALE_FAST)); + + } + catch (IOException e) + { + return null; + } +} public ImageIcon get(String name) { + if(images.get(name).size()==0) + return null; return images.get(name).get(0); } diff --git a/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java b/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java index 4a01fd30603..97e67659848 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java @@ -4,7 +4,6 @@ import forge.adventure.util.Config; import org.apache.commons.lang3.tuple.Pair; import javax.swing.*; -import java.awt.*; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; diff --git a/forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java b/forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java index 7388d926db1..8cc56aac09c 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java @@ -3,6 +3,7 @@ package forge.adventure.editor; import forge.adventure.util.Config; import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -27,6 +28,7 @@ public class TextListEdit extends Box { }); add(edit); + edit.setPreferredSize(new Dimension(400,edit.getPreferredSize().height)); //add(findButton); elements= new JComboBox(possibleElements); add(elements); @@ -84,7 +86,7 @@ public class TextListEdit extends Box { { values.append(intValues[i]); if(intValues.length>i+2) - values.append(";"); + values.append("\n"); } edit.setText(values.toString()); } diff --git a/forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java b/forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java index 437ecce9e76..d2ee9ea1f9a 100644 --- a/forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java +++ b/forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java @@ -1,7 +1,6 @@ package forge.adventure.editor; import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.JsonWriter; import forge.adventure.data.BiomeData; @@ -16,7 +15,6 @@ import java.awt.*; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; public class WorldEditor extends JComponent { diff --git a/forge-gui-mobile/src/forge/CachedCardImage.java b/forge-gui-mobile/src/forge/CachedCardImage.java index 51ae26f81cc..7919d23d762 100644 --- a/forge-gui-mobile/src/forge/CachedCardImage.java +++ b/forge-gui-mobile/src/forge/CachedCardImage.java @@ -1,7 +1,6 @@ package forge; import com.badlogic.gdx.graphics.Texture; - import forge.assets.ImageCache; import forge.game.card.CardView; import forge.gui.GuiBase; diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 830775aa7ed..10b83090d62 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -5,11 +5,7 @@ import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.InputProcessor; -import com.badlogic.gdx.graphics.Cursor; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.TextureData; +import com.badlogic.gdx.graphics.*; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; @@ -23,11 +19,7 @@ import forge.adventure.scene.SceneType; import forge.adventure.stage.MapStage; import forge.adventure.util.Config; import forge.animation.ForgeAnimation; -import forge.assets.Assets; -import forge.assets.AssetsDownloader; -import forge.assets.FSkin; -import forge.assets.FSkinFont; -import forge.assets.ImageCache; +import forge.assets.*; import forge.error.ExceptionHandler; import forge.gamemodes.limited.BoosterDraft; import forge.gui.FThreads; diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java index da4feba9f20..a2b64e15c34 100644 --- a/forge-gui-mobile/src/forge/Graphics.java +++ b/forge-gui-mobile/src/forge/Graphics.java @@ -1,10 +1,10 @@ package forge; -import java.util.ArrayDeque; -import java.util.Deque; - import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.*; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.Pixmap; +import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.ShaderProgram; @@ -15,7 +15,6 @@ 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; @@ -23,6 +22,9 @@ import forge.toolbox.FDisplayObject; import forge.util.TextBounds; import forge.util.Utils; +import java.util.ArrayDeque; +import java.util.Deque; + public class Graphics { private static final int GL_BLEND = GL20.GL_BLEND; private static final int GL_LINE_SMOOTH = 2848; //create constant here since not in GL20 diff --git a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java index ad356681ea7..ee768ab3c5b 100644 --- a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java @@ -1,11 +1,6 @@ package forge.adventure.character; -import com.badlogic.gdx.graphics.g2d.Animation; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.Sprite; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; +import com.badlogic.gdx.graphics.g2d.*; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Array; diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java index 4a487dd5d20..19c2836f7d1 100644 --- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Array; diff --git a/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java b/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java index dda93529618..a6ba72c8b55 100644 --- a/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java @@ -1,6 +1,5 @@ package forge.adventure.character; -import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Array; import forge.adventure.data.RewardData; import forge.adventure.util.JSONStringLoader; diff --git a/forge-gui-mobile/src/forge/adventure/data/BiomeData.java b/forge-gui-mobile/src/forge/adventure/data/BiomeData.java index 2e5c220cec2..1bd21bc2ecb 100644 --- a/forge-gui-mobile/src/forge/adventure/data/BiomeData.java +++ b/forge-gui-mobile/src/forge/adventure/data/BiomeData.java @@ -6,7 +6,6 @@ import forge.util.MyRandom; import java.io.Serializable; import java.util.ArrayList; -import java.util.List; import java.util.Random; /** diff --git a/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java b/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java index 02bf44caaf7..4769635fda6 100644 --- a/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java +++ b/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java @@ -1,6 +1,5 @@ package forge.adventure.data; -import java.awt.*; import java.awt.image.BufferedImage; public class BiomeStructureData { @@ -31,6 +30,7 @@ public class BiomeStructureData { public String structureAtlasPath; public String sourcePath; + public String maskPath; public boolean periodicInput=true; public float height; public float width; @@ -45,6 +45,7 @@ public class BiomeStructureData { public BiomeStructureData(BiomeStructureData biomeStructureData) { this.structureAtlasPath=biomeStructureData.structureAtlasPath; this.sourcePath=biomeStructureData.sourcePath; + this.maskPath=biomeStructureData.maskPath; this.x=biomeStructureData.x; this.y=biomeStructureData.y; this.width=biomeStructureData.width; diff --git a/forge-gui-mobile/src/forge/adventure/data/ConfigData.java b/forge-gui-mobile/src/forge/adventure/data/ConfigData.java index 04b9efdc1b4..e904058a6e3 100644 --- a/forge-gui-mobile/src/forge/adventure/data/ConfigData.java +++ b/forge-gui-mobile/src/forge/adventure/data/ConfigData.java @@ -1,8 +1,6 @@ package forge.adventure.data; -import java.util.List; - /** * Data class that will be used to read Json configuration files * BiomeData diff --git a/forge-gui-mobile/src/forge/adventure/data/UIData.java b/forge-gui-mobile/src/forge/adventure/data/UIData.java index d1ece9a84db..a9d528ea818 100644 --- a/forge-gui-mobile/src/forge/adventure/data/UIData.java +++ b/forge-gui-mobile/src/forge/adventure/data/UIData.java @@ -1,6 +1,5 @@ package forge.adventure.data; -import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.OrderedMap; /** diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java index 57db089e307..3c1301ae7e5 100644 --- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java +++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java @@ -5,7 +5,10 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Null; import com.google.common.collect.Lists; -import forge.adventure.data.*; +import forge.adventure.data.DifficultyData; +import forge.adventure.data.EffectData; +import forge.adventure.data.HeroListData; +import forge.adventure.data.ItemData; import forge.adventure.util.*; import forge.adventure.world.WorldSave; import forge.deck.CardPool; @@ -18,7 +21,10 @@ import forge.util.ItemPool; import forge.util.MyRandom; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; /** * Class that represents the player (not the player sprite) diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index cff35135c80..8362057f3e0 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java @@ -9,18 +9,10 @@ import forge.adventure.player.AdventurePlayer; import forge.assets.FImage; import forge.assets.FSkinFont; import forge.assets.FSkinImage; -import forge.deck.CardPool; -import forge.deck.Deck; -import forge.deck.DeckFormat; -import forge.deck.DeckSection; -import forge.deck.FDeckViewer; +import forge.deck.*; import forge.item.InventoryItem; import forge.item.PaperCard; -import forge.itemmanager.CardManager; -import forge.itemmanager.ColumnDef; -import forge.itemmanager.ItemColumn; -import forge.itemmanager.ItemManager; -import forge.itemmanager.ItemManagerConfig; +import forge.itemmanager.*; import forge.itemmanager.filters.ItemFilter; import forge.localinstance.properties.ForgePreferences; import forge.menu.FCheckBoxMenuItem; diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java index 2cc444e966a..c92ee4d4e4a 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java @@ -3,12 +3,7 @@ package forge.adventure.scene; import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.InputEvent; -import com.badlogic.gdx.scenes.scene2d.ui.Dialog; -import com.badlogic.gdx.scenes.scene2d.ui.Label; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.Table; -import com.badlogic.gdx.scenes.scene2d.ui.TextButton; -import com.badlogic.gdx.scenes.scene2d.ui.TextField; +import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.IntMap; diff --git a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java index 6899204efdf..003a39dbd7e 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java @@ -4,13 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.scenes.scene2d.ui.CheckBox; -import com.badlogic.gdx.scenes.scene2d.ui.Image; -import com.badlogic.gdx.scenes.scene2d.ui.ImageButton; -import com.badlogic.gdx.scenes.scene2d.ui.Label; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.TextButton; -import com.badlogic.gdx.scenes.scene2d.ui.TextField; +import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.utils.Array; diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 68be744d25f..05a8a1ee183 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -4,11 +4,7 @@ import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.scenes.scene2d.ui.Image; -import com.badlogic.gdx.scenes.scene2d.ui.Label; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.Table; -import com.badlogic.gdx.scenes.scene2d.ui.TextButton; +import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.utils.Align; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java index 907886ec011..6e708079824 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java @@ -13,11 +13,7 @@ import forge.adventure.character.ShopActor; import forge.adventure.player.AdventurePlayer; import forge.adventure.pointofintrest.PointOfInterestChanges; import forge.adventure.stage.GameHUD; -import forge.adventure.util.CardUtil; -import forge.adventure.util.Config; -import forge.adventure.util.Current; -import forge.adventure.util.Reward; -import forge.adventure.util.RewardActor; +import forge.adventure.util.*; import forge.adventure.world.WorldSave; import forge.assets.ImageCache; import forge.sound.SoundEffectType; diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java index 307f24ff778..c70a84a3db3 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java @@ -3,7 +3,10 @@ package forge.adventure.scene; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; -import com.badlogic.gdx.scenes.scene2d.ui.*; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; +import com.badlogic.gdx.scenes.scene2d.ui.SelectBox; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import forge.Forge; @@ -19,7 +22,6 @@ import forge.item.PaperCard; import forge.util.MyRandom; import java.util.*; -import java.util.List; import java.util.stream.Collectors; import java.util.stream.StreamSupport; diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java index 1dc759ef348..4c84835fc91 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java +++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java @@ -41,7 +41,6 @@ import forge.screens.TransitionScreen; import forge.sound.SoundEffectType; import forge.sound.SoundSystem; - import java.util.HashMap; import java.util.Map; diff --git a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java index 2c951ca36f3..dc080b8ba65 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java +++ b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java @@ -11,11 +11,7 @@ import forge.adventure.character.EnemySprite; import forge.adventure.data.BiomeData; import forge.adventure.data.EnemyData; import forge.adventure.data.WorldData; -import forge.adventure.scene.DuelScene; -import forge.adventure.scene.RewardScene; -import forge.adventure.scene.Scene; -import forge.adventure.scene.SceneType; -import forge.adventure.scene.TileMapScene; +import forge.adventure.scene.*; import forge.adventure.util.Current; import forge.adventure.util.SaveFileContent; import forge.adventure.util.SaveFileData; diff --git a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java index f86b7fee73e..28d987171e2 100644 --- a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java +++ b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java @@ -1,6 +1,8 @@ package forge.adventure.util; -import com.badlogic.gdx.scenes.scene2d.ui.*; +import com.badlogic.gdx.scenes.scene2d.ui.Dialog; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.utils.Array; import forge.Forge; import forge.adventure.character.EnemySprite; diff --git a/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java b/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java index e98c42eb5cb..c0ee5ab05c5 100644 --- a/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java +++ b/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java @@ -10,11 +10,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapTile; import com.badlogic.gdx.maps.tiled.TiledMapTileSet; import com.badlogic.gdx.maps.tiled.TmxMapLoader; import com.badlogic.gdx.maps.tiled.tiles.AnimatedTiledMapTile; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.GdxRuntimeException; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.SerializationException; -import com.badlogic.gdx.utils.XmlReader; +import com.badlogic.gdx.utils.*; import forge.Forge; import java.io.File; diff --git a/forge-gui-mobile/src/forge/adventure/util/UIActor.java b/forge-gui-mobile/src/forge/adventure/util/UIActor.java index 7763465fc6a..840fa8e4661 100644 --- a/forge-gui-mobile/src/forge/adventure/util/UIActor.java +++ b/forge-gui-mobile/src/forge/adventure/util/UIActor.java @@ -10,7 +10,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; -import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.OrderedMap; diff --git a/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java b/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java index 8f970041f68..3dcf0c5b74b 100644 --- a/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java +++ b/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java @@ -33,7 +33,14 @@ public class BiomeStructure { public TextureAtlas atlas() { if(structureAtlas==null) { - structureAtlas = Config.instance().getAtlas(data.structureAtlasPath); + try + { + structureAtlas = Config.instance().getAtlas(data.structureAtlasPath); + } + catch (Exception e) + { + e.printStackTrace(); + } } return structureAtlas; } @@ -62,23 +69,31 @@ public class BiomeStructure { } boolean suc=false; for(int i=0;i<10&&!suc;i++) - suc=model.run((int) seed+(i*5355),15000); + suc=model.run((int) seed+(i*5355),0); if(!suc) { dataMap=new int[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)]; collisionMap=new boolean[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)]; + for(int x=0;x pics = new ArrayList<>(); ArrayList spics = new ArrayList<>(); + if(!region.getTexture().getTextureData().isPrepared()) region.getTexture().getTextureData().prepare(); Pixmap completePicture = region.getTexture().getTextureData().consumePixmap(); for (int y = 0; y < 4; y++) { diff --git a/forge-gui-mobile/src/forge/adventure/world/World.java b/forge-gui-mobile/src/forge/adventure/world/World.java index 09dbe9dd750..c819d49aac6 100644 --- a/forge-gui-mobile/src/forge/adventure/world/World.java +++ b/forge-gui-mobile/src/forge/adventure/world/World.java @@ -274,9 +274,19 @@ private void clearTerrain(int x,int y,int size) } } +} +private long measureGenerationTime(String msg,long lastTime) +{ + long currentTime = System.currentTimeMillis(); + System.out.print("\n"+msg+" :\t\t"+((currentTime-lastTime)/1000f)+" s"); + return currentTime; } public World generateNew(long seed) { + + long currentTime = System.currentTimeMillis(); + loadWorldData(); + if(seed==0) { seed=random.nextLong(); } this.seed=seed; random.setSeed(seed); @@ -301,6 +311,7 @@ private void clearTerrain(int x,int y,int size) pix.fill(); int biomeIndex = -1; + currentTime=measureGenerationTime("loading data",currentTime); for (BiomeData biome : data.GetBiomes()) { biomeIndex++; @@ -311,8 +322,8 @@ private void clearTerrain(int x,int y,int size) int beginX = Math.max(biomeXStart - biomeWidth / 2, 0); int beginY = Math.max(biomeYStart - biomeHeight / 2, 0); - int endX = Math.min(biomeXStart + biomeWidth, width); - int endY = Math.min(biomeYStart + biomeHeight, height); + int endX = Math.min(biomeXStart + biomeWidth/2, width); + int endY = Math.min(biomeYStart + biomeHeight/2, height); if (biome.width == 1.0 && biome.height == 1.0) { beginX = 0; beginY = 0; @@ -358,21 +369,29 @@ private void clearTerrain(int x,int y,int size) { for(BiomeStructureData data:biome.structures) { + BiomeStructure structure; if(!structureDataMap.containsKey(data)) { - structureDataMap.put(data,new BiomeStructure(data,seed,biomeWidth,biomeHeight)); + structure=new BiomeStructure(data,seed,biomeWidth,biomeHeight); + structure.initialize(); + structureDataMap.put(data,structure); + currentTime=measureGenerationTime("wavefunctioncollapse "+data.sourcePath,currentTime); } - structure=structureDataMap.get(data); - int structureXStart= structure.x()+beginX; - int structureYStart= structure.y()+beginY; - int structureIndex=structure.objectID(x-structureXStart,y-structureYStart); + else + { + structure=structureDataMap.get(data); + } + int structureXStart= x-(biomeXStart - biomeWidth / 2)-(int) ((data.x*biomeWidth)-(data.width*biomeWidth/2)); + int structureYStart= y-(biomeYStart - biomeHeight / 2)- (int) ((data.y*biomeHeight)-(data.height*biomeHeight/2)); + + int structureIndex=structure.objectID(structureXStart,structureYStart); if(structureIndex>=0) { pix.setColor(data.mappingInfo[structureIndex].getColor()); pix.drawPixel(x, y); terrainMap[x][y]=terrainCounter+structureIndex; - if(structure.collision(x-structureXStart,y-structureYStart)) + if(structure.collision(structureXStart,structureYStart)) terrainMap[x][y]|=collisionBit; terrainMap[x][y]|=isStructureBit; @@ -485,6 +504,7 @@ private void clearTerrain(int x,int y,int size) } } + currentTime=measureGenerationTime("poi placement",currentTime); //sort towns List> allSortedTowns = new ArrayList<>(); @@ -624,6 +644,7 @@ private void clearTerrain(int x,int y,int size) } } } + currentTime=measureGenerationTime("roads",currentTime); mapObjectIds = new SpritesDataMap(getChunkSize(), data.tileSize, data.width / getChunkSize()); for (int x = 0; x < width; x++) { @@ -656,7 +677,7 @@ private void clearTerrain(int x,int y,int size) } } biomeImage = pix; - + measureGenerationTime("sprites",currentTime); WorldStage.getInstance().clearCache(); return this; } diff --git a/forge-gui-mobile/src/forge/animation/ForgeAnimation.java b/forge-gui-mobile/src/forge/animation/ForgeAnimation.java index 4ce7ceb42d3..7c7566f7323 100644 --- a/forge-gui-mobile/src/forge/animation/ForgeAnimation.java +++ b/forge-gui-mobile/src/forge/animation/ForgeAnimation.java @@ -1,12 +1,11 @@ package forge.animation; +import com.badlogic.gdx.Gdx; +import forge.Forge; + import java.util.ArrayList; import java.util.List; -import com.badlogic.gdx.Gdx; - -import forge.Forge; - public abstract class ForgeAnimation { private static final List activeAnimations = new ArrayList<>(); // A guard against inspecting activeAnimations while it's in the process of being edited diff --git a/forge-gui-mobile/src/forge/animation/ForgeTransition.java b/forge-gui-mobile/src/forge/animation/ForgeTransition.java index 4e2fb125394..066b3bdd70a 100644 --- a/forge-gui-mobile/src/forge/animation/ForgeTransition.java +++ b/forge-gui-mobile/src/forge/animation/ForgeTransition.java @@ -1,15 +1,14 @@ package forge.animation; +import com.badlogic.gdx.math.Rectangle; +import forge.Graphics; +import forge.toolbox.FDisplayObject; +import forge.toolbox.FOverlay; + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.Map; -import com.badlogic.gdx.math.Rectangle; - -import forge.Graphics; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FOverlay; - public class ForgeTransition extends ForgeAnimation { private static final FOverlay overlay = new FOverlay(null) { @Override protected void doLayout(final float width, final float height) { diff --git a/forge-gui-mobile/src/forge/animation/GifAnimation.java b/forge-gui-mobile/src/forge/animation/GifAnimation.java index 6cd7aa7cde5..bdc313a51a7 100644 --- a/forge-gui-mobile/src/forge/animation/GifAnimation.java +++ b/forge-gui-mobile/src/forge/animation/GifAnimation.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.Animation.PlayMode; import com.badlogic.gdx.graphics.g2d.TextureRegion; - import forge.Graphics; public class GifAnimation extends ForgeAnimation { diff --git a/forge-gui-mobile/src/forge/animation/GifDecoder.java b/forge-gui-mobile/src/forge/animation/GifDecoder.java index 506bda6bf6f..4af968cc208 100644 --- a/forge-gui-mobile/src/forge/animation/GifDecoder.java +++ b/forge-gui-mobile/src/forge/animation/GifDecoder.java @@ -5,9 +5,6 @@ package forge.animation; /* Released under Apache 2.0 */ /* https://code.google.com/p/animated-gifs-in-android/ */ -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; @@ -15,6 +12,9 @@ import com.badlogic.gdx.graphics.g2d.Animation.PlayMode; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; +import java.io.InputStream; +import java.util.Vector; + public class GifDecoder { /** * File read status: No errors. diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index 02ece668d82..0e5f29264e5 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -1,24 +1,22 @@ package forge.assets; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.List; - -import forge.gui.GuiBase; -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Application.ApplicationType; import com.badlogic.gdx.Gdx; import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.gui.download.GuiDownloadZipService; import forge.gui.util.SOptionPane; 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 diff --git a/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java b/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java index c5b17a2e44a..5ec2993c392 100644 --- a/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java +++ b/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java @@ -23,7 +23,6 @@ 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; /** diff --git a/forge-gui-mobile/src/forge/assets/FBufferedImage.java b/forge-gui-mobile/src/forge/assets/FBufferedImage.java index eaebff0e25b..51bd937792c 100644 --- a/forge-gui-mobile/src/forge/assets/FBufferedImage.java +++ b/forge-gui-mobile/src/forge/assets/FBufferedImage.java @@ -7,7 +7,6 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.FrameBuffer; import com.badlogic.gdx.math.Matrix4; - import forge.Graphics; import forge.gui.FThreads; diff --git a/forge-gui-mobile/src/forge/assets/FDelayLoadImage.java b/forge-gui-mobile/src/forge/assets/FDelayLoadImage.java index 10a339f59ba..3559315df78 100644 --- a/forge-gui-mobile/src/forge/assets/FDelayLoadImage.java +++ b/forge-gui-mobile/src/forge/assets/FDelayLoadImage.java @@ -2,7 +2,6 @@ package forge.assets; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; - import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/assets/FLanguage.java b/forge-gui-mobile/src/forge/assets/FLanguage.java index a10d7284174..e5d4c1bfa96 100644 --- a/forge-gui-mobile/src/forge/assets/FLanguage.java +++ b/forge-gui-mobile/src/forge/assets/FLanguage.java @@ -1,16 +1,15 @@ package forge.assets; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; - import forge.localinstance.properties.ForgeConstants; 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) { diff --git a/forge-gui-mobile/src/forge/assets/FRotatedImage.java b/forge-gui-mobile/src/forge/assets/FRotatedImage.java index 1022aaebd52..2e2c0bd32cf 100644 --- a/forge-gui-mobile/src/forge/assets/FRotatedImage.java +++ b/forge-gui-mobile/src/forge/assets/FRotatedImage.java @@ -1,7 +1,6 @@ package forge.assets; import com.badlogic.gdx.graphics.Texture; - import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/assets/FSkinColor.java b/forge-gui-mobile/src/forge/assets/FSkinColor.java index ae9d69328bc..3aa53bb1a97 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinColor.java +++ b/forge-gui-mobile/src/forge/assets/FSkinColor.java @@ -1,12 +1,11 @@ package forge.assets; -import java.util.HashMap; - import com.badlogic.gdx.graphics.Color; - import forge.localinstance.skin.FSkinProp; import forge.screens.match.TargetingOverlay; +import java.util.HashMap; + public class FSkinColor { public enum Colors { CLR_THEME (FSkinProp.CLR_THEME), diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java index b7fa468dd58..d91563c9744 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinFont.java +++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java @@ -1,10 +1,5 @@ package forge.assets; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; @@ -20,7 +15,6 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.utils.Array; - import com.badlogic.gdx.utils.IntSet; import forge.Forge; import forge.gui.FThreads; @@ -30,6 +24,11 @@ import forge.util.LineReader; import forge.util.TextBounds; import forge.util.Utils; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; + public class FSkinFont { private static final int MIN_FONT_SIZE = 8; private static int MAX_FONT_SIZE = 72; diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 2e79623a888..d80df909565 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -6,7 +6,6 @@ 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 forge.Forge; import forge.Graphics; import forge.localinstance.properties.ForgeConstants; diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java index be4da23b628..671cd57d1d1 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java +++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java @@ -1,17 +1,16 @@ 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; - import forge.Forge; 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), diff --git a/forge-gui-mobile/src/forge/assets/FTextureImage.java b/forge-gui-mobile/src/forge/assets/FTextureImage.java index 292d97c083e..bca8d94fb85 100644 --- a/forge-gui-mobile/src/forge/assets/FTextureImage.java +++ b/forge-gui-mobile/src/forge/assets/FTextureImage.java @@ -1,7 +1,6 @@ package forge.assets; import com.badlogic.gdx.graphics.Texture; - import com.badlogic.gdx.graphics.g2d.TextureRegion; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/assets/FTextureRegionImage.java b/forge-gui-mobile/src/forge/assets/FTextureRegionImage.java index dcd6c914b1b..0966fb76f97 100644 --- a/forge-gui-mobile/src/forge/assets/FTextureRegionImage.java +++ b/forge-gui-mobile/src/forge/assets/FTextureRegionImage.java @@ -2,7 +2,6 @@ package forge.assets; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; - import forge.Graphics; public class FTextureRegionImage extends FImageComplex { diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java index 3af05833443..2c6e61060a7 100644 --- a/forge-gui-mobile/src/forge/assets/ImageCache.java +++ b/forge-gui-mobile/src/forge/assets/ImageCache.java @@ -17,48 +17,41 @@ */ package forge.assets; -import java.io.File; -import java.util.ConcurrentModificationException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Queue; -import java.util.Set; - +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.Pixmap.Format; +import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.TextureData; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.google.common.collect.EvictingQueue; import com.google.common.collect.Queues; import com.google.common.collect.Sets; -import forge.deck.DeckProxy; -import forge.gui.FThreads; -import forge.gui.GuiBase; -import forge.util.FileUtil; -import forge.util.TextUtil; -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; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.TextureRegion; - import forge.Forge; import forge.ImageKeys; import forge.card.CardEdition; import forge.card.CardRenderer; import forge.deck.Deck; +import forge.deck.DeckProxy; import forge.game.card.CardView; import forge.game.player.IHasIcon; +import forge.gui.FThreads; +import forge.gui.GuiBase; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; +import forge.util.FileUtil; 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.*; /** * This class stores ALL card images in a cache with soft values. this means diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java index 9f6c4ee4fcd..d977d6a94b0 100644 --- a/forge-gui-mobile/src/forge/assets/TextRenderer.java +++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java @@ -1,13 +1,7 @@ package forge.assets; -import java.text.BreakIterator; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.card.CardFaceSymbols; @@ -16,6 +10,11 @@ import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.util.TextBounds; +import java.text.BreakIterator; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + //Encodes text for drawing with symbols and reminder text public class TextRenderer { static { diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java index cb8cc135829..6c5cf738b89 100644 --- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java +++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java @@ -17,8 +17,6 @@ */ package forge.card; -import java.util.StringTokenizer; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinImage; @@ -26,6 +24,8 @@ import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.gui.error.BugReporter; +import java.util.StringTokenizer; + public class CardFaceSymbols { public static final float FONT_SIZE_FACTOR = 0.85f; diff --git a/forge-gui-mobile/src/forge/card/CardImage.java b/forge-gui-mobile/src/forge/card/CardImage.java index d542a7509bd..6e7da4f9784 100644 --- a/forge-gui-mobile/src/forge/card/CardImage.java +++ b/forge-gui-mobile/src/forge/card/CardImage.java @@ -1,7 +1,6 @@ package forge.card; import com.badlogic.gdx.graphics.Texture; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 1a001553b64..e92e7624cc6 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -1,24 +1,13 @@ 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 forge.ImageKeys; -import forge.assets.*; -import forge.item.PaperCard; -import forge.util.ImageUtil; -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.ImageKeys; +import forge.assets.*; import forge.card.CardRenderer.CardStackPosition; import forge.card.mana.ManaCost; import forge.game.GameView; @@ -27,13 +16,22 @@ 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.PaperCard; import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.screens.FScreen; import forge.screens.match.MatchController; import forge.util.CardTranslation; +import forge.util.ImageUtil; 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; diff --git a/forge-gui-mobile/src/forge/card/CardListPreview.java b/forge-gui-mobile/src/forge/card/CardListPreview.java index cd6411f8c72..4a321eb48c0 100644 --- a/forge-gui-mobile/src/forge/card/CardListPreview.java +++ b/forge-gui-mobile/src/forge/card/CardListPreview.java @@ -2,7 +2,6 @@ package forge.card; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.item.PaperCard; import forge.toolbox.FChoiceList; import forge.toolbox.FLabel; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index bb1ab421dad..a7713347fae 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -1,17 +1,5 @@ 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 forge.ImageKeys; -import forge.localinstance.properties.ForgeConstants; -import forge.util.*; -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; @@ -27,19 +15,11 @@ 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; -import forge.assets.FImage; -import forge.assets.FImageComplex; -import forge.assets.FRotatedImage; -import forge.assets.FSkin; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.FTextureRegionImage; -import forge.assets.ImageCache; +import forge.ImageKeys; +import forge.assets.*; import forge.card.CardZoom.ActivateHandler; import forge.card.mana.ManaCost; import forge.game.card.CardView; @@ -51,12 +31,20 @@ import forge.gui.card.CardDetailUtil; import forge.gui.card.CardDetailUtil.DetailColors; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.localinstance.properties.ForgeConstants; 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.FileUtil; +import forge.util.TextBounds; +import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; public class CardRenderer { public enum CardStackPosition { diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java index 2100a310b9b..461c9e049f1 100644 --- a/forge-gui-mobile/src/forge/card/CardZoom.java +++ b/forge-gui-mobile/src/forge/card/CardZoom.java @@ -1,13 +1,8 @@ package forge.card; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinImage; @@ -30,6 +25,10 @@ import forge.toolbox.FOverlay; import forge.util.Utils; import forge.util.collect.FCollectionView; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + public class CardZoom extends FOverlay { private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH; diff --git a/forge-gui-mobile/src/forge/card/GameEntityPicker.java b/forge-gui-mobile/src/forge/card/GameEntityPicker.java index 22aa5cb889f..ccb1b2d8254 100644 --- a/forge-gui-mobile/src/forge/card/GameEntityPicker.java +++ b/forge-gui-mobile/src/forge/card/GameEntityPicker.java @@ -1,11 +1,6 @@ package forge.card; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -22,6 +17,10 @@ import forge.toolbox.FOptionPane; import forge.toolbox.FTextField; import forge.util.Callback; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class GameEntityPicker extends TabPageScreen { private final FOptionPane optionPane; diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java index 31819c20052..01fda9ec328 100644 --- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java +++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java @@ -17,13 +17,8 @@ */ 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; @@ -37,21 +32,16 @@ import forge.card.CardZoom; import forge.card.mana.ManaCostShard; import forge.item.PaperCard; import forge.model.FModel; -import forge.toolbox.FCardPanel; -import forge.toolbox.FComboBox; -import forge.toolbox.FContainer; -import forge.toolbox.FDialog; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; -import forge.toolbox.FTextArea; import forge.util.Callback; import forge.util.MyRandom; import forge.util.Utils; +import java.text.NumberFormat; +import java.util.Map; +import java.util.Map.Entry; + public class AddBasicLandsDialog extends FDialog { private static final float ADD_BTN_SIZE = Utils.AVG_FINGER_HEIGHT * 0.75f; diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index dea7c235863..32db7788bb7 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -1,20 +1,7 @@ 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 java.util.stream.Collectors; - -import forge.util.MyRandom; -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; @@ -43,17 +30,16 @@ import forge.screens.FScreen; import forge.screens.LoadingOverlay; import forge.screens.home.NewGameMenu.NewGameScreen; import forge.screens.match.MatchController; -import forge.toolbox.FButton; -import forge.toolbox.FComboBox; -import forge.toolbox.FContainer; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FOptionPane; -import forge.toolbox.GuiChoose; -import forge.toolbox.ListChooser; import forge.util.Callback; +import forge.util.MyRandom; import forge.util.Utils; import forge.util.storage.IStorage; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.stream.Collectors; public class FDeckChooser extends FScreen { public static final float PADDING = Utils.scale(5); diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index d55d25ca4e6..72cd70e2fad 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -35,7 +35,10 @@ import forge.screens.TabPageScreen; import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; -import forge.util.*; +import forge.util.Callback; +import forge.util.ItemPool; +import forge.util.Lang; +import forge.util.Utils; import forge.util.storage.IStorage; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java index 144bf237709..1d64b8f52f9 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java +++ b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java @@ -17,11 +17,7 @@ */ package forge.deck; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.Graphics; import forge.StaticData; @@ -29,15 +25,13 @@ import forge.deck.DeckRecognizer.TokenType; import forge.game.GameType; import forge.gui.FThreads; import forge.gui.util.SOptionPane; -import forge.toolbox.FCheckBox; -import forge.toolbox.FComboBox; -import forge.toolbox.FDialog; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FOptionPane; -import forge.toolbox.FTextArea; import forge.util.Callback; +import java.util.ArrayList; +import java.util.List; + public class FDeckImportDialog extends FDialog { private Callback callback; diff --git a/forge-gui-mobile/src/forge/deck/FDeckViewer.java b/forge-gui-mobile/src/forge/deck/FDeckViewer.java index 16b359a8766..26cb4149586 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckViewer.java +++ b/forge-gui-mobile/src/forge/deck/FDeckViewer.java @@ -1,13 +1,7 @@ package forge.deck; -import java.util.Map.Entry; - import forge.Forge; -import forge.assets.FImage; -import forge.assets.FSkin; -import forge.assets.FSkinImage; -import forge.assets.FTextureRegionImage; -import forge.assets.ImageCache; +import forge.assets.*; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManagerConfig; @@ -20,6 +14,8 @@ import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FOptionPane; +import java.util.Map.Entry; + public class FDeckViewer extends FScreen { private static FDeckViewer deckViewer; private static FPopupMenu menu = new FPopupMenu() { diff --git a/forge-gui-mobile/src/forge/deck/FSideboardDialog.java b/forge-gui-mobile/src/forge/deck/FSideboardDialog.java index 3255d779db8..72b8ecc84bc 100644 --- a/forge-gui-mobile/src/forge/deck/FSideboardDialog.java +++ b/forge-gui-mobile/src/forge/deck/FSideboardDialog.java @@ -1,10 +1,6 @@ package forge.deck; -import java.util.List; - import forge.Forge; -import org.apache.commons.lang3.StringUtils; - import forge.assets.FImage; import forge.item.PaperCard; import forge.itemmanager.CardManager; @@ -19,6 +15,9 @@ import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.GuiChoose; import forge.util.Callback; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class FSideboardDialog extends FDialog { private final SideboardTabs tabs; diff --git a/forge-gui-mobile/src/forge/error/BugReportDialog.java b/forge-gui-mobile/src/forge/error/BugReportDialog.java index eaf6ff02a75..0eeae737acd 100644 --- a/forge-gui-mobile/src/forge/error/BugReportDialog.java +++ b/forge-gui-mobile/src/forge/error/BugReportDialog.java @@ -1,7 +1,6 @@ package forge.error; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/itemmanager/CardManager.java b/forge-gui-mobile/src/forge/itemmanager/CardManager.java index 6f194a42afc..e3780528656 100644 --- a/forge-gui-mobile/src/forge/itemmanager/CardManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/CardManager.java @@ -1,22 +1,17 @@ package forge.itemmanager; -import java.util.Map.Entry; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.card.CardRenderer; import forge.card.CardZoom; import forge.item.PaperCard; -import forge.itemmanager.filters.AdvancedSearchFilter; -import forge.itemmanager.filters.CardColorFilter; -import forge.itemmanager.filters.CardFormatFilter; -import forge.itemmanager.filters.CardSearchFilter; -import forge.itemmanager.filters.CardTypeFilter; -import forge.itemmanager.filters.TextSearchFilter; +import forge.itemmanager.filters.*; import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; +import java.util.Map.Entry; + /** * ItemManager for cards */ diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java index b7caa658876..8a78e60f927 100644 --- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java @@ -1,9 +1,6 @@ package forge.itemmanager; -import java.util.Map.Entry; - import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -25,6 +22,8 @@ import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; import forge.util.Utils; +import java.util.Map.Entry; + /** * ItemManager for decks */ diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index c026f10d756..209b60e8272 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -17,16 +17,6 @@ */ 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; @@ -34,7 +24,6 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -53,17 +42,16 @@ import forge.menu.FDropDownMenu; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.screens.FScreen; -import forge.toolbox.FComboBox; -import forge.toolbox.FContainer; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; -import forge.toolbox.FLabel; -import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; import forge.util.ItemPool; import forge.util.LayoutHelper; +import java.util.*; +import java.util.Map.Entry; + public abstract class ItemManager extends FContainer implements IItemManager, ActivateHandler { private ItemPool pool; diff --git a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java index 6202cff5591..05b58ea7dcf 100644 --- a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java @@ -1,11 +1,8 @@ package forge.itemmanager; -import java.util.Map.Entry; - import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.Align; import com.google.common.base.Function; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -21,6 +18,8 @@ import forge.itemmanager.filters.TextSearchFilter; import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; +import java.util.Map.Entry; + public class SpellShopManager extends ItemManager { private final Function, Object> fnGetPrice; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index e4870f49300..8600df15191 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -3,7 +3,6 @@ package forge.itemmanager.filters; import com.badlogic.gdx.utils.Align; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.Forge; import forge.assets.FSkinImage; import forge.assets.TextRenderer; @@ -16,14 +15,8 @@ import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.menu.FTooltip; import forge.screens.FScreen; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FList; -import forge.toolbox.FScrollPane; -import forge.toolbox.FTextField; import forge.util.Callback; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java index cb3d1d6ec26..54d58870b79 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java @@ -1,11 +1,6 @@ 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; @@ -19,6 +14,10 @@ import forge.toolbox.FList; import forge.util.Callback; import forge.util.Utils; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + /** * Created by maustin on 16/04/2018. */ diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java index 2166262d712..0adafdb50ce 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.item.PaperCard; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java index b3bc12c091b..0ec55488ee8 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; - import forge.item.PaperCard; import forge.itemmanager.ItemManager; import forge.itemmanager.SFilterUtil; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java index 3cb0670784a..21c51b53f73 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.item.PaperCard; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java index 3d8942d2f77..36c80aa64d6 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.item.PaperCard; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java index 57d3dba01a0..19dd6c9d2ec 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.item.PaperCard; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardRarityFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardRarityFilter.java index 902bf59389c..47c494b6bfb 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardRarityFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardRarityFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; - import forge.card.CardRarity; import forge.item.PaperCard; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java index 35fa8ec8633..c0c22addfb8 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; - import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java index 940e67e7a27..3acb2f19312 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.item.PaperCard; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java index 167beaaeb2a..249ac6cbe3e 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java @@ -1,16 +1,15 @@ package forge.itemmanager.filters; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; 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 { public CardTypeFilter(ItemManager itemManager0) { diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java index 52cc7b4b593..885f4b13bc2 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; - import forge.deck.DeckProxy; import forge.itemmanager.ItemManager; import forge.itemmanager.SFilterUtil; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java index 1a24bfb9aae..79e2cb0d81e 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java @@ -1,13 +1,12 @@ package forge.itemmanager.filters; +import com.google.common.base.Predicate; +import forge.deck.DeckProxy; +import forge.itemmanager.ItemManager; + import java.util.HashSet; import java.util.Set; -import com.google.common.base.Predicate; - -import forge.deck.DeckProxy; -import forge.itemmanager.ItemManager; - public class DeckFolderFilter extends ListLabelFilter { protected final Set folders = new HashSet<>(); diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java index 1a3a51dd06e..0ca3dc64f61 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.deck.DeckProxy; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java index 0db437ac335..54dd6c08e87 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java @@ -1,13 +1,6 @@ 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; @@ -19,17 +12,14 @@ import forge.itemmanager.ItemManager; import forge.model.FModel; import forge.screens.FScreen; import forge.screens.settings.SettingsScreen; -import forge.toolbox.FCheckBox; -import forge.toolbox.FComboBox; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FGroupList; -import forge.toolbox.FList; import forge.util.Callback; import forge.util.TextUtil; import forge.util.Utils; +import java.util.*; + public abstract class FormatFilter extends ItemFilter { protected GameFormat format; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java index 8eaaad46868..401b48825c2 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.google.common.base.Predicate; - import forge.assets.FSkinFont; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java index 04c179a4789..7398e095dc7 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java @@ -1,7 +1,6 @@ package forge.itemmanager.filters; import com.badlogic.gdx.utils.Align; - import forge.assets.FSkinFont; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java index 70045e02123..7fecb5cb863 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java @@ -1,8 +1,5 @@ package forge.itemmanager.filters; -import java.util.HashMap; -import java.util.Map; - import forge.assets.FSkin; import forge.item.InventoryItem; import forge.item.ItemPredicate; @@ -14,6 +11,9 @@ 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 extends ToggleButtonsFilter { protected final Map buttonMap; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java index b3a0c9906f3..2ac7005cfc1 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java @@ -3,7 +3,6 @@ package forge.itemmanager.filters; import com.badlogic.gdx.utils.Align; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java index 61f986c9c38..c666f2f18f9 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java @@ -1,10 +1,6 @@ package forge.itemmanager.filters; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.assets.FImage; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; @@ -13,6 +9,9 @@ import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; import forge.toolbox.FLabel; +import java.util.ArrayList; +import java.util.List; + public abstract class ToggleButtonsFilter extends ItemFilter { protected boolean lockFiltering; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java index 588ab1809b6..47cddb538c1 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java @@ -2,7 +2,6 @@ package forge.itemmanager.filters; import com.badlogic.gdx.utils.Align; import com.google.common.base.Predicate; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.item.InventoryItem; diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java index 2c8881865be..7559c1428cb 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java @@ -17,14 +17,7 @@ */ 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.Forge; import forge.Graphics; import forge.assets.FImage; @@ -33,15 +26,17 @@ import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.item.InventoryItem; -import forge.itemmanager.ColumnDef; -import forge.itemmanager.ItemColumn; -import forge.itemmanager.ItemManager; -import forge.itemmanager.ItemManagerConfig; -import forge.itemmanager.ItemManagerModel; +import forge.itemmanager.*; import forge.toolbox.FCheckBox; import forge.toolbox.FDisplayObject; import forge.toolbox.FList; +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 extends ItemView { private static final FSkinColor ROW_COLOR = FSkinColor.get(Colors.CLR_ZEBRA); diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java index 3a33ae11a2d..64a73071532 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java @@ -1,27 +1,22 @@ 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; import forge.assets.FSkinColor.Colors; import forge.item.InventoryItem; -import forge.itemmanager.ColumnDef; -import forge.itemmanager.ItemColumn; -import forge.itemmanager.ItemManager; -import forge.itemmanager.ItemManagerConfig; -import forge.itemmanager.ItemManagerModel; +import forge.itemmanager.*; import forge.toolbox.FContainer; 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; + public abstract class ItemView { protected static final float UNOWNED_ALPHA_COMPOSITE = 0.35f; private static final FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_TEXT); diff --git a/forge-gui-mobile/src/forge/menu/FDropDown.java b/forge-gui-mobile/src/forge/menu/FDropDown.java index 84ccde8799d..df23b86498a 100644 --- a/forge-gui-mobile/src/forge/menu/FDropDown.java +++ b/forge-gui-mobile/src/forge/menu/FDropDown.java @@ -1,7 +1,6 @@ package forge.menu; import com.badlogic.gdx.math.Rectangle; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/menu/FMagnifyView.java b/forge-gui-mobile/src/forge/menu/FMagnifyView.java index 495e094ad3b..6c33345e13f 100644 --- a/forge-gui-mobile/src/forge/menu/FMagnifyView.java +++ b/forge-gui-mobile/src/forge/menu/FMagnifyView.java @@ -1,7 +1,6 @@ package forge.menu; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/menu/FMenuBar.java b/forge-gui-mobile/src/forge/menu/FMenuBar.java index 58096d0293e..324c5ff79f0 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuBar.java +++ b/forge-gui-mobile/src/forge/menu/FMenuBar.java @@ -1,11 +1,11 @@ package forge.menu; -import java.util.ArrayList; -import java.util.List; - import forge.Graphics; import forge.screens.FScreen.Header; +import java.util.ArrayList; +import java.util.List; + public class FMenuBar extends Header { private final List tabs = new ArrayList<>(); diff --git a/forge-gui-mobile/src/forge/menu/FMenuItem.java b/forge-gui-mobile/src/forge/menu/FMenuItem.java index 1b8e7a00fbf..0c56962adf0 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuItem.java +++ b/forge-gui-mobile/src/forge/menu/FMenuItem.java @@ -3,7 +3,6 @@ package forge.menu; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; - import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/menu/FMenuTab.java b/forge-gui-mobile/src/forge/menu/FMenuTab.java index 34198ae06d4..405e7e34d1d 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuTab.java +++ b/forge-gui-mobile/src/forge/menu/FMenuTab.java @@ -1,7 +1,6 @@ package forge.menu; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; diff --git a/forge-gui-mobile/src/forge/menu/FPopupMenu.java b/forge-gui-mobile/src/forge/menu/FPopupMenu.java index 19d3e7751c5..a3cea1656d5 100644 --- a/forge-gui-mobile/src/forge/menu/FPopupMenu.java +++ b/forge-gui-mobile/src/forge/menu/FPopupMenu.java @@ -1,7 +1,6 @@ package forge.menu; import com.badlogic.gdx.math.Vector2; - import forge.Forge; import forge.Graphics; import forge.screens.FScreen; diff --git a/forge-gui-mobile/src/forge/menu/FTooltip.java b/forge-gui-mobile/src/forge/menu/FTooltip.java index 4686a03573f..e20dc607a70 100644 --- a/forge-gui-mobile/src/forge/menu/FTooltip.java +++ b/forge-gui-mobile/src/forge/menu/FTooltip.java @@ -1,7 +1,6 @@ package forge.menu; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java index ec36dc3884d..450c3553e77 100644 --- a/forge-gui-mobile/src/forge/screens/FScreen.java +++ b/forge-gui-mobile/src/forge/screens/FScreen.java @@ -1,11 +1,8 @@ package forge.screens; -import java.util.List; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -25,6 +22,8 @@ import forge.toolbox.FLabel; import forge.util.Callback; import forge.util.Utils; +import java.util.List; + public abstract class FScreen extends FContainer { public static final FSkinColor TEXTURE_OVERLAY_COLOR = FSkinColor.get(Colors.CLR_THEME); diff --git a/forge-gui-mobile/src/forge/screens/LaunchScreen.java b/forge-gui-mobile/src/forge/screens/LaunchScreen.java index 5917c67972e..1f345dd4114 100644 --- a/forge-gui-mobile/src/forge/screens/LaunchScreen.java +++ b/forge-gui-mobile/src/forge/screens/LaunchScreen.java @@ -1,7 +1,6 @@ package forge.screens; import com.badlogic.gdx.Input.Keys; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinImage; diff --git a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java index 2ccda45df86..ccad3622efc 100644 --- a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java +++ b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java @@ -2,7 +2,6 @@ package forge.screens; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkin; diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java index 5b9ffcb8e2b..474cff437f9 100644 --- a/forge-gui-mobile/src/forge/screens/SplashScreen.java +++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java @@ -3,7 +3,6 @@ package forge.screens; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; diff --git a/forge-gui-mobile/src/forge/screens/TabPageScreen.java b/forge-gui-mobile/src/forge/screens/TabPageScreen.java index 0c369d6ac42..3dbc86a1b6a 100644 --- a/forge-gui-mobile/src/forge/screens/TabPageScreen.java +++ b/forge-gui-mobile/src/forge/screens/TabPageScreen.java @@ -1,7 +1,6 @@ package forge.screens; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -11,12 +10,8 @@ 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.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FScrollPane; import forge.util.Utils; public class TabPageScreen> extends FScreen { diff --git a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java index bc1a36e8fcd..f72ef3a6946 100644 --- a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java +++ b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java @@ -3,15 +3,9 @@ package forge.screens.achievements; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; -import forge.assets.FBufferedImage; -import forge.assets.FImage; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.FSkinTexture; +import forge.assets.*; import forge.card.CardZoom; import forge.item.IPaperCard; import forge.localinstance.achievements.Achievement; diff --git a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java index 113d00743a3..f6ff97d13a5 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java +++ b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java @@ -1,11 +1,7 @@ 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; @@ -21,6 +17,9 @@ import forge.util.Callback; import forge.util.MyRandom; import forge.util.Utils; +import java.util.List; +import java.util.Map; + public class AvatarSelector extends FScreen { public static int getRandomAvatar(List usedAvatars) { int random = 0; diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index 216b4c46463..a691adde2c5 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -1,29 +1,15 @@ package forge.screens.constructed; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import forge.player.GamePlayerUtil; -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; import com.google.common.collect.Iterables; - import forge.Forge; 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.deck.*; import forge.game.GameType; import forge.gamemodes.match.GameLobby; import forge.gamemodes.match.LobbySlot; @@ -38,19 +24,18 @@ import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; import forge.menu.FPopupMenu; import forge.model.FModel; +import forge.player.GamePlayerUtil; import forge.screens.FScreen; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; import forge.screens.settings.SettingsScreen; -import forge.toolbox.FCheckBox; -import forge.toolbox.FComboBox; -import forge.toolbox.FLabel; -import forge.toolbox.FList; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; +import forge.toolbox.*; import forge.util.MyRandom; import forge.util.TextUtil; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { private static final ForgePreferences prefs = FModel.getPreferences(); diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java index fd4bc7713d8..da6252fe7ed 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java @@ -1,15 +1,8 @@ package forge.screens.constructed; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.utils.Align; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import forge.Forge; import forge.Graphics; import forge.ai.AIOption; @@ -17,11 +10,7 @@ import forge.assets.FSkin; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.assets.FTextureRegionImage; -import forge.deck.Deck; -import forge.deck.DeckProxy; -import forge.deck.DeckType; -import forge.deck.FDeckChooser; -import forge.deck.FVanguardChooser; +import forge.deck.*; import forge.game.GameType; import forge.gamemodes.match.LobbySlot; import forge.gamemodes.match.LobbySlotType; @@ -31,20 +20,14 @@ import forge.itemmanager.DeckManager; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; -import forge.toolbox.FComboBox; -import forge.toolbox.FContainer; -import forge.toolbox.FEvent; +import forge.toolbox.*; 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.util.Callback; -import forge.util.Lang; -import forge.util.NameGenerator; -import forge.util.TextUtil; -import forge.util.Utils; +import forge.util.*; +import org.apache.commons.lang3.StringUtils; + +import java.util.Collections; +import java.util.List; +import java.util.Set; public class PlayerPanel extends FContainer { private static final ForgePreferences prefs = FModel.getPreferences(); diff --git a/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java b/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java index 9dd1550b647..acd7eec392f 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java +++ b/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java @@ -1,11 +1,7 @@ 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; @@ -21,6 +17,9 @@ import forge.util.Callback; import forge.util.MyRandom; import forge.util.Utils; +import java.util.List; +import java.util.Map; + public class SleevesSelector extends FScreen { public static int getRandomSleeves(List usedSleeves) { int random = 0; diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java index e8dc7a078ca..54fff9e5a71 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -1,13 +1,6 @@ package forge.screens.gauntlet; -import java.io.File; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -36,6 +29,12 @@ import forge.util.Callback; import forge.util.ThreadUtil; import forge.util.Utils; +import java.io.File; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class LoadGauntletScreen extends LaunchScreen { private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT; private static final float PADDING = Utils.AVG_FINGER_HEIGHT * 0.1f; diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java index 14853c017c9..db7f0a45b3d 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java @@ -1,10 +1,5 @@ package forge.screens.gauntlet; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.Forge; import forge.assets.FSkinFont; import forge.deck.Deck; @@ -26,6 +21,11 @@ import forge.toolbox.ListChooser; import forge.util.Callback; import forge.util.Utils; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class NewGauntletScreen extends LaunchScreen { private static final float PADDING = Utils.scale(10); diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index b82e9c0ed69..d30bc46ef23 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -1,11 +1,7 @@ package forge.screens.home; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; - import com.google.common.collect.ImmutableList; import forge.Forge; import forge.Graphics; @@ -23,15 +19,14 @@ import forge.screens.online.OnlineMenu.OnlineScreen; import forge.screens.planarconquest.ConquestMenu; import forge.screens.quest.QuestMenu; import forge.screens.settings.SettingsScreen; -import forge.toolbox.FButton; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; import forge.util.Callback; import forge.util.Utils; +import java.util.ArrayList; +import java.util.List; + public class HomeScreen extends FScreen { private static final float PADDING = Utils.scale(5); private static final FSkinColor clrTheme = FSkinColor.get(Colors.CLR_THEME); 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 2393dd7ca24..9be5063f384 100644 --- a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java @@ -1,9 +1,5 @@ package forge.screens.home.puzzle; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import forge.Forge; import forge.assets.FSkinFont; import forge.deck.Deck; @@ -26,6 +22,10 @@ import forge.toolbox.GuiChoose; import forge.util.Callback; 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); diff --git a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java index 1ce0b215a6d..b18203fb2c6 100644 --- a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java @@ -1,8 +1,6 @@ package forge.screens.limited; import forge.Forge; -import org.apache.commons.lang3.StringUtils; - import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.FDeckEditor; @@ -16,6 +14,7 @@ import forge.screens.FScreen; import forge.screens.home.LoadGameMenu.LoadGameScreen; import forge.toolbox.FOptionPane; import forge.util.Callback; +import org.apache.commons.lang3.StringUtils; public class DraftingProcessScreen extends FDeckEditor { private boolean isDraftSaved; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java index 1331e0824a8..d05e2ceec97 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java @@ -1,17 +1,9 @@ package forge.screens.limited; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FSkinFont; -import forge.deck.Deck; -import forge.deck.DeckGroup; -import forge.deck.DeckProxy; -import forge.deck.FDeckChooser; -import forge.deck.FDeckEditor; +import forge.deck.*; import forge.deck.FDeckEditor.EditorType; import forge.deck.io.DeckPreferences; import forge.game.GameType; @@ -33,6 +25,9 @@ import forge.toolbox.FComboBox; import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; +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() diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java index 27f7c82e56b..dee07f06d43 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java @@ -1,17 +1,9 @@ package forge.screens.limited; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FSkinFont; -import forge.deck.Deck; -import forge.deck.DeckGroup; -import forge.deck.DeckProxy; -import forge.deck.FDeckChooser; -import forge.deck.FDeckEditor; +import forge.deck.*; import forge.deck.FDeckEditor.EditorType; import forge.deck.io.DeckPreferences; import forge.game.GameType; @@ -33,6 +25,9 @@ import forge.toolbox.FComboBox; import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; +import java.util.ArrayList; +import java.util.List; + public class LoadSealedScreen extends LaunchScreen { private final DeckManager lstDecks = add(new DeckManager(GameType.Draft)); private final FLabel lblTip = add(new FLabel.Builder() diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 50a3cc66b33..003450d2e4a 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -1,42 +1,27 @@ package forge.screens.match; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import forge.adventure.scene.DuelScene; -import forge.adventure.scene.SceneType; -import forge.ai.GameState; -import forge.deck.Deck; -import forge.game.player.Player; -import forge.item.IPaperCard; -import forge.screens.TransitionScreen; -import forge.util.collect.FCollection; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; - import forge.Forge; 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.adventure.scene.DuelScene; +import forge.adventure.scene.SceneType; +import forge.ai.GameState; +import forge.assets.*; import forge.card.CardAvatarImage; import forge.card.GameEntityPicker; import forge.deck.CardPool; +import forge.deck.Deck; import forge.deck.FSideboardDialog; import forge.game.GameEntityView; import forge.game.card.CardView; import forge.game.phase.PhaseType; import forge.game.player.DelayedReveal; import forge.game.player.IHasIcon; +import forge.game.player.Player; import forge.game.player.PlayerView; import forge.game.spellability.SpellAbilityView; import forge.game.zone.ZoneType; @@ -46,6 +31,7 @@ import forge.gui.FThreads; import forge.gui.GuiBase; import forge.gui.util.SGuiChoose; import forge.gui.util.SOptionPane; +import forge.item.IPaperCard; import forge.item.PaperCard; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; @@ -53,12 +39,9 @@ import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.player.PlayerZoneUpdate; import forge.player.PlayerZoneUpdates; -import forge.screens.match.views.VAssignCombatDamage; -import forge.screens.match.views.VAssignGenericAmount; -import forge.screens.match.views.VPhaseIndicator; -import forge.screens.match.views.VPlayerPanel; +import forge.screens.TransitionScreen; +import forge.screens.match.views.*; import forge.screens.match.views.VPlayerPanel.InfoTab; -import forge.screens.match.views.VPrompt; import forge.screens.match.winlose.ViewWinLose; import forge.toolbox.FButton; import forge.toolbox.FDisplayObject; @@ -67,7 +50,14 @@ import forge.trackable.TrackableCollection; import forge.util.ITriggerEvent; import forge.util.MessageUtil; import forge.util.WaitCallback; +import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; 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 b9c01727900..8d421a44ab0 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java @@ -1,71 +1,60 @@ package forge.screens.match; -import java.util.*; -import java.util.Map.Entry; - -import com.badlogic.gdx.math.Vector2; -import forge.animation.ForgeAnimation; -import forge.assets.FImage; -import forge.card.CardImageRenderer; -import forge.card.CardRenderer; -import forge.card.CardZoom; -import forge.game.spellability.StackItemView; -import forge.gui.interfaces.IGuiGame; -import forge.toolbox.FDisplayObject; -import forge.util.Utils; -import forge.util.collect.FCollectionView; -import org.apache.commons.lang3.tuple.Pair; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.math.Rectangle; +import com.badlogic.gdx.math.Vector2; import com.google.common.collect.Maps; - import forge.Forge; import forge.Forge.KeyInputAdapter; import forge.Graphics; import forge.animation.AbilityEffect; +import forge.animation.ForgeAnimation; +import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; import forge.assets.FSkinTexture; +import forge.card.CardImageRenderer; +import forge.card.CardRenderer; +import forge.card.CardZoom; import forge.game.GameEntityView; import forge.game.GameView; import forge.game.card.CardView; import forge.game.combat.CombatView; import forge.game.phase.PhaseType; import forge.game.player.PlayerView; +import forge.game.spellability.StackItemView; import forge.game.zone.ZoneType; import forge.gui.GuiBase; +import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences.FPref; -import forge.menu.FDropDown; -import forge.menu.FDropDownMenu; -import forge.menu.FMenuBar; -import forge.menu.FMenuItem; -import forge.menu.FMenuTab; +import forge.menu.*; import forge.model.FModel; import forge.player.PlayerZoneUpdate; import forge.screens.FScreen; -import forge.screens.match.views.VAvatar; +import forge.screens.match.views.*; import forge.screens.match.views.VCardDisplayArea.CardAreaPanel; -import forge.screens.match.views.VDevMenu; -import forge.screens.match.views.VGameMenu; -import forge.screens.match.views.VLog; -import forge.screens.match.views.VManaPool; import forge.screens.match.views.VPhaseIndicator.PhaseLabel; -import forge.screens.match.views.VPlayerPanel; 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; +import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FScrollPane; import forge.util.Callback; +import forge.util.Utils; +import forge.util.collect.FCollectionView; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class MatchScreen extends FScreen { public static FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_BORDERS); diff --git a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java index 6a6261db737..497f48309e9 100644 --- a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java +++ b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java @@ -19,7 +19,6 @@ 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; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java index 918a0fcd4dc..b9d2d7c0739 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java @@ -17,13 +17,7 @@ */ 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; @@ -37,20 +31,14 @@ import forge.game.card.CardView; import forge.game.card.CounterEnumType; import forge.game.player.PlayerView; import forge.screens.match.MatchController; -import forge.toolbox.FCardPanel; -import forge.toolbox.FContainer; -import forge.toolbox.FDialog; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; -import forge.util.Callback; -import forge.util.CardTranslation; -import forge.util.TextUtil; -import forge.util.Utils; -import forge.util.WaitCallback; +import forge.util.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class VAssignCombatDamage extends FDialog { private static final float CARD_GAP_X = Utils.scale(10); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java index 7650c8f5e06..f3d4e6c6dc8 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java @@ -17,13 +17,7 @@ */ 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; @@ -36,20 +30,14 @@ import forge.card.MagicColor; import forge.game.card.CardView; import forge.game.player.PlayerView; import forge.screens.match.MatchController; -import forge.toolbox.FCardPanel; -import forge.toolbox.FContainer; -import forge.toolbox.FDialog; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; -import forge.util.Callback; -import forge.util.CardTranslation; -import forge.util.TextUtil; -import forge.util.Utils; -import forge.util.WaitCallback; +import forge.util.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class VAssignGenericAmount extends FDialog { private static final float CARD_GAP_X = Utils.scale(10); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java b/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java index d98195d43d0..a62129d971a 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java @@ -1,18 +1,14 @@ package forge.screens.match.views; -import java.util.ArrayList; -import java.util.List; - import forge.Forge; import forge.screens.match.MatchController; -import forge.toolbox.FCheckBox; -import forge.toolbox.FChoiceList; -import forge.toolbox.FDialog; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FOptionPane; import forge.util.TextBounds; +import java.util.ArrayList; +import java.util.List; + public class VAutoYields extends FDialog { private final FChoiceList lstAutoYields; private final FCheckBox chkDisableAll; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java index e32ea675cfb..8a20be01aec 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; 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 d88b05f1ded..01b573d2e40 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java @@ -1,14 +1,8 @@ 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.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.math.Vector2; - import forge.Forge; import forge.Graphics; import forge.card.CardRenderer.CardStackPosition; @@ -23,6 +17,11 @@ import forge.toolbox.FCardPanel; import forge.toolbox.FDisplayObject; import forge.util.ThreadUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public abstract class VCardDisplayArea extends VDisplayArea implements ActivateHandler { private static final float CARD_STACK_OFFSET = 0.2f; 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 615afc93982..b59c0e99e3e 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VField.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java @@ -1,8 +1,5 @@ package forge.screens.match.views; -import java.util.ArrayList; -import java.util.List; - import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.game.player.PlayerView; @@ -10,6 +7,9 @@ import forge.gui.FThreads; import forge.screens.match.views.VCardDisplayArea.CardAreaPanel; import forge.toolbox.FContainer; +import java.util.ArrayList; +import java.util.List; + public class VField extends FContainer { private final PlayerView player; private final FieldRow row1, row2; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VLog.java b/forge-gui-mobile/src/forge/screens/match/views/VLog.java index b2242350a9b..de5e754fa3d 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VLog.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VLog.java @@ -1,9 +1,6 @@ package forge.screens.match.views; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -18,6 +15,8 @@ import forge.screens.match.MatchController; import forge.toolbox.FDisplayObject; import forge.util.Utils; +import java.util.List; + public class VLog extends FDropDown { private static final float PADDING = Utils.scale(5); private static final FSkinFont FONT = FSkinFont.get(11); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java index 4d0bfbc56b8..f823a4ae3a3 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java @@ -1,10 +1,6 @@ package forge.screens.match.views; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -18,6 +14,9 @@ import forge.player.GamePlayerUtil; import forge.screens.match.MatchController; import forge.toolbox.FDisplayObject; +import java.util.ArrayList; +import java.util.List; + public class VManaPool extends VDisplayArea { private static final FSkinColor FORE_COLOR = FSkinColor.get(Colors.CLR_TEXT); private static final FSkinFont FONT = FSkinFont.get(16); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java index f2064e1008c..db08d3b75d3 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java @@ -1,11 +1,7 @@ package forge.screens.match.views; -import java.util.HashMap; -import java.util.Map; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -16,6 +12,9 @@ import forge.toolbox.FDisplayObject; import forge.util.TextBounds; import forge.util.Utils; +import java.util.HashMap; +import java.util.Map; + public class VPhaseIndicator extends FContainer { public static final FSkinFont BASE_FONT = FSkinFont.get(11); public static final float PADDING_X = Utils.scale(1); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index b7592677798..8da7dec2115 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -1,14 +1,8 @@ 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.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -28,6 +22,11 @@ import forge.toolbox.FContainer; import forge.toolbox.FDisplayObject; import forge.util.Utils; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class VPlayerPanel extends FContainer { private static final FSkinFont LIFE_FONT = FSkinFont.get(18); private static final FSkinFont LIFE_FONT_ALT = FSkinFont.get(22); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java index a380ecf60b6..eee291f4fef 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java @@ -1,7 +1,6 @@ package forge.screens.match.views; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; @@ -11,11 +10,7 @@ import forge.deck.FDeckViewer; import forge.game.player.PlayerView; import forge.menu.FDropDown; import forge.screens.match.MatchController; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; -import forge.toolbox.FLabel; -import forge.toolbox.FList; +import forge.toolbox.*; import forge.util.Utils; public class VPlayers extends FDropDown { diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java b/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java index 73ee45326ef..8a705a6e208 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java @@ -1,9 +1,6 @@ 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.FSkinColor.Colors; @@ -19,6 +16,7 @@ import forge.toolbox.FDisplayObject; import forge.toolbox.FEvent.FEventHandler; import forge.util.TextBounds; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; public class VPrompt extends FContainer { public static final float HEIGHT = Utils.AVG_FINGER_HEIGHT; 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 2b5e32e3263..f0c549dab00 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -1,14 +1,8 @@ package forge.screens.match.views; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -26,11 +20,7 @@ import forge.gui.card.CardDetailUtil; import forge.gui.card.CardDetailUtil.DetailColors; import forge.gui.interfaces.IGuiGame; import forge.interfaces.IGameController; -import forge.menu.FCheckBoxMenuItem; -import forge.menu.FDropDown; -import forge.menu.FMenuItem; -import forge.menu.FMenuTab; -import forge.menu.FPopupMenu; +import forge.menu.*; import forge.player.PlayerZoneUpdates; import forge.screens.match.MatchController; import forge.screens.match.TargetingOverlay; @@ -43,6 +33,11 @@ import forge.util.TextUtil; import forge.util.Utils; import forge.util.collect.FCollectionView; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + public class VStack extends FDropDown { public static final float CARD_WIDTH = Utils.AVG_FINGER_WIDTH; public static final float CARD_HEIGHT = Math.round(CARD_WIDTH * FCardPanel.ASPECT_RATIO); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java index 5421f3affee..54e517679fd 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java @@ -1,7 +1,5 @@ package forge.screens.match.views; -import java.util.List; - import forge.Forge; import forge.Graphics; import forge.game.player.PlayerView; @@ -9,6 +7,8 @@ import forge.game.zone.ZoneType; import forge.toolbox.FCardPanel; import forge.toolbox.FDisplayObject; +import java.util.List; + public class VZoneDisplay extends VCardDisplayArea { private final PlayerView player; private final ZoneType zoneType; 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 2519001b4c2..d4d69770920 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java @@ -1,7 +1,5 @@ package forge.screens.match.winlose; -import java.util.List; - import forge.Forge; import forge.game.GameView; import forge.gamemodes.gauntlet.GauntletWinLoseController; @@ -9,6 +7,8 @@ import forge.gui.FThreads; import forge.gui.util.SOptionPane; import forge.localinstance.skin.FSkinProp; +import java.util.List; + /** * The Win/Lose handler for 'gauntlet' type tournament * games. 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 600631e2ae5..415bbab70e0 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -1,12 +1,7 @@ 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; - import forge.Forge; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -22,15 +17,12 @@ import forge.item.PaperCard; import forge.localinstance.skin.FSkinProp; import forge.menu.FMagnifyView; import forge.model.FModel; -import forge.toolbox.FButton; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOverlay; -import forge.toolbox.FTextArea; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class ViewWinLose extends FOverlay implements IWinLoseView { private static final float INSETS_FACTOR = 0.025f; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java index 614649a7e38..567bde97f45 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java @@ -2,7 +2,6 @@ package forge.screens.online; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index 5eeb5f5169d..0ab1ff5b782 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -1,14 +1,9 @@ package forge.screens.online; import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.gamemodes.match.GameLobby; -import forge.gamemodes.net.ChatMessage; -import forge.gamemodes.net.IOnlineChatInterface; -import forge.gamemodes.net.IOnlineLobby; -import forge.gamemodes.net.NetConnectUtil; -import forge.gamemodes.net.OfflineLobby; +import forge.gamemodes.net.*; import forge.gamemodes.net.client.FGameClient; import forge.gamemodes.net.server.FServerManager; import forge.gui.FThreads; diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java index 521ab3491b2..e2ab059d93a 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java @@ -1,7 +1,5 @@ package forge.screens.online; -import static forge.screens.online.OnlineLobbyScreen.getGameLobby; - import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinImage; @@ -17,6 +15,8 @@ import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FOptionPane; import forge.util.Callback; +import static forge.screens.online.OnlineLobbyScreen.getGameLobby; + public class OnlineMenu extends FPopupMenu { public enum OnlineScreen { Lobby("lblLobby", FSkinImage.FAVICON, OnlineLobbyScreen.class), diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index ad4cce3b5c1..30a3cf44880 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -1,9 +1,5 @@ package forge.screens.planarconquest; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Align; @@ -11,21 +7,12 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; -import forge.assets.FSkin; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinTexture; -import forge.assets.TextRenderer; -import forge.card.CardRarity; -import forge.card.CardRenderer; +import forge.assets.*; +import forge.card.*; import forge.card.CardRenderer.CardStackPosition; -import forge.card.CardZoom; -import forge.card.ColorSet; -import forge.card.ColorSetImage; import forge.gamemodes.planarconquest.ConquestCommander; import forge.gamemodes.planarconquest.ConquestData; import forge.gamemodes.planarconquest.ConquestPlane; @@ -36,17 +23,17 @@ import forge.item.PaperCard; import forge.localinstance.skin.FSkinProp; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FCardPanel; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.GuiChoose; import forge.util.Aggregates; import forge.util.Callback; import forge.util.MyRandom; import forge.util.Utils; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class ConquestAEtherScreen extends FScreen { public static final Color FILTER_BUTTON_COLOR = ConquestMultiverseScreen.LOCATION_BAR_COLOR; public static final FSkinColor FILTER_BUTTON_TEXT_COLOR = FSkinColor.getStandardColor(ConquestMultiverseScreen.LOCATION_BAR_TEXT_COLOR); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java index c24ac7370d4..1364a326b89 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java @@ -1,7 +1,6 @@ package forge.screens.planarconquest; import com.badlogic.gdx.math.Vector2; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java index 8f335335cf5..81c34c980b9 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java @@ -1,11 +1,7 @@ package forge.screens.planarconquest; -import java.util.Collection; -import java.util.Map.Entry; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; @@ -34,6 +30,9 @@ import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FLabel; +import java.util.Collection; +import java.util.Map.Entry; + public class ConquestCollectionScreen extends TabPageScreen { private final FLabel lblShards = add(new FLabel.Builder().font(ConquestAEtherScreen.LABEL_FONT).parseSymbols().build()); private final FLabel lblInfo = add(new FLabel.Builder().font(FSkinFont.get(11)).build()); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java index cc684bbfe7a..a554b16622b 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java @@ -1,10 +1,7 @@ package forge.screens.planarconquest; -import java.util.Map.Entry; - import com.badlogic.gdx.utils.Align; import com.google.common.base.Predicate; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -26,22 +23,16 @@ import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.SFilterUtil; import forge.itemmanager.SItemManagerUtil.StatTypes; -import forge.itemmanager.filters.AdvancedSearchFilter; -import forge.itemmanager.filters.ComboBoxFilter; -import forge.itemmanager.filters.ItemFilter; -import forge.itemmanager.filters.StatTypeFilter; -import forge.itemmanager.filters.TextSearchFilter; +import forge.itemmanager.filters.*; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FButton; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; -import forge.toolbox.FOptionPane; -import forge.toolbox.FTextField; import forge.util.Callback; +import java.util.Map.Entry; + public class ConquestCommandersScreen extends FScreen { private static final float PADDING = FDeckChooser.PADDING; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java index 439fc001775..58cef268e05 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java @@ -1,7 +1,5 @@ package forge.screens.planarconquest; -import java.util.Map; - import forge.Forge; import forge.deck.DeckProxy; import forge.deck.FDeckEditor; @@ -15,6 +13,8 @@ import forge.model.FModel; import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; +import java.util.Map; + public class ConquestDeckEditor extends FDeckEditor { public ConquestDeckEditor(final ConquestCommander commander) { super(EditorType.PlanarConquest, new DeckProxy(commander.getDeck(), Forge.getLocalizer().getMessage("lblConquestCommander"), diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index fbe7327925c..5aa64340e7b 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -1,42 +1,18 @@ package forge.screens.planarconquest; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; -import forge.assets.FImage; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.FSkinTexture; -import forge.card.CardAvatarImage; -import forge.card.CardFaceSymbols; -import forge.card.CardImageRenderer; -import forge.card.CardRenderer; -import forge.card.CardZoom; -import forge.card.ColorSet; -import forge.gamemodes.planarconquest.ConquestAwardPool; -import forge.gamemodes.planarconquest.ConquestBattle; -import forge.gamemodes.planarconquest.ConquestChaosBattle; -import forge.gamemodes.planarconquest.ConquestData; -import forge.gamemodes.planarconquest.ConquestEvent; +import forge.assets.*; +import forge.card.*; +import forge.gamemodes.planarconquest.*; 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.gui.FThreads; import forge.gui.card.CardDetailUtil; import forge.gui.card.CardDetailUtil.DetailColors; @@ -44,15 +20,13 @@ import forge.item.PaperCard; import forge.model.FModel; import forge.screens.FScreen; import forge.screens.LoadingOverlay; -import forge.toolbox.FButton; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FList; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; +import forge.toolbox.*; import forge.util.Callback; import forge.util.Utils; import forge.util.collect.FCollectionView; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class ConquestMultiverseScreen extends FScreen { private static final Color FOG_OF_WAR_COLOR = FSkinColor.alphaColor(Color.BLACK, 0.65f); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java index 89b368bd69a..d4548b71293 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java @@ -1,21 +1,14 @@ package forge.screens.planarconquest; -import java.util.List; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.utils.Align; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - import forge.Forge; import forge.Graphics; -import forge.assets.FImage; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.FSkinTexture; +import forge.assets.*; import forge.card.CardRenderer; import forge.gamemodes.planarconquest.ConquestPlane; import forge.item.PaperCard; @@ -27,6 +20,8 @@ import forge.toolbox.GuiDialog; import forge.util.Utils; import forge.util.collect.FCollectionView; +import java.util.List; + public class ConquestPlaneSelector extends FDisplayObject { private static final FSkinFont PLANE_NAME_FONT = FSkinFont.get(30); private static final Color BACK_COLOR = FSkinColor.fromRGB(1, 2, 2); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java index 65fe6e6d9f8..71ec5f83819 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java @@ -2,7 +2,6 @@ package forge.screens.planarconquest; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java index 60833e8cdb5..daee1621b08 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java @@ -8,15 +8,8 @@ import forge.gamemodes.planarconquest.ConquestPreferences; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FNumericTextField; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; -import forge.toolbox.FTextField; import forge.util.Utils; public class ConquestPrefsScreen extends FScreen { diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java index f148d39d2bf..62918f10b21 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java @@ -1,11 +1,7 @@ package forge.screens.planarconquest; -import java.util.ArrayList; -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; @@ -18,14 +14,13 @@ import forge.card.CardRenderer.CardStackPosition; import forge.card.CardZoom; import forge.gamemodes.planarconquest.ConquestReward; import forge.item.PaperCard; -import forge.toolbox.FCardPanel; -import forge.toolbox.FDialog; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FScrollPane; import forge.util.Utils; +import java.util.ArrayList; +import java.util.List; + public class ConquestRewardDialog extends FScrollPane { private static final float PADDING = Utils.scale(5); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java index 94af5690b78..1f38341fc88 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java @@ -1,7 +1,6 @@ package forge.screens.planarconquest; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; @@ -12,12 +11,8 @@ import forge.gamemodes.planarconquest.IVConquestStats; import forge.gui.interfaces.IButton; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FComboBox; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FScrollPane; import forge.util.Utils; public class ConquestStatsScreen extends FScreen implements IVConquestStats { diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index 6df8ee87386..e2f92c2e960 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -1,16 +1,7 @@ package forge.screens.planarconquest; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -40,6 +31,9 @@ import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.Utils; +import java.io.File; +import java.util.*; + public class LoadConquestScreen extends LaunchScreen { private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT; private static final float PADDING = Utils.AVG_FINGER_HEIGHT * 0.1f; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index 5cfbaa7fb21..073283f5c64 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -1,7 +1,6 @@ package forge.screens.planarconquest; import com.google.common.collect.Iterables; - import forge.Forge; import forge.assets.FImage; import forge.card.CardImage; diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index a98717ba8e1..84f59174f2f 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -1,18 +1,7 @@ package forge.screens.quest; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -42,6 +31,11 @@ import forge.toolbox.FTextArea; import forge.util.ThreadUtil; import forge.util.Utils; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.*; + public class LoadQuestScreen extends LaunchScreen { private static final float ITEM_HEIGHT = Utils.AVG_FINGER_HEIGHT; private static final float PADDING = Utils.AVG_FINGER_HEIGHT * 0.1f; diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java index 51f14a71410..317b228cfac 100644 --- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java @@ -1,13 +1,6 @@ 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; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -16,13 +9,8 @@ import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; import forge.game.GameFormat; -import forge.gamemodes.quest.QuestController; -import forge.gamemodes.quest.QuestMode; -import forge.gamemodes.quest.QuestUtil; -import forge.gamemodes.quest.QuestWorld; -import forge.gamemodes.quest.StartingPoolPreferences; +import forge.gamemodes.quest.*; 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; @@ -39,19 +27,18 @@ import forge.screens.FScreen; import forge.screens.LoadingOverlay; import forge.screens.home.NewGameMenu; import forge.screens.quest.QuestMenu.LaunchReason; -import forge.toolbox.FCheckBox; -import forge.toolbox.FComboBox; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FLabel; -import forge.toolbox.FNumericTextField; -import forge.toolbox.FOptionPane; -import forge.toolbox.FRadioButton; +import forge.toolbox.*; import forge.toolbox.FRadioButton.RadioButtonGroup; -import forge.toolbox.FScrollPane; import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.Utils; +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 { private static final float EMBARK_BTN_HEIGHT = 2 * Utils.AVG_FINGER_HEIGHT; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java index 3a1183c30e5..ac40451f307 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java @@ -1,11 +1,7 @@ package forge.screens.quest; -import java.util.List; -import java.util.Set; - import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -20,16 +16,13 @@ import forge.gamemodes.quest.data.QuestAssets; import forge.gui.GuiBase; import forge.model.FModel; import forge.screens.TabPageScreen; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FList; -import forge.toolbox.FScrollPane; -import forge.toolbox.FTextArea; import forge.util.Utils; +import java.util.List; +import java.util.Set; + public class QuestBazaarScreen extends TabPageScreen { public QuestBazaarScreen() { diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java index e86019ad2d9..fbf9b192dca 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java @@ -2,7 +2,6 @@ package forge.screens.quest; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FSkinFont; import forge.gui.interfaces.IButton; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java b/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java index 173c618ba3c..37951dbae7b 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java @@ -1,8 +1,5 @@ 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; @@ -12,6 +9,9 @@ import forge.itemmanager.ItemColumn; import forge.itemmanager.ItemManagerConfig; import forge.model.FModel; +import java.util.HashMap; +import java.util.Map; + public class QuestDeckEditor extends FDeckEditor { public QuestDeckEditor(boolean commander) { super(commander ? EditorType.QuestCommander: EditorType.Quest, "", false); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java index c3c98f39998..17bcfd67482 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java @@ -1,7 +1,6 @@ package forge.screens.quest; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FSkinFont; import forge.assets.ImageCache; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java index 8560f42ec61..5d62bd3c038 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java @@ -1,10 +1,7 @@ package forge.screens.quest; -import java.util.List; - import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.assets.FSkinFont; import forge.gamemodes.quest.QuestEventDuel; @@ -14,6 +11,8 @@ import forge.model.FModel; import forge.screens.LoadingOverlay; import forge.toolbox.FLabel; +import java.util.List; + public class QuestDuelsScreen extends QuestLaunchScreen { private final FLabel lblInfo = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectNextDuel")) diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java b/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java index 956ca72a852..08d3fa57ce4 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java @@ -2,14 +2,9 @@ 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.*; import forge.assets.FSkinColor.Colors; -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; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java index 67ca2c6eba6..176e0997d78 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java @@ -1,8 +1,5 @@ package forge.screens.quest; -import java.io.File; -import java.io.IOException; - import forge.Forge; import forge.assets.FSkinImage; import forge.deck.Deck; @@ -28,6 +25,9 @@ import forge.screens.home.LoadGameMenu.LoadGameScreen; import forge.screens.home.NewGameMenu.NewGameScreen; import forge.util.ThreadUtil; +import java.io.File; +import java.io.IOException; + public class QuestMenu extends FPopupMenu implements IVQuestStats { private static final QuestMenu questMenu = new QuestMenu(); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java index 4164e09814c..950240cbbec 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java @@ -8,15 +8,8 @@ import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FNumericTextField; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; -import forge.toolbox.FTextField; import forge.util.Utils; public class QuestPrefsScreen extends FScreen { diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java index 4cf53a0909f..206ab3fd21d 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java @@ -1,13 +1,6 @@ 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; import forge.assets.FImage; import forge.assets.FSkinFont; @@ -36,6 +29,12 @@ import forge.util.Callback; import forge.util.ItemPool; 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 { private final SpellShopPage spellShopPage; private final InventoryPage inventoryPage; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java index 154e9462a72..9331fc945ed 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java @@ -1,7 +1,5 @@ package forge.screens.quest; -import java.util.List; - import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; @@ -14,16 +12,12 @@ import forge.gui.interfaces.ICheckBox; import forge.gui.interfaces.IComboBox; import forge.model.FModel; import forge.screens.FScreen; -import forge.toolbox.FCheckBox; -import forge.toolbox.FComboBox; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOptionPane; -import forge.toolbox.FScrollPane; import forge.util.Utils; +import java.util.List; + public class QuestStatsScreen extends FScreen { private static final float PADDING = FOptionPane.PADDING; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 98f4a5ac791..5962018b0d5 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -1,17 +1,9 @@ package forge.screens.quest; -import java.util.Arrays; - import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; -import forge.assets.FSkin; -import forge.assets.FSkinColor; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.FTextureRegionImage; -import forge.assets.ImageCache; +import forge.assets.*; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckGroup; @@ -38,6 +30,8 @@ import forge.toolbox.FLabel; import forge.toolbox.FTextField; import forge.util.Utils; +import java.util.Arrays; + public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestTournamentView { //Select Tournament panel private final SelectTournamentPanel pnlSelectTournament = add(new SelectTournamentPanel()); diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java index cbd354505bb..3ed187d8804 100644 --- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -1,45 +1,32 @@ package forge.screens.settings; +import com.badlogic.gdx.utils.Align; +import com.google.common.collect.ImmutableList; +import forge.Forge; +import forge.Graphics; +import forge.StaticData; +import forge.assets.FSkinColor; +import forge.assets.FSkinFont; +import forge.assets.FSkinImage; +import forge.gui.FThreads; +import forge.gui.GuiBase; +import forge.gui.download.*; +import forge.localinstance.properties.ForgeConstants; +import forge.localinstance.properties.ForgeProfileProperties; +import forge.screens.LoadingOverlay; +import forge.screens.TabPageScreen.TabPage; +import forge.toolbox.*; +import forge.toolbox.FFileChooser.ChoiceType; +import forge.util.Callback; +import forge.util.FileUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.google.common.collect.ImmutableList; -import forge.StaticData; -import forge.gui.FThreads; -import forge.gui.GuiBase; -import forge.screens.LoadingOverlay; -import org.apache.commons.lang3.StringUtils; - -import com.badlogic.gdx.utils.Align; - -import forge.Forge; -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.gui.download.GuiDownloadZipService; -import forge.localinstance.properties.ForgeConstants; -import forge.localinstance.properties.ForgeProfileProperties; -import forge.screens.TabPageScreen.TabPage; -import forge.toolbox.FFileChooser; -import forge.toolbox.FFileChooser.ChoiceType; -import forge.toolbox.FGroupList; -import forge.toolbox.FList; -import forge.toolbox.FOptionPane; -import forge.toolbox.GuiChoose; -import forge.util.Callback; -import forge.util.FileUtil; -import org.apache.commons.lang3.tuple.Pair; - public class FilesPage extends TabPage { private final FGroupList lstItems = add(new FGroupList<>()); diff --git a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java index 537f0d64819..c00e9b6e4bc 100644 --- a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java +++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java @@ -17,22 +17,18 @@ */ package forge.screens.settings; -import java.net.Proxy; - import forge.Forge; 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.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FProgressBar; -import forge.toolbox.FRadioButton; import forge.toolbox.FRadioButton.RadioButtonGroup; -import forge.toolbox.FTextField; import forge.util.Callback; import forge.util.Utils; +import java.net.Proxy; + public class GuiDownloader extends FDialog { public static final Proxy.Type[] TYPES = Proxy.Type.values(); private static final float PADDING = Utils.scale(10); diff --git a/forge-gui-mobile/src/forge/toolbox/DualListBox.java b/forge-gui-mobile/src/forge/toolbox/DualListBox.java index d9698d747b0..bb0a621a3b2 100644 --- a/forge-gui-mobile/src/forge/toolbox/DualListBox.java +++ b/forge-gui-mobile/src/forge/toolbox/DualListBox.java @@ -1,17 +1,16 @@ package forge.toolbox; -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.Forge; 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; + // An input box for handling the order of choices. // Left box has the original choices // Right box has the final order diff --git a/forge-gui-mobile/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java index 4c62825ae36..0291ce5cad9 100644 --- a/forge-gui-mobile/src/forge/toolbox/FButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FButton.java @@ -1,10 +1,7 @@ package forge.toolbox; -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -18,6 +15,7 @@ import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; import forge.util.TextBounds; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; public class FButton extends FDisplayObject implements IButton { private static final FSkinColor DEFAULT_FORE_COLOR = FSkinColor.get(Colors.CLR_TEXT); diff --git a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java index fd7d6438737..ca8b2cb5f09 100644 --- a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java @@ -1,7 +1,6 @@ package forge.toolbox; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java index e63a7c8acd9..77abaa7871c 100644 --- a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java +++ b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java @@ -1,13 +1,6 @@ package forge.toolbox; -import static forge.card.CardRenderer.MANA_SYMBOL_SIZE; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkin; import forge.assets.FSkinColor; @@ -38,6 +31,12 @@ import forge.screens.match.views.VStack; import forge.util.TextUtil; import forge.util.Utils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static forge.card.CardRenderer.MANA_SYMBOL_SIZE; + public class FChoiceList extends FList implements ActivateHandler { public static final FSkinColor ITEM_COLOR = FSkinColor.get(Colors.CLR_ZEBRA); public static final FSkinColor ALT_ITEM_COLOR = ITEM_COLOR.getContrastColor(-20); diff --git a/forge-gui-mobile/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java index 2a2a863157d..65753a8c151 100644 --- a/forge-gui-mobile/src/forge/toolbox/FComboBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FComboBox.java @@ -1,11 +1,6 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.gui.interfaces.IComboBox; import forge.menu.FDropDownMenu; @@ -13,6 +8,10 @@ import forge.menu.FMenuItem; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class FComboBox extends FTextField implements IComboBox { private final List items = new ArrayList<>(); private T selectedItem; diff --git a/forge-gui-mobile/src/forge/toolbox/FContainer.java b/forge-gui-mobile/src/forge/toolbox/FContainer.java index bb0f248c431..6b14cfb711d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FContainer.java +++ b/forge-gui-mobile/src/forge/toolbox/FContainer.java @@ -1,14 +1,13 @@ package forge.toolbox; +import com.badlogic.gdx.math.Vector2; +import forge.Graphics; +import forge.gui.error.BugReporter; + import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.List; -import com.badlogic.gdx.math.Vector2; - -import forge.Graphics; -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/FDialog.java b/forge-gui-mobile/src/forge/toolbox/FDialog.java index 28f86cf4729..3e8e87222d5 100644 --- a/forge-gui-mobile/src/forge/toolbox/FDialog.java +++ b/forge-gui-mobile/src/forge/toolbox/FDialog.java @@ -2,7 +2,6 @@ package forge.toolbox; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; diff --git a/forge-gui-mobile/src/forge/toolbox/FDisplayObject.java b/forge-gui-mobile/src/forge/toolbox/FDisplayObject.java index 92aaef7130d..4355a1a57a6 100644 --- a/forge-gui-mobile/src/forge/toolbox/FDisplayObject.java +++ b/forge-gui-mobile/src/forge/toolbox/FDisplayObject.java @@ -1,13 +1,12 @@ package forge.toolbox; -import java.util.List; - import com.badlogic.gdx.math.Rectangle; - import forge.Forge; import forge.Graphics; import forge.gui.GuiBase; +import java.util.List; + public abstract class FDisplayObject { protected static final float DISABLED_COMPOSITE = 0.25f; diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java index 8b12f2cf3dd..3d7cd187fe7 100644 --- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java @@ -1,13 +1,7 @@ package forge.toolbox; -import java.io.File; -import java.io.FilenameFilter; - -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -19,6 +13,10 @@ import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; import forge.util.FileUtil; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FilenameFilter; public class FFileChooser extends FDialog { private static final float BACK_ICON_THICKNESS = Utils.scale(2); diff --git a/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java b/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java index 10178690641..89cf891724a 100644 --- a/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java +++ b/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java @@ -6,7 +6,6 @@ import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; - import forge.Forge; import forge.assets.FSkin; import forge.localinstance.properties.ForgePreferences.FPref; diff --git a/forge-gui-mobile/src/forge/toolbox/FGroupBox.java b/forge-gui-mobile/src/forge/toolbox/FGroupBox.java index fbfd85e2ecf..e7e6eb0219b 100644 --- a/forge-gui-mobile/src/forge/toolbox/FGroupBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FGroupBox.java @@ -1,7 +1,6 @@ package forge.toolbox; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; diff --git a/forge-gui-mobile/src/forge/toolbox/FGroupList.java b/forge-gui-mobile/src/forge/toolbox/FGroupList.java index 0bf2b243018..dd4109d9247 100644 --- a/forge-gui-mobile/src/forge/toolbox/FGroupList.java +++ b/forge-gui-mobile/src/forge/toolbox/FGroupList.java @@ -1,8 +1,5 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.List; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; @@ -13,6 +10,9 @@ import forge.toolbox.FList.DefaultListItemRenderer; import forge.toolbox.FList.ListItemRenderer; import forge.util.Utils; +import java.util.ArrayList; +import java.util.List; + public class FGroupList extends FScrollPane { private static final float GROUP_HEADER_HEIGHT = Math.round(Utils.AVG_FINGER_HEIGHT * 0.6f); diff --git a/forge-gui-mobile/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java index a48b09c9b6c..d16a84dee43 100644 --- a/forge-gui-mobile/src/forge/toolbox/FLabel.java +++ b/forge-gui-mobile/src/forge/toolbox/FLabel.java @@ -3,14 +3,9 @@ package forge.toolbox; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Graphics; -import forge.assets.FImage; -import forge.assets.FSkinColor; +import forge.assets.*; import forge.assets.FSkinColor.Colors; -import forge.assets.FSkinFont; -import forge.assets.FSkinImage; -import forge.assets.TextRenderer; import forge.gui.UiCommand; import forge.gui.interfaces.IButton; import forge.localinstance.skin.FSkinProp; diff --git a/forge-gui-mobile/src/forge/toolbox/FList.java b/forge-gui-mobile/src/forge/toolbox/FList.java index e5282ad3b20..f7014384ae5 100644 --- a/forge-gui-mobile/src/forge/toolbox/FList.java +++ b/forge-gui-mobile/src/forge/toolbox/FList.java @@ -1,11 +1,6 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; @@ -18,6 +13,10 @@ import forge.model.FModel; import forge.screens.FScreen; import forge.util.Utils; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class FList extends FScrollPane implements Iterable { public static final float PADDING = Utils.scale(3); public static final FSkinColor FORE_COLOR = FSkinColor.get(Colors.CLR_TEXT); diff --git a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java index 96dbe34a66d..45869375fa4 100644 --- a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java @@ -1,14 +1,9 @@ package forge.toolbox; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; import com.google.common.collect.ImmutableList; - import forge.Forge; import forge.Graphics; import forge.assets.FImage; @@ -25,6 +20,9 @@ import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; import forge.util.Utils; import forge.util.WaitCallback; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class FOptionPane extends FDialog { public static final FSkinImage QUESTION_ICON = FSkinImage.QUESTION; diff --git a/forge-gui-mobile/src/forge/toolbox/FOverlay.java b/forge-gui-mobile/src/forge/toolbox/FOverlay.java index 7dd5911e493..d65457db31d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FOverlay.java +++ b/forge-gui-mobile/src/forge/toolbox/FOverlay.java @@ -1,13 +1,8 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -16,6 +11,10 @@ import forge.gui.FThreads; import forge.screens.FScreen; import forge.screens.match.MatchController; +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + public abstract class FOverlay extends FContainer { public static final float ALPHA_COMPOSITE = 0.5f; private static final Stack overlays = new Stack<>(); diff --git a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java index c4ba558b089..a610fa653ff 100644 --- a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java +++ b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java @@ -1,18 +1,16 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang3.tuple.Pair; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinFont; import forge.gui.interfaces.IProgressBar; import forge.util.Utils; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; public class FProgressBar extends FDisplayObject implements IProgressBar { public static Color BACK_COLOR, FORE_COLOR, SEL_BACK_COLOR, SEL_FORE_COLOR; diff --git a/forge-gui-mobile/src/forge/toolbox/FRadioButton.java b/forge-gui-mobile/src/forge/toolbox/FRadioButton.java index 7488045e387..f4b618d2a4d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FRadioButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FRadioButton.java @@ -1,16 +1,15 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.List; - import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; import forge.util.Utils; +import java.util.ArrayList; +import java.util.List; + public class FRadioButton extends FLabel { private static final FSkinColor INNER_CIRCLE_COLOR = FSkinColor.get(Colors.CLR_TEXT); private static final FSkinColor OUTER_CIRCLE_COLOR = INNER_CIRCLE_COLOR.alphaColor(0.5f); diff --git a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java index 2f6dde5199a..2cd7316fefb 100644 --- a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java @@ -1,9 +1,6 @@ package forge.toolbox; -import java.util.List; - import com.badlogic.gdx.math.Vector2; - import forge.Graphics; import forge.animation.ForgeAnimation; import forge.assets.FSkinColor; @@ -12,6 +9,8 @@ import forge.model.FModel; import forge.util.PhysicsObject; import forge.util.Utils; +import java.util.List; + public abstract class FScrollPane extends FContainer { private static final float FLING_DECEL = 750f; private static final FSkinColor INDICATOR_COLOR = FSkinColor.get(FSkinColor.Colors.CLR_TEXT).alphaColor(0.7f); diff --git a/forge-gui-mobile/src/forge/toolbox/FTextArea.java b/forge-gui-mobile/src/forge/toolbox/FTextArea.java index fe1e02c47d8..6bdf9cd5992 100644 --- a/forge-gui-mobile/src/forge/toolbox/FTextArea.java +++ b/forge-gui-mobile/src/forge/toolbox/FTextArea.java @@ -2,7 +2,6 @@ package forge.toolbox; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/toolbox/FTextField.java b/forge-gui-mobile/src/forge/toolbox/FTextField.java index 6510cc32fd5..428f9418ddd 100644 --- a/forge-gui-mobile/src/forge/toolbox/FTextField.java +++ b/forge-gui-mobile/src/forge/toolbox/FTextField.java @@ -2,7 +2,6 @@ package forge.toolbox; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.utils.Align; - import forge.Forge; import forge.Forge.KeyInputAdapter; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java b/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java index e65c4697b39..fabff813983 100644 --- a/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java +++ b/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java @@ -1,7 +1,6 @@ package forge.toolbox; import com.badlogic.gdx.utils.Align; - import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinColor.Colors; diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index 04cb896d927..cb8797007f9 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java @@ -1,20 +1,13 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import forge.Forge; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.collect.Iterables; - +import forge.Forge; import forge.game.card.CardView; import forge.util.Callback; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; public class GuiChoose { diff --git a/forge-gui-mobile/src/forge/toolbox/GuiDialog.java b/forge-gui-mobile/src/forge/toolbox/GuiDialog.java index dbc1605c654..657c058d8f4 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiDialog.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiDialog.java @@ -1,13 +1,11 @@ package forge.toolbox; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.ImmutableList; - import forge.game.card.CardView; import forge.util.Callback; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; /** * Holds player interactions using standard windows diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java index 5f0e0359ec9..ad7d8c39204 100644 --- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java @@ -18,16 +18,11 @@ package forge.toolbox; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; @@ -43,6 +38,10 @@ import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; import forge.util.Utils; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * A simple class that shows a list of choices in a dialog. Two properties * influence the behavior of a list chooser: minSelection and maxSelection. diff --git a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java index 271cca37605..09c2cde8026 100644 --- a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java +++ b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java @@ -1,5 +1,9 @@ package forge.util; +import com.badlogic.gdx.files.FileHandle; +import forge.Forge; +import forge.gui.GuiBase; + import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -7,11 +11,6 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; -import com.badlogic.gdx.files.FileHandle; - -import forge.Forge; -import forge.gui.GuiBase; - public class LibGDXImageFetcher extends ImageFetcher { @Override protected Runnable getDownloadTask(String[] downloadUrls, String destPath, Runnable notifyObservers) { diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json index 9a9c1d7f76f..5413ac49ede 100644 --- a/forge-gui/res/adventure/Shandalar/world/black.json +++ b/forge-gui/res/adventure/Shandalar/world/black.json @@ -1,37 +1,145 @@ { - "startPointX": 0.70, - "startPointY": 0.78, - "name": "black", - "noiseWeight": 0.5, - "distWeight": 1.5, - "tilesetName":"Black", - "tilesetAtlas":"world/tilesets/terrain.atlas", - "terrain":[ - { - "spriteName":"Black_1", - "min": 0, - "max": 0.2, - "resolution": 10 - },{ - "spriteName":"Black_2", - "min": 0.8, - "max": 1.0, - "resolution": 10 - } - ], - "width": 0.7, - "height": 0.7, - "color": "110903", - "spriteNames":[ "SwampTree","SwampTree2","DarkGras","Skull","SwampRock","DarkWood","Reed","Waterlily","Shroom","Shroom2"] , - "enemies":[ "Beholder","Big Zombie","Black Wiz1","Black Wiz2","Black Wiz3","Dark Knight","Death Knight","Demon","Ghoul","Ghost","Harpy","Harpy 2","High Vampire","Lich","Rakdos Devil","Skeleton","Skeleton Soldier","Vampire","Zombie","Zombie Lord" ] , - "pointsOfInterest":[ - "Black Castle", - "Swamp Town","Swamp Town2", - "Zombie Town", - "Graveyard", "Graveyard1", "Graveyard2", "Graveyard3", "Graveyard4", - "VampireCastle", "VampireCastle1", "VampireCastle2", - "EvilGrove", "EvilGrove1", "EvilGrove2", "EvilGrove3", "EvilGrove4", - "SkullCaveB", "SkullCaveB1", "SkullCaveB2", - "CaveB", "CaveB1", "CaveB2", "CaveB3", "CaveB4", "CaveB5", "CaveB6", "CaveB8", "CaveBA" - ] +"startPointX": 0.7, +"startPointY": 0.78, +"noiseWeight": 0.5, +"distWeight": 1.5, +"name": "black", +"tilesetAtlas": "world/tilesets/terrain.atlas", +"tilesetName": "Black", +"terrain": [ + { + "spriteName": "Black_1", + "max": 0.2, + "resolution": 10 + }, + { + "spriteName": "Black_2", + "min": 0.8, + "max": 1, + "resolution": 10 + } +], +"width": 0.7, +"height": 0.7, +"color": "110903", +"spriteNames": [ + "SwampTree", + "SwampTree2", + "DarkGras", + "Skull", + "SwampRock", + "DarkWood", + "Reed", + "Waterlily", + "Shroom", + "Shroom2" +], +"enemies": [ + "Beholder", + "Big Zombie", + "Black Wiz1", + "Black Wiz2", + "Black Wiz3", + "Dark Knight", + "Death Knight", + "Demon", + "Ghoul", + "Ghost", + "Harpy", + "Harpy 2", + "High Vampire", + "Lich", + "Rakdos Devil", + "Skeleton", + "Skeleton Soldier", + "Vampire", + "Zombie", + "Zombie Lord" +], +"pointsOfInterest": [ + "Black Castle", + "Swamp Town", + "Swamp Town2", + "Zombie Town", + "Graveyard", + "Graveyard1", + "Graveyard2", + "Graveyard3", + "Graveyard4", + "VampireCastle", + "VampireCastle1", + "VampireCastle2", + "EvilGrove", + "EvilGrove1", + "EvilGrove2", + "EvilGrove3", + "EvilGrove4", + "SkullCaveB", + "SkullCaveB1", + "SkullCaveB2", + "CaveB", + "CaveB1", + "CaveB2", + "CaveB3", + "CaveB4", + "CaveB5", + "CaveB6", + "CaveB8", + "CaveBA" +], +"structures": [ + { + "N": 2, + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/swamp_forest.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.4, + "width": 0.4, + "symmetry": 8, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "swamp_forest", + "color": "007000", + "collision": true + }, + { + "name": "swamp_water", + "color": "005050", + "collision": true + } + ] + }, + { + "N": 2, + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/swamp_ruins.png", + "maskPath": "world/tilesets/circle.png", + "height": 0.20000002, + "width": 0.20000002, + "symmetry": 1, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "deep_swamp", + "color": "002000", + "collision": true + }, + { + "name": "structure", + "color": "505050", + "collision": true + }, + { + "name": "swamp_forest2", + "color": "007000", + "collision": true + } + ] + } +] } \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json index bb8fc0927ec..fafce7a20d8 100644 --- a/forge-gui/res/adventure/Shandalar/world/blue.json +++ b/forge-gui/res/adventure/Shandalar/world/blue.json @@ -1,38 +1,126 @@ { - "startPointX": 0.79, - "startPointY": 0.43, - "name": "blue", - "noiseWeight": 0.5, - "distWeight": 1.5, - "tilesetName":"Blue", - "tilesetAtlas":"world/tilesets/terrain.atlas", - "terrain":[ - { - "spriteName":"Blue_1", - "min": 0, - "max": 0.2, - "resolution": 10 - }, { - "spriteName":"Blue_2", - "min": 0.8, - "max": 1.0, - "resolution": 10 - } - ], - "width": 0.7, - "height": 0.7, - "color": "10a2e0", - "spriteNames":["IslandTree" ,"Coral" ,"Shell" ], - "enemies":[ "Bird","Djinn","Elemental","Merfolk","Merfolk Avatar","Merfolk Fighter","Merfolk Lord","Merfolk Soldier","Merfolk warrior","Blue Wiz1","Blue Wiz2","Blue Wiz3","Geist","Rogue","Sea Monster","Tarkir Djinn","Doppelganger" ] , - "pointsOfInterest":[ - "Blue Castle", - "Island Town", - "NestU", - "MerfolkPool", "MerfolkPool1", "MerfolkPool2", "MerfolkPool3", "MerfolkPool4", - "DjinnPalace", "DjinnPalace1", - "Factory", "Factory1", - "MageTowerX", - "MageTowerU", "MageTowerU1", "MageTowerU2", "MageTowerU3", "MageTowerU4", "MageTowerU5", "MageTowerU6", "MageTowerU7", "MageTowerUD", - "CaveU", "CaveU1", "CaveU2", "CaveU3", "CaveU4" - ] +"startPointX": 0.79, +"startPointY": 0.43, +"noiseWeight": 0.5, +"distWeight": 1.5, +"name": "blue", +"tilesetAtlas": "world/tilesets/terrain.atlas", +"tilesetName": "Blue", +"terrain": [ + { + "spriteName": "Blue_1", + "max": 0.2, + "resolution": 10 + }, + { + "spriteName": "Blue_2", + "min": 0.8, + "max": 1, + "resolution": 10 + } +], +"width": 0.7, +"height": 0.7, +"color": "10a2e0", +"spriteNames": [ + "IslandTree", + "Coral", + "Shell" +], +"enemies": [ + "Bird", + "Djinn", + "Elemental", + "Merfolk", + "Merfolk Avatar", + "Merfolk Fighter", + "Merfolk Lord", + "Merfolk Soldier", + "Merfolk warrior", + "Blue Wiz1", + "Blue Wiz2", + "Blue Wiz3", + "Geist", + "Rogue", + "Sea Monster", + "Tarkir Djinn", + "Doppelganger" +], +"pointsOfInterest": [ + "Blue Castle", + "Island Town", + "NestU", + "MerfolkPool", + "MerfolkPool1", + "MerfolkPool2", + "MerfolkPool3", + "MerfolkPool4", + "DjinnPalace", + "DjinnPalace1", + "Factory", + "Factory1", + "MageTowerX", + "MageTowerU", + "MageTowerU1", + "MageTowerU2", + "MageTowerU3", + "MageTowerU4", + "MageTowerU5", + "MageTowerU6", + "MageTowerU7", + "MageTowerUD", + "CaveU", + "CaveU1", + "CaveU2", + "CaveU3", + "CaveU4" +], +"structures": [ + { + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/water.png", + "maskPath": "world/tilesets/circle.png", + "height": 0.20000002, + "width": 0.20000002, + "symmetry": 8, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "water", + "color": "0070a0", + "collision": true + }, + { + "name": "island_forest", + "color": "00a000", + "collision": true + } + ] + }, + { + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/island_forest.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.4, + "width": 0.4, + "symmetry": 8, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "water", + "color": "0070a0", + "collision": true + }, + { + "name": "island_forest", + "color": "00a000", + "collision": true + } + ] + } +] } \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/green.json b/forge-gui/res/adventure/Shandalar/world/green.json index 644004f6b77..cf577f13624 100644 --- a/forge-gui/res/adventure/Shandalar/world/green.json +++ b/forge-gui/res/adventure/Shandalar/world/green.json @@ -91,17 +91,18 @@ ], "structures": [ { + "N": 2, "x": 0.5, "y": 0.5, "structureAtlasPath": "world/tilesets/structures.atlas", - "sourcePath": "world/tilesets/forestSource.png", - "height": 0.3, - "width": 0.3, + "sourcePath": "world/tilesets/forest.png", + "maskPath": "world/tilesets/circle.png", + "height": 0.20000002, + "width": 0.20000002, "symmetry": 1, - "periodicOutput": false, "mappingInfo": [ { - "name": "Forest", + "name": "forest", "color": "007000", "collision": true } @@ -109,21 +110,22 @@ }, { "N": 2, - "x": 0.3, - "y": 0.3, + "x": 0.5, + "y": 0.5, "structureAtlasPath": "world/tilesets/structures.atlas", - "sourcePath": "world/tilesets/lakeSource.png", - "height": 0.3, - "width": 0.3, + "sourcePath": "world/tilesets/lake.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.4, + "width": 0.4, "periodicOutput": false, "mappingInfo": [ { - "name": "Lake", + "name": "lake", "color": "0070a0", "collision": true }, { - "name": "Forest2", + "name": "forest2", "color": "009000", "collision": true } diff --git a/forge-gui/res/adventure/Shandalar/world/red.json b/forge-gui/res/adventure/Shandalar/world/red.json index b91c3da9f19..9cb469cdd20 100644 --- a/forge-gui/res/adventure/Shandalar/world/red.json +++ b/forge-gui/res/adventure/Shandalar/world/red.json @@ -1,39 +1,144 @@ { - "startPointX": 0.31, - "startPointY": 0.78, - "name": "red", - "noiseWeight": 0.5, - "distWeight": 1.5, - "tilesetName":"Red", - "tilesetAtlas":"world/tilesets/terrain.atlas", - "terrain":[ - { - "spriteName":"Red_1", - "min": 0, - "max": 0.2, - "resolution": 10 - },{ - "spriteName":"Red_2", - "min": 0.8, - "max": 1.0, - "resolution": 10 - } - ], - "width": 0.7, - "height": 0.7, - "color": "b63729", - "spriteNames":[ "MountainTree","MountainTree2","MountainRock","LargeMountainRock","Gravel"] , - "enemies":[ "Amonkhet Minotaur","Ashmouth Devil","Axgard Dwarf","Berserker","Boggart","Cyclops","Devil","Dinosaur","Dragon","Dwarf","Efreet","Fire Elemental","Flame Elemental","Goblin","Goblin Chief","Goblin Warrior","Hellhound","Immersturm Demon","Khan","Minotaur","Minotaur Flayer","Red Beast","Red Wiz1","Red Wiz2","Red Wiz3","Shaman","Troll","Vampire Lord","Viashino","Yeti" ] , - "pointsOfInterest":[ - "Red Castle", - "Mountain Town", - "YuleTown", - "BarbarianCamp", "BarbarianCamp1", "BarbarianCamp2", - "Maze", "Maze1", "Maze2", "Maze3", - "Fort", "Fort5", - "Factory", "Factory2", "Factory3", - "SnowAbbey", "SnowAbbey1", "SnowAbbey2", - "SkullCaveR", "SkullCaveR1", "SkullCaveR2", - "CaveR", "CaveR1", "CaveR2", "CaveR3", "CaveR4", "CaveR5", "CaveR6", "CaveR7", "CaveR8", "CaveR9", "CaveRA", "CaveRB", "CaveRC", "CaveRE", "CaveRG", "CaveRH", "CaveRJ" - ] +"startPointX": 0.31, +"startPointY": 0.78, +"noiseWeight": 0.5, +"distWeight": 1.5, +"name": "red", +"tilesetAtlas": "world/tilesets/terrain.atlas", +"tilesetName": "Red", +"terrain": [ + { + "spriteName": "Red_1", + "max": 0.2, + "resolution": 10 + }, + { + "spriteName": "Red_2", + "min": 0.8, + "max": 1, + "resolution": 10 + } +], +"width": 0.7, +"height": 0.7, +"color": "b63729", +"spriteNames": [ + "MountainTree", + "MountainTree2", + "MountainRock", + "Gravel" +], +"enemies": [ + "Amonkhet Minotaur", + "Ashmouth Devil", + "Axgard Dwarf", + "Berserker", + "Boggart", + "Cyclops", + "Devil", + "Dinosaur", + "Dragon", + "Dwarf", + "Efreet", + "Fire Elemental", + "Flame Elemental", + "Goblin", + "Goblin Chief", + "Goblin Warrior", + "Hellhound", + "Immersturm Demon", + "Khan", + "Minotaur", + "Minotaur Flayer", + "Red Beast", + "Red Wiz1", + "Red Wiz2", + "Red Wiz3", + "Shaman", + "Troll", + "Vampire Lord", + "Viashino", + "Yeti" +], +"pointsOfInterest": [ + "Red Castle", + "Mountain Town", + "YuleTown", + "BarbarianCamp", + "BarbarianCamp1", + "BarbarianCamp2", + "Maze", + "Maze1", + "Maze2", + "Maze3", + "Fort", + "Fort5", + "Factory", + "Factory2", + "Factory3", + "SnowAbbey", + "SnowAbbey1", + "SnowAbbey2", + "SkullCaveR", + "SkullCaveR1", + "SkullCaveR2", + "CaveR", + "CaveR1", + "CaveR2", + "CaveR3", + "CaveR4", + "CaveR5", + "CaveR6", + "CaveR7", + "CaveR8", + "CaveR9", + "CaveRA", + "CaveRB", + "CaveRC", + "CaveRE", + "CaveRG", + "CaveRH", + "CaveRJ" +], +"structures": [ + { + "N": 2, + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/mountain.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.4, + "width": 0.4, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "mountain", + "color": "a07020", + "collision": true + }, + { + "name": "mountain_forest", + "color": "007000", + "collision": true + } + ] + }, + { + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/lava.png", + "maskPath": "world/tilesets/circle.png", + "height": 0.2, + "width": 0.2, + "mappingInfo": [ + { + "name": "lava", + "color": "ff5000", + "collision": true + } + ] + } +] } \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/circle.png b/forge-gui/res/adventure/Shandalar/world/tilesets/circle.png new file mode 100644 index 00000000000..73f7a8e663b Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/circle.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/deep_swamp.png b/forge-gui/res/adventure/Shandalar/world/tilesets/deep_swamp.png new file mode 100644 index 00000000000..a97692a24ae Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/deep_swamp.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/forest.png b/forge-gui/res/adventure/Shandalar/world/tilesets/forest.png index cf8dd71e0c9..8bcd553e663 100644 Binary files a/forge-gui/res/adventure/Shandalar/world/tilesets/forest.png and b/forge-gui/res/adventure/Shandalar/world/tilesets/forest.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/forestSource.png b/forge-gui/res/adventure/Shandalar/world/tilesets/forestSource.png deleted file mode 100644 index d67c70f9fe7..00000000000 Binary files a/forge-gui/res/adventure/Shandalar/world/tilesets/forestSource.png and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/hole.png b/forge-gui/res/adventure/Shandalar/world/tilesets/hole.png new file mode 100644 index 00000000000..0f9cd1e0e05 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/hole.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/island_forest.png b/forge-gui/res/adventure/Shandalar/world/tilesets/island_forest.png new file mode 100644 index 00000000000..d9de72cb85b Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/island_forest.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/lake.png b/forge-gui/res/adventure/Shandalar/world/tilesets/lake.png new file mode 100644 index 00000000000..655270f1f03 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/lake.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/lakeSource.png b/forge-gui/res/adventure/Shandalar/world/tilesets/lakeSource.png deleted file mode 100644 index af2f51f4f89..00000000000 Binary files a/forge-gui/res/adventure/Shandalar/world/tilesets/lakeSource.png and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/lava.png b/forge-gui/res/adventure/Shandalar/world/tilesets/lava.png new file mode 100644 index 00000000000..c78188f8d90 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/lava.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/moon.png b/forge-gui/res/adventure/Shandalar/world/tilesets/moon.png new file mode 100644 index 00000000000..6a1c6639c82 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/moon.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/moon2.png b/forge-gui/res/adventure/Shandalar/world/tilesets/moon2.png new file mode 100644 index 00000000000..57c48364141 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/moon2.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/moon3.png b/forge-gui/res/adventure/Shandalar/world/tilesets/moon3.png new file mode 100644 index 00000000000..2fe39f08bf1 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/moon3.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/moon4.png b/forge-gui/res/adventure/Shandalar/world/tilesets/moon4.png new file mode 100644 index 00000000000..a124ae379ae Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/moon4.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/mountain.png b/forge-gui/res/adventure/Shandalar/world/tilesets/mountain.png new file mode 100644 index 00000000000..01d8d464fd4 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/mountain.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/mountain_forest.png b/forge-gui/res/adventure/Shandalar/world/tilesets/mountain_forest.png new file mode 100644 index 00000000000..224e0d9138e Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/mountain_forest.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/plains_forest.png b/forge-gui/res/adventure/Shandalar/world/tilesets/plains_forest.png new file mode 100644 index 00000000000..98ebe05fbf6 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/plains_forest.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/plateau.png b/forge-gui/res/adventure/Shandalar/world/tilesets/plateau.png new file mode 100644 index 00000000000..b415a0c76d9 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/plateau.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/ring.png b/forge-gui/res/adventure/Shandalar/world/tilesets/ring.png new file mode 100644 index 00000000000..759eb1645c8 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/ring.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/ring2.png b/forge-gui/res/adventure/Shandalar/world/tilesets/ring2.png new file mode 100644 index 00000000000..90636b7824d Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/ring2.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/structures.atlas b/forge-gui/res/adventure/Shandalar/world/tilesets/structures.atlas index c7b9d7cff58..9ea32b0053c 100644 --- a/forge-gui/res/adventure/Shandalar/world/tilesets/structures.atlas +++ b/forge-gui/res/adventure/Shandalar/world/tilesets/structures.atlas @@ -1,27 +1,60 @@ structures.png -size: 96,64 +size: 288,384 format: RGBA8888 filter: Nearest,Nearest repeat: none -Forest - rotate: false +forest xy: 0, 0 size: 48, 64 - orig: 0, 0 - offset: 0, 0 - index: 0 -Lake - Lake: false +lake xy: 48, 0 - size: 48, 64 - orig: 0, 0 - offset: 0, 0 - index: 0 -Forest2 - rotate: false + size: 48, 64 +forest2 xy: 96, 0 size: 48, 64 - orig: 0, 0 - offset: 0, 0 - index: 0 \ No newline at end of file +swamp_forest + xy: 0, 64 + size: 48, 64 +swamp_forest2 + xy: 48, 64 + size: 48, 64 +structure + xy: 96, 64 + size: 48, 64 +swamp_water + xy: 144, 64 + size: 48, 64 +deep_swamp + xy: 192, 64 + size: 48, 64 +mountain + xy: 0, 128 + size: 48, 64 +lava + xy: 48, 128 + size: 48, 64 +mountain_forest + xy: 96, 128 + size: 48, 64 +plateau + xy: 0, 192 + size: 48, 64 +plains_forest + xy: 48, 192 + size: 48, 64 +water + xy: 0, 256 + size: 48, 64 +island_forest + xy: 48, 256 + size: 48, 64 +hole + xy: 0, 320 + size: 48, 64 +waste_mountain + xy: 48, 320 + size: 48, 64 +waste_structure + xy: 96, 320 + size: 48, 64 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/structures.png b/forge-gui/res/adventure/Shandalar/world/tilesets/structures.png index 444966a1c76..376ba44ed4d 100644 Binary files a/forge-gui/res/adventure/Shandalar/world/tilesets/structures.png and b/forge-gui/res/adventure/Shandalar/world/tilesets/structures.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/swamp.png b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp.png new file mode 100644 index 00000000000..9cf0d6c324b Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_forest.png b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_forest.png new file mode 100644 index 00000000000..f061ee9cdda Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_forest.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_ruins.png b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_ruins.png new file mode 100644 index 00000000000..34904ade0c2 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/swamp_ruins.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/waste_structure.png b/forge-gui/res/adventure/Shandalar/world/tilesets/waste_structure.png new file mode 100644 index 00000000000..a1f6fc80f99 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/waste_structure.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/tilesets/water.png b/forge-gui/res/adventure/Shandalar/world/tilesets/water.png new file mode 100644 index 00000000000..ed435a73e12 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/world/tilesets/water.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json index 750ed106b10..30d4535005b 100644 --- a/forge-gui/res/adventure/Shandalar/world/waste.json +++ b/forge-gui/res/adventure/Shandalar/world/waste.json @@ -1,37 +1,141 @@ { - "startPointX": 0.5, - "startPointY": 0.5, - "name": "waste", - "noiseWeight": 0.3, - "distWeight": 1.0, - "tilesetName":"Waste", - "tilesetAtlas":"world/tilesets/terrain.atlas", - "terrain":[ - { - "spriteName":"Waste_1", - "min": 0, - "max": 0.2, - "resolution": 5 - }, { - "spriteName":"Waste_2", - "min": 0.8, - "max": 1.0, - "resolution": 5 - } - ], - "width": 0.85, - "height": 0.85, - "color": "aeaeae", - "spriteNames":[ "WasteTree","Stone","WasteRock"] , - "enemies":[ "Bandit","ClayGolem","Construct","Eldrazi","Gargoyle","Gargoyle 2","Golem","Sliver","Black Wiz1","Black Wiz2","Black Wiz3","Blue Wiz1","Blue Wiz2","Blue Wiz3","Green Wiz1","Green Wiz2","Green Wiz3","Red Wiz1","Red Wiz2","Red Wiz3","White Wiz1","White Wiz2","White Wiz3","Doppelganger" ] , - "pointsOfInterest":[ - "Final Castle", - "Colorless Castle", - "Skep", - "Waste Town", - "Fort", "Fort1", "Fort2", "Fort3", "Fort4", "Fort5", "Fort6", - "Factory", "Factory1", "Factory2", "Factory3", - "MageTowerC", "MageTowerC1", "MageTowerC2", "MageTowerC3", "MageTowerC4", "MageTowerC5", - "CaveC", "CaveC1", "CaveC2", "CaveC3", "CaveC4", "CaveC5", "CaveC6", "CaveC7", "CaveC8", "CaveC9", "CaveCA", "CaveCB", "CaveCD" - ] +"startPointX": 0.5, +"startPointY": 0.5, +"noiseWeight": 0.3, +"distWeight": 1, +"name": "waste", +"tilesetAtlas": "world/tilesets/terrain.atlas", +"tilesetName": "Waste", +"terrain": [ + { + "spriteName": "Waste_1", + "max": 0.2, + "resolution": 5 + }, + { + "spriteName": "Waste_2", + "min": 0.8, + "max": 1, + "resolution": 5 + } +], +"width": 0.85, +"height": 0.85, +"color": "aeaeae", +"spriteNames": [ + "WasteTree", + "Stone", + "WasteRock" +], +"enemies": [ + "Bandit", + "ClayGolem", + "Construct", + "Eldrazi", + "Gargoyle", + "Gargoyle 2", + "Golem", + "Sliver", + "Black Wiz1", + "Black Wiz2", + "Black Wiz3", + "Blue Wiz1", + "Blue Wiz2", + "Blue Wiz3", + "Green Wiz1", + "Green Wiz2", + "Green Wiz3", + "Red Wiz1", + "Red Wiz2", + "Red Wiz3", + "White Wiz1", + "White Wiz2", + "White Wiz3", + "Doppelganger" +], +"pointsOfInterest": [ + "Final Castle", + "Colorless Castle", + "Skep", + "Waste Town", + "Fort", + "Fort1", + "Fort2", + "Fort3", + "Fort4", + "Fort5", + "Fort6", + "Factory", + "Factory1", + "Factory2", + "Factory3", + "MageTowerC", + "MageTowerC1", + "MageTowerC2", + "MageTowerC3", + "MageTowerC4", + "MageTowerC5", + "CaveC", + "CaveC1", + "CaveC2", + "CaveC3", + "CaveC4", + "CaveC5", + "CaveC6", + "CaveC7", + "CaveC8", + "CaveC9", + "CaveCA", + "CaveCB", + "CaveCD" +], +"structures": [ + { + "N": 2, + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/waste_structure.png", + "maskPath": "world/tilesets/circle.png", + "periodicInput": false, + "height": 0.20000002, + "width": 0.20000002, + "symmetry": 4, + "mappingInfo": [ + { + "name": "waste_structure", + "color": "444444", + "collision": true + }, + { + "name": "waste_mountain", + "color": "9a9a9a", + "collision": true + } + ] + }, + { + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/hole.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.3, + "width": 0.3, + "symmetry": 8, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "hole", + "color": "111111", + "collision": true + }, + { + "name": "waste_mountain", + "color": "9a9a9a", + "collision": true + } + ] + } +] } \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json index 86b8b226a0a..725e91de497 100644 --- a/forge-gui/res/adventure/Shandalar/world/white.json +++ b/forge-gui/res/adventure/Shandalar/world/white.json @@ -1,37 +1,114 @@ -{ - "startPointX": 0.5, - "startPointY": 0.22, - "name": "white", - "noiseWeight": 0.5, - "distWeight": 1.5, - "tilesetName":"White", - "tilesetAtlas":"world/tilesets/terrain.atlas", - "terrain":[ - { - "spriteName":"White_1", - "min": 0, - "max": 0.2, - "resolution": 10 - }, { - "spriteName":"White_2", - "min": 0.8, - "max": 1.0, - "resolution": 10 - } - ], - "width": 0.7, - "height": 0.7, - "color": "efe697", - "spriteNames":[ "PlainsTree", "Cactus" ,"PlainsRock" ,"LargePlainsRock" ,"DarkGras" ], - "enemies":[ "Adventurer","Archer","Cat","Cathar","Cleric","Dawnhart Witch","Eldraine Knight","Griffin","Horseman","Human","Human elite","Human guard","Knight","Monk","White Dwarf","White Wiz1","White Wiz2","White Wiz3" ] , - "pointsOfInterest":[ - "White Castle", - "Plains Town", - "Monastery", "Monastery1", "Monastery2", "Monastery3", "Monastery4", - "Castle", "Castle1", "Castle2", - "Fort7", "Fort8", "Fort9", - "CatLairW", "CatLairW1", "CatLairW2", - "NestW", - "CaveW", "CaveW1", "CaveW2", "CaveW3", "CaveW4", "CaveW5", "CaveW6" - ] +{ +"startPointX": 0.5, +"startPointY": 0.22, +"noiseWeight": 0.5, +"distWeight": 1.5, +"name": "white", +"tilesetAtlas": "world/tilesets/terrain.atlas", +"tilesetName": "White", +"terrain": [ + { + "spriteName": "White_1", + "max": 0.2, + "resolution": 10 + }, + { + "spriteName": "White_2", + "min": 0.8, + "max": 1, + "resolution": 10 + } +], +"width": 0.7, +"height": 0.7, +"color": "efe697", +"spriteNames": [ + "PlainsTree", + "Cactus", + "PlainsRock", + "DarkGras" +], +"enemies": [ + "Adventurer", + "Archer", + "Cat", + "Cathar", + "Cleric", + "Dawnhart Witch", + "Eldraine Knight", + "Griffin", + "Horseman", + "Human", + "Human elite", + "Human guard", + "Knight", + "Monk", + "White Dwarf", + "White Wiz1", + "White Wiz2", + "White Wiz3" +], +"pointsOfInterest": [ + "White Castle", + "Plains Town", + "Monastery", + "Monastery1", + "Monastery2", + "Monastery3", + "Monastery4", + "Castle", + "Castle1", + "Castle2", + "Fort7", + "Fort8", + "Fort9", + "CatLairW", + "CatLairW1", + "CatLairW2", + "NestW", + "CaveW", + "CaveW1", + "CaveW2", + "CaveW3", + "CaveW4", + "CaveW5", + "CaveW6" +], +"structures": [ + { + "N": 2, + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/plains_forest.png", + "maskPath": "world/tilesets/circle.png", + "height": 0.20000002, + "width": 0.20000002, + "symmetry": 8, + "mappingInfo": [ + { + "name": "plains_forest", + "color": "9c4000", + "collision": true + } + ] + }, + { + "x": 0.5, + "y": 0.5, + "structureAtlasPath": "world/tilesets/structures.atlas", + "sourcePath": "world/tilesets/plateau.png", + "maskPath": "world/tilesets/ring.png", + "height": 0.4, + "width": 0.4, + "periodicOutput": false, + "mappingInfo": [ + { + "name": "plateau", + "color": "caaa66", + "collision": true + } + ] + } +] } \ No newline at end of file