From af67a590005c849b1788d65aa49cd9d0eac2796c Mon Sep 17 00:00:00 2001
From: Stachelbeere1248 <moritzrossbacher@gmail.com>
Date: Sun, 10 Mar 2024 12:44:21 +0100
Subject: [PATCH] minor fixes

---
 .../zombiesutils/ZombiesUtils.java                 |  4 ++--
 .../zombiesutils/game/enums/Map.java               | 14 --------------
 .../zombiesutils/game/waves/Waves.java             | 11 ++++++-----
 .../handlers/RenderGameOverlayHandler.java         |  4 ++--
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/ZombiesUtils.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/ZombiesUtils.java
index 18a76ab..99fa0fc 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/ZombiesUtils.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/ZombiesUtils.java
@@ -16,12 +16,11 @@ import org.jetbrains.annotations.NotNull;
 public class ZombiesUtils {
     private static ZombiesUtils instance;
     private final Hotkeys hotkeys;
-    private final Handlers handlers;
+    private Handlers handlers;
     private Logger logger;
 
     public ZombiesUtils() {
         hotkeys = new Hotkeys();
-        handlers = new Handlers();
         instance = this;
     }
 
@@ -41,6 +40,7 @@ public class ZombiesUtils {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
+        handlers = new Handlers();
         handlers.registerAll();
         CommandRegistry.registerAll();
         hotkeys.registerAll();
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/game/enums/Map.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/game/enums/Map.java
index 9320ec5..6fd1f72 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/game/enums/Map.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/game/enums/Map.java
@@ -1,18 +1,4 @@
 package com.github.stachelbeere1248.zombiesutils.game.enums;
-
-import org.jetbrains.annotations.NotNull;
-
 public enum Map {
     DEAD_END, BAD_BLOOD, ALIEN_ARCADIUM, PRISON;
-
-    @Override
-    public @NotNull String toString() {
-        switch (this) {
-            case DEAD_END: return "Dead End";
-            case BAD_BLOOD: return "Bad Blood";
-            case ALIEN_ARCADIUM: return "Alien Arcadium";
-            case PRISON: return "Prison";
-            default: throw new IllegalStateException("Unexpected Map value:" + this);
-        }
-    }
 }
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Waves.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Waves.java
index 88d196d..ebbb678 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Waves.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Waves.java
@@ -18,21 +18,22 @@ public class Waves {
 
     @Contract(pure = true)
     public static byte[] get(@NotNull Map map, byte round) {
-        byte[] ret = new byte[0];
+        byte[] ret = new byte[]{ 0 };
         try {
             switch (map) {
                 case DEAD_END:
                     ret = deadEndWaveTimes[round - 1];
+                    break;
                 case BAD_BLOOD:
                     ret = badBloodWaveTimes[round - 1];
+                    break;
                 case ALIEN_ARCADIUM:
                     ret = alienArcadiumWaveTimes[round - 1];
-                default:
-                    throw new IllegalStateException("Unexpected value: " + map);
+                    break;
             }
-        } catch (ArrayIndexOutOfBoundsException e) {
+        } catch (ArrayIndexOutOfBoundsException ignored) {
             Minecraft.getMinecraft().thePlayer.addChatMessage(
-                    new ChatComponentText("Achievement get: Round " + round + map)
+                    new ChatComponentText("Achievement get: Round " + round + " " + map)
             );
         }
         return ret;
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderGameOverlayHandler.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderGameOverlayHandler.java
index 1c46f88..0c36e95 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderGameOverlayHandler.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderGameOverlayHandler.java
@@ -135,7 +135,7 @@ public class RenderGameOverlayHandler {
         }
     }
     public void renderCPS() {
-        final String cps = String.format("%2.1f", getClicks());
+        final String cps = String.format("%2d", getClicks());
         final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
         final int screenWidth = scaledResolution.getScaledWidth();
         final int width = fontRenderer.getStringWidth(cps);
@@ -148,7 +148,7 @@ public class RenderGameOverlayHandler {
         );
     }
 
-    public double getClicks() {
+    public int getClicks() {
         int i = 0;
         for (boolean tick : clicks) {
             if (tick) i++;