README.md

@@ -1,51 +1,34 @@
 # zombies-utils
-
+##### Download the latest release [here](https://github.com/Stachelbeere1248/zombies-utils/releases/latest)
-##### Go to release page [here](https://git.stachel.xyz/Stachelbeere1248/zombies-utils/releases)
-
 Hello, I am currently working on this mod. More features will come. For now it has:
-
 - An accurate timer + Automatic splitting
 - Tracking of splits & segment PBs (with custom categories)
 - SLA hud
 - A chat macro
 - Spawn-times HUD: visual, auditory, RL-mode
 - Player Visibility
-
 #### Disclaimers
-
 - If you are using a Hypixel language other than the selected one the mod may not work entirely. Check config.
-
 ## For Users
-
+The timer automatically splits every round. The PB/Segment recorder automatically distinguishes maps and difficulties, but not player count.
-The timer automatically splits every round. The PB/Segment recorder automatically distinguishes maps and difficulties,
-but not player count.
-
 ### Config
-
+- Language: The selected Hypixel language. Currently supports EN,FR,DE.
-- `Language`: The selected Hypixel language. Currently supports EN,FR,DE.
+- Timer:
-- ###### Timer:
+  - Default Category: The record-category to be selected when starting the game.
-    - `Default Category`: The record-category to be selected when starting the game.
+  - PB Announcements: Whether to show **\*\*\*NEW PERSONAL BEST\*\*\*** on PB in summaries.
-    - `PB Announcements`: Whether to show **\*\*\*NEW PERSONAL BEST\*\*\*** on PB in summaries.
+- SST:
-- ###### SST:
+  - Enabled: Enables / disables this feature.
-    - `Enabled`: Enables / disables this feature.
+  - Auditory: A List of tick offsets that a sound should be played. Default (-40, -20, 0) means 2s and 1s in advance, as well as on spawn.
-    - `Auditory`: A List of tick offsets that a sound should be played. Default (-40, -20, 0) means 2s and 1s in
+  - RL pre-timing: During RL mode, how much SST times sohuld be offsetted. Defaults to 1.4s earlier. Affects HUD as well as auditory.
-      advance, as well as on spawn.
+  - Truncate: Whether to show passed rounds in the HUD.
-    - `RL pre-timing`: During RL mode, how much SST times sohuld be offsetted. Defaults to 1.4s earlier. Affects HUD as
+- SLA:
-      well as auditory.
+  - Enabled: Whether the SLA HUD should automatically be shown when starting a game.
-    - `Truncate`: Whether to show passed rounds in the HUD.
+  - Truncate: Whether inactive windows and rooms should be shown.
-- ###### SLA:
+- Macro Message: The Message to be sent when pressing the Chat Macro Key. Do NOT use "§" as symbol.
-    - `Enabled`: Whether the SLA HUD should automatically be shown when starting a game.
+- Player Visibility: Whether to enable PlayerVisibility by default.
-    - `Truncate`: Whether inactive windows and rooms should be shown.
+- CPS Counter: A simple CPS Counter which shows the amount of clicks within the last 20 gameticks.
-- ###### Player Visibility:
-    - `Enabled`: Whether to enable PlayerVisibility by default.
-    - `Range`: The range within which players are hidden while enabled.
-- `Macro Message`: The Message to be sent when pressing the Chat Macro Key. Do NOT use "§" as symbol.
-- `CPS Counter`: A simple CPS Counter which shows the amount of clicks within the last 20 gameticks.
-
 ### Commands
-
+- /category \<name> - Switches to the category called name. All recorded times are bound to its category. Tabcomplete suggests already existing categories, but you can insert a new (clean) one as well.
-- /category \<name> - Switches to the category called name. All recorded times are bound to its category. Tabcomplete
-  suggests already existing categories, but you can insert a new (clean) one as well.
   - Examples:
     - /category pistol_only
     - /category no_doors_solo
@@ -54,27 +37,17 @@ but not player count.
   - /sla off - Disables the SLA hud
   - /sla map \<de|bb|aa|p> - forcefully set the map
   - /sla quick \<mogi_a|ghxula|ghxula-garden>
-    - useless for most players:
   - /sla rotate - rotates all windows around the axis (0,y,0)
   - /sla mirror \<x|z> - mirrors all windows along the plane (0,y,z) or (x,y,0)
   - /sla offset \<x> \<y> \<z> - set an offset, allowing you to use sla on map-recreations, such as housings
 - /zombiesutils \<timer>
   - /zombiesutils timer \<kill|split>
     - /zombiesutils timer kill - Stops the running timer completely
-        - /zombiesutils timer split \<round> - Splits as if \<round> was passed, not recommended to use as it might
+    - /zombiesutils timer split \<round> - Splits as if \<round> was passed, not recommended to use as it might create impossible PBs.
-          create impossible PBs.
 - /qz \<de|bb|aa|p> - sends you to a new game of Dead End, Bad Blood, Alien Arcadium or Prison
-
 ### Hotkeys
-
 - Chat Macro: Sends the message specified in the config.
 - RL Mode: Toggles usage of the rocket launcher mode spawn-time offset.
 - Player Visibility: Toggles whether to show players that are within a 4 block radius.
-
 ### Extra
-
+- Managing split-categories: In your game directory is a folder called "zombies" which contains the folder "splits". You can simply rename or delete the folders inside "splits". You can also edit your splits, the data is stored as a list of ticks inside the MAP_DIFFICULTY.times files, a simple text editor (such as Notepad on Windows) should be able to edit it (UTF-16 encoded text). The other subfolder, runs, logs all the splits for every run you play.
-- Managing split-categories: In your game directory (aka `.minecraft`) is a folder called `zombies` which contains the
-  folder `splits`. You can simply rename or delete the folders inside `splits`, they represent your categories. You can
-  also edit your splits, the data is stored as a list of ticks inside the `MAP_DIFFICULTY.times` files, a simple text
-  editor (such as Notepad on Windows) should be able to edit it (UTF-16 encoded text). The other subfolder, runs, logs
-  all the splits for every run you play.

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.stachelbeere1248.zombiesutils
 mcVersion = 1.8.9
 modid = zombiesutils
-version=1.3.7
+version = 1.3.6

log4j2.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
     <!-- Filter out Hypixel scoreboard and sound errors -->
-    <RegexFilter regex="Error executing task.*|Unable to play unknown soundEvent.*" onMatch="DENY"
+    <RegexFilter regex="Error executing task.*|Unable to play unknown soundEvent.*" onMatch="DENY" onMismatch="NEUTRAL"/>
-                 onMismatch="NEUTRAL"/>
 </Configuration>

src/main/java/com/github/stachelbeere1248/zombiesutils/commands/SlaCommand.java

@@ -1,8 +1,8 @@
 package com.github.stachelbeere1248.zombiesutils.commands;
 
+import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
 import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 import com.github.stachelbeere1248.zombiesutils.game.sla.QuickSLA;
-import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
 import net.minecraft.command.*;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;

src/main/java/com/github/stachelbeere1248/zombiesutils/commands/ZombiesUtilsCommand.java

@@ -68,7 +68,8 @@ public class ZombiesUtilsCommand extends CommandBase {
                 default:
                     return Collections.emptyList();
             }
-        } else if (args.length == 3) {
+        }
+        else if (args.length == 3) {
             switch (args[0]) {
                 case "timer":
                     switch (args[1]) {

src/main/java/com/github/stachelbeere1248/zombiesutils/config/Hotkeys.java

@@ -41,7 +41,6 @@ public class Hotkeys {
     public KeyBinding getRlSpawn() {
         return rlSpawn;
     }
-
     public KeyBinding getPlayerVisiblity() {
         return playerVisiblity;
     }

src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java

@@ -1,5 +1,6 @@
 package com.github.stachelbeere1248.zombiesutils.config;
 
+import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
 import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
@@ -26,7 +27,6 @@ public class ZombiesUtilsConfig {
     private Property cpsCounter;
     private Property announcePB;
     private Property playerVis;
-    private Property playerVisRange;
 
     public ZombiesUtilsConfig(Configuration config) {
         this.config = config;
@@ -34,7 +34,9 @@ public class ZombiesUtilsConfig {
     }
 
     private void read() {
+        ZombiesUtils.getInstance().getLogger().debug("Loading config...");
         config.load();
+        ZombiesUtils.getInstance().getLogger().debug("Config loaded.");
 
         //SST
         sstHud = config.get(
@@ -97,22 +99,6 @@ public class ZombiesUtilsConfig {
                 "Whether to announce PBs."
         );
 
-        //Player Visibility
-        playerVis = config.get(
-                "PlayerVis",
-                "default",
-                false,
-                "If players should always be visible"
-        );
-        playerVisRange = config.get(
-                "PlayerVis",
-                "range",
-                4,
-                "The range within which players are hidden",
-                0,
-                50
-        );
-
 
         //ROOT
         language = config.get(
@@ -128,6 +114,12 @@ public class ZombiesUtilsConfig {
                 "T",
                 "The Text to be sent when pressing the chat-macro hotkey"
         );
+        playerVis = config.get(
+                Configuration.CATEGORY_GENERAL,
+                "playervis",
+                false,
+                "If players should always be visible"
+        );
         cpsCounter = config.get(
                 Configuration.CATEGORY_GENERAL,
                 "cps",
@@ -159,21 +151,14 @@ public class ZombiesUtilsConfig {
         );
     }
 
-    private List<IConfigElement> getPlayerVisElements() {
-        return Arrays.asList(
-                new CustomConfigElement("Enabled", playerVis),
-                new CustomConfigElement("Range", playerVisRange)
-        );
-    }
-
     List<IConfigElement> getRootElements() {
         return Arrays.asList(
                 new CustomConfigElement("Language", language),
                 new DummyConfigElement.DummyCategoryElement("Timer", "", getTimerElements()),
                 new DummyConfigElement.DummyCategoryElement("SST", "", getSpawntimeElements()),
                 new DummyConfigElement.DummyCategoryElement("SLA", "", getSlaElements()),
-                new DummyConfigElement.DummyCategoryElement("Player Visibility", "", getPlayerVisElements()),
                 new CustomConfigElement("Macro message", chatMacro),
+                new CustomConfigElement("Player visibility", playerVis),
                 new CustomConfigElement("CPS counter", cpsCounter)
 
         );
@@ -219,19 +204,13 @@ public class ZombiesUtilsConfig {
     public boolean getCpsToggle() {
         return cpsCounter.getBoolean();
     }
-
     public boolean getAnnouncePB() {
         return announcePB.getBoolean();
     }
-
     public boolean getPlayerVis() {
         return playerVis.getBoolean();
     }
 
-    public int getPlayerVisRange() {
-        return playerVisRange.getInt();
-    }
-
     @SubscribeEvent
     public void onConfigChange(ConfigChangedEvent.@NotNull OnConfigChangedEvent event) {
         if (event.modID.equals("zombiesutils") && event.configID == null) {

src/main/java/com/github/stachelbeere1248/zombiesutils/game/GameData.java

@@ -8,7 +8,6 @@ import org.jetbrains.annotations.NotNull;
 
 public class GameData {
     private final Round[][] roundData;
-
     public GameData() {
         roundData = new Round[10][];
         roundData[0] = readFromFile("data/rounds/DEAD_END_NORMAL.json");
@@ -24,6 +23,7 @@ public class GameData {
     }
 
     public Round getRound(@NotNull GameMode gameMode, int round) {
+        final Round[] selected;
         switch (gameMode) {
             case DEAD_END:
                 return roundData[0][round-1];

src/main/java/com/github/stachelbeere1248/zombiesutils/game/GameMode.java

@@ -12,28 +12,11 @@ public enum GameMode {
     PRISON(Map.PRISON, Difficulty.NORMAL), PRISON_HARD(Map.PRISON, Difficulty.HARD), PRISON_RIP(Map.PRISON, Difficulty.RIP);
     private final Map map;
     private final Difficulty difficulty;
-
     GameMode(final @NotNull Map map, final @NotNull Difficulty difficulty) {
         this.map = map;
         this.difficulty = difficulty;
     }
 
-    @Contract(pure = true)
-    public static GameMode getNormalForMap(final @NotNull Map map) {
-        switch (map) {
-            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 value: " + map);
-        }
-    }
-
     public Map getMap() {
         return this.map;
     }
@@ -41,7 +24,6 @@ public enum GameMode {
     public Difficulty getDifficulty() {
         return this.difficulty;
     }
-
     public GameMode appliedDifficulty(final Difficulty difficulty) {
         switch (this.map) {
             case DEAD_END:
@@ -77,8 +59,23 @@ public enum GameMode {
                 throw new IllegalStateException("Invalid Map: " + this.map);
         }
     }
-
     public boolean isMap(Map map) {
         return this.getMap() == map;
     }
+
+    @Contract(pure = true)
+    public static GameMode getNormalForMap(final @NotNull Map map) {
+        switch (map) {
+            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 value: " + map);
+        }
+    }
 }

src/main/java/com/github/stachelbeere1248/zombiesutils/game/sla/QuickSLA.java

@@ -1,7 +1,7 @@
 package com.github.stachelbeere1248.zombiesutils.game.sla;
 
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
+import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 
 @SuppressWarnings("SpellCheckingInspection")
 public class QuickSLA {

src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Prefix.java

@@ -1,37 +1,39 @@
 package com.github.stachelbeere1248.zombiesutils.game.waves;
 
+import java.util.stream.IntStream;
+
 public enum Prefix {
-    BOSS(0xCC5555, "B", 0x7A3333),
+        BOSS(0xCC5555, "B"),
-    BLAZES(0xEFB61F, "BL", 0x8F6D0F),
+        BLAZES(0xEFB61F, "BL"),
-    SLIME(0x88FF88, "S", 0x51A951),
+        SLIME(0x88FF88,"S"),
-    HBM(0x2A415F, "HBM", 0x193241),
+        HBM(0x2A415F, "HBM"),
-    WITHER_SKELETON(0x888888, "WS", 0x515151),
+        WITHER_SKELETON(0x888888, "WS"),
-    OLD_ONE(0x55AA55, "O1", 0x336633),
+        OLD_ONE(0x55AA55, "O1"),
-    GIANT(0x00FFFF, "G", 0x009999),
+        GIANT(0x00FFFF,"G"),
-    POLICE(0x16537E, "P", 0x0E324D),
+        POLICE(0x16537E,"P"),
-    CELL(0xFF8234, "C", 0x99501F),
+        CELL(0xFF8234,"C"),
-    WINDOW(0xAAAAAA, "W", 0x666666);
+        WINDOW(0xAAAAAA,"W");
 
     private final int color;
-    private final int fadedColor;
     private final String prefix;
 
-    Prefix(final int color, final String prefix, final int fadedColor) {
+    Prefix(final int color, final String prefix) {
         this.color = color;
         this.prefix = prefix;
-        this.fadedColor = fadedColor;
     }
-
     public int getColor() {
         return color;
     }
-
     public String getPrefix() {
         return prefix;
     }
 
-    public int getFadedColor() {
+    public int getFadedColor(final int fact, final int div) {
-        return fadedColor;
+        final int normalColor = this.getColor();
+        final int B = normalColor % 0xFF;
+        final int G = (normalColor - B) % (0xFF * 0xFF);
+        final int R = (normalColor - (B + G));
+        return IntStream.of(R, G, B).map(i -> (i * fact) / div).sum();
     }
 
 }

src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Round.java

@@ -1,5 +1,8 @@
 package com.github.stachelbeere1248.zombiesutils.game.waves;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public class Round {
     private final Wave[] waves;
 

src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/Wave.java

@@ -9,7 +9,6 @@ public class Wave {
         this.ticks = ticks;
         this.prefixes = prefixes;
     }
-
     public Wave(final short ticks) {
         this.ticks = ticks;
         this.prefixes = new Prefix[]{Prefix.WINDOW};

src/main/java/com/github/stachelbeere1248/zombiesutils/game/waves/WaveTiming.java

@@ -8,7 +8,6 @@ import java.util.Arrays;
 
 public class WaveTiming {
     public static int rl = 0;
-
     public static void onTick() {
         if (Scoreboard.isNotZombies()) return;
         ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(

src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java

@@ -17,19 +17,18 @@ public class ChatHandler {
 
     @SubscribeEvent
     public void difficultyChange(@NotNull final ClientChatReceivedEvent event) {
-        if (event.message.getUnformattedText().contains(":")) return;
-        final String message = STRIP_COLOR_PATTERN.matcher(event.message.getUnformattedText()).replaceAll("").trim();
-
-        if (LanguageSupport.containsHard(message)) {
-            ZombiesUtils.getInstance().getGameManager().setDifficulty(Difficulty.HARD);
-        } else if (LanguageSupport.containsRIP(message)) {
-            ZombiesUtils.getInstance().getGameManager().setDifficulty(Difficulty.RIP);
-        } else {
         ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
                 game -> {
-                        if (LanguageSupport.isHelicopterIncoming(message)) game.helicopter();
+                    String message = STRIP_COLOR_PATTERN.matcher(event.message.getUnformattedText()).replaceAll("").trim();
+                    if (message.contains(":")) return;
+                    if (LanguageSupport.containsHard(message)) {
+                        game.changeDifficulty(Difficulty.HARD);
+                    } else if (LanguageSupport.containsRIP(message)) {
+                        game.changeDifficulty(Difficulty.RIP);
+                    } else if (LanguageSupport.isHelicopterIncoming(message)) {
+                        game.helicopter();
+                    }
                 }
         );
     }
 }
-}

src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderGameOverlayHandler.java

@@ -2,9 +2,10 @@ package com.github.stachelbeere1248.zombiesutils.handlers;
 
 import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
 import com.github.stachelbeere1248.zombiesutils.game.waves.Prefix;
+import com.github.stachelbeere1248.zombiesutils.game.waves.Round;
 import com.github.stachelbeere1248.zombiesutils.game.waves.Wave;
-import com.github.stachelbeere1248.zombiesutils.game.windows.Room;
 import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
+import com.github.stachelbeere1248.zombiesutils.game.windows.Room;
 import com.github.stachelbeere1248.zombiesutils.timer.Game;
 import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
 import net.minecraft.client.Minecraft;
@@ -51,8 +52,7 @@ public class RenderGameOverlayHandler {
                 }
         );
 
-        if (!Minecraft.getMinecraft().gameSettings.showDebugInfo)
+        if (!Minecraft.getMinecraft().gameSettings.showDebugInfo) SLA.getInstance().ifPresent(sla -> renderSla(sla.getRooms()));
-            SLA.getInstance().ifPresent(sla -> renderSla(sla.getRooms()));
         if (ZombiesUtils.getInstance().getConfig().getCpsToggle()) renderCPS();
     }
 
@@ -87,7 +87,6 @@ public class RenderGameOverlayHandler {
             y++;
         }
     }
-
     private void renderSpawnTime(final Game game) {
         if (!ZombiesUtils.getInstance().getConfig().getSST() || Scoreboard.isNotZombies()) return;
         final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
@@ -124,7 +123,7 @@ public class RenderGameOverlayHandler {
                         prefixString,
                         screenWidth - width,
                         screenHeight - fontRenderer.FONT_HEIGHT * (length - heightIndex),
-                        faded ? prefix.getFadedColor() : prefix.getColor()
+                        faded ? prefix.getFadedColor(3,5) : prefix.getColor()
                 );
             }
             if (!faded) color = 0xAAAAAA;

src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/RenderPlayerHandler.java

@@ -24,10 +24,8 @@ public class RenderPlayerHandler {
     }
 
     private boolean inRange(@NotNull Vec3 playerOther) {
-        final int range = ZombiesUtils.getInstance().getConfig().getPlayerVisRange();
+        return playerOther.squareDistanceTo(Minecraft.getMinecraft().thePlayer.getPositionVector()) <= 16;
-        return playerOther.squareDistanceTo(Minecraft.getMinecraft().thePlayer.getPositionVector()) <= range * range;
     }
-
     public void togglePlayerVisibility() {
         this.visible = !this.visible;
         final String s;

src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Game.java

@@ -3,8 +3,8 @@ package com.github.stachelbeere1248.zombiesutils.timer;
 import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
 import com.github.stachelbeere1248.zombiesutils.game.GameMode;
 import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
+import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 import com.github.stachelbeere1248.zombiesutils.handlers.Round1Correction;
 import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
 import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
@@ -35,7 +35,6 @@ public class Game {
         MinecraftForge.EVENT_BUS.register(new Round1Correction(this.timer, serverNumber));
         if (ZombiesUtils.getInstance().getConfig().isSlaToggled()) SLA.instance = new SLA(map);
     }
-
     public Game(@NotNull final Map map, final String serverNumber, final int round) {
         this.gameMode = GameMode.getNormalForMap(map);
         this.timer = new Timer();
@@ -52,19 +51,15 @@ public class Game {
     public Timer getTimer() {
       return this.timer;
     }
-
     public void setCategory(Category category) {
         this.category = category;
     }
-
     public void changeDifficulty(final Difficulty difficulty) {
         this.gameMode = this.gameMode.appliedDifficulty(difficulty);
     }
-
     public int getRound() {
         return round;
     }
-
     public GameMode getGameMode() {
         return gameMode;
     }
@@ -83,7 +78,6 @@ public class Game {
         this.timer.split();
         this.round = round + 1;
     }
-
     public void helicopter() {
         if (!gameMode.isMap(Map.PRISON)) {
             Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cEscaping without playing prison???"));

src/main/java/com/github/stachelbeere1248/zombiesutils/timer/GameManager.java

@@ -1,20 +1,17 @@
 package com.github.stachelbeere1248.zombiesutils.timer;
 
-import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
 import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
 import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
 import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
 import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
 public class GameManager {
     private final HashMap<String, Game> GAMES;
-    private Optional<Difficulty> queuedDifficulty = Optional.empty();
-    private String queuedDifficultyServer = "INVALID";
 
     public GameManager() {
         GAMES = new HashMap<>();
@@ -46,25 +43,11 @@ public class GameManager {
     public void splitOrNew(int round) throws ScoardboardException, InvalidMapException {
         final String serverNumber = Scoreboard.getServerNumber().orElseThrow(ScoardboardException::new);
         if (GAMES.containsKey(serverNumber)) {
-            if (round == 0) newGame(serverNumber);
+            if (round == 0) GAMES.put(serverNumber, new Game(Map.getMap().orElseThrow(InvalidMapException::new), serverNumber));
             else GAMES.get(serverNumber).pass(round);
-        } else newGame(serverNumber);
+        } else {
+            GAMES.put(serverNumber, new Game(Map.getMap().orElseThrow(InvalidMapException::new), serverNumber, round + 1));
         }
-
-    private void newGame(@NotNull String serverNumber) throws InvalidMapException {
-        final Game game = new Game(Map.getMap().orElseThrow(InvalidMapException::new), serverNumber);
-        if (serverNumber.equals(queuedDifficultyServer)) {
-            this.queuedDifficulty.ifPresent(game::changeDifficulty);
-        }
-        this.queuedDifficulty = Optional.empty();
-        this.GAMES.put(serverNumber, game);
-    }
-
-    public void setDifficulty(@NotNull Difficulty difficulty) {
-        this.queuedDifficultyServer = Scoreboard.getServerNumber().orElse("INVALID");
-        if (this.GAMES.containsKey(this.queuedDifficultyServer)) {
-            this.GAMES.get(this.queuedDifficultyServer).changeDifficulty(difficulty);
-        } else this.queuedDifficulty = Optional.of(difficulty);
     }
 
     public Set<String> getGames() {

src/main/java/com/github/stachelbeere1248/zombiesutils/timer/RecordMessageSender.java

@@ -15,7 +15,6 @@ public class RecordMessageSender {
     private final String deltaString;
     private final String timeString;
     private String copyString;
-
     public RecordMessageSender(final String categoryName, final int round, final int newTime, final int oldTime) {
         this.recordMessage = new StringBuilder(
                 "§l§a▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬\n§e Category: §d" + categoryName
@@ -70,7 +69,6 @@ public class RecordMessageSender {
                 String.format("Round %d took %s!", round, timeString) :
                 String.format("Round %d took %s (%s)!", round, timeString, deltaString);
     }
-
     public void helicopterSplit() {
         final String announcement = newTime < oldTime && ZombiesUtils.getInstance().getConfig().getAnnouncePB() ?
                 "\n§e§l***§6§l NEW PERSONAL BEST! §e§l***" : "";
@@ -84,7 +82,6 @@ public class RecordMessageSender {
                 String.format("Helicopter called at %s!", timeString) :
                 String.format("Helicopter called at %s (%s)!", timeString, deltaString);
     }
-
     @Contract(pure = true)
     private String formattedTime(int time) {
         time *= 50;
@@ -95,7 +92,6 @@ public class RecordMessageSender {
                 (time % 100) / 10
         );
     }
-
     @Contract(pure = true)
     private String formattedDelta(int newTime, int oldTime) {
         final double delta = (double) (newTime - oldTime) / 20;

src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Timer.java

@@ -14,11 +14,9 @@ public class Timer {
     public void correctStartTick() {
         this.startTick = this.getCurrentTick() - 200;
     }
-
     void split() {
         this.roundStart = this.getGameTime();
     }
-
     public int getGameTime() {
         return (int) (getCurrentTick() - startTick);
     }

src/main/java/com/github/stachelbeere1248/zombiesutils/utils/LanguageSupport.java

@@ -51,7 +51,6 @@ public class LanguageSupport {
         };
         return Arrays.stream(words).anyMatch(input::contains);
     }
-
     public static boolean isHelicopterIncoming(@NotNull String input) {
         final String[] words = {
                 "The Helicopter is on its way! Hold out for 120 more seconds!"
@@ -71,7 +70,6 @@ public class LanguageSupport {
                 throw new IllegalStateException("Unexpected value: " + language);
         }
     }
-
     public static String[] getLanguages() {
         return LANGUAGES;
     }

src/main/resources/mcmod.info

@@ -2,16 +2,16 @@
   {
     "modid": "${modid}",
     "name": "Zombies Utils",
-    "description": "An all-in-one mod for Hypixel Zombies. Targets legit speed-runners.",
+    "description": "",
     "version": "${version}",
     "mcversion": "${mcversion}",
     "url": "https://github.com/Stachelbeere1248/zombies-utils",
-    "updateUrl": "https://github.com/Stachelbeere1248/zombies-utils/blob/master/update.json",
+    "updateUrl": "https://github.com/Stachelbeere1248/zombies-utils/update.json",
     "authorList": [
       "Stachelbeere1248"
     ],
     "credits": "Seosean, thamid-23",
-    "logoFile": "zombiesutils.png",
+    "logoFile": "",
     "screenshots": [],
     "dependencies": []
   }

update.json

@@ -1,13 +1,10 @@
 {
   "homepage": "https://github.com/Stachelbeere1248/zombies-utils/releases",
   "promos": {
-    "1.8.9-latest": "1.3.7",
+    "1.8.9-latest"     : "1.3.4",
-    "1.8.9-recommended": "1.3.7"
+    "1.8.9-recommended" : "1.3.4"
   },
   "1.8.9" : {
-    "1.3.6": "SST Prefixes, added update checker url",
+    "1.3.5" : "SST Prefixes, added update checker url"
-    "1.3.7-PRE_1": "patch: difficiluty detection",
-    "1.3.7-PRE_2": "fix instant crash",
-    "1.3.7": "mark release, fix faded prefix colors"
   }
 }