Fix launching the game, spotless

4 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 1794951248..bf42a0792d 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -37,14 +37,9 @@ public class CommandEnableDebugWhileRunning implements ICommand {
 
     @Override
     public int compareTo(final Object o) {
-        if (o instanceof Comparable<?>) {
-            @SuppressWarnings("unchecked")
-            Comparable<ICommand> a = (Comparable<ICommand>) o;
-            if (a.equals(this)) {
-                return 0;
-            } else {
-                return -1;
-            }
+        if (o instanceof ICommand c) {
+            return this.getCommandName()
+                .compareTo(c.getCommandName());
         }
         return -1;
     }
@@ -224,7 +219,7 @@ public class CommandEnableDebugWhileRunning implements ICommand {
     }
 
     @Override
-    public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
+    public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
         ArrayList<String> aTabCompletes = new ArrayList<>();
         aTabCompletes.add("?");
         aTabCompletes.add("logging");
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
index 6065044c29..f23e45a359 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
@@ -26,7 +26,11 @@ public class CommandMath implements ICommand {
 
     @Override
     public int compareTo(final Object o) {
-        return 0;
+        if (o instanceof ICommand c) {
+            return this.getCommandName()
+                .compareTo(c.getCommandName());
+        }
+        return -1;
     }
 
     @Override
@@ -75,7 +79,7 @@ public class CommandMath implements ICommand {
     }
 
     @Override
-    public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
+    public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
         return null;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 9108fafc22..8dce46ee46 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -10,7 +10,6 @@ import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-import gregtech.GT_Version;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
@@ -19,6 +18,7 @@ import net.minecraft.world.World;
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import gregtech.GT_Version;
 import gregtech.api.objects.XSTR;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index 4d5473d349..016dfc8c58 100644
--- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -32,7 +32,7 @@ public class MiningExplosion extends Explosion {
     private final Random explosionRNG = new XSTR();
     private final World worldObj;
 
-    private final Map<Entity, Vec3> field_77288_k = new HashMap<>();
+    private final Map<EntityPlayer, Vec3> field_77288_k = new HashMap<>();
 
     public MiningExplosion(final World worldObj, final Entity entityObj, final double x, final double y, final double z,
         final float size) {
@@ -152,8 +152,8 @@ public class MiningExplosion extends Explosion {
                     entity.motionY += d6 * d8;
                     entity.motionZ += d7 * d8;
 
-                    if (entity instanceof EntityPlayer) {
-                        this.field_77288_k.put(entity, Vec3.createVectorHelper(d5 * d11, d6 * d11, d7 * d11));
+                    if (entity instanceof EntityPlayer player) {
+                        this.field_77288_k.put(player, Vec3.createVectorHelper(d5 * d11, d6 * d11, d7 * d11));
                     }
                 }
             }
@@ -425,7 +425,7 @@ public class MiningExplosion extends Explosion {
     }
 
     @Override
-    public Map<Entity, Vec3> func_77277_b() {
+    public Map<EntityPlayer, Vec3> func_77277_b() {
         return this.field_77288_k;
     }