RL command, rename package

.gitignore

@@ -1,3 +1,10 @@
 run/
 build/
 .gradle/
+.envrc
+.classpath
+.factorypath
+.project
+.settings
+.vscode
+bin

src/main/java/xyz/stachel/zombiesutils/ResourceLoader.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils;
+package xyz.stachel.zombiesutils;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;

src/main/java/xyz/stachel/zombiesutils/ZombiesUtils.java

@@ -1,11 +1,12 @@
-package com.github.stachelbeere1248.zombiesutils;
+package xyz.stachel.zombiesutils;
 
-import com.github.stachelbeere1248.zombiesutils.commands.CommandRegistry;
-import com.github.stachelbeere1248.zombiesutils.config.Hotkeys;
-import com.github.stachelbeere1248.zombiesutils.config.ZombiesUtilsConfig;
-import com.github.stachelbeere1248.zombiesutils.game.GameData;
-import com.github.stachelbeere1248.zombiesutils.handlers.Handlers;
-import com.github.stachelbeere1248.zombiesutils.timer.GameManager;
+import xyz.stachel.zombiesutils.commands.CommandRegistry;
+import xyz.stachel.zombiesutils.config.Hotkeys;
+import xyz.stachel.zombiesutils.config.ZombiesUtilsConfig;
+import xyz.stachel.zombiesutils.game.GameData;
+import xyz.stachel.zombiesutils.game.waves.WaveTiming;
+import xyz.stachel.zombiesutils.handlers.Handlers;
+import xyz.stachel.zombiesutils.timer.GameManager;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.Mod;
@@ -14,7 +15,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
-@Mod(modid = "zombiesutils", useMetadata = true, clientSideOnly = true, guiFactory = "com.github.stachelbeere1248.zombiesutils.config.GuiFactory")
+@Mod(modid = "zombiesutils", useMetadata = true, clientSideOnly = true, guiFactory = "xyz.stachel.zombiesutils.config.GuiFactory")
 public class ZombiesUtils {
     private static ZombiesUtils instance;
     private final Hotkeys hotkeys;
@@ -23,6 +24,7 @@ public class ZombiesUtils {
     private Handlers handlers;
     private Logger logger;
     private GameData gameData;
+    private WaveTiming waveTiming; // yeah fuck it im putting this here
 
     public ZombiesUtils() {
         hotkeys = new Hotkeys();
@@ -55,6 +57,7 @@ public class ZombiesUtils {
         CommandRegistry.registerAll();
         hotkeys.registerAll();
         gameData = new GameData();
+        waveTiming = new WaveTiming();
     }
 
     public Logger getLogger() {
@@ -80,4 +83,8 @@ public class ZombiesUtils {
     public GameData getGameData() {
         return gameData;
     }
+
+    public WaveTiming getWaveTiming() {
+      return waveTiming;
+    }
 }

src/main/java/xyz/stachel/zombiesutils/commands/CategoryCommand.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.commands;
+package xyz.stachel.zombiesutils.commands;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.timer.recorder.Category;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;

src/main/java/xyz/stachel/zombiesutils/commands/CommandRegistry.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.commands;
+package xyz.stachel.zombiesutils.commands;
 
 import net.minecraftforge.client.ClientCommandHandler;
 

src/main/java/xyz/stachel/zombiesutils/commands/QuickZombiesCommand.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.commands;
+package xyz.stachel.zombiesutils.commands;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;

src/main/java/xyz/stachel/zombiesutils/commands/RocketLauncherCommand.java

@@ -0,0 +1,48 @@
+package xyz.stachel.zombiesutils.commands;
+
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.WrongUsageException;
+import net.minecraft.util.BlockPos;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+
+class RocketLauncherCommand implements ICommand {
+  @Override
+  public String getCommandUsage(ICommandSender sender) {
+    return "/rl <ticks>";
+  }
+
+  @Override
+  public String getCommandName() {
+    return "rl";
+  }
+
+  @Override
+  public boolean isUsernameIndex(String[] args, int index) {
+    return false;
+  }
+
+  @Override
+  public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+    if (args.length == 1) return List.of("-28");
+    else return Collections.emptyList();
+  }
+
+  @Override
+  public boolean canCommandSenderUseCommand(ICommandSender sender) {
+    return true;
+  }
+
+  @Override
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+    if (args.length == 0) throw new WrongUsageException("[Missing argument] argument: <ticks>", args);
+    else try {
+      int ticks = Integer.parseInt(args[0]);
+      //TODO
+    }
+  }
+}

src/main/java/xyz/stachel/zombiesutils/commands/SlaCommand.java

@@ -1,8 +1,8 @@
-package com.github.stachelbeere1248.zombiesutils.commands;
+package xyz.stachel.zombiesutils.commands;
 
-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 xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.game.sla.QuickSLA;
+import xyz.stachel.zombiesutils.game.windows.SLA;
 import net.minecraft.command.*;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;

src/main/java/xyz/stachel/zombiesutils/commands/ZombiesUtilsCommand.java

@@ -1,9 +1,9 @@
-package com.github.stachelbeere1248.zombiesutils.commands;
+package xyz.stachel.zombiesutils.commands;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
-import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.utils.InvalidMapException;
+import xyz.stachel.zombiesutils.utils.ScoardboardException;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.command.*;
 import net.minecraft.util.BlockPos;
 import org.jetbrains.annotations.NotNull;

src/main/java/xyz/stachel/zombiesutils/config/CustomConfigElement.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.config;
+package xyz.stachel.zombiesutils.config;
 
 import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.ConfigElement;

src/main/java/xyz/stachel/zombiesutils/config/GuiConfig.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.config;
+package xyz.stachel.zombiesutils.config;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import net.minecraft.client.gui.GuiScreen;
 
 public class GuiConfig extends net.minecraftforge.fml.client.config.GuiConfig {

src/main/java/xyz/stachel/zombiesutils/config/GuiFactory.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.config;
+package xyz.stachel.zombiesutils.config;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;

src/main/java/xyz/stachel/zombiesutils/config/Hotkeys.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.config;
+package xyz.stachel.zombiesutils.config;
 
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.fml.client.registry.ClientRegistry;

src/main/java/xyz/stachel/zombiesutils/config/ZombiesUtilsConfig.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.config;
+package xyz.stachel.zombiesutils.config;
 
-import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
+import xyz.stachel.zombiesutils.utils.LanguageSupport;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 import net.minecraftforge.fml.client.config.DummyConfigElement;

src/main/java/xyz/stachel/zombiesutils/game/GameData.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.game;
+package xyz.stachel.zombiesutils.game;
 
-import com.github.stachelbeere1248.zombiesutils.ResourceLoader;
-import com.github.stachelbeere1248.zombiesutils.game.waves.Round;
+import xyz.stachel.zombiesutils.ResourceLoader;
+import xyz.stachel.zombiesutils.game.waves.Round;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import org.jetbrains.annotations.NotNull;

src/main/java/xyz/stachel/zombiesutils/game/GameMode.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.game;
+package xyz.stachel.zombiesutils.game;
 
-import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.game.enums.Difficulty;
+import xyz.stachel.zombiesutils.game.enums.Map;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/xyz/stachel/zombiesutils/game/enums/Difficulty.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.game.enums;
+package xyz.stachel.zombiesutils.game.enums;
 
 public enum Difficulty {
     NORMAL, HARD, RIP

src/main/java/xyz/stachel/zombiesutils/game/enums/Map.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.game.enums;
+package xyz.stachel.zombiesutils.game.enums;
 
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.init.Blocks;

src/main/java/xyz/stachel/zombiesutils/game/sla/QuickSLA.java

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

src/main/java/xyz/stachel/zombiesutils/game/waves/Prefix.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.game.waves;
+package xyz.stachel.zombiesutils.game.waves;
 
 public enum Prefix {
     BOSS(0xCC5555, "B", 0x7A3333),

src/main/java/xyz/stachel/zombiesutils/game/waves/Round.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.game.waves;
+package xyz.stachel.zombiesutils.game.waves;
 
 public class Round {
     private final Wave[] waves;

src/main/java/xyz/stachel/zombiesutils/game/waves/Wave.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.game.waves;
+package xyz.stachel.zombiesutils.game.waves;
 
 @SuppressWarnings("DuplicatedCode")
 public class Wave {

src/main/java/xyz/stachel/zombiesutils/game/waves/WaveTiming.java

@@ -1,15 +1,20 @@
-package com.github.stachelbeere1248.zombiesutils.game.waves;
+package xyz.stachel.zombiesutils.game.waves;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.client.Minecraft;
 
 import java.util.Arrays;
 
 public class WaveTiming {
-    public static int rl = 0;
+    private int rlSetting;
+    public int rl = 0;
 
-    public static void onTick() {
+    public WaveTiming() {
+       this.rlSetting = ZombiesUtils.getInstance().getConfig().getOffset();
+    }
+
+    public void onTick() {
         if (Scoreboard.isNotZombies()) return;
         ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
                 game -> {
@@ -27,8 +32,12 @@ public class WaveTiming {
         );
     }
 
-    public static void toggleRL() {
-        if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset();
+    public void toggleRL() {
+        if (rl == 0) rl = rlSetting;
         else rl = 0;
     }
+
+    public void setRlTemp(final int ticks) {
+      this.rlSetting = ticks;
+    }
 }

src/main/java/xyz/stachel/zombiesutils/game/windows/Room.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.game.windows;
+package xyz.stachel.zombiesutils.game.windows;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import net.minecraft.util.Vec3;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

src/main/java/xyz/stachel/zombiesutils/game/windows/SLA.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.game.windows;
+package xyz.stachel.zombiesutils.game.windows;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.enums.Map;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import org.jetbrains.annotations.NotNull;

src/main/java/xyz/stachel/zombiesutils/game/windows/Window.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.game.windows;
+package xyz.stachel.zombiesutils.game.windows;
 
 public class Window {
     private final short[] xyz = new short[3];

src/main/java/xyz/stachel/zombiesutils/handlers/ChatHandler.java

@@ -1,8 +1,8 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
-import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.enums.Difficulty;
+import xyz.stachel.zombiesutils.utils.LanguageSupport;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.jetbrains.annotations.NotNull;

src/main/java/xyz/stachel/zombiesutils/handlers/Handlers.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import net.minecraftforge.common.MinecraftForge;
 
 public class Handlers {

src/main/java/xyz/stachel/zombiesutils/handlers/KeyInputHandler.java

@@ -1,8 +1,8 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.config.Hotkeys;
-import com.github.stachelbeere1248.zombiesutils.game.waves.WaveTiming;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.config.Hotkeys;
+import xyz.stachel.zombiesutils.game.waves.WaveTiming;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent;

src/main/java/xyz/stachel/zombiesutils/handlers/RenderGameOverlayHandler.java

@@ -1,12 +1,12 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.waves.Prefix;
-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.timer.Game;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.waves.Prefix;
+import xyz.stachel.zombiesutils.game.waves.Wave;
+import xyz.stachel.zombiesutils.game.windows.Room;
+import xyz.stachel.zombiesutils.game.windows.SLA;
+import xyz.stachel.zombiesutils.timer.Game;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;

src/main/java/xyz/stachel/zombiesutils/handlers/RenderPlayerHandler.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.Vec3;

src/main/java/xyz/stachel/zombiesutils/handlers/Round1Correction.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.timer.Timer;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.timer.Timer;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;

src/main/java/xyz/stachel/zombiesutils/handlers/TickHandler.java

@@ -1,8 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.handlers;
+package xyz.stachel.zombiesutils.handlers;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.waves.WaveTiming;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.jetbrains.annotations.NotNull;
@@ -12,7 +11,7 @@ public class TickHandler {
     public void onTick(TickEvent.@NotNull ClientTickEvent event) {
         if (event.phase == TickEvent.Phase.START) return;
         Scoreboard.refresh();
-        WaveTiming.onTick();
+        ZombiesUtils.getInstance().getWaveTiming().onTick();
         ZombiesUtils.getInstance().getHandlers().getRenderer().tick();
     }
 }

src/main/java/xyz/stachel/zombiesutils/mixin/MixinNetHandlerPlayClient.java

@@ -1,10 +1,10 @@
-package com.github.stachelbeere1248.zombiesutils.mixin;
+package xyz.stachel.zombiesutils.mixin;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
-import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
-import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
-import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.utils.InvalidMapException;
+import xyz.stachel.zombiesutils.utils.LanguageSupport;
+import xyz.stachel.zombiesutils.utils.ScoardboardException;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.network.play.server.S29PacketSoundEffect;

src/main/java/xyz/stachel/zombiesutils/timer/Game.java

@@ -1,14 +1,14 @@
-package com.github.stachelbeere1248.zombiesutils.timer;
+package xyz.stachel.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.handlers.Round1Correction;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.GameFile;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.GameMode;
+import xyz.stachel.zombiesutils.game.enums.Difficulty;
+import xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.game.windows.SLA;
+import xyz.stachel.zombiesutils.handlers.Round1Correction;
+import xyz.stachel.zombiesutils.timer.recorder.Category;
+import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
+import xyz.stachel.zombiesutils.timer.recorder.files.GameFile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import net.minecraftforge.common.MinecraftForge;

src/main/java/xyz/stachel/zombiesutils/timer/GameManager.java

@@ -1,10 +1,10 @@
-package com.github.stachelbeere1248.zombiesutils.timer;
+package xyz.stachel.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 xyz.stachel.zombiesutils.game.enums.Difficulty;
+import xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.utils.InvalidMapException;
+import xyz.stachel.zombiesutils.utils.ScoardboardException;
+import xyz.stachel.zombiesutils.utils.Scoreboard;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;

src/main/java/xyz/stachel/zombiesutils/timer/RecordMessageSender.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.timer;
+package xyz.stachel.zombiesutils.timer;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.util.ChatComponentText;

src/main/java/xyz/stachel/zombiesutils/timer/Timer.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.timer;
+package xyz.stachel.zombiesutils.timer;
 
 import net.minecraft.client.Minecraft;
 

src/main/java/xyz/stachel/zombiesutils/timer/recorder/Category.java

@@ -1,8 +1,8 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder;
+package xyz.stachel.zombiesutils.timer.recorder;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.GameMode;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.GameMode;
+import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;

src/main/java/xyz/stachel/zombiesutils/timer/recorder/FileManager.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder;
+package xyz.stachel.zombiesutils.timer.recorder;
 
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.CategoryData;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
+import xyz.stachel.zombiesutils.timer.recorder.data.CategoryData;
+import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import org.apache.commons.io.FileUtils;

src/main/java/xyz/stachel/zombiesutils/timer/recorder/ISplitsData.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder;
+package xyz.stachel.zombiesutils.timer.recorder;
 
 public interface ISplitsData {
     String toJSON();

src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/CategoryData.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder.data;
+package xyz.stachel.zombiesutils.timer.recorder.data;
 
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.ISplitsData;
+import xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.timer.recorder.ISplitsData;
 import com.google.gson.Gson;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/GameData.java

@@ -1,7 +1,7 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder.data;
+package xyz.stachel.zombiesutils.timer.recorder.data;
 
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.ISplitsData;
+import xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.timer.recorder.ISplitsData;
 import com.google.gson.Gson;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/CategoryFile.java

@@ -1,9 +1,9 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder.files;
+package xyz.stachel.zombiesutils.timer.recorder.files;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.GameMode;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.CategoryData;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.GameMode;
+import xyz.stachel.zombiesutils.timer.recorder.FileManager;
+import xyz.stachel.zombiesutils.timer.recorder.data.CategoryData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import org.apache.commons.lang3.exception.ExceptionUtils;

src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/GameFile.java

@@ -1,10 +1,10 @@
-package com.github.stachelbeere1248.zombiesutils.timer.recorder.files;
+package xyz.stachel.zombiesutils.timer.recorder.files;
 
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
-import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
-import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.GameData;
+import xyz.stachel.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.game.enums.Map;
+import xyz.stachel.zombiesutils.timer.recorder.FileManager;
+import xyz.stachel.zombiesutils.timer.recorder.data.GameData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import org.apache.commons.lang3.exception.ExceptionUtils;

src/main/java/xyz/stachel/zombiesutils/utils/InvalidMapException.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.utils;
+package xyz.stachel.zombiesutils.utils;
 
 public class InvalidMapException extends Exception {
 }

src/main/java/xyz/stachel/zombiesutils/utils/LanguageSupport.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.utils;
+package xyz.stachel.zombiesutils.utils;
 
 import org.jetbrains.annotations.NotNull;
 

src/main/java/xyz/stachel/zombiesutils/utils/ScoardboardException.java

@@ -1,4 +1,4 @@
-package com.github.stachelbeere1248.zombiesutils.utils;
+package xyz.stachel.zombiesutils.utils;
 
 public class ScoardboardException extends Exception {
     public ScoardboardException() {

src/main/java/xyz/stachel/zombiesutils/utils/Scoreboard.java

@@ -1,6 +1,6 @@
-package com.github.stachelbeere1248.zombiesutils.utils;
+package xyz.stachel.zombiesutils.utils;
 
-import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
+import xyz.stachel.zombiesutils.ZombiesUtils;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import net.minecraft.client.Minecraft;