Resolve the mess made by the rebase and run IntelliJ import optimizer

flTobi · NicholasBatesNZ · commit a3e3b8c7bc81 · 2020-02-11T14:09:31.000+13:00
diff --git a/engine/src/main/java/org/destinationsol/assets/Assets.java b/engine/src/main/java/org/destinationsol/assets/Assets.java
@@ -30,7 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.ModuleEnvironment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/engine/src/main/java/org/destinationsol/assets/audio/OggMusicFileFormat.java b/engine/src/main/java/org/destinationsol/assets/audio/OggMusicFileFormat.java
@@ -18,7 +18,6 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import org.destinationsol.assets.AssetDataFileHandle;
-import org.destinationsol.assets.AssetHelper;
 import org.destinationsol.assets.Assets;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
diff --git a/engine/src/main/java/org/destinationsol/assets/audio/OggSoundFileFormat.java b/engine/src/main/java/org/destinationsol/assets/audio/OggSoundFileFormat.java
@@ -17,7 +17,6 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
-import org.destinationsol.assets.AssetHelper;
 import org.destinationsol.assets.AssetDataFileHandle;
 import org.destinationsol.assets.Assets;
 import org.terasology.gestalt.assets.ResourceUrn;
diff --git a/engine/src/main/java/org/destinationsol/assets/emitters/EmitterFileFormat.java b/engine/src/main/java/org/destinationsol/assets/emitters/EmitterFileFormat.java
@@ -18,7 +18,6 @@
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.ParticleEmitter;
 import org.destinationsol.assets.AssetDataFileHandle;
-import org.destinationsol.assets.AssetHelper;
 import org.destinationsol.assets.Assets;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
diff --git a/engine/src/main/java/org/destinationsol/assets/json/JsonFileFormat.java b/engine/src/main/java/org/destinationsol/assets/json/JsonFileFormat.java
@@ -17,9 +17,7 @@
 
 import com.badlogic.gdx.files.FileHandle;
 import org.destinationsol.assets.AssetDataFileHandle;
-import org.destinationsol.assets.Assets;
 import org.json.JSONObject;
-import org.destinationsol.assets.AssetHelper;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
 import org.terasology.gestalt.assets.format.AssetDataFile;
diff --git a/engine/src/main/java/org/destinationsol/assets/textures/DSTextureFileFormat.java b/engine/src/main/java/org/destinationsol/assets/textures/DSTextureFileFormat.java
@@ -18,7 +18,6 @@
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Texture;
 import org.destinationsol.assets.AssetDataFileHandle;
-import org.destinationsol.assets.AssetHelper;
 import org.destinationsol.assets.Assets;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
diff --git a/engine/src/main/java/org/destinationsol/common/SolMath.java b/engine/src/main/java/org/destinationsol/common/SolMath.java
@@ -17,10 +17,10 @@
 
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
-import org.json.JSONArray;
-import org.json.JSONObject;
 import com.badlogic.gdx.utils.Pool;
 import org.destinationsol.Const;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 
diff --git a/engine/src/main/java/org/destinationsol/game/AbilityCommonConfig.java b/engine/src/main/java/org/destinationsol/game/AbilityCommonConfig.java
@@ -15,12 +15,12 @@
  */
 package org.destinationsol.game;
 
-import org.json.JSONObject;
 import org.destinationsol.assets.audio.OggSound;
 import org.destinationsol.assets.audio.OggSoundManager;
 import org.destinationsol.assets.audio.PlayableSound;
 import org.destinationsol.game.particle.EffectConfig;
 import org.destinationsol.game.particle.EffectTypes;
+import org.json.JSONObject;
 
 public class AbilityCommonConfig {
     public final EffectConfig effect;
diff --git a/engine/src/main/java/org/destinationsol/game/AbilityCommonConfigs.java b/engine/src/main/java/org/destinationsol/game/AbilityCommonConfigs.java
@@ -15,12 +15,12 @@
  */
 package org.destinationsol.game;
 
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.assets.audio.OggSoundManager;
 import org.destinationsol.assets.json.Json;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.game.particle.EffectTypes;
+import org.json.JSONObject;
 import org.terasology.gestalt.assets.ResourceUrn;
 
 import java.util.HashMap;
diff --git a/engine/src/main/java/org/destinationsol/game/SolNames.java b/engine/src/main/java/org/destinationsol/game/SolNames.java
@@ -15,14 +15,14 @@
  */
 package org.destinationsol.game;
 
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.assets.json.Json;
+import org.destinationsol.assets.json.Validator;
+import org.json.JSONObject;
 import org.terasology.gestalt.assets.ResourceUrn;
 
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Set;
 
 public class SolNames {
diff --git a/engine/src/main/java/org/destinationsol/game/chunk/SpaceEnvConfig.java b/engine/src/main/java/org/destinationsol/game/chunk/SpaceEnvConfig.java
@@ -17,8 +17,8 @@
 package org.destinationsol.game.chunk;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
+import org.json.JSONObject;
 
 import java.util.List;
 
diff --git a/engine/src/main/java/org/destinationsol/game/item/AbilityCharge.java b/engine/src/main/java/org/destinationsol/game/item/AbilityCharge.java
@@ -16,10 +16,10 @@
 package org.destinationsol.game.item;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.game.SolGame;
+import org.json.JSONObject;
 
 public class AbilityCharge implements SolItem {
     private final Config config;
diff --git a/engine/src/main/java/org/destinationsol/game/item/Armor.java b/engine/src/main/java/org/destinationsol/game/item/Armor.java
@@ -16,14 +16,14 @@
 package org.destinationsol.game.item;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.assets.audio.OggSoundManager;
 import org.destinationsol.assets.audio.OggSoundSet;
 import org.destinationsol.assets.audio.PlayableSound;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.game.DmgType;
 import org.destinationsol.game.SolGame;
+import org.json.JSONObject;
 
 import java.util.List;
 
diff --git a/engine/src/main/java/org/destinationsol/game/item/Clip.java b/engine/src/main/java/org/destinationsol/game/item/Clip.java
@@ -16,11 +16,11 @@
 package org.destinationsol.game.item;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.projectile.ProjectileConfig;
+import org.json.JSONObject;
 
 public class Clip implements SolItem {
     private final Config config;
diff --git a/engine/src/main/java/org/destinationsol/game/item/TradeConfig.java b/engine/src/main/java/org/destinationsol/game/item/TradeConfig.java
@@ -15,10 +15,10 @@
  */
 package org.destinationsol.game.item;
 
-import org.json.JSONObject;
 import org.destinationsol.files.HullConfigManager;
 import org.destinationsol.game.ShipConfig;
 import org.destinationsol.game.ship.hulls.HullConfig;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/engine/src/main/java/org/destinationsol/game/maze/MazeConfig.java b/engine/src/main/java/org/destinationsol/game/maze/MazeConfig.java
@@ -16,14 +16,14 @@
 package org.destinationsol.game.maze;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.common.SolRandom;
 import org.destinationsol.files.HullConfigManager;
 import org.destinationsol.game.CollisionMeshLoader;
 import org.destinationsol.game.ShipConfig;
 import org.destinationsol.game.chunk.SpaceEnvConfig;
 import org.destinationsol.game.item.ItemManager;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/engine/src/main/java/org/destinationsol/game/maze/MazeConfigs.java b/engine/src/main/java/org/destinationsol/game/maze/MazeConfigs.java
@@ -15,12 +15,12 @@
  */
 package org.destinationsol.game.maze;
 
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.assets.json.Json;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.files.HullConfigManager;
 import org.destinationsol.game.item.ItemManager;
+import org.json.JSONObject;
 import org.terasology.gestalt.assets.ResourceUrn;
 
 import java.util.ArrayList;
diff --git a/engine/src/main/java/org/destinationsol/game/particle/EffectConfig.java b/engine/src/main/java/org/destinationsol/game/particle/EffectConfig.java
@@ -17,9 +17,9 @@
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.game.GameColors;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/engine/src/main/java/org/destinationsol/game/planet/PlanetConfig.java b/engine/src/main/java/org/destinationsol/game/planet/PlanetConfig.java
@@ -16,13 +16,13 @@
 package org.destinationsol.game.planet;
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.files.HullConfigManager;
 import org.destinationsol.game.GameColors;
 import org.destinationsol.game.ShipConfig;
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.TradeConfig;
+import org.json.JSONObject;
 
 import java.util.List;
 
diff --git a/engine/src/main/java/org/destinationsol/game/planet/PlanetConfigs.java b/engine/src/main/java/org/destinationsol/game/planet/PlanetConfigs.java
@@ -15,20 +15,20 @@
  */
 package org.destinationsol.game.planet;
 
-import org.destinationsol.assets.json.Validator;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.assets.json.Json;
+import org.destinationsol.assets.json.Validator;
 import org.destinationsol.common.SolRandom;
 import org.destinationsol.files.HullConfigManager;
 import org.destinationsol.game.GameColors;
 import org.destinationsol.game.item.ItemManager;
+import org.json.JSONObject;
 import org.terasology.gestalt.assets.ResourceUrn;
 
-import java.util.Map;
-import java.util.List;
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 public class PlanetConfigs {
diff --git a/engine/src/main/java/org/destinationsol/game/planet/SkyConfig.java b/engine/src/main/java/org/destinationsol/game/planet/SkyConfig.java
@@ -16,8 +16,8 @@
 package org.destinationsol.game.planet;
 
 import com.badlogic.gdx.graphics.Color;
-import org.json.JSONObject;
 import org.destinationsol.game.GameColors;
+import org.json.JSONObject;
 
 public class SkyConfig {
     public final Color dawn;
diff --git a/engine/src/main/java/org/destinationsol/game/planet/SysConfigs.java b/engine/src/main/java/org/destinationsol/game/planet/SysConfigs.java
@@ -25,7 +25,7 @@
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.TradeConfig;
 import org.json.JSONObject;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/engine/src/main/java/org/destinationsol/game/projectile/ProjectileConfigs.java b/engine/src/main/java/org/destinationsol/game/projectile/ProjectileConfigs.java
@@ -30,7 +30,7 @@
 import org.destinationsol.game.particle.EffectConfig;
 import org.destinationsol.game.particle.EffectTypes;
 import org.json.JSONObject;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/engine/src/main/java/org/destinationsol/game/ship/EmWave.java b/engine/src/main/java/org/destinationsol/game/ship/EmWave.java
@@ -17,14 +17,14 @@
 package org.destinationsol.game.ship;
 
 import com.badlogic.gdx.math.Vector2;
-import org.json.JSONObject;
 import org.destinationsol.game.AbilityCommonConfig;
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.SolObject;
 import org.destinationsol.game.drawables.DrawableLevel;
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.particle.DSParticleEmitter;
+import org.json.JSONObject;
 
 public class EmWave implements ShipAbility {
     private static final int MAX_RADIUS = 4;
diff --git a/engine/src/main/java/org/destinationsol/game/ship/KnockBack.java b/engine/src/main/java/org/destinationsol/game/ship/KnockBack.java
@@ -17,7 +17,6 @@
 package org.destinationsol.game.ship;
 
 import com.badlogic.gdx.math.Vector2;
-import org.json.JSONObject;
 import org.destinationsol.common.SolMath;
 import org.destinationsol.game.AbilityCommonConfig;
 import org.destinationsol.game.SolGame;
@@ -26,6 +25,7 @@
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.particle.DSParticleEmitter;
+import org.json.JSONObject;
 
 public class KnockBack implements ShipAbility {
     private static final int MAX_RADIUS = 8;
diff --git a/engine/src/main/java/org/destinationsol/game/ship/SloMo.java b/engine/src/main/java/org/destinationsol/game/ship/SloMo.java
@@ -17,14 +17,14 @@
 package org.destinationsol.game.ship;
 
 import com.badlogic.gdx.math.Vector2;
-import org.json.JSONObject;
 import org.destinationsol.common.SolMath;
 import org.destinationsol.game.AbilityCommonConfig;
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.drawables.DrawableLevel;
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.particle.DSParticleEmitter;
+import org.json.JSONObject;
 
 public class SloMo implements ShipAbility {
     private static final float SLO_MO_CHG_SPD = .03f;
diff --git a/engine/src/main/java/org/destinationsol/game/ship/Teleport.java b/engine/src/main/java/org/destinationsol/game/ship/Teleport.java
@@ -20,7 +20,6 @@
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.physics.box2d.Body;
-import org.json.JSONObject;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.common.SolMath;
 import org.destinationsol.common.SolRandom;
@@ -30,6 +29,7 @@
 import org.destinationsol.game.item.ItemManager;
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.planet.Planet;
+import org.json.JSONObject;
 
 public class Teleport implements ShipAbility {
     private static final int MAX_RADIUS = 4;
diff --git a/engine/src/main/java/org/destinationsol/game/ship/UnShield.java b/engine/src/main/java/org/destinationsol/game/ship/UnShield.java
@@ -17,7 +17,6 @@
 package org.destinationsol.game.ship;
 
 import com.badlogic.gdx.math.Vector2;
-import org.json.JSONObject;
 import org.destinationsol.common.SolMath;
 import org.destinationsol.game.AbilityCommonConfig;
 import org.destinationsol.game.DmgType;
@@ -28,6 +27,7 @@
 import org.destinationsol.game.item.Shield;
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.particle.DSParticleEmitter;
+import org.json.JSONObject;
 
 public class UnShield implements ShipAbility {
     private static final int MAX_RADIUS = 6;
diff --git a/engine/src/main/java/org/destinationsol/menu/InputMapMixedScreen.java b/engine/src/main/java/org/destinationsol/menu/InputMapMixedScreen.java
@@ -21,8 +21,8 @@
 import com.badlogic.gdx.InputAdapter;
 import org.destinationsol.GameOptions;
 import org.destinationsol.SolApplication;
-import org.destinationsol.ui.SolUiControl;
 import org.destinationsol.ui.SolInputManager;
+import org.destinationsol.ui.SolUiControl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/engine/src/main/java/org/destinationsol/modules/OptimisedArchiveFileSource.java b/engine/src/main/java/org/destinationsol/modules/OptimisedArchiveFileSource.java
@@ -15,8 +15,6 @@
  */
 package org.destinationsol.modules;
 
-import java.io.IOException;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Maps;
@@ -26,6 +24,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
