diff --git a/.gitignore b/.gitignore index 3e72c7a..0d10744 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ run/ build/ .gradle/ +.envrc +.classpath +.factorypath +.project +.settings +.vscode +bin diff --git a/src/main/java/xyz/stachel/zombiesutils/ResourceLoader.java b/src/main/java/xyz/stachel/zombiesutils/ResourceLoader.java index 0be0db2..92fc918 100644 --- a/src/main/java/xyz/stachel/zombiesutils/ResourceLoader.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/ZombiesUtils.java b/src/main/java/xyz/stachel/zombiesutils/ZombiesUtils.java index f7c1069..d4212de 100644 --- a/src/main/java/xyz/stachel/zombiesutils/ZombiesUtils.java +++ b/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; + } } diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/CategoryCommand.java b/src/main/java/xyz/stachel/zombiesutils/commands/CategoryCommand.java index f9e3525..3093827 100644 --- a/src/main/java/xyz/stachel/zombiesutils/commands/CategoryCommand.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/CommandRegistry.java b/src/main/java/xyz/stachel/zombiesutils/commands/CommandRegistry.java index 00d8270..019be22 100644 --- a/src/main/java/xyz/stachel/zombiesutils/commands/CommandRegistry.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/QuickZombiesCommand.java b/src/main/java/xyz/stachel/zombiesutils/commands/QuickZombiesCommand.java index 711da30..e7bf170 100644 --- a/src/main/java/xyz/stachel/zombiesutils/commands/QuickZombiesCommand.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/RocketLauncherCommand.java b/src/main/java/xyz/stachel/zombiesutils/commands/RocketLauncherCommand.java new file mode 100644 index 0000000..ffeb7ad --- /dev/null +++ b/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 "; + } + + @Override + public String getCommandName() { + return "rl"; + } + + @Override + public boolean isUsernameIndex(String[] args, int index) { + return false; + } + + @Override + public List 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: ", args); + else try { + int ticks = Integer.parseInt(args[0]); + //TODO + } + } +} diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/SlaCommand.java b/src/main/java/xyz/stachel/zombiesutils/commands/SlaCommand.java index c382473..550eda6 100644 --- a/src/main/java/xyz/stachel/zombiesutils/commands/SlaCommand.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/commands/ZombiesUtilsCommand.java b/src/main/java/xyz/stachel/zombiesutils/commands/ZombiesUtilsCommand.java index e9c14e2..5ff07ec 100644 --- a/src/main/java/xyz/stachel/zombiesutils/commands/ZombiesUtilsCommand.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/config/CustomConfigElement.java b/src/main/java/xyz/stachel/zombiesutils/config/CustomConfigElement.java index a337e4d..2d7e4fc 100644 --- a/src/main/java/xyz/stachel/zombiesutils/config/CustomConfigElement.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/config/GuiConfig.java b/src/main/java/xyz/stachel/zombiesutils/config/GuiConfig.java index 2f17ca5..a13eb02 100644 --- a/src/main/java/xyz/stachel/zombiesutils/config/GuiConfig.java +++ b/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 { diff --git a/src/main/java/xyz/stachel/zombiesutils/config/GuiFactory.java b/src/main/java/xyz/stachel/zombiesutils/config/GuiFactory.java index 3139574..9edcd7b 100644 --- a/src/main/java/xyz/stachel/zombiesutils/config/GuiFactory.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/config/Hotkeys.java b/src/main/java/xyz/stachel/zombiesutils/config/Hotkeys.java index 0817a64..53e818e 100644 --- a/src/main/java/xyz/stachel/zombiesutils/config/Hotkeys.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/config/ZombiesUtilsConfig.java b/src/main/java/xyz/stachel/zombiesutils/config/ZombiesUtilsConfig.java index 6557702..9219603 100644 --- a/src/main/java/xyz/stachel/zombiesutils/config/ZombiesUtilsConfig.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/GameData.java b/src/main/java/xyz/stachel/zombiesutils/game/GameData.java index abae070..78f8b6b 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/GameData.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/GameMode.java b/src/main/java/xyz/stachel/zombiesutils/game/GameMode.java index 9680359..e3f3037 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/GameMode.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/enums/Difficulty.java b/src/main/java/xyz/stachel/zombiesutils/game/enums/Difficulty.java index d709f46..74357e7 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/enums/Difficulty.java +++ b/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 diff --git a/src/main/java/xyz/stachel/zombiesutils/game/enums/Map.java b/src/main/java/xyz/stachel/zombiesutils/game/enums/Map.java index b29fb3a..0a2508f 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/enums/Map.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/sla/QuickSLA.java b/src/main/java/xyz/stachel/zombiesutils/game/sla/QuickSLA.java index 0fba42a..88ef6bd 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/sla/QuickSLA.java +++ b/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 { diff --git a/src/main/java/xyz/stachel/zombiesutils/game/waves/Prefix.java b/src/main/java/xyz/stachel/zombiesutils/game/waves/Prefix.java index 4a8d187..634c3e6 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/waves/Prefix.java +++ b/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), diff --git a/src/main/java/xyz/stachel/zombiesutils/game/waves/Round.java b/src/main/java/xyz/stachel/zombiesutils/game/waves/Round.java index 6f02b06..3f93f67 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/waves/Round.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/waves/Wave.java b/src/main/java/xyz/stachel/zombiesutils/game/waves/Wave.java index 463f517..525719a 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/waves/Wave.java +++ b/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 { diff --git a/src/main/java/xyz/stachel/zombiesutils/game/waves/WaveTiming.java b/src/main/java/xyz/stachel/zombiesutils/game/waves/WaveTiming.java index c9ecd98..2bb8f4d 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/waves/WaveTiming.java +++ b/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; + } } diff --git a/src/main/java/xyz/stachel/zombiesutils/game/windows/Room.java b/src/main/java/xyz/stachel/zombiesutils/game/windows/Room.java index 67bba87..e68ab74 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/windows/Room.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/windows/SLA.java b/src/main/java/xyz/stachel/zombiesutils/game/windows/SLA.java index 3e27e20..373b494 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/windows/SLA.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/game/windows/Window.java b/src/main/java/xyz/stachel/zombiesutils/game/windows/Window.java index f52b871..e1c1774 100644 --- a/src/main/java/xyz/stachel/zombiesutils/game/windows/Window.java +++ b/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]; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/ChatHandler.java b/src/main/java/xyz/stachel/zombiesutils/handlers/ChatHandler.java index cf3fb7f..61185b2 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/ChatHandler.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/Handlers.java b/src/main/java/xyz/stachel/zombiesutils/handlers/Handlers.java index 38a7c92..2d94bc3 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/Handlers.java +++ b/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 { diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/KeyInputHandler.java b/src/main/java/xyz/stachel/zombiesutils/handlers/KeyInputHandler.java index f0c314c..29b72f5 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/KeyInputHandler.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/RenderGameOverlayHandler.java b/src/main/java/xyz/stachel/zombiesutils/handlers/RenderGameOverlayHandler.java index de305a8..6a52fb8 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/RenderGameOverlayHandler.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/RenderPlayerHandler.java b/src/main/java/xyz/stachel/zombiesutils/handlers/RenderPlayerHandler.java index e5661a6..941530a 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/RenderPlayerHandler.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/Round1Correction.java b/src/main/java/xyz/stachel/zombiesutils/handlers/Round1Correction.java index 3803f21..f297a23 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/Round1Correction.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/handlers/TickHandler.java b/src/main/java/xyz/stachel/zombiesutils/handlers/TickHandler.java index 6c9cde0..6f3c557 100644 --- a/src/main/java/xyz/stachel/zombiesutils/handlers/TickHandler.java +++ b/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(); } } diff --git a/src/main/java/xyz/stachel/zombiesutils/mixin/MixinNetHandlerPlayClient.java b/src/main/java/xyz/stachel/zombiesutils/mixin/MixinNetHandlerPlayClient.java index 16710f3..818c151 100644 --- a/src/main/java/xyz/stachel/zombiesutils/mixin/MixinNetHandlerPlayClient.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/Game.java b/src/main/java/xyz/stachel/zombiesutils/timer/Game.java index 84085af..5c44ee6 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/Game.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/GameManager.java b/src/main/java/xyz/stachel/zombiesutils/timer/GameManager.java index e391855..4926770 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/GameManager.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/RecordMessageSender.java b/src/main/java/xyz/stachel/zombiesutils/timer/RecordMessageSender.java index 570e139..286ed25 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/RecordMessageSender.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/Timer.java b/src/main/java/xyz/stachel/zombiesutils/timer/Timer.java index 9fb52ed..bc94abc 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/Timer.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/Category.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/Category.java index cd50f27..c56b011 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/Category.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/FileManager.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/FileManager.java index cb6b50a..f2a3aaa 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/FileManager.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/ISplitsData.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/ISplitsData.java index 5a4e8c4..07917ae 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/ISplitsData.java +++ b/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(); diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/CategoryData.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/CategoryData.java index 15c5b1f..40cdb9c 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/CategoryData.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/GameData.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/GameData.java index 4444b83..bf0eaae 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/data/GameData.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/CategoryFile.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/CategoryFile.java index d8fcd9f..1fc377c 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/CategoryFile.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/GameFile.java b/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/GameFile.java index 618e238..900ef4c 100644 --- a/src/main/java/xyz/stachel/zombiesutils/timer/recorder/files/GameFile.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/utils/InvalidMapException.java b/src/main/java/xyz/stachel/zombiesutils/utils/InvalidMapException.java index e9b5aad..66923a9 100644 --- a/src/main/java/xyz/stachel/zombiesutils/utils/InvalidMapException.java +++ b/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 { } diff --git a/src/main/java/xyz/stachel/zombiesutils/utils/LanguageSupport.java b/src/main/java/xyz/stachel/zombiesutils/utils/LanguageSupport.java index 383307d..2fef5ae 100644 --- a/src/main/java/xyz/stachel/zombiesutils/utils/LanguageSupport.java +++ b/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; diff --git a/src/main/java/xyz/stachel/zombiesutils/utils/ScoardboardException.java b/src/main/java/xyz/stachel/zombiesutils/utils/ScoardboardException.java index 2c8070e..536ef64 100644 --- a/src/main/java/xyz/stachel/zombiesutils/utils/ScoardboardException.java +++ b/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() { diff --git a/src/main/java/xyz/stachel/zombiesutils/utils/Scoreboard.java b/src/main/java/xyz/stachel/zombiesutils/utils/Scoreboard.java index cf6b6bc..3110592 100644 --- a/src/main/java/xyz/stachel/zombiesutils/utils/Scoreboard.java +++ b/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;