refactor: remove dead code (#4016)

Co-authored-by: jdrueckert <jd.rueckert@googlemail.com>
MovingBlocks · Jun 6, 2020 · 012985c · 012985c
1 parent 3896443
commit 012985c
Show file tree

Hide file tree

Showing 35 changed files with 10 additions and 125 deletions.
diff --git a/engine/src/main/java/org/terasology/config/flexible/internal/SettingImplBuilder.java b/engine/src/main/java/org/terasology/config/flexible/internal/SettingImplBuilder.java
@@ -17,7 +17,6 @@
 
 import org.terasology.config.flexible.Setting;
 import org.terasology.config.flexible.constraints.SettingConstraint;
-import org.terasology.engine.SimpleUri;
 import org.terasology.reflection.TypeInfo;
 
 public class SettingImplBuilder<T> implements SettingBuilder<T> {

diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityPool.java
@@ -17,7 +17,6 @@
 
 import org.terasology.entitySystem.Component;
 import org.terasology.entitySystem.prefab.Prefab;
-import org.terasology.game.GameManifest;
 import org.terasology.math.geom.Quat4f;
 import org.terasology.math.geom.Vector3f;
 

diff --git a/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java b/engine/src/main/java/org/terasology/input/binds/inventory/package-info.java
@@ -19,4 +19,3 @@
 ) package org.terasology.input.binds.inventory;
 
 import org.terasology.input.InputCategory;
-import org.terasology.module.sandbox.API;
diff --git a/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java b/engine/src/main/java/org/terasology/logic/behavior/CollectiveInterpreter.java
@@ -21,7 +21,6 @@
 import org.terasology.logic.common.DisplayNameComponent;
 import org.terasology.module.sandbox.API;
 
-import java.util.HashSet;
 import java.util.Set;
 
 /**

diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java b/engine/src/main/java/org/terasology/logic/behavior/asset/Group.java
@@ -19,7 +19,6 @@
 import org.terasology.assets.AssetType;
 import org.terasology.assets.ResourceUrn;
 import org.terasology.assets.module.annotations.RegisterAssetType;
-import org.terasology.module.sandbox.API;
 
 /**
  * The main Group asset class. This is the reference type

diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupData.java
@@ -17,8 +17,6 @@
 
 import org.terasology.assets.AssetData;
 
-import java.util.List;
-
 /**
  * Every Group asset is described by a GroupData class.
  * @see Group

diff --git a/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java b/engine/src/main/java/org/terasology/logic/behavior/asset/GroupFormat.java
@@ -22,7 +22,6 @@
 import org.terasology.registry.CoreRegistry;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 /**

diff --git a/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java
@@ -49,7 +49,6 @@
 import org.terasology.logic.console.suggesters.ScreenSuggester;
 import org.terasology.logic.console.suggesters.SkinSuggester;
 import org.terasology.logic.inventory.events.DropItemEvent;
-import org.terasology.logic.location.Location;
 import org.terasology.logic.location.LocationComponent;
 import org.terasology.logic.permission.PermissionManager;
 import org.terasology.math.Direction;

diff --git a/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java b/engine/src/main/java/org/terasology/logic/debug/MovementDebugCommands.java
@@ -24,7 +24,6 @@
 import org.terasology.logic.characters.CharacterTeleportEvent;
 import org.terasology.logic.characters.CharacterImpulseEvent;
 import org.terasology.logic.characters.MovementMode;
-import org.terasology.logic.characters.events.OnScaleEvent;
 import org.terasology.logic.characters.events.ScaleToRequest;
 import org.terasology.logic.common.DisplayNameComponent;
 import org.terasology.logic.location.Location;

diff --git a/engine/src/main/java/org/terasology/math/Direction.java b/engine/src/main/java/org/terasology/math/Direction.java
@@ -17,7 +17,6 @@
 package org.terasology.math;
 
 import com.google.common.collect.Maps;
-import org.joml.Vector3fc;
 import org.terasology.math.geom.Vector3f;
 import org.terasology.math.geom.Vector3i;
 

diff --git a/engine/src/main/java/org/terasology/math/JomlUtil.java b/engine/src/main/java/org/terasology/math/JomlUtil.java
@@ -17,11 +17,9 @@
 
 import org.joml.Matrix3f;
 import org.joml.Matrix3fc;
-import org.joml.Matrix4f;
 import org.joml.Matrix4fc;
 import org.joml.Quaternionf;
 import org.joml.Quaternionfc;
-import org.joml.Vector2f;
 import org.joml.Vector2fc;
 import org.joml.Vector2ic;
 import org.joml.Vector3fc;

diff --git a/engine/src/main/java/org/terasology/math/MatrixUtils.java b/engine/src/main/java/org/terasology/math/MatrixUtils.java
@@ -21,7 +21,6 @@
 import org.lwjgl.BufferUtils;
 import org.terasology.math.geom.Matrix3f;
 import org.terasology.math.geom.Matrix4f;
-import org.terasology.math.geom.Vector3f;
 
 import java.nio.FloatBuffer;
 

diff --git a/engine/src/main/java/org/terasology/math/Vector3fUtil.java b/engine/src/main/java/org/terasology/math/Vector3fUtil.java
@@ -17,7 +17,6 @@
 package org.terasology.math;
 
 import org.terasology.math.geom.Vector3f;
-import org.terasology.physics.engine.PhysicsEngineManager;
 
 /**
  */

diff --git a/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java b/engine/src/main/java/org/terasology/particles/functions/RegisterParticleSystemFunction.java
@@ -15,7 +15,6 @@
  */
 package org.terasology.particles.functions;
 
-import org.terasology.entitySystem.Component;
 import org.terasology.module.sandbox.API;
 
 import java.lang.annotation.ElementType;

diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java b/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java
@@ -21,7 +21,6 @@
 import gnu.trove.iterator.TLongIterator;
 
 import java.nio.ByteBuffer;
-import java.util.Collection;
 import java.util.Map;
 
 /**

diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java b/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerContext.java
@@ -15,7 +15,6 @@
  */
 package org.terasology.persistence.typeHandling;
 
-import org.reflections.Reflections;
 import org.terasology.persistence.typeHandling.reflection.SerializationSandbox;
 import org.terasology.reflection.TypeInfo;
 

diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java b/engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java
@@ -18,7 +18,6 @@
 import org.terasology.reflection.TypeInfo;
 
 import java.util.Optional;
-import java.util.function.BiFunction;
 
 /**
  * Creates type handlers for a set of types. Type handler factories are generally used when a set of types

diff --git a/...rc/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java b/...rc/main/java/org/terasology/persistence/typeHandling/extensionTypes/ColorTypeHandler.java
@@ -16,7 +16,6 @@
 package org.terasology.persistence.typeHandling.extensionTypes;
 
 import gnu.trove.list.TIntList;
-import org.terasology.persistence.typeHandling.DeserializationException;
 import org.terasology.persistence.typeHandling.PersistedData;
 import org.terasology.persistence.typeHandling.PersistedDataArray;
 import org.terasology.persistence.typeHandling.PersistedDataSerializer;

diff --git a/...ava/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java b/...ava/org/terasology/persistence/typeHandling/extensionTypes/ComponentClassTypeHandler.java
@@ -17,22 +17,23 @@
 
 import org.terasology.entitySystem.Component;
 import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
+import org.terasology.persistence.typeHandling.TypeHandlerContext;
 
 public class ComponentClassTypeHandler extends StringRepresentationTypeHandler<Class<? extends Component>> {
 
+    TypeHandlerContext context;
+
+    public ComponentClassTypeHandler(final TypeHandlerContext context) {
+        this.context = context;
+    }
+
     @Override
     public String getAsString(Class<? extends Component> item) {
-        return item.getName();
+        return context.getSandbox().getSubTypeIdentifier(item, Component.class);
     }
 
     @Override
     public Class<? extends Component> getFromString(String representation) {
-        try {
-            final Class<? extends Component> clazz = Class.forName(representation).asSubclass(Component.class);
-            return clazz;
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
+        return context.getSandbox().findSubTypeOf(representation, Component.class).orElse(null);
     }
 }
diff --git a/...y/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java b/...y/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java
@@ -16,16 +16,12 @@
 package org.terasology.persistence.typeHandling.extensionTypes.factories;
 
 import org.terasology.entitySystem.Component;
-import org.terasology.persistence.typeHandling.PersistedData;
-import org.terasology.persistence.typeHandling.PersistedDataSerializer;
 import org.terasology.persistence.typeHandling.SpecificTypeHandlerFactory;
-import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler;
 import org.terasology.persistence.typeHandling.TypeHandler;
 import org.terasology.persistence.typeHandling.TypeHandlerContext;
+import org.terasology.persistence.typeHandling.extensionTypes.ComponentClassTypeHandler;
 import org.terasology.reflection.TypeInfo;
 
-import java.util.Optional;
-
 public class ComponentClassTypeHandlerFactory extends SpecificTypeHandlerFactory<Class<? extends Component>> {
 
     public ComponentClassTypeHandlerFactory() {
@@ -36,23 +32,4 @@ public ComponentClassTypeHandlerFactory() {
     protected TypeHandler<Class<? extends Component>> createHandler(TypeHandlerContext context) {
         return new ComponentClassTypeHandler(context);
     }
-
-    class ComponentClassTypeHandler extends StringRepresentationTypeHandler<Class<? extends Component>> {
-
-        TypeHandlerContext context;
-
-        public ComponentClassTypeHandler(final TypeHandlerContext context) {
-            this.context = context;
-        }
-
-        @Override
-        public String getAsString(Class<? extends Component> item) {
-            return context.getSandbox().getSubTypeIdentifier(item, Component.class);
-        }
-
-        @Override
-        public Class<? extends Component> getFromString(String representation) {
-            return context.getSandbox().findSubTypeOf(representation, Component.class).orElse(null);
-        }
-    }
 }
diff --git a/...ne/src/main/java/org/terasology/persistence/typeHandling/mathTypes/Rect2fTypeHandler.java b/...ne/src/main/java/org/terasology/persistence/typeHandling/mathTypes/Rect2fTypeHandler.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.Maps;
 import org.terasology.math.geom.Rect2f;
 import org.terasology.math.geom.Vector2f;
-import org.terasology.persistence.typeHandling.DeserializationException;
 import org.terasology.persistence.typeHandling.PersistedData;
 import org.terasology.persistence.typeHandling.PersistedDataMap;
 import org.terasology.persistence.typeHandling.PersistedDataSerializer;

diff --git a/...ne/src/main/java/org/terasology/persistence/typeHandling/mathTypes/Rect2iTypeHandler.java b/...ne/src/main/java/org/terasology/persistence/typeHandling/mathTypes/Rect2iTypeHandler.java
@@ -20,7 +20,6 @@
 
 import org.terasology.math.geom.Rect2i;
 import org.terasology.math.geom.Vector2i;
-import org.terasology.persistence.typeHandling.DeserializationException;
 import org.terasology.persistence.typeHandling.PersistedData;
 import org.terasology.persistence.typeHandling.PersistedDataMap;
 import org.terasology.persistence.typeHandling.PersistedDataSerializer;

diff --git a/engine/src/main/java/org/terasology/physics/bullet/shapes/BulletConvexHullShape.java b/engine/src/main/java/org/terasology/physics/bullet/shapes/BulletConvexHullShape.java
@@ -17,8 +17,6 @@
 
 import com.bulletphysics.collision.shapes.ConvexHullShape;
 import com.bulletphysics.util.ObjectArrayList;
-import org.terasology.math.AABB;
-import org.terasology.math.Transform;
 import org.terasology.math.VecMath;
 import org.terasology.math.geom.Quat4f;
 import org.terasology.math.geom.Vector3f;

diff --git a/engine/src/main/java/org/terasology/physics/engine/PhysicsEngine.java b/engine/src/main/java/org/terasology/physics/engine/PhysicsEngine.java
@@ -20,7 +20,6 @@
 import org.terasology.math.geom.Vector3f;
 import org.terasology.physics.CollisionGroup;
 import org.terasology.physics.Physics;
-import org.terasology.physics.shapes.CollisionShapeFactory;
 
 import java.util.Iterator;
 import java.util.List;

diff --git a/engine/src/main/java/org/terasology/physics/engine/PhysicsEngineManager.java b/engine/src/main/java/org/terasology/physics/engine/PhysicsEngineManager.java
@@ -15,7 +15,6 @@
  */
 package org.terasology.physics.engine;
 
-import com.bulletphysics.BulletGlobals;
 import org.terasology.context.Context;
 import org.terasology.physics.bullet.BulletPhysics;
 import org.terasology.physics.bullet.shapes.BulletCollisionShapeFactory;

diff --git a/engine/src/main/java/org/terasology/rendering/logic/MeshRenderer.java b/engine/src/main/java/org/terasology/rendering/logic/MeshRenderer.java
@@ -39,7 +39,6 @@
 import org.terasology.logic.players.LocalPlayer;
 import org.terasology.math.AABB;
 import org.terasology.math.MatrixUtils;
-import org.terasology.math.VecMath;
 import org.terasology.math.geom.Matrix4f;
 import org.terasology.math.geom.Quat4f;
 import org.terasology.math.geom.Vector3f;

diff --git a/engine/src/main/java/org/terasology/rendering/nui/AbstractWidget.java b/engine/src/main/java/org/terasology/rendering/nui/AbstractWidget.java
@@ -27,7 +27,6 @@
 import org.terasology.rendering.nui.skin.UISkin;
 import org.terasology.rendering.nui.widgets.UIDropdown;
 import org.terasology.rendering.nui.widgets.UILabel;
-import org.terasology.rendering.nui.widgets.UIList;
 import org.terasology.rendering.nui.widgets.UIRadialSection;
 
 import java.util.Collection;

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/StartPlayingScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/StartPlayingScreen.java
@@ -25,7 +25,6 @@
 import org.terasology.engine.module.ModuleManager;
 import org.terasology.game.GameManifest;
 import org.terasology.i18n.TranslationSystem;
-import org.terasology.module.Module;
 import org.terasology.network.NetworkMode;
 import org.terasology.registry.In;
 import org.terasology.rendering.assets.texture.Texture;

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layouts/ScrollableArea.java b/engine/src/main/java/org/terasology/rendering/nui/layouts/ScrollableArea.java
@@ -26,7 +26,6 @@
 import org.terasology.rendering.nui.SubRegion;
 import org.terasology.rendering.nui.UIWidget;
 import org.terasology.rendering.nui.events.NUIMouseWheelEvent;
-import org.terasology.rendering.nui.widgets.UIList;
 import org.terasology.rendering.nui.widgets.UIScrollbar;
 
 import java.util.Collections;

diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIRadialRing.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIRadialRing.java
@@ -15,8 +15,6 @@
  */
 package org.terasology.rendering.nui.widgets;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.terasology.math.geom.Rect2i;
 import org.terasology.math.geom.Vector2i;
 import org.terasology.rendering.nui.BaseInteractionListener;

diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIScrollingText.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIScrollingText.java
@@ -26,7 +26,6 @@
 import org.terasology.rendering.nui.databinding.Binding;
 import org.terasology.rendering.nui.databinding.DefaultBinding;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/engine/src/main/java/org/terasology/rendering/world/WorldRenderer.java b/engine/src/main/java/org/terasology/rendering/world/WorldRenderer.java
@@ -19,7 +19,6 @@
 import org.terasology.math.geom.Vector3i;
 import org.terasology.module.sandbox.API;
 import org.terasology.rendering.assets.material.Material;
-import org.terasology.rendering.cameras.Camera;
 import org.terasology.rendering.cameras.SubmersibleCamera;
 import org.terasology.rendering.dag.RenderGraph;
 import org.terasology.rendering.world.viewDistance.ViewDistance;

diff --git a/engine/src/main/java/org/terasology/world/block/loader/BlockFamilyDefinitionFormat.java b/engine/src/main/java/org/terasology/world/block/loader/BlockFamilyDefinitionFormat.java
@@ -41,7 +41,6 @@
 import org.terasology.registry.CoreRegistry;
 import org.terasology.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
 import org.terasology.utilities.gson.legacy.LegacyVector3fTypeAdapter;
-import org.terasology.utilities.gson.Vector3fTypeAdapter;
 import org.terasology.utilities.gson.legacy.LegacyVector4fTypeAdapter;
 import org.terasology.world.block.BlockPart;
 import org.terasology.world.block.family.BlockFamily;

diff --git a/engine/src/main/java/org/terasology/world/internal/BlockUpdate.java b/engine/src/main/java/org/terasology/world/internal/BlockUpdate.java
diff --git a/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java b/engine/src/main/java/org/terasology/world/propagation/light/LightMerger.java
@@ -31,15 +31,11 @@
 import org.terasology.world.propagation.StandardBatchPropagator;
 import org.terasology.world.propagation.SunlightRegenBatchPropagator;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 public class LightMerger<T> {