From e6d3e1f2ff270fb773fed9425da7c5c549c0bfb9 Mon Sep 17 00:00:00 2001
From: Raven Szewczyk <git@eigenraven.me>
Date: Fri, 24 May 2024 20:39:32 +0100
Subject: Fix launching the game, spotless

---
 .../core/commands/CommandEnableDebugWhileRunning.java       | 13 ++++---------
 src/main/java/gtPlusPlus/core/commands/CommandMath.java     |  8 ++++++--
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core/commands')

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;
     }
 
-- 
cgit