From 1a888e04570919ebd280406c627ae839c9681bf5 Mon Sep 17 00:00:00 2001
From: Stachelbeere1248 <moritzrossbacher@gmail.com>
Date: Sun, 26 Nov 2023 18:35:56 +0100
Subject: [PATCH] finish v1.2.0

---
 .../config/ZombiesUtilsConfig.java            |  2 +-
 .../zombiesutils/handlers/ChatHandler.java    |  4 +--
 .../mixin/MixinNetHandlerPlayClient.java      | 27 -------------------
 .../render/RenderGameOverlayHandler.java      |  7 +++--
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java
index 5744ca7..a566dde 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java
@@ -50,7 +50,7 @@ public class ZombiesUtilsConfig {
                 -28,
                 -200,
                 200,
-                "max: 200 ticks"
+                "ticks to be added to the wave spawn time"
         );
         shortSpawntime = config.getBoolean(
                 "passed wave spawns",
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java
index c5e059f..f2e443b 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java
@@ -26,10 +26,8 @@ public class ChatHandler {
 
         if (message.contains("Hard Difficulty") || message.contains("困难") || message.contains("困難")) {
             gameMode.changeDifficulty(Difficulty.HARD);
-            ZombiesUtils.getInstance().getLogger().debug("Changed to Hard");
-        } else if (message.contains("RIP Difficulty") || message.contains("安息") || message.contains("RIP")) {
+        } else if (message.contains("RIP") || message.contains("安息")) {
             gameMode.changeDifficulty(Difficulty.RIP);
-            ZombiesUtils.getInstance().getLogger().debug("Changed to RIP");
         }
     }
 
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java
index 72c27d5..d1af101 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java
@@ -36,33 +36,6 @@ public class MixinNetHandlerPlayClient {
                 || (soundEffect.equals("mob.guardian.curse") && !zombies_utils$alienUfoOpened)
         )) return;
         zombies_utils$alienUfoOpened = soundEffect.equals("mob.guardian.curse");
-        /*if (!Timer.getInstance().isPresent()) {
-            new Timer(
-                    Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
-                    Scoreboard.getMap().orElseThrow(() -> new RuntimeException("cannot figure out map")).map
-            );
-        }  else { Timer timer = Timer.getInstance().get();
-
-            final Scoreboard.MapContainer map = Scoreboard.getMap().orElse(new Scoreboard.MapContainer(
-                    timer.getGameMode().getMap(),
-                    false
-            ));
-
-            if (map.pregame) {
-                new Timer(
-                        Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
-                        map.map
-                );
-            } else if (timer.equalsServerOrNull(Scoreboard.getServerNumber().orElse(null))) timer.split(Scoreboard.getRound());
-            else {
-                new Timer(
-                        Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
-                        map.map
-                );
-            }
-        }*/
-
-
         try {
 
             if (Timer.getInstance().isPresent()) {
diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/render/RenderGameOverlayHandler.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/render/RenderGameOverlayHandler.java
index 892ced4..e869a71 100644
--- a/src/main/java/com/github/stachelbeere1248/zombiesutils/render/RenderGameOverlayHandler.java
+++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/render/RenderGameOverlayHandler.java
@@ -81,11 +81,14 @@ public class RenderGameOverlayHandler {
 
         for (byte waveTime: waveTimes) {
             int clonedColor = color;
-            final short waveTicks = (short) ((waveTime * 20)-rl);
+            final short waveTicks = (short) ((waveTime * 20)+rl);
 
             if (roundTicks>waveTicks) {
                 if (ZombiesUtilsConfig.isSpawntimeNotShortened()) clonedColor = 0x555555;
-                else continue;
+                else {
+                    heightIndex++;
+                    continue;
+                }
             }
 
             final String time = getWaveString(waveTicks, heightIndex + 1);