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

changed road algo

Browse Source 
added WaveFunctionCollapse to create biome structures
changed world generation.
added overworld collision for enemies.
This commit is contained in:
Grimm
2022-08-06 21:10:18 +02:00
parent 03aac93b26
commit f6bec79a28
229 changed files with 1329 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
View File

@@ -3,8 +3,6 @@ package forge.adventure.editor;
import forge.adventure.data.BiomeData; import forge.adventure.data.BiomeData;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.util.Arrays;
public class BiomeEdit extends FormPanel { public class BiomeEdit extends FormPanel {
BiomeData currentData; BiomeData currentData;

1
forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java
View File

@@ -2,7 +2,6 @@ package forge.adventure.editor;
import forge.adventure.data.BiomeStructureData; import forge.adventure.data.BiomeStructureData;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import forge.adventure.world.BiomeStructure;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

7
forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
View File

@@ -6,8 +6,6 @@ import forge.adventure.data.BiomeStructureData;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.image.BufferedImage;
public class BiomeStructureEdit extends FormPanel { public class BiomeStructureEdit extends FormPanel {
private boolean updating=false; private boolean updating=false;
@@ -21,6 +19,7 @@ public class BiomeStructureEdit extends FormPanel {
public JCheckBox randomPosition=new JCheckBox(); public JCheckBox randomPosition=new JCheckBox();
public IntSpinner N= new IntSpinner(); public IntSpinner N= new IntSpinner();
public JTextField sourcePath= new JTextField(); public JTextField sourcePath= new JTextField();
public JTextField maskPath= new JTextField();
public JCheckBox periodicInput= new JCheckBox(); public JCheckBox periodicInput= new JCheckBox();
public IntSpinner ground= new IntSpinner(); public IntSpinner ground= new IntSpinner();
public IntSpinner symmetry= new IntSpinner(); public IntSpinner symmetry= new IntSpinner();
@@ -37,6 +36,7 @@ public class BiomeStructureEdit extends FormPanel {
center.add("height:",height); center.add("height:",height);
center.add("N:",N); center.add("N:",N);
center.add("sourcePath:",sourcePath); center.add("sourcePath:",sourcePath);
center.add("maskPath:",maskPath);
center.add("periodicInput:",periodicInput); center.add("periodicInput:",periodicInput);
center.add("ground:",ground); center.add("ground:",ground);
center.add("symmetry:",symmetry); center.add("symmetry:",symmetry);
@@ -56,6 +56,7 @@ public class BiomeStructureEdit extends FormPanel {
N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(() -> 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()); periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
@@ -78,6 +79,7 @@ public class BiomeStructureEdit extends FormPanel {
randomPosition.setSelected(currentData.randomPosition); randomPosition.setSelected(currentData.randomPosition);
N.setValue(currentData.N); N.setValue(currentData.N);
sourcePath.setText(currentData.sourcePath); sourcePath.setText(currentData.sourcePath);
maskPath.setText(currentData.maskPath);
periodicInput.setSelected(currentData.periodicInput); periodicInput.setSelected(currentData.periodicInput);
ground.setValue(currentData.ground); ground.setValue(currentData.ground);
symmetry.setValue(currentData.symmetry); symmetry.setValue(currentData.symmetry);
@@ -105,6 +107,7 @@ public class BiomeStructureEdit extends FormPanel {
currentData.N= N.intValue(); currentData.N= N.intValue();
currentData.sourcePath= sourcePath.getText(); currentData.sourcePath= sourcePath.getText();
currentData.maskPath= maskPath.getText();
currentData.periodicInput= periodicInput.isSelected(); currentData.periodicInput= periodicInput.isSelected();
currentData.ground= ground.intValue(); currentData.ground= ground.intValue();
currentData.symmetry= symmetry.intValue(); currentData.symmetry= symmetry.intValue();

1
forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
View File

@@ -6,7 +6,6 @@ import forge.adventure.data.BiomeTerrainData;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*;
public class BiomeTerrainEdit extends FormPanel { public class BiomeTerrainEdit extends FormPanel {
SwingAtlasPreview preview=new SwingAtlasPreview(128); SwingAtlasPreview preview=new SwingAtlasPreview(128);

1
forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java
View File

@@ -5,7 +5,6 @@ import forge.adventure.data.EffectData;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*;
public class EffectEditor extends JComponent { public class EffectEditor extends JComponent {
EffectData currentData; EffectData currentData;

1
forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java
View File

@@ -3,7 +3,6 @@ package forge.adventure.editor;
import forge.adventure.data.EnemyData; import forge.adventure.data.EnemyData;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
/** /**
* Editor class to edit configuration, maybe moved or removed * Editor class to edit configuration, maybe moved or removed

1
forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java
View File

@@ -3,7 +3,6 @@ package forge.adventure.editor;
import forge.adventure.data.PointOfInterestData; import forge.adventure.data.PointOfInterestData;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
public class PointOfInterestEdit extends JComponent { public class PointOfInterestEdit extends JComponent {

1
forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
View File

@@ -7,7 +7,6 @@ import forge.game.keyword.Keyword;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*;
import java.util.Arrays; import java.util.Arrays;
/** /**

13
forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java
View File

@@ -2,7 +2,6 @@ package forge.adventure.editor;
import forge.adventure.data.BiomeData; import forge.adventure.data.BiomeData;
import forge.adventure.data.BiomeStructureData; import forge.adventure.data.BiomeStructureData;
import forge.adventure.data.WorldData;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import forge.adventure.world.BiomeStructure; import forge.adventure.world.BiomeStructure;
@@ -83,13 +82,14 @@ public class StructureEditor extends JComponent{
private void test() { private void test() {
if (list.isSelectionEmpty()) if (list.isSelectionEmpty())
return; return;
long start = System.currentTimeMillis();
BiomeStructureData data = model.get(list.getSelectedIndex()); BiomeStructureData data = model.get(list.getSelectedIndex());
try { try {
BiomeStructure struct = new BiomeStructure(data, System.currentTimeMillis(), BiomeStructure struct = new BiomeStructure(data, System.currentTimeMillis(),
(int) (currentData.width * EditorMainWindow.worldEditor.width.intValue() * data.width), (int) (currentData.width * EditorMainWindow.worldEditor.width.intValue() ),
(int) (currentData.width * EditorMainWindow.worldEditor.height.intValue() * data.height)); (int) (currentData.width * EditorMainWindow.worldEditor.height.intValue()));
struct.initialize(); struct.initialize();
JLabel label = new JLabel(); JLabel label = new JLabel();
BufferedImage image = struct.image; BufferedImage image = struct.image;
@@ -111,11 +111,14 @@ public class StructureEditor extends JComponent{
} }
label.setIcon(new ImageIcon(image)); label.setIcon(new ImageIcon(image));
label.setSize(640, 640); 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) 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);
} }
} }

10
forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java
View File

@@ -55,15 +55,25 @@ public class SwingAtlas {
} }
private ImageIcon spriteToImage(TextureAtlas.TextureAtlasData.Region sprite) throws IOException { private ImageIcon spriteToImage(TextureAtlas.TextureAtlasData.Region sprite) throws IOException {
try
{
BufferedImage img = ImageIO.read(sprite.page.textureFile.file()); BufferedImage img = ImageIO.read(sprite.page.textureFile.file());
if(sprite.width== sprite.height) if(sprite.width== sprite.height)
return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize,imageSize,SCALE_FAST)); return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize,imageSize,SCALE_FAST));
if(sprite.width>sprite.height) 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(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)); 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) { public ImageIcon get(String name) {
if(images.get(name).size()==0)
return null;
return images.get(name).get(0); return images.get(name).get(0);
} }

1
forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java
View File

@@ -4,7 +4,6 @@ import forge.adventure.util.Config;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
forge-adventure/src/main/java/forge/adventure/editor/TextListEdit.java
View File

@@ -3,6 +3,7 @@ package forge.adventure.editor;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File; import java.io.File;
@@ -27,6 +28,7 @@ public class TextListEdit extends Box {
}); });
add(edit); add(edit);
edit.setPreferredSize(new Dimension(400,edit.getPreferredSize().height));
//add(findButton); //add(findButton);
elements= new JComboBox(possibleElements); elements= new JComboBox(possibleElements);
add(elements); add(elements);
@@ -84,7 +86,7 @@ public class TextListEdit extends Box {
{ {
values.append(intValues[i]); values.append(intValues[i]);
if(intValues.length>i+2) if(intValues.length>i+2)
values.append(";"); values.append("\n");
} }
edit.setText(values.toString()); edit.setText(values.toString());
} }

2
forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java
View File

@@ -1,7 +1,6 @@
package forge.adventure.editor; package forge.adventure.editor;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonWriter; import com.badlogic.gdx.utils.JsonWriter;
import forge.adventure.data.BiomeData; import forge.adventure.data.BiomeData;
@@ -16,7 +15,6 @@ import java.awt.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
public class WorldEditor extends JComponent { public class WorldEditor extends JComponent {

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

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

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

@@ -5,11 +5,7 @@ import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.Cursor; import com.badlogic.gdx.graphics.*;
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.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -23,11 +19,7 @@ import forge.adventure.scene.SceneType;
import forge.adventure.stage.MapStage; import forge.adventure.stage.MapStage;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import forge.animation.ForgeAnimation; import forge.animation.ForgeAnimation;
import forge.assets.Assets; import forge.assets.*;
import forge.assets.AssetsDownloader;
import forge.assets.FSkin;
import forge.assets.FSkinFont;
import forge.assets.ImageCache;
import forge.error.ExceptionHandler; import forge.error.ExceptionHandler;
import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.limited.BoosterDraft;
import forge.gui.FThreads; import forge.gui.FThreads;

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

@@ -1,10 +1,10 @@
package forge; package forge;
import java.util.ArrayDeque;
import java.util.Deque;
import com.badlogic.gdx.Gdx; 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.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.ShaderProgram; 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.Vector2;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack; import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
import forge.assets.FImage; import forge.assets.FImage;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
@@ -23,6 +22,9 @@ import forge.toolbox.FDisplayObject;
import forge.util.TextBounds; import forge.util.TextBounds;
import forge.util.Utils; import forge.util.Utils;
import java.util.ArrayDeque;
import java.util.Deque;
public class Graphics { public class Graphics {
private static final int GL_BLEND = GL20.GL_BLEND; private static final int GL_BLEND = GL20.GL_BLEND;
private static final int GL_LINE_SMOOTH = 2848; //create constant here since not in GL20 private static final int GL_LINE_SMOOTH = 2848; //create constant here since not in GL20

7
forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
View File

@@ -1,11 +1,6 @@
package forge.adventure.character; package forge.adventure.character;
import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.*;
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.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;

1
forge-gui-mobile/src/forge/adventure/character/EnemySprite.java
View File

@@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;

1
forge-gui-mobile/src/forge/adventure/character/RewardSprite.java
View File

@@ -1,6 +1,5 @@
package forge.adventure.character; package forge.adventure.character;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import forge.adventure.data.RewardData; import forge.adventure.data.RewardData;
import forge.adventure.util.JSONStringLoader; import forge.adventure.util.JSONStringLoader;

1
forge-gui-mobile/src/forge/adventure/data/BiomeData.java
View File

@@ -6,7 +6,6 @@ import forge.util.MyRandom;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Random; import java.util.Random;
/** /**

3
forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
View File

@@ -1,6 +1,5 @@
package forge.adventure.data; package forge.adventure.data;
import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
public class BiomeStructureData { public class BiomeStructureData {
@@ -31,6 +30,7 @@ public class BiomeStructureData {
public String structureAtlasPath; public String structureAtlasPath;
public String sourcePath; public String sourcePath;
public String maskPath;
public boolean periodicInput=true; public boolean periodicInput=true;
public float height; public float height;
public float width; public float width;
@@ -45,6 +45,7 @@ public class BiomeStructureData {
public BiomeStructureData(BiomeStructureData biomeStructureData) { public BiomeStructureData(BiomeStructureData biomeStructureData) {
this.structureAtlasPath=biomeStructureData.structureAtlasPath; this.structureAtlasPath=biomeStructureData.structureAtlasPath;
this.sourcePath=biomeStructureData.sourcePath; this.sourcePath=biomeStructureData.sourcePath;
this.maskPath=biomeStructureData.maskPath;
this.x=biomeStructureData.x; this.x=biomeStructureData.x;
this.y=biomeStructureData.y; this.y=biomeStructureData.y;
this.width=biomeStructureData.width; this.width=biomeStructureData.width;

2
forge-gui-mobile/src/forge/adventure/data/ConfigData.java
View File

@@ -1,8 +1,6 @@
package forge.adventure.data; package forge.adventure.data;
import java.util.List;
/** /**
* Data class that will be used to read Json configuration files * Data class that will be used to read Json configuration files
* BiomeData * BiomeData

1
forge-gui-mobile/src/forge/adventure/data/UIData.java
View File

@@ -1,6 +1,5 @@
package forge.adventure.data; package forge.adventure.data;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.OrderedMap; import com.badlogic.gdx.utils.OrderedMap;
/** /**

10
forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
View File

@@ -5,7 +5,10 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Null; import com.badlogic.gdx.utils.Null;
import com.google.common.collect.Lists; 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.util.*;
import forge.adventure.world.WorldSave; import forge.adventure.world.WorldSave;
import forge.deck.CardPool; import forge.deck.CardPool;
@@ -18,7 +21,10 @@ import forge.util.ItemPool;
import forge.util.MyRandom; import forge.util.MyRandom;
import java.io.Serializable; 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) * Class that represents the player (not the player sprite)

12
forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
View File

@@ -9,18 +9,10 @@ import forge.adventure.player.AdventurePlayer;
import forge.assets.FImage; import forge.assets.FImage;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.assets.FSkinImage; import forge.assets.FSkinImage;
import forge.deck.CardPool; import forge.deck.*;
import forge.deck.Deck;
import forge.deck.DeckFormat;
import forge.deck.DeckSection;
import forge.deck.FDeckViewer;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.CardManager; import forge.itemmanager.*;
import forge.itemmanager.ColumnDef;
import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.filters.ItemFilter; import forge.itemmanager.filters.ItemFilter;
import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences;
import forge.menu.FCheckBoxMenuItem; import forge.menu.FCheckBoxMenuItem;

7
forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
View File

@@ -3,12 +3,7 @@ package forge.adventure.scene;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.Dialog; 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.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.IntMap; import com.badlogic.gdx.utils.IntMap;

8
forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
View File

@@ -4,13 +4,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox; import com.badlogic.gdx.scenes.scene2d.ui.*;
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.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;

6
forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
View File

@@ -4,11 +4,7 @@ import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.scenes.scene2d.ui.Image; 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.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import forge.Forge; import forge.Forge;

6
forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
View File

@@ -13,11 +13,7 @@ import forge.adventure.character.ShopActor;
import forge.adventure.player.AdventurePlayer; import forge.adventure.player.AdventurePlayer;
import forge.adventure.pointofintrest.PointOfInterestChanges; import forge.adventure.pointofintrest.PointOfInterestChanges;
import forge.adventure.stage.GameHUD; import forge.adventure.stage.GameHUD;
import forge.adventure.util.CardUtil; import forge.adventure.util.*;
import forge.adventure.util.Config;
import forge.adventure.util.Current;
import forge.adventure.util.Reward;
import forge.adventure.util.RewardActor;
import forge.adventure.world.WorldSave; import forge.adventure.world.WorldSave;
import forge.assets.ImageCache; import forge.assets.ImageCache;
import forge.sound.SoundEffectType; import forge.sound.SoundEffectType;

6
forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
View File

@@ -3,7 +3,10 @@ package forge.adventure.scene;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent; 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.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import forge.Forge; import forge.Forge;
@@ -19,7 +22,6 @@ import forge.item.PaperCard;
import forge.util.MyRandom; import forge.util.MyRandom;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;

1
forge-gui-mobile/src/forge/adventure/stage/MapStage.java
View File

@@ -41,7 +41,6 @@ import forge.screens.TransitionScreen;
import forge.sound.SoundEffectType; import forge.sound.SoundEffectType;
import forge.sound.SoundSystem; import forge.sound.SoundSystem;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

6
forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
View File

@@ -11,11 +11,7 @@ import forge.adventure.character.EnemySprite;
import forge.adventure.data.BiomeData; import forge.adventure.data.BiomeData;
import forge.adventure.data.EnemyData; import forge.adventure.data.EnemyData;
import forge.adventure.data.WorldData; import forge.adventure.data.WorldData;
import forge.adventure.scene.DuelScene; import forge.adventure.scene.*;
import forge.adventure.scene.RewardScene;
import forge.adventure.scene.Scene;
import forge.adventure.scene.SceneType;
import forge.adventure.scene.TileMapScene;
import forge.adventure.util.Current; import forge.adventure.util.Current;
import forge.adventure.util.SaveFileContent; import forge.adventure.util.SaveFileContent;
import forge.adventure.util.SaveFileData; import forge.adventure.util.SaveFileData;

4
forge-gui-mobile/src/forge/adventure/util/MapDialog.java
View File

@@ -1,6 +1,8 @@
package forge.adventure.util; 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 com.badlogic.gdx.utils.Array;
import forge.Forge; import forge.Forge;
import forge.adventure.character.EnemySprite; import forge.adventure.character.EnemySprite;

6
forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java
View File

@@ -10,11 +10,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapTile;
import com.badlogic.gdx.maps.tiled.TiledMapTileSet; import com.badlogic.gdx.maps.tiled.TiledMapTileSet;
import com.badlogic.gdx.maps.tiled.TmxMapLoader; import com.badlogic.gdx.maps.tiled.TmxMapLoader;
import com.badlogic.gdx.maps.tiled.tiles.AnimatedTiledMapTile; import com.badlogic.gdx.maps.tiled.tiles.AnimatedTiledMapTile;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.*;
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 forge.Forge; import forge.Forge;
import java.io.File; import java.io.File;

1
forge-gui-mobile/src/forge/adventure/util/UIActor.java
View File

@@ -10,7 +10,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.ui.*;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; 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.Json;
import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.OrderedMap; import com.badlogic.gdx.utils.OrderedMap;

31
forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
View File

@@ -32,9 +32,16 @@ public class BiomeStructure {
} }
public TextureAtlas atlas() { public TextureAtlas atlas() {
if(structureAtlas==null) if(structureAtlas==null)
{
try
{ {
structureAtlas = Config.instance().getAtlas(data.structureAtlasPath); structureAtlas = Config.instance().getAtlas(data.structureAtlasPath);
} }
catch (Exception e)
{
e.printStackTrace();
}
}
return structureAtlas; return structureAtlas;
} }
public int structureObjectCount() { public int structureObjectCount() {
@@ -62,23 +69,31 @@ public class BiomeStructure {
} }
boolean suc=false; boolean suc=false;
for(int i=0;i<10&&!suc;i++) 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) if(!suc)
{ {
dataMap=new int[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)]; dataMap=new int[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)];
collisionMap=new boolean[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)]; collisionMap=new boolean[(int) (data.width* biomeWidth)][ (int) (data.height*biomeHeight)];
for(int x=0;x<data.width* biomeWidth;x++)
for(int y=0;y<data.height*biomeHeight;y++)
dataMap[x][y]=-1;
return; return;
} }
image=model.graphics(); image=model.graphics();
dataMap=new int[image.getWidth()][image.getHeight()]; dataMap=new int[image.getWidth()][image.getHeight()];
collisionMap=new boolean[image.getWidth()][image.getHeight()]; collisionMap=new boolean[image.getWidth()][image.getHeight()];
BufferedImage maskImage=maskImage();
for(int x=0;x<image.getWidth();x++) for(int x=0;x<image.getWidth();x++)
{ {
for(int y=0;y<image.getHeight();y++) for(int y=0;y<image.getHeight();y++)
{ {
boolean isWhitePixel=maskImage!=null&&(maskImage.getRGB((int) (x*maskImage.getWidth()/(float)image.getWidth()),(int)(y*(maskImage.getHeight()/(float)image.getHeight())) ) & 0xffffff)!=0;
if(isWhitePixel)
image.setRGB(x,y, 0xffffffff);
int rgb=image.getRGB(x,y) & 0xffffff; int rgb=image.getRGB(x,y) & 0xffffff;
if(!colorIdMap.containsKey(rgb)) if(!colorIdMap.containsKey(rgb)||isWhitePixel)
{ {
dataMap[x][y]=-1; dataMap[x][y]=-1;
} }
@@ -99,14 +114,16 @@ public class BiomeStructure {
} }
} }
private BufferedImage maskImage() {
try {
return ImageIO.read(new File(Config.instance().getFilePath(data.maskPath)));
} catch (IOException e) {
return null;
}
public int x() {
return (int) ((data.x*biomeWidth)-(data.width*biomeWidth)/2);
}
public int y() {
return (int) ((data.y*biomeHeight)-(data.height*biomeHeight)/2);
} }
public BiomeStructureData.BiomeStructureDataMapping[] mapping() { public BiomeStructureData.BiomeStructureDataMapping[] mapping() {
return data.mappingInfo; return data.mappingInfo;
} }

18
forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
View File

@@ -86,7 +86,13 @@ public class BiomeTexture implements Serializable {
{ {
for(BiomeTerrainData terrain:data.terrain) for(BiomeTerrainData terrain:data.terrain)
{ {
regions.add(Config.instance().getAtlas(data.tilesetAtlas).findRegion(terrain.spriteName)); TextureAtlas.AtlasRegion region = Config.instance().getAtlas(data.tilesetAtlas).findRegion(terrain.spriteName);
if(region==null)
{
System.err.print("Can not find sprite "+terrain.spriteName);
continue;
}
regions.add(region);
source.add(Config.instance().getAtlas(data.tilesetAtlas)); source.add(Config.instance().getAtlas(data.tilesetAtlas));
} }
} }
@@ -98,8 +104,13 @@ public class BiomeTexture implements Serializable {
TextureAtlas atlas=structure.atlas (); TextureAtlas atlas=structure.atlas ();
for(BiomeStructureData.BiomeStructureDataMapping mapping:structure.mapping()) for(BiomeStructureData.BiomeStructureDataMapping mapping:structure.mapping())
{ {
TextureAtlas.AtlasRegion region = atlas.findRegion(mapping.name);
regions.add(atlas.findRegion(mapping.name)); if(region==null)
{
System.err.print("Can not find sprite "+mapping.name);
continue;
}
regions.add(region);
source.add(atlas); source.add(atlas);
} }
} }
@@ -108,6 +119,7 @@ public class BiomeTexture implements Serializable {
for (TextureAtlas.AtlasRegion region : regions) { for (TextureAtlas.AtlasRegion region : regions) {
ArrayList<Pixmap> pics = new ArrayList<>(); ArrayList<Pixmap> pics = new ArrayList<>();
ArrayList<Pixmap> spics = new ArrayList<>(); ArrayList<Pixmap> spics = new ArrayList<>();
if(!region.getTexture().getTextureData().isPrepared())
region.getTexture().getTextureData().prepare(); region.getTexture().getTextureData().prepare();
Pixmap completePicture = region.getTexture().getTextureData().consumePixmap(); Pixmap completePicture = region.getTexture().getTextureData().consumePixmap();
for (int y = 0; y < 4; y++) { for (int y = 0; y < 4; y++) {

37
forge-gui-mobile/src/forge/adventure/world/World.java
View File

@@ -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) { public World generateNew(long seed) {
long currentTime = System.currentTimeMillis();
loadWorldData(); loadWorldData();
if(seed==0) { seed=random.nextLong(); } if(seed==0) { seed=random.nextLong(); }
this.seed=seed; this.seed=seed;
random.setSeed(seed); random.setSeed(seed);
@@ -301,6 +311,7 @@ private void clearTerrain(int x,int y,int size)
pix.fill(); pix.fill();
int biomeIndex = -1; int biomeIndex = -1;
currentTime=measureGenerationTime("loading data",currentTime);
for (BiomeData biome : data.GetBiomes()) { for (BiomeData biome : data.GetBiomes()) {
biomeIndex++; biomeIndex++;
@@ -311,8 +322,8 @@ private void clearTerrain(int x,int y,int size)
int beginX = Math.max(biomeXStart - biomeWidth / 2, 0); int beginX = Math.max(biomeXStart - biomeWidth / 2, 0);
int beginY = Math.max(biomeYStart - biomeHeight / 2, 0); int beginY = Math.max(biomeYStart - biomeHeight / 2, 0);
int endX = Math.min(biomeXStart + biomeWidth, width); int endX = Math.min(biomeXStart + biomeWidth/2, width);
int endY = Math.min(biomeYStart + biomeHeight, height); int endY = Math.min(biomeYStart + biomeHeight/2, height);
if (biome.width == 1.0 && biome.height == 1.0) { if (biome.width == 1.0 && biome.height == 1.0) {
beginX = 0; beginX = 0;
beginY = 0; beginY = 0;
@@ -358,21 +369,29 @@ private void clearTerrain(int x,int y,int size)
{ {
for(BiomeStructureData data:biome.structures) for(BiomeStructureData data:biome.structures)
{ {
BiomeStructure structure; BiomeStructure structure;
if(!structureDataMap.containsKey(data)) 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);
} }
else
{
structure=structureDataMap.get(data); structure=structureDataMap.get(data);
int structureXStart= structure.x()+beginX; }
int structureYStart= structure.y()+beginY; int structureXStart= x-(biomeXStart - biomeWidth / 2)-(int) ((data.x*biomeWidth)-(data.width*biomeWidth/2));
int structureIndex=structure.objectID(x-structureXStart,y-structureYStart); int structureYStart= y-(biomeYStart - biomeHeight / 2)- (int) ((data.y*biomeHeight)-(data.height*biomeHeight/2));
int structureIndex=structure.objectID(structureXStart,structureYStart);
if(structureIndex>=0) if(structureIndex>=0)
{ {
pix.setColor(data.mappingInfo[structureIndex].getColor()); pix.setColor(data.mappingInfo[structureIndex].getColor());
pix.drawPixel(x, y); pix.drawPixel(x, y);
terrainMap[x][y]=terrainCounter+structureIndex; terrainMap[x][y]=terrainCounter+structureIndex;
if(structure.collision(x-structureXStart,y-structureYStart)) if(structure.collision(structureXStart,structureYStart))
terrainMap[x][y]|=collisionBit; terrainMap[x][y]|=collisionBit;
terrainMap[x][y]|=isStructureBit; terrainMap[x][y]|=isStructureBit;
@@ -485,6 +504,7 @@ private void clearTerrain(int x,int y,int size)
} }
} }
currentTime=measureGenerationTime("poi placement",currentTime);
//sort towns //sort towns
List<Pair<PointOfInterest, PointOfInterest>> allSortedTowns = new ArrayList<>(); List<Pair<PointOfInterest, PointOfInterest>> 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()); mapObjectIds = new SpritesDataMap(getChunkSize(), data.tileSize, data.width / getChunkSize());
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
@@ -656,7 +677,7 @@ private void clearTerrain(int x,int y,int size)
} }
} }
biomeImage = pix; biomeImage = pix;
measureGenerationTime("sprites",currentTime);
WorldStage.getInstance().clearCache(); WorldStage.getInstance().clearCache();
return this; return this;
} }

7
forge-gui-mobile/src/forge/animation/ForgeAnimation.java
View File

@@ -1,12 +1,11 @@
package forge.animation; package forge.animation;
import com.badlogic.gdx.Gdx;
import forge.Forge;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.Gdx;
import forge.Forge;
public abstract class ForgeAnimation { public abstract class ForgeAnimation {
private static final List<ForgeAnimation> activeAnimations = new ArrayList<>(); private static final List<ForgeAnimation> activeAnimations = new ArrayList<>();
// A guard against inspecting activeAnimations while it's in the process of being edited // A guard against inspecting activeAnimations while it's in the process of being edited

11
forge-gui-mobile/src/forge/animation/ForgeTransition.java
View File

@@ -1,15 +1,14 @@
package forge.animation; 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.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; 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 { public class ForgeTransition extends ForgeAnimation {
private static final FOverlay overlay = new FOverlay(null) { private static final FOverlay overlay = new FOverlay(null) {
@Override protected void doLayout(final float width, final float height) { @Override protected void doLayout(final float width, final float height) {

1
forge-gui-mobile/src/forge/animation/GifAnimation.java
View File

@@ -4,7 +4,6 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.Animation;
import com.badlogic.gdx.graphics.g2d.Animation.PlayMode; import com.badlogic.gdx.graphics.g2d.Animation.PlayMode;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics; import forge.Graphics;
public class GifAnimation extends ForgeAnimation { public class GifAnimation extends ForgeAnimation {

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

@@ -5,9 +5,6 @@ package forge.animation;
/* Released under Apache 2.0 */ /* Released under Apache 2.0 */
/* https://code.google.com/p/animated-gifs-in-android/ */ /* 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.Pixmap;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Animation; 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.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import java.io.InputStream;
import java.util.Vector;
public class GifDecoder { public class GifDecoder {
/** /**
* File read status: No errors. * File read status: No errors.

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

@@ -1,24 +1,22 @@
package forge.assets; 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.Application.ApplicationType;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import forge.Forge; import forge.Forge;
import forge.gui.FThreads; import forge.gui.FThreads;
import forge.gui.GuiBase;
import forge.gui.download.GuiDownloadZipService; import forge.gui.download.GuiDownloadZipService;
import forge.gui.util.SOptionPane; import forge.gui.util.SOptionPane;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;
import forge.screens.SplashScreen; import forge.screens.SplashScreen;
import forge.util.FileUtil; 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 class AssetsDownloader {
public static final boolean SHARE_DESKTOP_ASSETS = true; //change to false to test downloading separate assets for desktop version public static final boolean SHARE_DESKTOP_ASSETS = true; //change to false to test downloading separate assets for desktop version

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

@@ -23,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.BitmapFont.Glyph;
import com.badlogic.gdx.graphics.g2d.PixmapPacker.Page; import com.badlogic.gdx.graphics.g2d.PixmapPacker.Page;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import forge.util.TextUtil; import forge.util.TextUtil;
/** /**

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

@@ -7,7 +7,6 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.FrameBuffer; import com.badlogic.gdx.graphics.glutils.FrameBuffer;
import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Matrix4;
import forge.Graphics; import forge.Graphics;
import forge.gui.FThreads; import forge.gui.FThreads;

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

@@ -2,7 +2,6 @@ package forge.assets;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics; import forge.Graphics;

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

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

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

@@ -1,7 +1,6 @@
package forge.assets; package forge.assets;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics; import forge.Graphics;

5
forge-gui-mobile/src/forge/assets/FSkinColor.java
View File

@@ -1,12 +1,11 @@
package forge.assets; package forge.assets;
import java.util.HashMap;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import forge.localinstance.skin.FSkinProp; import forge.localinstance.skin.FSkinProp;
import forge.screens.match.TargetingOverlay; import forge.screens.match.TargetingOverlay;
import java.util.HashMap;
public class FSkinColor { public class FSkinColor {
public enum Colors { public enum Colors {
CLR_THEME (FSkinProp.CLR_THEME), CLR_THEME (FSkinProp.CLR_THEME),

11
forge-gui-mobile/src/forge/assets/FSkinFont.java
View File

@@ -1,10 +1,5 @@
package forge.assets; 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.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color; 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.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntSet; import com.badlogic.gdx.utils.IntSet;
import forge.Forge; import forge.Forge;
import forge.gui.FThreads; import forge.gui.FThreads;
@@ -30,6 +24,11 @@ import forge.util.LineReader;
import forge.util.TextBounds; import forge.util.TextBounds;
import forge.util.Utils; import forge.util.Utils;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
public class FSkinFont { public class FSkinFont {
private static final int MIN_FONT_SIZE = 8; private static final int MIN_FONT_SIZE = 8;
private static int MAX_FONT_SIZE = 72; private static int MAX_FONT_SIZE = 72;

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

@@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;

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

@@ -1,17 +1,16 @@
package forge.assets; 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.files.FileHandle;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Texture.TextureWrap; import com.badlogic.gdx.graphics.Texture.TextureWrap;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public enum FSkinTexture implements FImage { public enum FSkinTexture implements FImage {
BG_TEXTURE(ForgeConstants.TEXTURE_BG_FILE, true, false), BG_TEXTURE(ForgeConstants.TEXTURE_BG_FILE, true, false),
BG_MATCH(ForgeConstants.MATCH_BG_FILE, false, false), BG_MATCH(ForgeConstants.MATCH_BG_FILE, false, false),

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

@@ -1,7 +1,6 @@
package forge.assets; package forge.assets;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics; import forge.Graphics;

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

@@ -2,7 +2,6 @@ package forge.assets;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics; import forge.Graphics;
public class FTextureRegionImage extends FImageComplex { public class FTextureRegionImage extends FImageComplex {

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

@@ -17,48 +17,41 @@
*/ */
package forge.assets; package forge.assets;
import java.io.File; import com.badlogic.gdx.Gdx;
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.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; 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.TextureData;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
import com.google.common.collect.EvictingQueue; import com.google.common.collect.EvictingQueue;
import com.google.common.collect.Queues; import com.google.common.collect.Queues;
import com.google.common.collect.Sets; 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.Forge;
import forge.ImageKeys; import forge.ImageKeys;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.card.CardRenderer; import forge.card.CardRenderer;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckProxy;
import forge.game.card.CardView; import forge.game.card.CardView;
import forge.game.player.IHasIcon; import forge.game.player.IHasIcon;
import forge.gui.FThreads;
import forge.gui.GuiBase;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel; import forge.model.FModel;
import forge.util.FileUtil;
import forge.util.ImageUtil; 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 * This class stores ALL card images in a cache with soft values. this means

11
forge-gui-mobile/src/forge/assets/TextRenderer.java
View File

@@ -1,13 +1,7 @@
package forge.assets; 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.graphics.Color;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.card.CardFaceSymbols; import forge.card.CardFaceSymbols;
@@ -16,6 +10,11 @@ import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel; import forge.model.FModel;
import forge.util.TextBounds; 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 //Encodes text for drawing with symbols and reminder text
public class TextRenderer { public class TextRenderer {
static { static {

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

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

1
forge-gui-mobile/src/forge/card/CardImage.java
View File

@@ -1,7 +1,6 @@
package forge.card; package forge.card;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;

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

@@ -1,24 +1,13 @@
package forge.card; 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.Color;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.ImageKeys;
import forge.assets.*;
import forge.card.CardRenderer.CardStackPosition; import forge.card.CardRenderer.CardStackPosition;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.GameView; import forge.game.GameView;
@@ -27,13 +16,22 @@ import forge.game.card.CardView.CardStateView;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.card.CardDetailUtil; import forge.gui.card.CardDetailUtil;
import forge.gui.card.CardDetailUtil.DetailColors; import forge.gui.card.CardDetailUtil.DetailColors;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel; import forge.model.FModel;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.screens.match.MatchController; import forge.screens.match.MatchController;
import forge.util.CardTranslation; import forge.util.CardTranslation;
import forge.util.ImageUtil;
import forge.util.Utils; 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 { public class CardImageRenderer {
private static final float BASE_IMAGE_WIDTH = 360; private static final float BASE_IMAGE_WIDTH = 360;

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

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

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

@@ -1,17 +1,5 @@
package forge.card; 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.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color; 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.graphics.glutils.PixmapTextureData;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import forge.CachedCardImage; import forge.CachedCardImage;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.ImageKeys;
import forge.assets.FImageComplex; import forge.assets.*;
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.card.CardZoom.ActivateHandler; import forge.card.CardZoom.ActivateHandler;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.card.CardView; import forge.game.card.CardView;
@@ -51,12 +31,20 @@ import forge.gui.card.CardDetailUtil;
import forge.gui.card.CardDetailUtil.DetailColors; import forge.gui.card.CardDetailUtil.DetailColors;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgeConstants.CounterDisplayType; import forge.localinstance.properties.ForgeConstants.CounterDisplayType;
import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgePreferences.FPref; import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel; import forge.model.FModel;
import forge.screens.match.MatchController; import forge.screens.match.MatchController;
import forge.toolbox.FList; 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 class CardRenderer {
public enum CardStackPosition { public enum CardStackPosition {

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

@@ -1,13 +1,8 @@
package forge.card; 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.Gdx;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinImage; import forge.assets.FSkinImage;
@@ -30,6 +25,10 @@ import forge.toolbox.FOverlay;
import forge.util.Utils; import forge.util.Utils;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
public class CardZoom extends FOverlay { public class CardZoom extends FOverlay {
private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH; private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH;

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

@@ -1,11 +1,6 @@
package forge.card; package forge.card;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;
@@ -22,6 +17,10 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField; import forge.toolbox.FTextField;
import forge.util.Callback; import forge.util.Callback;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class GameEntityPicker extends TabPageScreen<GameEntityPicker> { public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
private final FOptionPane optionPane; private final FOptionPane optionPane;

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

@@ -17,13 +17,8 @@
*/ */
package forge.deck; package forge.deck;
import java.text.NumberFormat;
import java.util.Map;
import java.util.Map.Entry;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.StaticData; import forge.StaticData;
@@ -37,21 +32,16 @@ import forge.card.CardZoom;
import forge.card.mana.ManaCostShard; import forge.card.mana.ManaCostShard;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.toolbox.FCardPanel; import forge.toolbox.*;
import forge.toolbox.FComboBox;
import forge.toolbox.FContainer;
import forge.toolbox.FDialog;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; 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.Callback;
import forge.util.MyRandom; import forge.util.MyRandom;
import forge.util.Utils; import forge.util.Utils;
import java.text.NumberFormat;
import java.util.Map;
import java.util.Map.Entry;
public class AddBasicLandsDialog extends FDialog { public class AddBasicLandsDialog extends FDialog {
private static final float ADD_BTN_SIZE = Utils.AVG_FINGER_HEIGHT * 0.75f; private static final float ADD_BTN_SIZE = Utils.AVG_FINGER_HEIGHT * 0.75f;

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

@@ -1,20 +1,7 @@
package forge.deck; 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.badlogic.gdx.utils.Align;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import forge.Forge; import forge.Forge;
import forge.assets.ImageCache; import forge.assets.ImageCache;
import forge.deck.FDeckEditor.EditorType; import forge.deck.FDeckEditor.EditorType;
@@ -43,17 +30,16 @@ import forge.screens.FScreen;
import forge.screens.LoadingOverlay; import forge.screens.LoadingOverlay;
import forge.screens.home.NewGameMenu.NewGameScreen; import forge.screens.home.NewGameMenu.NewGameScreen;
import forge.screens.match.MatchController; import forge.screens.match.MatchController;
import forge.toolbox.FButton; import forge.toolbox.*;
import forge.toolbox.FComboBox;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.GuiChoose;
import forge.toolbox.ListChooser;
import forge.util.Callback; import forge.util.Callback;
import forge.util.MyRandom;
import forge.util.Utils; import forge.util.Utils;
import forge.util.storage.IStorage; 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 class FDeckChooser extends FScreen {
public static final float PADDING = Utils.scale(5); public static final float PADDING = Utils.scale(5);

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

@@ -35,7 +35,10 @@ import forge.screens.TabPageScreen;
import forge.toolbox.*; import forge.toolbox.*;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType; 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 forge.util.storage.IStorage;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

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

@@ -17,11 +17,7 @@
*/ */
package forge.deck; package forge.deck;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.StaticData; import forge.StaticData;
@@ -29,15 +25,13 @@ import forge.deck.DeckRecognizer.TokenType;
import forge.game.GameType; import forge.game.GameType;
import forge.gui.FThreads; import forge.gui.FThreads;
import forge.gui.util.SOptionPane; import forge.gui.util.SOptionPane;
import forge.toolbox.FCheckBox; import forge.toolbox.*;
import forge.toolbox.FComboBox;
import forge.toolbox.FDialog;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextArea;
import forge.util.Callback; import forge.util.Callback;
import java.util.ArrayList;
import java.util.List;
public class FDeckImportDialog extends FDialog { public class FDeckImportDialog extends FDialog {
private Callback<Deck> callback; private Callback<Deck> callback;

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

@@ -1,13 +1,7 @@
package forge.deck; package forge.deck;
import java.util.Map.Entry;
import forge.Forge; import forge.Forge;
import forge.assets.FImage; import forge.assets.*;
import forge.assets.FSkin;
import forge.assets.FSkinImage;
import forge.assets.FTextureRegionImage;
import forge.assets.ImageCache;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.CardManager; import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerConfig;
@@ -20,6 +14,8 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import java.util.Map.Entry;
public class FDeckViewer extends FScreen { public class FDeckViewer extends FScreen {
private static FDeckViewer deckViewer; private static FDeckViewer deckViewer;
private static FPopupMenu menu = new FPopupMenu() { private static FPopupMenu menu = new FPopupMenu() {

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

@@ -1,10 +1,6 @@
package forge.deck; package forge.deck;
import java.util.List;
import forge.Forge; import forge.Forge;
import org.apache.commons.lang3.StringUtils;
import forge.assets.FImage; import forge.assets.FImage;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.CardManager; import forge.itemmanager.CardManager;
@@ -19,6 +15,9 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.GuiChoose; import forge.toolbox.GuiChoose;
import forge.util.Callback; import forge.util.Callback;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
public class FSideboardDialog extends FDialog { public class FSideboardDialog extends FDialog {
private final SideboardTabs tabs; private final SideboardTabs tabs;

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

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

11
forge-gui-mobile/src/forge/itemmanager/CardManager.java
View File

@@ -1,22 +1,17 @@
package forge.itemmanager; package forge.itemmanager;
import java.util.Map.Entry;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.card.CardRenderer; import forge.card.CardRenderer;
import forge.card.CardZoom; import forge.card.CardZoom;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.filters.AdvancedSearchFilter; import forge.itemmanager.filters.*;
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.toolbox.FList; import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler; import forge.toolbox.FList.CompactModeHandler;
import java.util.Map.Entry;
/** /**
* ItemManager for cards * ItemManager for cards
*/ */

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

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

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

@@ -17,16 +17,6 @@
*/ */
package forge.itemmanager; 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.Gdx;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Align; 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.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
@@ -53,17 +42,16 @@ import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem; import forge.menu.FMenuItem;
import forge.menu.FPopupMenu; import forge.menu.FPopupMenu;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.toolbox.FComboBox; import forge.toolbox.*;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType; import forge.toolbox.FEvent.FEventType;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler; import forge.toolbox.FList.CompactModeHandler;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.LayoutHelper; import forge.util.LayoutHelper;
import java.util.*;
import java.util.Map.Entry;
public abstract class ItemManager<T extends InventoryItem> extends FContainer implements IItemManager<T>, ActivateHandler { public abstract class ItemManager<T extends InventoryItem> extends FContainer implements IItemManager<T>, ActivateHandler {
private ItemPool<T> pool; private ItemPool<T> pool;

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

@@ -1,11 +1,8 @@
package forge.itemmanager; package forge.itemmanager;
import java.util.Map.Entry;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.base.Function; import com.google.common.base.Function;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
@@ -21,6 +18,8 @@ import forge.itemmanager.filters.TextSearchFilter;
import forge.toolbox.FList; import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler; import forge.toolbox.FList.CompactModeHandler;
import java.util.Map.Entry;
public class SpellShopManager extends ItemManager<InventoryItem> { public class SpellShopManager extends ItemManager<InventoryItem> {
private final Function<Entry<? extends InventoryItem, Integer>, Object> fnGetPrice; private final Function<Entry<? extends InventoryItem, Integer>, Object> fnGetPrice;

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

@@ -3,7 +3,6 @@ package forge.itemmanager.filters;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.Forge; import forge.Forge;
import forge.assets.FSkinImage; import forge.assets.FSkinImage;
import forge.assets.TextRenderer; import forge.assets.TextRenderer;
@@ -16,14 +15,8 @@ import forge.menu.FMenuItem;
import forge.menu.FPopupMenu; import forge.menu.FPopupMenu;
import forge.menu.FTooltip; import forge.menu.FTooltip;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.toolbox.FContainer; import forge.toolbox.*;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; 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; import forge.util.Callback;

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

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

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.item.PaperCard; import forge.item.PaperCard;

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

@@ -1,7 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil; import forge.itemmanager.SFilterUtil;

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.item.PaperCard; import forge.item.PaperCard;

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.item.PaperCard; import forge.item.PaperCard;

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

@@ -1,7 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.card.CardRarity; import forge.card.CardRarity;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;

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

@@ -1,7 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.item.PaperCard; import forge.item.PaperCard;

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

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

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

@@ -1,7 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil; import forge.itemmanager.SFilterUtil;

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

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

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;

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

@@ -1,13 +1,6 @@
package forge.itemmanager.filters; 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 com.badlogic.gdx.utils.Align;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
@@ -19,17 +12,14 @@ import forge.itemmanager.ItemManager;
import forge.model.FModel; import forge.model.FModel;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.screens.settings.SettingsScreen; import forge.screens.settings.SettingsScreen;
import forge.toolbox.FCheckBox; import forge.toolbox.*;
import forge.toolbox.FComboBox;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FGroupList;
import forge.toolbox.FList;
import forge.util.Callback; import forge.util.Callback;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.Utils; import forge.util.Utils;
import java.util.*;
public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> { public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> {
protected GameFormat format; protected GameFormat format;

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

@@ -1,7 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;

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

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

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

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

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

@@ -3,7 +3,6 @@ package forge.itemmanager.filters;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;

7
forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
View File

@@ -1,10 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import java.util.ArrayList;
import java.util.List;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import forge.assets.FImage; import forge.assets.FImage;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;
@@ -13,6 +9,9 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType; import forge.toolbox.FEvent.FEventType;
import forge.toolbox.FLabel; import forge.toolbox.FLabel;
import java.util.ArrayList;
import java.util.List;
public abstract class ToggleButtonsFilter<T extends InventoryItem> extends ItemFilter<T> { public abstract class ToggleButtonsFilter<T extends InventoryItem> extends ItemFilter<T> {
protected boolean lockFiltering; protected boolean lockFiltering;

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

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Align;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.item.InventoryItem; import forge.item.InventoryItem;

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

@@ -17,14 +17,7 @@
*/ */
package forge.itemmanager.views; 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 com.badlogic.gdx.math.Rectangle;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;
@@ -33,15 +26,17 @@ import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.assets.FSkinImage; import forge.assets.FSkinImage;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.itemmanager.ColumnDef; import forge.itemmanager.*;
import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerModel;
import forge.toolbox.FCheckBox; import forge.toolbox.FCheckBox;
import forge.toolbox.FDisplayObject; import forge.toolbox.FDisplayObject;
import forge.toolbox.FList; 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<T extends InventoryItem> extends ItemView<T> { public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
private static final FSkinColor ROW_COLOR = FSkinColor.get(Colors.CLR_ZEBRA); private static final FSkinColor ROW_COLOR = FSkinColor.get(Colors.CLR_ZEBRA);

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

@@ -1,27 +1,22 @@
package forge.itemmanager.views; 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 com.badlogic.gdx.math.Rectangle;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.itemmanager.ColumnDef; import forge.itemmanager.*;
import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerModel;
import forge.toolbox.FContainer; import forge.toolbox.FContainer;
import forge.toolbox.FEvent; import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventType; import forge.toolbox.FEvent.FEventType;
import forge.toolbox.FScrollPane; import forge.toolbox.FScrollPane;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
public abstract class ItemView<T extends InventoryItem> { public abstract class ItemView<T extends InventoryItem> {
protected static final float UNOWNED_ALPHA_COMPOSITE = 0.35f; protected static final float UNOWNED_ALPHA_COMPOSITE = 0.35f;
private static final FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_TEXT); private static final FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_TEXT);

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

@@ -1,7 +1,6 @@
package forge.menu; package forge.menu;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

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

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

6
forge-gui-mobile/src/forge/menu/FMenuBar.java
View File

@@ -1,11 +1,11 @@
package forge.menu; package forge.menu;
import java.util.ArrayList;
import java.util.List;
import forge.Graphics; import forge.Graphics;
import forge.screens.FScreen.Header; import forge.screens.FScreen.Header;
import java.util.ArrayList;
import java.util.List;
public class FMenuBar extends Header { public class FMenuBar extends Header {
private final List<FMenuTab> tabs = new ArrayList<>(); private final List<FMenuTab> tabs = new ArrayList<>();

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