Skip to content

Commit 32a9cc4

Browse files
flTobiNicholasBatesNZ
authored andcommitted
Checkstyle: Remove unused imports and make formatting changes
1 parent cbc53f1 commit 32a9cc4

33 files changed

+65
-101
lines changed

engine/src/main/java/org/destinationsol/FactionDisplay.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
import com.badlogic.gdx.Input;
2020
import com.badlogic.gdx.graphics.Color;
2121
import com.badlogic.gdx.math.Vector2;
22-
23-
import org.destinationsol.game.SolGame;
22+
import org.destinationsol.game.FactionInfo;
2423
import org.destinationsol.game.ObjectManager;
2524
import org.destinationsol.game.SolCam;
25+
import org.destinationsol.game.SolGame;
2626
import org.destinationsol.game.SolObject;
27-
import org.destinationsol.game.FactionInfo;
2827
import org.destinationsol.game.ship.SolShip;
2928
import org.destinationsol.ui.SolInputManager;
3029
import org.destinationsol.ui.UiDrawer;
@@ -48,12 +47,12 @@ public void drawFactionNames(SolGame game, UiDrawer uiDrawer, SolInputManager in
4847
}
4948
// angle must be zero as the camera angles on planets mess up the text display
5049
if (isPressed && cam.getAngle() == 0 && !inputManager.isScreenOn(game.getScreens().mapScreen)) {
51-
for(SolObject obj: objManager.getObjects()) {
50+
for (SolObject obj : objManager.getObjects()) {
5251
if (obj instanceof SolShip) {
5352
SolShip ship = (SolShip) obj;
5453
Vector2 drawPosition = cam.worldToScreen(ship);
5554
uiDrawer.drawString(ship.getFactionName(), drawPosition.x * SolApplication.displayDimensions.getRatio(),
56-
drawPosition.y -.1f, 1, false, Color.valueOf(info.getFactionColors().get(ship.getFactionID()).toString()));
55+
drawPosition.y - .1f, 1, false, Color.valueOf(info.getFactionColors().get(ship.getFactionID()).toString()));
5756
}
5857
}
5958
}

engine/src/main/java/org/destinationsol/assets/Assets.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
import java.util.Optional;
3939
import java.util.Set;
4040

41-
import static java.lang.System.exit;
42-
4341
/**
4442
* A high-level wrapper over the AssetHelper class.
4543
*

engine/src/main/java/org/destinationsol/files/HullConfigManager.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,20 @@
1616
package org.destinationsol.files;
1717

1818
import com.badlogic.gdx.math.Vector2;
19-
import org.destinationsol.assets.json.Validator;
20-
import org.destinationsol.game.AbilityCommonConfig;
21-
import org.destinationsol.modules.ModuleManager;
22-
import org.json.JSONArray;
23-
import org.json.JSONObject;
2419
import org.destinationsol.assets.Assets;
25-
import org.destinationsol.assets.json.Json;
20+
import org.destinationsol.assets.json.Validator;
2621
import org.destinationsol.common.SolMath;
22+
import org.destinationsol.game.AbilityCommonConfig;
2723
import org.destinationsol.game.AbilityCommonConfigs;
2824
import org.destinationsol.game.item.Engine;
2925
import org.destinationsol.game.item.ItemManager;
3026
import org.destinationsol.game.particle.DSParticleEmitter;
3127
import org.destinationsol.game.ship.AbilityConfig;
3228
import org.destinationsol.game.ship.hulls.GunSlot;
3329
import org.destinationsol.game.ship.hulls.HullConfig;
34-
import org.terasology.gestalt.module.Module;
35-
import org.terasology.gestalt.naming.Name;
30+
import org.destinationsol.modules.ModuleManager;
31+
import org.json.JSONArray;
32+
import org.json.JSONObject;
3633

3734
import java.lang.reflect.Method;
3835
import java.util.ArrayList;

engine/src/main/java/org/destinationsol/game/FactionInfo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private void createFactionList() {
5454
private static Set<String> getModuleSet() {
5555
Set<String> moduleSet = new HashSet<String>();
5656
Set<ResourceUrn> moduleUrn = Assets.getAssetHelper().list(Json.class, "[a-zA-Z0-9]*:factions");
57-
for(ResourceUrn module : moduleUrn) {
57+
for (ResourceUrn module : moduleUrn) {
5858
moduleSet.add(module.toString());
5959
}
6060
return moduleSet;
@@ -76,14 +76,14 @@ public static ArrayList getFactionColors() {
7676

7777
public static int getFactionID(SolShip ship) {
7878
String shipName = ship.getHull().getHullConfig().getInternalName();
79-
for(String modulePath: getModuleSet()) {
79+
for (String modulePath : getModuleSet()) {
8080
Json factionJson = Assets.getJson(modulePath);
8181
Validator.getValidatedJSON(modulePath, "engine:schemaFactions");
8282
JSONArray factionJsonArray = factionJson.getJsonValue().getJSONArray("factions");
8383
shipName = shipName.replaceAll(".*:", "");
84-
for(int n = 0; n < factionJsonArray.length(); n++) {
85-
for(int z = 0; z < factionJsonArray.getJSONObject(n).getJSONArray("ships").length(); z++) {
86-
if(shipName.equals(factionJsonArray.getJSONObject(n).getJSONArray("ships").get(z))) {
84+
for (int n = 0; n < factionJsonArray.length(); n++) {
85+
for (int z = 0; z < factionJsonArray.getJSONObject(n).getJSONArray("ships").length(); z++) {
86+
if (shipName.equals(factionJsonArray.getJSONObject(n).getJSONArray("ships").get(z))) {
8787
return n;
8888
}
8989
}

engine/src/main/java/org/destinationsol/game/GalaxyFiller.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
package org.destinationsol.game;
1717

1818
import com.badlogic.gdx.math.Vector2;
19-
import org.destinationsol.assets.json.Validator;
20-
import org.json.JSONObject;
21-
import com.google.gson.JsonParseException;
2219
import org.destinationsol.Const;
23-
import org.destinationsol.assets.Assets;
2420
import org.destinationsol.assets.json.Json;
21+
import org.destinationsol.assets.json.Validator;
2522
import org.destinationsol.common.SolMath;
2623
import org.destinationsol.common.SolRandom;
2724
import org.destinationsol.files.HullConfigManager;
@@ -41,6 +38,7 @@
4138
import org.destinationsol.game.planet.SysConfig;
4239
import org.destinationsol.game.ship.FarShip;
4340
import org.destinationsol.game.ship.hulls.HullConfig;
41+
import org.json.JSONObject;
4442

4543
import java.util.ArrayList;
4644

engine/src/main/java/org/destinationsol/game/GameColors.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717

1818
import com.badlogic.gdx.graphics.Color;
1919
import org.destinationsol.assets.json.Validator;
20-
import org.json.JSONObject;
21-
import org.destinationsol.assets.Assets;
22-
import org.destinationsol.assets.json.Json;
2320
import org.destinationsol.common.SolColorUtil;
21+
import org.json.JSONObject;
2422

2523
import java.util.HashMap;
2624
import java.util.Map;

engine/src/main/java/org/destinationsol/game/MountDetectDrawer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.destinationsol.common.SolColor;
2222
import org.destinationsol.game.ship.SolShip;
2323

24-
public class MountDetectDrawer implements UpdateAwareSystem{
24+
public class MountDetectDrawer implements UpdateAwareSystem {
2525
private final Vector2 myNePos;
2626
private final TextureAtlas.AtlasRegion myTexture;
2727

engine/src/main/java/org/destinationsol/game/ObjectManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ public List<SolObject> getObjects() {
287287
*
288288
* @param squaredDistance If the distance between any object and {@code fromObject} is less than this,
289289
* the {@code action} will be executed with that object as the argument.
290-
* @param fromObject The point of reference. This is <b>not</b> exempt from the {@code action}.
291-
* @param action The action to commit to {@code fromObject}.
290+
* @param fromObject The point of reference. This is <b>not</b> exempt from the {@code action}.
291+
* @param action The action to commit to {@code fromObject}.
292292
*/
293293
public void doToAllCloserThan(float squaredDistance, SolObject fromObject, Consumer<SolObject> action) {
294-
for(SolObject obj : myObjs) {
295-
if(fromObject.getPosition().dst2(obj.getPosition()) < squaredDistance) {
294+
for (SolObject obj : myObjs) {
295+
if (fromObject.getPosition().dst2(obj.getPosition()) < squaredDistance) {
296296
action.accept(obj);
297297
}
298298
}

engine/src/main/java/org/destinationsol/game/PlayerSpawnConfig.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
package org.destinationsol.game;
1717

1818
import org.destinationsol.assets.json.Validator;
19-
import org.json.JSONObject;
20-
import org.destinationsol.assets.Assets;
21-
import org.destinationsol.assets.json.Json;
2219
import org.destinationsol.files.HullConfigManager;
2320
import org.destinationsol.game.item.ItemManager;
21+
import org.json.JSONObject;
2422

2523
public class PlayerSpawnConfig {
2624
final ShipConfig mainStation;

engine/src/main/java/org/destinationsol/game/ShipConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
package org.destinationsol.game;
1717

1818
import com.badlogic.gdx.math.Vector2;
19-
import org.destinationsol.assets.json.Validator;
20-
import org.json.JSONArray;
21-
import org.json.JSONObject;
2219
import org.destinationsol.assets.Assets;
2320
import org.destinationsol.assets.json.Json;
21+
import org.destinationsol.assets.json.Validator;
2422
import org.destinationsol.files.HullConfigManager;
2523
import org.destinationsol.game.item.ItemManager;
2624
import org.destinationsol.game.ship.hulls.HullConfig;
25+
import org.json.JSONArray;
26+
import org.json.JSONObject;
2727
import org.terasology.gestalt.assets.ResourceUrn;
2828

2929
import java.util.ArrayList;
@@ -58,15 +58,15 @@ public Vector2 getSpawnPos() {
5858
return spawnPos;
5959
}
6060

61-
public int getMoney(){
61+
public int getMoney() {
6262
return money;
6363
}
6464

65-
public HullConfig getHull(){
65+
public HullConfig getHull() {
6666
return hull;
6767
}
6868

69-
public String getItems(){
69+
public String getItems() {
7070
return items;
7171
}
7272

0 commit comments

Comments
 (0)