RL command, rename package
This commit is contained in:
parent
53572b6e84
commit
b4997831cc
49 changed files with 210 additions and 140 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -1,3 +1,10 @@
|
||||||
run/
|
run/
|
||||||
build/
|
build/
|
||||||
.gradle/
|
.gradle/
|
||||||
|
.envrc
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
.vscode
|
||||||
|
bin
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils;
|
package xyz.stachel.zombiesutils;
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils;
|
package xyz.stachel.zombiesutils;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.commands.CommandRegistry;
|
import xyz.stachel.zombiesutils.commands.CommandRegistry;
|
||||||
import com.github.stachelbeere1248.zombiesutils.config.Hotkeys;
|
import xyz.stachel.zombiesutils.config.Hotkeys;
|
||||||
import com.github.stachelbeere1248.zombiesutils.config.ZombiesUtilsConfig;
|
import xyz.stachel.zombiesutils.config.ZombiesUtilsConfig;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.GameData;
|
import xyz.stachel.zombiesutils.game.GameData;
|
||||||
import com.github.stachelbeere1248.zombiesutils.handlers.Handlers;
|
import xyz.stachel.zombiesutils.game.waves.WaveTiming;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.GameManager;
|
import xyz.stachel.zombiesutils.handlers.Handlers;
|
||||||
|
import xyz.stachel.zombiesutils.timer.GameManager;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraftforge.common.config.Configuration;
|
import net.minecraftforge.common.config.Configuration;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
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.apache.logging.log4j.Logger;
|
||||||
import org.jetbrains.annotations.NotNull;
|
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 {
|
public class ZombiesUtils {
|
||||||
private static ZombiesUtils instance;
|
private static ZombiesUtils instance;
|
||||||
private final Hotkeys hotkeys;
|
private final Hotkeys hotkeys;
|
||||||
|
@ -23,6 +24,7 @@ public class ZombiesUtils {
|
||||||
private Handlers handlers;
|
private Handlers handlers;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
private GameData gameData;
|
private GameData gameData;
|
||||||
|
private WaveTiming waveTiming; // yeah fuck it im putting this here
|
||||||
|
|
||||||
public ZombiesUtils() {
|
public ZombiesUtils() {
|
||||||
hotkeys = new Hotkeys();
|
hotkeys = new Hotkeys();
|
||||||
|
@ -55,6 +57,7 @@ public class ZombiesUtils {
|
||||||
CommandRegistry.registerAll();
|
CommandRegistry.registerAll();
|
||||||
hotkeys.registerAll();
|
hotkeys.registerAll();
|
||||||
gameData = new GameData();
|
gameData = new GameData();
|
||||||
|
waveTiming = new WaveTiming();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Logger getLogger() {
|
public Logger getLogger() {
|
||||||
|
@ -80,4 +83,8 @@ public class ZombiesUtils {
|
||||||
public GameData getGameData() {
|
public GameData getGameData() {
|
||||||
return gameData;
|
return gameData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public WaveTiming getWaveTiming() {
|
||||||
|
return waveTiming;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.commands;
|
package xyz.stachel.zombiesutils.commands;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
|
import xyz.stachel.zombiesutils.timer.recorder.Category;
|
||||||
import net.minecraft.command.CommandException;
|
import net.minecraft.command.CommandException;
|
||||||
import net.minecraft.command.ICommand;
|
import net.minecraft.command.ICommand;
|
||||||
import net.minecraft.command.ICommandSender;
|
import net.minecraft.command.ICommandSender;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.commands;
|
package xyz.stachel.zombiesutils.commands;
|
||||||
|
|
||||||
import net.minecraftforge.client.ClientCommandHandler;
|
import net.minecraftforge.client.ClientCommandHandler;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.commands;
|
package xyz.stachel.zombiesutils.commands;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.command.CommandBase;
|
import net.minecraft.command.CommandBase;
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,8 +1,8 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.commands;
|
package xyz.stachel.zombiesutils.commands;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.sla.QuickSLA;
|
import xyz.stachel.zombiesutils.game.sla.QuickSLA;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
|
import xyz.stachel.zombiesutils.game.windows.SLA;
|
||||||
import net.minecraft.command.*;
|
import net.minecraft.command.*;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.commands;
|
package xyz.stachel.zombiesutils.commands;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
|
import xyz.stachel.zombiesutils.utils.InvalidMapException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
|
import xyz.stachel.zombiesutils.utils.ScoardboardException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import net.minecraft.command.*;
|
import net.minecraft.command.*;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -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.ConfigCategory;
|
||||||
import net.minecraftforge.common.config.ConfigElement;
|
import net.minecraftforge.common.config.ConfigElement;
|
||||||
|
|
|
@ -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;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
|
|
||||||
public class GuiConfig extends net.minecraftforge.fml.client.config.GuiConfig {
|
public class GuiConfig extends net.minecraftforge.fml.client.config.GuiConfig {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.config;
|
package xyz.stachel.zombiesutils.config;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.config;
|
package xyz.stachel.zombiesutils.config;
|
||||||
|
|
||||||
import net.minecraft.client.settings.KeyBinding;
|
import net.minecraft.client.settings.KeyBinding;
|
||||||
import net.minecraftforge.fml.client.registry.ClientRegistry;
|
import net.minecraftforge.fml.client.registry.ClientRegistry;
|
||||||
|
|
|
@ -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.Configuration;
|
||||||
import net.minecraftforge.common.config.Property;
|
import net.minecraftforge.common.config.Property;
|
||||||
import net.minecraftforge.fml.client.config.DummyConfigElement;
|
import net.minecraftforge.fml.client.config.DummyConfigElement;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game;
|
package xyz.stachel.zombiesutils.game;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ResourceLoader;
|
import xyz.stachel.zombiesutils.ResourceLoader;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.waves.Round;
|
import xyz.stachel.zombiesutils.game.waves.Round;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game;
|
package xyz.stachel.zombiesutils.game;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
|
import xyz.stachel.zombiesutils.game.enums.Difficulty;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import org.jetbrains.annotations.Contract;
|
import org.jetbrains.annotations.Contract;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.enums;
|
package xyz.stachel.zombiesutils.game.enums;
|
||||||
|
|
||||||
public enum Difficulty {
|
public enum Difficulty {
|
||||||
NORMAL, HARD, RIP
|
NORMAL, HARD, RIP
|
||||||
|
|
|
@ -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.block.Block;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
|
import xyz.stachel.zombiesutils.game.windows.SLA;
|
||||||
|
|
||||||
@SuppressWarnings("SpellCheckingInspection")
|
@SuppressWarnings("SpellCheckingInspection")
|
||||||
public class QuickSLA {
|
public class QuickSLA {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.waves;
|
package xyz.stachel.zombiesutils.game.waves;
|
||||||
|
|
||||||
public enum Prefix {
|
public enum Prefix {
|
||||||
BOSS(0xCC5555, "B", 0x7A3333),
|
BOSS(0xCC5555, "B", 0x7A3333),
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.waves;
|
package xyz.stachel.zombiesutils.game.waves;
|
||||||
|
|
||||||
public class Round {
|
public class Round {
|
||||||
private final Wave[] waves;
|
private final Wave[] waves;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.waves;
|
package xyz.stachel.zombiesutils.game.waves;
|
||||||
|
|
||||||
@SuppressWarnings("DuplicatedCode")
|
@SuppressWarnings("DuplicatedCode")
|
||||||
public class Wave {
|
public class Wave {
|
||||||
|
|
|
@ -1,15 +1,20 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.waves;
|
package xyz.stachel.zombiesutils.game.waves;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
public class WaveTiming {
|
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;
|
if (Scoreboard.isNotZombies()) return;
|
||||||
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
|
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
|
||||||
game -> {
|
game -> {
|
||||||
|
@ -27,8 +32,12 @@ public class WaveTiming {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleRL() {
|
public void toggleRL() {
|
||||||
if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset();
|
if (rl == 0) rl = rlSetting;
|
||||||
else rl = 0;
|
else rl = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setRlTemp(final int ticks) {
|
||||||
|
this.rlSetting = ticks;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 net.minecraft.util.Vec3;
|
||||||
import org.jetbrains.annotations.Contract;
|
import org.jetbrains.annotations.Contract;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
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 com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
import net.minecraft.client.entity.EntityPlayerSP;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.game.windows;
|
package xyz.stachel.zombiesutils.game.windows;
|
||||||
|
|
||||||
public class Window {
|
public class Window {
|
||||||
private final short[] xyz = new short[3];
|
private final short[] xyz = new short[3];
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.handlers;
|
package xyz.stachel.zombiesutils.handlers;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
|
import xyz.stachel.zombiesutils.game.enums.Difficulty;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
|
import xyz.stachel.zombiesutils.utils.LanguageSupport;
|
||||||
import net.minecraftforge.client.event.ClientChatReceivedEvent;
|
import net.minecraftforge.client.event.ClientChatReceivedEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -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;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
|
||||||
public class Handlers {
|
public class Handlers {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.handlers;
|
package xyz.stachel.zombiesutils.handlers;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.config.Hotkeys;
|
import xyz.stachel.zombiesutils.config.Hotkeys;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.waves.WaveTiming;
|
import xyz.stachel.zombiesutils.game.waves.WaveTiming;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.gameevent.InputEvent;
|
import net.minecraftforge.fml.common.gameevent.InputEvent;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.handlers;
|
package xyz.stachel.zombiesutils.handlers;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.waves.Prefix;
|
import xyz.stachel.zombiesutils.game.waves.Prefix;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.waves.Wave;
|
import xyz.stachel.zombiesutils.game.waves.Wave;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.windows.Room;
|
import xyz.stachel.zombiesutils.game.windows.Room;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
|
import xyz.stachel.zombiesutils.game.windows.SLA;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.Game;
|
import xyz.stachel.zombiesutils.timer.Game;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
import net.minecraft.client.gui.ScaledResolution;
|
||||||
|
|
|
@ -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.client.Minecraft;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import net.minecraft.util.Vec3;
|
import net.minecraft.util.Vec3;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.handlers;
|
package xyz.stachel.zombiesutils.handlers;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
|
import xyz.stachel.zombiesutils.timer.Timer;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import net.minecraft.entity.monster.EntityZombie;
|
import net.minecraft.entity.monster.EntityZombie;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.handlers;
|
package xyz.stachel.zombiesutils.handlers;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.waves.WaveTiming;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.gameevent.TickEvent;
|
import net.minecraftforge.fml.common.gameevent.TickEvent;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
@ -12,7 +11,7 @@ public class TickHandler {
|
||||||
public void onTick(TickEvent.@NotNull ClientTickEvent event) {
|
public void onTick(TickEvent.@NotNull ClientTickEvent event) {
|
||||||
if (event.phase == TickEvent.Phase.START) return;
|
if (event.phase == TickEvent.Phase.START) return;
|
||||||
Scoreboard.refresh();
|
Scoreboard.refresh();
|
||||||
WaveTiming.onTick();
|
ZombiesUtils.getInstance().getWaveTiming().onTick();
|
||||||
ZombiesUtils.getInstance().getHandlers().getRenderer().tick();
|
ZombiesUtils.getInstance().getHandlers().getRenderer().tick();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.mixin;
|
package xyz.stachel.zombiesutils.mixin;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
|
import xyz.stachel.zombiesutils.utils.InvalidMapException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
|
import xyz.stachel.zombiesutils.utils.LanguageSupport;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
|
import xyz.stachel.zombiesutils.utils.ScoardboardException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.network.NetHandlerPlayClient;
|
import net.minecraft.client.network.NetHandlerPlayClient;
|
||||||
import net.minecraft.network.play.server.S29PacketSoundEffect;
|
import net.minecraft.network.play.server.S29PacketSoundEffect;
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.timer;
|
package xyz.stachel.zombiesutils.timer;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
|
import xyz.stachel.zombiesutils.game.GameMode;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
|
import xyz.stachel.zombiesutils.game.enums.Difficulty;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
|
import xyz.stachel.zombiesutils.game.windows.SLA;
|
||||||
import com.github.stachelbeere1248.zombiesutils.handlers.Round1Correction;
|
import xyz.stachel.zombiesutils.handlers.Round1Correction;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
|
import xyz.stachel.zombiesutils.timer.recorder.Category;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
|
import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.GameFile;
|
import xyz.stachel.zombiesutils.timer.recorder.files.GameFile;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.timer;
|
package xyz.stachel.zombiesutils.timer;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
|
import xyz.stachel.zombiesutils.game.enums.Difficulty;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
|
import xyz.stachel.zombiesutils.utils.InvalidMapException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
|
import xyz.stachel.zombiesutils.utils.ScoardboardException;
|
||||||
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
|
import xyz.stachel.zombiesutils.utils.Scoreboard;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
|
@ -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.client.Minecraft;
|
||||||
import net.minecraft.event.ClickEvent;
|
import net.minecraft.event.ClickEvent;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.timer;
|
package xyz.stachel.zombiesutils.timer;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.timer.recorder;
|
package xyz.stachel.zombiesutils.timer.recorder;
|
||||||
|
|
||||||
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
|
import xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
|
import xyz.stachel.zombiesutils.game.GameMode;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
|
import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.timer.recorder.data.CategoryData;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
|
import xyz.stachel.zombiesutils.timer.recorder.files.CategoryFile;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonSyntaxException;
|
import com.google.gson.JsonSyntaxException;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.timer.recorder;
|
package xyz.stachel.zombiesutils.timer.recorder;
|
||||||
|
|
||||||
public interface ISplitsData {
|
public interface ISplitsData {
|
||||||
String toJSON();
|
String toJSON();
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.ISplitsData;
|
import xyz.stachel.zombiesutils.timer.recorder.ISplitsData;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.ISplitsData;
|
import xyz.stachel.zombiesutils.timer.recorder.ISplitsData;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
|
import xyz.stachel.zombiesutils.game.GameMode;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
|
import xyz.stachel.zombiesutils.timer.recorder.FileManager;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.CategoryData;
|
import xyz.stachel.zombiesutils.timer.recorder.data.CategoryData;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import org.apache.commons.lang3.exception.ExceptionUtils;
|
import org.apache.commons.lang3.exception.ExceptionUtils;
|
||||||
|
|
|
@ -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 xyz.stachel.zombiesutils.ZombiesUtils;
|
||||||
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
|
import xyz.stachel.zombiesutils.game.enums.Map;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
|
import xyz.stachel.zombiesutils.timer.recorder.FileManager;
|
||||||
import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.GameData;
|
import xyz.stachel.zombiesutils.timer.recorder.data.GameData;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import org.apache.commons.lang3.exception.ExceptionUtils;
|
import org.apache.commons.lang3.exception.ExceptionUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.utils;
|
package xyz.stachel.zombiesutils.utils;
|
||||||
|
|
||||||
public class InvalidMapException extends Exception {
|
public class InvalidMapException extends Exception {
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.utils;
|
package xyz.stachel.zombiesutils.utils;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.github.stachelbeere1248.zombiesutils.utils;
|
package xyz.stachel.zombiesutils.utils;
|
||||||
|
|
||||||
public class ScoardboardException extends Exception {
|
public class ScoardboardException extends Exception {
|
||||||
public ScoardboardException() {
|
public ScoardboardException() {
|
||||||
|
|
|
@ -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.Iterables;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
Loading…
Add table
Reference in a new issue