summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-18 10:38:24 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-18 11:12:01 +0100
commit31e86605f68f3069fafa8d99fc24f7fbbb5e3a54 (patch)
treee0c2718d9a34408fc8ec73265592c745c2ea2980 /core/src/ch/asynk/rustanddust/game
parent85f55649a107e47a8103dd74f0bab7fde5bc6ec1 (diff)
downloadRustAndDust-31e86605f68f3069fafa8d99fc24f7fbbb5e3a54.zip
RustAndDust-31e86605f68f3069fafa8d99fc24f7fbbb5e3a54.tar.gz
cleanup tree using fix_java
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Engagement.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hex.java5
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/Player.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/Unit.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleTest.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java5
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map3Animations.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateBreak.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateDeployment.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateEngage.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StatePromote.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateRotate.java1
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateSelect.java2
17 files changed, 0 insertions, 33 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Engagement.java b/core/src/ch/asynk/rustanddust/game/Engagement.java
index b7630ed..f1edfba 100644
--- a/core/src/ch/asynk/rustanddust/game/Engagement.java
+++ b/core/src/ch/asynk/rustanddust/game/Engagement.java
@@ -97,7 +97,6 @@ public class Engagement implements Disposable, Pool.Poolable
this.defenseSum = (unitDefense + terrainDefense + weatherDefense);
}
-
@Override
public String toString()
{
diff --git a/core/src/ch/asynk/rustanddust/game/Hex.java b/core/src/ch/asynk/rustanddust/game/Hex.java
index 76d224f..27b52cd 100644
--- a/core/src/ch/asynk/rustanddust/game/Hex.java
+++ b/core/src/ch/asynk/rustanddust/game/Hex.java
@@ -1,15 +1,10 @@
package ch.asynk.rustanddust.game;
-import java.util.List;
-import java.util.Iterator;
-
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import ch.asynk.rustanddust.engine.Board;
import ch.asynk.rustanddust.engine.Pawn;
import ch.asynk.rustanddust.engine.Tile;
import ch.asynk.rustanddust.engine.Orientation;
-import ch.asynk.rustanddust.game.Unit.UnitType;
public class Hex extends Tile
{
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index 3ced3dd..d9aec5c 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -8,11 +8,9 @@ import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import ch.asynk.rustanddust.engine.gfx.Animation;
-import ch.asynk.rustanddust.game.State.StateType;
import ch.asynk.rustanddust.ui.Position;
import ch.asynk.rustanddust.ui.Bg;
import ch.asynk.rustanddust.ui.Msg;
diff --git a/core/src/ch/asynk/rustanddust/game/Player.java b/core/src/ch/asynk/rustanddust/game/Player.java
index 6495e8e..de8be76 100644
--- a/core/src/ch/asynk/rustanddust/game/Player.java
+++ b/core/src/ch/asynk/rustanddust/game/Player.java
@@ -1,7 +1,5 @@
package ch.asynk.rustanddust.game;
-import java.util.List;
-
import ch.asynk.rustanddust.RustAndDust;
public class Player
diff --git a/core/src/ch/asynk/rustanddust/game/Unit.java b/core/src/ch/asynk/rustanddust/game/Unit.java
index bbb60ef..a3277b8 100644
--- a/core/src/ch/asynk/rustanddust/game/Unit.java
+++ b/core/src/ch/asynk/rustanddust/game/Unit.java
@@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
import ch.asynk.rustanddust.engine.Pawn;
import ch.asynk.rustanddust.engine.Tile;
import ch.asynk.rustanddust.engine.HeadedPawn;
-import ch.asynk.rustanddust.engine.Orientation;
import ch.asynk.rustanddust.game.Hex.Terrain;
import ch.asynk.rustanddust.RustAndDust;
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index a9634f6..bb78a55 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -4,7 +4,6 @@ import ch.asynk.rustanddust.game.Army;
import ch.asynk.rustanddust.game.Player;
import ch.asynk.rustanddust.game.Map;
import ch.asynk.rustanddust.game.Zone;
-import ch.asynk.rustanddust.game.Unit;
import ch.asynk.rustanddust.game.Unit.UnitId;
import ch.asynk.rustanddust.ui.Position;
import ch.asynk.rustanddust.engine.Orientation;
diff --git a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
index 1948356..ef15222 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
@@ -2,7 +2,6 @@ package ch.asynk.rustanddust.game.hud;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import ch.asynk.rustanddust.RustAndDust;
@@ -48,7 +47,6 @@ public class ActionButtons extends Widget
this.position = Position.BOTTOM_RIGHT;
this.idx = Buttons.NONE.i;
-
this.buttons = new Bg[Buttons.LAST.i];
this.buttons[Buttons.DONE.i] = new Bg(game.factory.getHudRegion(game.factory.ACT_DONE));
this.buttons[Buttons.ABORT.i] = new Bg(game.factory.getHudRegion(game.factory.ACT_ABORT));
diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
index fa6e206..15726aa 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
@@ -2,8 +2,6 @@ package ch.asynk.rustanddust.game.hud;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import ch.asynk.rustanddust.RustAndDust;
diff --git a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java
index 7ba4325..a7dea32 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java
@@ -3,19 +3,14 @@ package ch.asynk.rustanddust.game.hud;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import ch.asynk.rustanddust.engine.gfx.Animation;
import ch.asynk.rustanddust.engine.gfx.Drawable;
import ch.asynk.rustanddust.RustAndDust;
-import ch.asynk.rustanddust.game.State.StateType;
import ch.asynk.rustanddust.game.Ctrl;
-import ch.asynk.rustanddust.game.Hud;
import ch.asynk.rustanddust.game.Army;
-import ch.asynk.rustanddust.game.Unit;
import ch.asynk.rustanddust.game.Player;
import ch.asynk.rustanddust.ui.Bg;
import ch.asynk.rustanddust.ui.LabelImage;
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java b/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java
index b0080ce..ee114f7 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java
@@ -2,7 +2,6 @@ package ch.asynk.rustanddust.game.map;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import ch.asynk.rustanddust.RustAndDust;
import ch.asynk.rustanddust.engine.SelectedTile;
@@ -19,7 +18,6 @@ import ch.asynk.rustanddust.engine.gfx.animations.RunnableAnimation;
import ch.asynk.rustanddust.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb;
import ch.asynk.rustanddust.game.Hex;
import ch.asynk.rustanddust.game.Unit;
-import ch.asynk.rustanddust.game.Ctrl;
import ch.asynk.rustanddust.game.Army;
import ch.asynk.rustanddust.game.Player;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
index 62dd9f5..56e8ba6 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
@@ -1,6 +1,5 @@
package ch.asynk.rustanddust.game.states;
-import ch.asynk.rustanddust.ui.Position;
import ch.asynk.rustanddust.engine.Orientation;
import ch.asynk.rustanddust.game.Unit;
import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
index a014b03..a8c3030 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
@@ -7,8 +7,6 @@ import ch.asynk.rustanddust.game.Unit;
import ch.asynk.rustanddust.game.UnitList;
import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
-import ch.asynk.rustanddust.RustAndDust;
-
public class StateDeployment extends StateCommon
{
private boolean completed;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
index 2345aa0..582e5dd 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
@@ -1,7 +1,6 @@
package ch.asynk.rustanddust.game.states;
import ch.asynk.rustanddust.game.Unit;
-import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
import ch.asynk.rustanddust.RustAndDust;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StatePromote.java b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java
index 701b856..e80ebec 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StatePromote.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java
@@ -1,7 +1,5 @@
package ch.asynk.rustanddust.game.states;
-import ch.asynk.rustanddust.game.Unit;
-
public class StatePromote extends StateCommon
{
@Override
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
index 419373e..846adce 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
@@ -3,7 +3,6 @@ package ch.asynk.rustanddust.game.states;
import ch.asynk.rustanddust.game.Hex;
import ch.asynk.rustanddust.game.Zone;
import ch.asynk.rustanddust.game.Unit;
-import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
public class StateReinforcement extends StateCommon
{
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
index 8385570..b3159f5 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
@@ -1,7 +1,6 @@
package ch.asynk.rustanddust.game.states;
import ch.asynk.rustanddust.engine.Orientation;
-import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
import ch.asynk.rustanddust.RustAndDust;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
index 0bb9900..e2cfef8 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
@@ -1,10 +1,8 @@
package ch.asynk.rustanddust.game.states;
import ch.asynk.rustanddust.ui.Position;
-import ch.asynk.rustanddust.game.Map;
import ch.asynk.rustanddust.game.Hex;
import ch.asynk.rustanddust.game.Unit;
-import ch.asynk.rustanddust.game.Ctrl;
import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons;
import ch.asynk.rustanddust.RustAndDust;