Compare commits

..

No commits in common. "master" and "v1.3.0-pre5" have entirely different histories.

87 changed files with 960 additions and 11326 deletions

View file

@ -1,38 +0,0 @@
on:
push:
tags:
- '*'
jobs:
build:
runs-on: docker
steps:
- name: checkout repository
uses: actions/checkout@v3
- name: make gradle wrapper executable
run: chmod +x ./gradlew
- name: set up jdk
run: |
INSTALL_DIR="/opt/java"
mkdir -p "$INSTALL_DIR"
JDK8_URL="https://cdn.azul.com/zulu/bin/zulu8.84.0.15-ca-jdk8.0.442-linux_x64.tar.gz"
JRE17_URL="https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jre17.0.14-linux_x64.tar.gz"
echo "Downloading JDK8 from $JDK8_URL"
curl -L "$JDK8_URL" | tar -xz -C "$INSTALL_DIR"
echo "Downloading JRE17 from $JRE17_URL"
curl -L "$JRE17_URL" | tar -xz -C "$INSTALL_DIR"
- name: build
run: JDK8=/opt/java/zulu8.84.0.15-ca-jdk8.0.442-linux_x64 JAVA_HOME=/opt/java/zulu17.56.15-ca-jre17.0.14-linux_x64 ./gradlew build
- name: capture build artifacts
uses: https://code.forgejo.org/forgejo/upload-artifact@v3
with:
name: Artifacts
path: 'build/libs'

4
.gitattributes vendored
View file

@ -1,4 +0,0 @@
gradlew* linguist-vendored
gradle/wrapper/* linguist-vendored
*.bat text eol=crlf

22
.github/workflows/build.yml vendored Normal file
View file

@ -0,0 +1,22 @@
name: Run Gradle Build
on: [push, pull_request]
jobs:
gradle:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v3
- uses: actions/setup-java@v3
name: Setup Java
with:
distribution: temurin
java-version: 17
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Execute Gradle build
run: ./gradlew build
- uses: actions/upload-artifact@v3
name: Upload built mod JAR
with:
name: latest-autobuild
path: build/libs/*.jar

View file

@ -0,0 +1,10 @@
name: "Validate Gradle Wrapper"
on: [push, pull_request]
jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1

3
.gitignore vendored
View file

@ -1,3 +1,6 @@
.idea/
.vscode/
run/ run/
build/ build/
.gradle/ .gradle/

View file

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

View file

@ -1,5 +1,3 @@
import org.apache.commons.lang3.SystemUtils
plugins { plugins {
idea idea
java java
@ -10,12 +8,11 @@ plugins {
//Constants: //Constants:
val baseGroup: String by project val baseGroup = "com.github.stachelbeere1248.zombiesutils"
val mcVersion: String by project val mcVersion: String by project
val version: String by project val version: String by project
val mixinGroup = "$baseGroup.mixin" val mixinGroup = "$baseGroup.mixin"
val modid: String by project val modid: String by project
val transformerFile = file("src/main/resources/accesstransformer.cfg")
// Toolchains: // Toolchains:
java { java {
@ -29,26 +26,14 @@ loom {
"client" { "client" {
// If you don't want mixins, remove these lines // If you don't want mixins, remove these lines
property("mixin.debug", "true") property("mixin.debug", "true")
property("asmhelper.verbose", "true")
arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
} }
} }
runConfigs {
"client" {
if (SystemUtils.IS_OS_MAC_OSX) {
// This argument causes a crash on macOS
vmArgs.remove("-XstartOnFirstThread")
}
}
remove(getByName("server"))
}
forge { forge {
pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter()) pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
// If you don't want mixins, remove this lines // If you don't want mixins, remove this lines
mixinConfig("mixins.$modid.json") mixinConfig("mixins.$modid.json")
if (transformerFile.exists()) {
println("Installing access transformer")
accessTransformer(transformerFile)
}
} }
// If you don't want mixins, remove these lines // If you don't want mixins, remove these lines
mixin { mixin {
@ -65,6 +50,8 @@ sourceSets.main {
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://repo.spongepowered.org/maven/") maven("https://repo.spongepowered.org/maven/")
// If you don't want to log in with your real minecraft account, remove this line
maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
} }
val shadowImpl: Configuration by configurations.creating { val shadowImpl: Configuration by configurations.creating {
@ -81,6 +68,10 @@ dependencies {
isTransitive = false isTransitive = false
} }
annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT") annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
// If you don't want to log in with your real minecraft account, remove this line
runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.2")
} }
// Tasks: // Tasks:
@ -89,7 +80,7 @@ tasks.withType(JavaCompile::class) {
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
tasks.withType(org.gradle.jvm.tasks.Jar::class) { tasks.withType(Jar::class) {
archiveBaseName.set(modid) archiveBaseName.set(modid)
manifest.attributes.run { manifest.attributes.run {
this["FMLCorePluginContainsFMLMod"] = "true" this["FMLCorePluginContainsFMLMod"] = "true"
@ -98,8 +89,6 @@ tasks.withType(org.gradle.jvm.tasks.Jar::class) {
// If you don't want mixins, remove these lines // If you don't want mixins, remove these lines
this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
this["MixinConfigs"] = "mixins.$modid.json" this["MixinConfigs"] = "mixins.$modid.json"
if (transformerFile.exists())
this["FMLAT"] = "${modid}_at.cfg"
} }
} }
@ -107,13 +96,13 @@ tasks.processResources {
inputs.property("version", project.version) inputs.property("version", project.version)
inputs.property("mcversion", mcVersion) inputs.property("mcversion", mcVersion)
inputs.property("modid", modid) inputs.property("modid", modid)
inputs.property("basePackage", baseGroup) inputs.property("mixinGroup", mixinGroup)
filesMatching(listOf("mcmod.info", "mixins.$modid.json")) { filesMatching(listOf("mcmod.info", "mixins.$modid.json")) {
expand(inputs.properties) expand(inputs.properties)
} }
rename("accesstransformer.cfg", "META-INF/${modid}_at.cfg") rename("(.+_at.cfg)", "META-INF/$1")
} }
@ -125,16 +114,16 @@ val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
tasks.jar { tasks.jar {
archiveClassifier.set("without-deps") archiveClassifier.set("without-deps")
destinationDirectory.set(layout.buildDirectory.dir("intermediates")) destinationDirectory.set(layout.buildDirectory.dir("badjars"))
} }
tasks.shadowJar { tasks.shadowJar {
destinationDirectory.set(layout.buildDirectory.dir("intermediates")) destinationDirectory.set(layout.buildDirectory.dir("badjars"))
archiveClassifier.set("non-obfuscated-with-deps") archiveClassifier.set("all-dev")
configurations = listOf(shadowImpl) configurations = listOf(shadowImpl)
doLast { doLast {
configurations.forEach { configurations.forEach {
println("Copying dependencies into mod: ${it.files}") println("Copying jars into mod: ${it.files}")
} }
} }

View file

@ -1,7 +1,6 @@
loom.platform=forge loom.platform=forge
org.gradle.jvmargs=-Xmx2g org.gradle.jvmargs=-Xmx2g
baseGroup = xyz.stachel.zombiesutils baseGroup = com.github.stachelbeere1248.zombiesutils
mcVersion = 1.8.9 mcVersion = 1.8.9
modid = zombiesutils modid = zombiesutils
version = 1.4.0 version = 1.3.0-PREVIEW_4
org.gradle.java.installations.fromEnv=JDK8,JRE17

Binary file not shown.

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

19
gradlew vendored
View file

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -83,8 +83,7 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -145,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045 # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045 # shellcheck disable=SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -202,11 +201,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command;
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# and any embedded shellness will be escaped. # shell script including quotes and variable substitutions, so put them in
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # double quotes to make sure that they get re-expanded; and
# treated as '${Hostname}' itself on the command line. # * put everything else in single quotes, so that it's not re-expanded.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

20
gradlew.bat vendored
View file

@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail

View file

@ -7,7 +7,7 @@ pluginManagement {
maven("https://maven.fabricmc.net") maven("https://maven.fabricmc.net")
maven("https://maven.minecraftforge.net/") maven("https://maven.minecraftforge.net/")
maven("https://repo.spongepowered.org/maven/") maven("https://repo.spongepowered.org/maven/")
maven("https://repo.essential.gg/repository/maven-releases/") maven("https://repo.sk1er.club/repository/maven-releases/")
} }
resolutionStrategy { resolutionStrategy {
eachPlugin { eachPlugin {

View file

@ -3,9 +3,7 @@ package com.github.stachelbeere1248.zombiesutils;
import com.github.stachelbeere1248.zombiesutils.commands.CommandRegistry; import com.github.stachelbeere1248.zombiesutils.commands.CommandRegistry;
import com.github.stachelbeere1248.zombiesutils.config.Hotkeys; import com.github.stachelbeere1248.zombiesutils.config.Hotkeys;
import com.github.stachelbeere1248.zombiesutils.config.ZombiesUtilsConfig; 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.handlers.Handlers;
import com.github.stachelbeere1248.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;
@ -18,16 +16,12 @@ import org.jetbrains.annotations.NotNull;
public class ZombiesUtils { public class ZombiesUtils {
private static ZombiesUtils instance; private static ZombiesUtils instance;
private final Hotkeys hotkeys; private final Hotkeys hotkeys;
private final GameManager gameManager;
private ZombiesUtilsConfig config; private ZombiesUtilsConfig config;
private Handlers handlers; private Handlers handlers;
private Logger logger; private Logger logger;
private GameData gameData;
public ZombiesUtils() { public ZombiesUtils() {
hotkeys = new Hotkeys(); hotkeys = new Hotkeys();
gameManager = new GameManager();
instance = this; instance = this;
} }
@ -42,9 +36,10 @@ public class ZombiesUtils {
@Mod.EventHandler @Mod.EventHandler
public void preInit(@NotNull FMLPreInitializationEvent event) { public void preInit(@NotNull FMLPreInitializationEvent event) {
this.logger = event.getModLog(); logger = event.getModLog();
this.config = new ZombiesUtilsConfig(new Configuration( this.config = new ZombiesUtilsConfig(new Configuration(
event.getSuggestedConfigurationFile()) event.getSuggestedConfigurationFile(),
"1.2.4")
); );
} }
@ -54,7 +49,6 @@ public class ZombiesUtils {
handlers.registerAll(); handlers.registerAll();
CommandRegistry.registerAll(); CommandRegistry.registerAll();
hotkeys.registerAll(); hotkeys.registerAll();
gameData = new GameData();
} }
public Logger getLogger() { public Logger getLogger() {
@ -72,12 +66,4 @@ public class ZombiesUtils {
public ZombiesUtilsConfig getConfig() { public ZombiesUtilsConfig getConfig() {
return config; return config;
} }
public GameManager getGameManager() {
return gameManager;
}
public GameData getGameData() {
return gameData;
}
} }

View file

@ -1,6 +1,6 @@
package com.github.stachelbeere1248.zombiesutils.commands; package com.github.stachelbeere1248.zombiesutils.commands;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category; import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
import net.minecraft.command.CommandException; import net.minecraft.command.CommandException;
import net.minecraft.command.ICommand; import net.minecraft.command.ICommand;
@ -42,8 +42,8 @@ public class CategoryCommand implements ICommand {
if (cat.contains(File.separator)) if (cat.contains(File.separator))
throw new WrongUsageException("Your name must not contain '" + File.separator + "' as this is the systems separator character for folder" + File.separator + "sub-folder"); throw new WrongUsageException("Your name must not contain '" + File.separator + "' as this is the systems separator character for folder" + File.separator + "sub-folder");
Category.setSelectedCategory(cat); Category.setSelectedCategory(cat);
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(game -> game.setCategory(new Category()));
sender.addChatMessage(new ChatComponentText("§eSet category to §c" + cat)); sender.addChatMessage(new ChatComponentText("§eSet category to §c" + cat));
Timer.getInstance().ifPresent(timer -> timer.setCategory(new Category()));
} }
} }

View file

@ -1,8 +1,8 @@
package com.github.stachelbeere1248.zombiesutils.commands; package com.github.stachelbeere1248.zombiesutils.commands;
import com.github.stachelbeere1248.zombiesutils.game.SLA;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map; import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.game.sla.QuickSLA; import com.github.stachelbeere1248.zombiesutils.game.sla.QuickSLA;
import com.github.stachelbeere1248.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;
@ -21,7 +21,7 @@ public class SlaCommand extends CommandBase {
@Override @Override
public String getCommandUsage(ICommandSender sender) { public String getCommandUsage(ICommandSender sender) {
return "/sla off\n/sla offset [x] [x] [x]\n/sla rotate\n/sla mirror\n/sla map <de|bb|aa|p>\n/sla quick"; return "/sla off\n/sla offset [x] [x] [x]\n/sla rotate\n/sla mirror\n/sla map <de|bb|aa>\n/sla quick";
} }
@Override @Override
@ -83,12 +83,9 @@ public class SlaCommand extends CommandBase {
case "aa": case "aa":
SLA.instance = new SLA(Map.ALIEN_ARCADIUM); SLA.instance = new SLA(Map.ALIEN_ARCADIUM);
break; break;
case "p":
SLA.instance = new SLA(Map.PRISON);
break;
default: default:
throw new WrongUsageException( throw new WrongUsageException(
"[Invalid option] options: de, bb, aa, p", args[1]); "[Invalid option] options: de, bb, aa", args[1]);
} }
break; break;
case "quick": case "quick":
@ -122,12 +119,12 @@ public class SlaCommand extends CommandBase {
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();
if (args.length == 1) options.addAll(Arrays.asList("off", "offset", "rotate", "mirror", "map", "quick")); if (args.length == 1) options.addAll(Arrays.asList("off", "offset", "rotate", "mirror", "map", "quick"));
else { else {
if (args.length >= 2) switch (args[0]) { if (args.length > 1) switch (args[0]) {
case "offset": case "offset":
if (args.length < 5) options.add("0"); if (args.length < 5) options.add("0");
break; break;
case "map": case "map":
options.addAll(Arrays.asList("de", "bb", "aa", "p")); options.addAll(Arrays.asList("de", "bb", "aa"));
break; break;
case "mirror": case "mirror":
options.addAll(Arrays.asList("x", "z")); options.addAll(Arrays.asList("x", "z"));

View file

@ -1,9 +1,6 @@
package com.github.stachelbeere1248.zombiesutils.commands; package com.github.stachelbeere1248.zombiesutils.commands;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
import com.github.stachelbeere1248.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;
@ -32,24 +29,18 @@ public class ZombiesUtilsCommand extends CommandBase {
case "timer": case "timer":
switch (args[1]) { switch (args[1]) {
case "kill": case "kill":
String serverNumber = Scoreboard.getServerNumber().orElse(""); Timer.dropInstances();
if (args.length == 3) serverNumber = args[2];
ZombiesUtils.getInstance().getGameManager().endGame(serverNumber, false);
break; break;
case "killall":
ZombiesUtils.getInstance().getGameManager().killAll();
case "split": case "split":
try { try {
ZombiesUtils.getInstance().getGameManager().splitOrNew(Integer.parseInt(args[2])); Timer.getInstance().ifPresent(timer -> timer.split(Byte.parseByte(args[2])));
} catch (NumberFormatException | NullPointerException ignored) { } catch (NumberFormatException | NullPointerException ignored) {
throw new NumberInvalidException("t", args[2]); throw new NumberInvalidException("t", args[2]);
} catch (ScoardboardException | InvalidMapException e) {
ZombiesUtils.getInstance().getLogger().error(e.getStackTrace());
} }
break; break;
default: default:
throw new WrongUsageException( throw new WrongUsageException(
"[Invalid option] options: kill, killall, split", args[0]); "[Invalid option] options: kill, split", args[0]);
} }
break; break;
default: default:
@ -61,24 +52,12 @@ public class ZombiesUtilsCommand extends CommandBase {
@Override @Override
public List<String> addTabCompletionOptions(ICommandSender sender, String @NotNull [] args, BlockPos blockPos) { public List<String> addTabCompletionOptions(ICommandSender sender, String @NotNull [] args, BlockPos blockPos) {
if (args.length == 1) return new ArrayList<>(Collections.singleton("timer")); if (args.length == 1) return new ArrayList<>(Collections.singleton("timer"));
else if (args.length == 2) {
switch (args[0]) { switch (args[0]) {
case "timer": case "timer":
return new ArrayList<>(Arrays.asList("kill", "killall", "split")); return new ArrayList<>(Arrays.asList("kill", "split"));
default: default:
return Collections.emptyList(); return Collections.emptyList();
} }
} else if (args.length == 3) {
switch (args[0]) {
case "timer":
switch (args[1]) {
case "kill":
return new ArrayList<>(ZombiesUtils.getInstance().getGameManager().getGames());
}
default:
return Collections.emptyList();
}
} else return Collections.emptyList();
} }
@Override @Override

View file

@ -7,7 +7,6 @@ import org.lwjgl.input.Keyboard;
public class Hotkeys { public class Hotkeys {
private final KeyBinding chatMacro; private final KeyBinding chatMacro;
private final KeyBinding rlSpawn; private final KeyBinding rlSpawn;
private final KeyBinding playerVisiblity;
public Hotkeys() { public Hotkeys() {
chatMacro = new KeyBinding( chatMacro = new KeyBinding(
@ -17,12 +16,7 @@ public class Hotkeys {
); );
rlSpawn = new KeyBinding( rlSpawn = new KeyBinding(
"Rocket Launcher Mode", "Rocket Launcher Mode",
Keyboard.KEY_UP, Keyboard.KEY_NONE,
"Zombies Utils"
);
playerVisiblity = new KeyBinding(
"Player Visibility",
Keyboard.KEY_RIGHT,
"Zombies Utils" "Zombies Utils"
); );
@ -31,7 +25,6 @@ public class Hotkeys {
public void registerAll() { public void registerAll() {
ClientRegistry.registerKeyBinding(this.chatMacro); ClientRegistry.registerKeyBinding(this.chatMacro);
ClientRegistry.registerKeyBinding(this.rlSpawn); ClientRegistry.registerKeyBinding(this.rlSpawn);
ClientRegistry.registerKeyBinding(this.playerVisiblity);
} }
public KeyBinding getChatMacro() { public KeyBinding getChatMacro() {
@ -41,8 +34,4 @@ public class Hotkeys {
public KeyBinding getRlSpawn() { public KeyBinding getRlSpawn() {
return rlSpawn; return rlSpawn;
} }
public KeyBinding getPlayerVisiblity() {
return playerVisiblity;
}
} }

View file

@ -1,5 +1,6 @@
package com.github.stachelbeere1248.zombiesutils.config; package com.github.stachelbeere1248.zombiesutils.config;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport; import com.github.stachelbeere1248.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;
@ -23,10 +24,10 @@ public class ZombiesUtilsConfig {
private Property defaultCategory; private Property defaultCategory;
private Property language; private Property language;
private Property auditory; private Property auditory;
private Property copyDelta;
private Property cpsCounter; private Property cpsCounter;
private Property announcePB; private Property announcePB;
private Property playerVis; private Property playerVis;
private Property playerVisRange;
public ZombiesUtilsConfig(Configuration config) { public ZombiesUtilsConfig(Configuration config) {
this.config = config; this.config = config;
@ -34,7 +35,9 @@ public class ZombiesUtilsConfig {
} }
private void read() { private void read() {
ZombiesUtils.getInstance().getLogger().debug("Loading config...");
config.load(); config.load();
ZombiesUtils.getInstance().getLogger().debug("Config loaded.");
//SST //SST
sstHud = config.get( sstHud = config.get(
@ -90,6 +93,12 @@ public class ZombiesUtilsConfig {
"general", "general",
"name of the category to be selected unless specified using /runCategory" "name of the category to be selected unless specified using /runCategory"
); );
copyDelta = config.get(
"timer",
"copy delta",
false,
"Also copy the delta-time when clicking the round-end message?"
);
announcePB = config.get( announcePB = config.get(
"timer", "timer",
"announce", "announce",
@ -97,22 +106,6 @@ public class ZombiesUtilsConfig {
"Whether to announce PBs." "Whether to announce PBs."
); );
//Player Visibility
playerVis = config.get(
"PlayerVis",
"default",
false,
"If players should always be visible"
);
playerVisRange = config.get(
"PlayerVis",
"range",
4,
"The range within which players are hidden",
0,
50
);
//ROOT //ROOT
language = config.get( language = config.get(
@ -128,6 +121,12 @@ public class ZombiesUtilsConfig {
"T", "T",
"The Text to be sent when pressing the chat-macro hotkey" "The Text to be sent when pressing the chat-macro hotkey"
); );
playerVis = config.get(
Configuration.CATEGORY_GENERAL,
"playervis",
false,
"If players should always be visible"
);
cpsCounter = config.get( cpsCounter = config.get(
Configuration.CATEGORY_GENERAL, Configuration.CATEGORY_GENERAL,
"cps", "cps",
@ -148,21 +147,15 @@ public class ZombiesUtilsConfig {
private List<IConfigElement> getSlaElements() { private List<IConfigElement> getSlaElements() {
return Arrays.asList( return Arrays.asList(
new CustomConfigElement("Enabled", slaToggle), new CustomConfigElement("Enabled", slaToggle),
new CustomConfigElement("Truncate", slaShortener) new CustomConfigElement("Truncate", slaShortener),
new CustomConfigElement("PB announcements", announcePB)
); );
} }
private List<IConfigElement> getTimerElements() { private List<IConfigElement> getTimerElements() {
return Arrays.asList( return Arrays.asList(
new CustomConfigElement("Default category", defaultCategory), new CustomConfigElement("Default category", defaultCategory),
new CustomConfigElement("PB announcements", announcePB) new CustomConfigElement("Paste delta", copyDelta)
);
}
private List<IConfigElement> getPlayerVisElements() {
return Arrays.asList(
new CustomConfigElement("Enabled", playerVis),
new CustomConfigElement("Range", playerVisRange)
); );
} }
@ -172,8 +165,8 @@ public class ZombiesUtilsConfig {
new DummyConfigElement.DummyCategoryElement("Timer", "", getTimerElements()), new DummyConfigElement.DummyCategoryElement("Timer", "", getTimerElements()),
new DummyConfigElement.DummyCategoryElement("SST", "", getSpawntimeElements()), new DummyConfigElement.DummyCategoryElement("SST", "", getSpawntimeElements()),
new DummyConfigElement.DummyCategoryElement("SLA", "", getSlaElements()), new DummyConfigElement.DummyCategoryElement("SLA", "", getSlaElements()),
new DummyConfigElement.DummyCategoryElement("Player Visibility", "", getPlayerVisElements()),
new CustomConfigElement("Macro message", chatMacro), new CustomConfigElement("Macro message", chatMacro),
new CustomConfigElement("Player visibility", playerVis),
new CustomConfigElement("CPS counter", cpsCounter) new CustomConfigElement("CPS counter", cpsCounter)
); );
@ -216,22 +209,20 @@ public class ZombiesUtilsConfig {
return sstHud.getBoolean(); return sstHud.getBoolean();
} }
public boolean getCopyDelta() {
return copyDelta.getBoolean();
}
public boolean getCpsToggle() { public boolean getCpsToggle() {
return cpsCounter.getBoolean(); return cpsCounter.getBoolean();
} }
public boolean getAnnouncePB() { public boolean getAnnouncePB() {
return announcePB.getBoolean(); return announcePB.getBoolean();
} }
public boolean getPlayerVis() { public boolean getPlayerVis() {
return playerVis.getBoolean(); return playerVis.getBoolean();
} }
public int getPlayerVisRange() {
return playerVisRange.getInt();
}
@SubscribeEvent @SubscribeEvent
public void onConfigChange(ConfigChangedEvent.@NotNull OnConfigChangedEvent event) { public void onConfigChange(ConfigChangedEvent.@NotNull OnConfigChangedEvent event) {
if (event.modID.equals("zombiesutils") && event.configID == null) { if (event.modID.equals("zombiesutils") && event.configID == null) {

View file

@ -0,0 +1,44 @@
package com.github.stachelbeere1248.zombiesutils.game;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import org.jetbrains.annotations.NotNull;
public class GameMode {
private final Map map;
private Difficulty difficulty;
public GameMode(@NotNull Map map) {
this.map = map;
this.difficulty = Difficulty.NORMAL;
}
public GameMode(@NotNull Map map, @NotNull Difficulty difficulty) {
this.map = map;
this.difficulty = difficulty;
}
public Map getMap() {
return map;
}
public Difficulty getDifficulty() {
return difficulty;
}
public void changeDifficulty(@NotNull Difficulty difficulty) {
switch (map) {
case DEAD_END:
case BAD_BLOOD:
case PRISON:
this.difficulty = difficulty;
break;
case ALIEN_ARCADIUM:
throw new RuntimeException("Achievement Get: Alien Arcadium Hard/RIP" + Map.ALIEN_ARCADIUM);
}
}
public boolean is(Map map, Difficulty difficulty) {
return this.getDifficulty() == difficulty && this.getMap() == map;
}
}

View file

@ -1,9 +1,12 @@
package com.github.stachelbeere1248.zombiesutils.game.windows; package com.github.stachelbeere1248.zombiesutils.game;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map; import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.game.windows.Room;
import com.github.stachelbeere1248.zombiesutils.game.windows.Window;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.util.ChatComponentText;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Arrays; import java.util.Arrays;
@ -28,6 +31,7 @@ public class SLA {
break; break;
case PRISON: case PRISON:
this.rooms = new Room[0]; this.rooms = new Room[0];
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cThis map has no SLA database yet. Contribute by dming Stachelbeere1248 coordinates for windows on Discord."));
break; break;
default: default:
throw new IllegalStateException("Unexpected value: " + map); throw new IllegalStateException("Unexpected value: " + map);
@ -76,7 +80,8 @@ public class SLA {
player.posY - offset[1], player.posY - offset[1],
player.posZ - offset[2] player.posZ - offset[2]
}; };
for (Room room : rooms) { for (Room room : rooms
) {
room.resetActiveWindowCount(); room.resetActiveWindowCount();
for (Window window : room.getWindows() for (Window window : room.getWindows()
) { ) {
@ -86,8 +91,7 @@ public class SLA {
} }
// (2x)²+(2y)²+(2z)² = 4(x²+y²+z²) = 4d² // (2x)²+(2y)²+(2z)² = 4(x²+y²+z²) = 4d²
final int slaRange = 50; if (distanceDoubledThenSquared < 6400) {
if (distanceDoubledThenSquared < 4 * slaRange * slaRange) {
window.setActive(true); window.setActive(true);
room.increaseActiveWindowCount(); room.increaseActiveWindowCount();
} else window.setActive(false); } else window.setActive(false);

View file

@ -14,15 +14,17 @@ public enum Map {
public static Optional<Map> getMap() { public static Optional<Map> getMap() {
World world = Minecraft.getMinecraft().theWorld; World world = Minecraft.getMinecraft().theWorld;
BlockPos pos = new BlockPos(44, 71, 0); BlockPos pos = new BlockPos(44,71,0);
if (!world.isBlockLoaded(pos) || Scoreboard.isNotZombies()) return Optional.empty(); if (!world.isBlockLoaded(pos) || Scoreboard.isNotZombies()) return Optional.empty();
Block block = world.getBlockState(pos).getBlock(); Block block = world.getBlockState(pos).getBlock();
if (block.equals(Blocks.air)) {
if (block.equals(Blocks.air)) return Optional.of(Map.DEAD_END); return Optional.of(Map.DEAD_END);
if (block.equals(Blocks.wool)) return Optional.of(Map.BAD_BLOOD); } else if (block.equals(Blocks.wool)) {
if (block.equals(Blocks.stone_slab)) return Optional.of(Map.ALIEN_ARCADIUM); return Optional.of(Map.BAD_BLOOD);
if (block.equals(Blocks.wooden_slab)) return Optional.of(Map.PRISON); } else if (block.equals(Blocks.stone_slab)) {
return Optional.of(Map.ALIEN_ARCADIUM);
else return Optional.empty(); } else if (block.equals(Blocks.wooden_slab)) {
return Optional.of(Map.PRISON);
} else return Optional.empty();
} }
} }

View file

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

View file

@ -0,0 +1,49 @@
package com.github.stachelbeere1248.zombiesutils.game.waves;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
import net.minecraft.client.Minecraft;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
public class WaveTiming {
public static int rl = 0;
public static byte[] getWaves(@NotNull Timer timer) {
return Waves.get(
timer.getGameMode().getMap(),
timer.getRound()
);
}
public static byte getLastWave(@NotNull Timer timer) {
return Waves.getLastWave(
timer.getGameMode().getMap(),
timer.getRound()
);
}
public static void onTick() {
if (Scoreboard.isNotZombies()) return;
//TODO: Assert correct server number!
Timer.getInstance().ifPresent(timer -> {
byte[] waves = getWaves(timer);
final int roundTime = timer.roundTime();
final int[] auditory = ZombiesUtils.getInstance().getConfig().getAuditory();
for (int wave : waves) {
wave = wave * 20 + rl;
final Integer pre = roundTime - wave;
if (Arrays.stream(auditory).anyMatch(pre::equals)) {
Minecraft.getMinecraft().thePlayer.playSound("note.pling", 1, 2);
}
}
});
}
public static void toggleRL() {
if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset();
else rl = 0;
}
}

View file

@ -0,0 +1,48 @@
package com.github.stachelbeere1248.zombiesutils.game.waves;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@SuppressWarnings("DuplicatedCode")
public class Waves {
private static final byte[][]
deadEndWaveTimes = {{10, 20}, {10, 20}, {10, 20, 35}, {10, 20, 35}, {10, 22, 37}, {10, 22, 44}, {10, 25, 47}, {10, 25, 50}, {10, 22, 38}, {10, 24, 45}, {10, 25, 48}, {10, 25, 50}, {10, 25, 50}, {10, 25, 45}, {10, 25, 46}, {10, 24, 47}, {10, 24, 47}, {10, 24, 47}, {10, 24, 47}, {10, 24, 49}, {10, 23, 44}, {10, 23, 45}, {10, 23, 42}, {10, 23, 43}, {10, 23, 43}, {10, 23, 36}, {10, 24, 44}, {10, 24, 42}, {10, 24, 42}, {10, 24, 45}},
badBloodWaveTimes = {{10, 22}, {10, 22}, {10, 22}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34}, {10, 24, 38}, {10, 24, 38}, {10, 22, 34}, {10, 24, 38}, {10, 22, 34}},
alienArcadiumWaveTimes = {{10, 13, 16, 19}, {10, 14, 18, 22}, {10, 13, 16, 19}, {10, 14, 17, 21, 25, 28}, {10, 14, 18, 22, 26, 30}, {10, 14, 19, 23, 28, 32}, {10, 15, 19, 23, 27, 31}, {10, 15, 20, 25, 30, 35}, {10, 14, 19, 23, 28, 32}, {10, 16, 22, 27, 33, 38}, {10, 16, 21, 27, 32, 38}, {10, 16, 22, 28, 34, 40}, {10, 16, 22, 28, 34, 40}, {10, 16, 21, 26, 31, 36}, {10, 17, 24, 31, 38, 46}, {10, 16, 22, 27, 33, 38}, {10, 14, 19, 23, 28, 32}, {10, 14, 19, 23, 28, 32}, {10, 14, 18, 22, 26, 30}, {10, 15, 21, 26, 31, 36}, {10, 14, 19, 23, 28, 32}, {10, 14, 19, 23, 28, 34}, {10, 14, 18, 22, 26, 30}, {10, 14, 19, 23, 28, 32}, {10}, {10, 23, 36}, {10, 22, 34}, {10, 20, 30}, {10, 24, 38}, {10, 22, 34}, {10, 22, 34}, {10, 21, 32}, {10, 22, 34}, {10, 22, 34}, {10}, {10, 22, 34}, {10, 20, 31}, {10, 22, 34}, {10, 22, 34}, {10, 22, 34, 37, 45}, {10, 21, 32}, {10, 22, 34}, {10, 13, 22, 25, 34, 37}, {10, 22, 34}, {10, 22, 34, 35}, {10, 21, 32, 35}, {10, 20, 30}, {10, 20, 30, 33}, {10, 21, 32}, {10, 22, 34, 37}, {10, 20, 30, 33}, {10, 22, 34, 37}, {10, 22, 34, 37}, {10, 20, 32, 35, 39}, {10, 16, 22, 28, 34, 40}, {10, 14, 18}, {10, 14, 18}, {10, 22, 34, 37, 38}, {10, 14, 18, 22, 26, 30}, {10, 20, 30, 33}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 27, 32}, {10, 14, 18, 22, 27, 32}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {10, 14, 18, 22, 26, 30}, {5}, {5}, {5}, {5}, {5}},
prisonWaveTimes = {{10, 20}, {10, 20, 30}, {10, 17, 24, 31}, {10, 17, 24, 31}, {10, 20, 30}, {10, 20, 30}, {10, 20, 30}, {10, 25, 40}, {10, 25, 35}, {10, 25, 45}, {10, 25, 40}, {10, 25, 37}, {10, 22, 34}, {10, 25, 37}, {10, 25, 40}, {10, 22, 37}, {10, 22, 42}, {10, 25, 45}, {10, 25, 45}, {10, 25, 40}, {10, 20, 35, 55, 75}, {10, 25, 40}, {10, 30, 50}, {10, 30, 50}, {10, 25, 45}, {10, 30, 50}, {10, 25, 45}, {10, 30, 50}, {10, 30, 55}, {10}};
@Contract(pure = true)
public static byte[] get(@NotNull Map map, byte round) {
byte[] ret = new byte[]{0};
try {
switch (map) {
case DEAD_END:
ret = deadEndWaveTimes[round - 1];
break;
case BAD_BLOOD:
ret = badBloodWaveTimes[round - 1];
break;
case ALIEN_ARCADIUM:
ret = alienArcadiumWaveTimes[round - 1];
break;
case PRISON:
ret = prisonWaveTimes[round - 1];
break;
}
} catch (ArrayIndexOutOfBoundsException ignored) {
Minecraft.getMinecraft().thePlayer.addChatMessage(
new ChatComponentText("Achievement get: Round " + round + " " + map)
);
}
return ret;
}
public static byte getLastWave(@NotNull Map map, byte round) {
byte[] aByte = get(map, round);
return aByte[aByte.length - 1];
}
}

View file

@ -151,116 +151,8 @@ public class Room {
} }
@Contract(" -> new") @Contract(" -> new")
public static Room @NotNull [] getP() { public static Room @NotNull [] getPrison() {
return new Room[]{ return new Room[0];
new Room("Cell Blocks", "cb", new Window[]{
new Window(1, 109, 144, 21),
new Window(2, 109, 144, -19),
new Window(3, 193, 158, -17),
new Window(4, 193, 158, 19),
}),
new Room("Corridors", "co", new Window[]{
new Window(1, 189, 144, 21),
new Window(2, 251, 144, 31),
new Window(3, 219, 144, -21),
new Window(4, 233, 144, -49),
new Window(5, 221, 158, -21),
new Window(6, 255, 158, 9),
new Window(7, 273, 158, 51),
}),
new Room("Cafeteria", "ca", new Window[]{
new Window(1, 249, 144, 73),
new Window(2, 189, 144, 25),
}),
new Room("Visitor's Room", "v", new Window[]{
new Window(1, 261, 144, -45),
new Window(2, 273, 144, 13)
}),
new Room("Library", "l", new Window[]{
new Window(1, 265, 158, 9),
new Window(2, 263, 158, -47),
}),
new Room("Monitor Room", "mt", new Window[]{
new Window(1, 201, 158, 25),
new Window(2, 197, 158, 3),
}),
new Room("Medical Bay", "mt", new Window[]{
new Window(1, 249, 158, 31),
new Window(2, 223, 158, 53),
}),
new Room("The Courts", "cs", new Window[]{
new Window(1, 285, 144, 81),
new Window(2, 247, 144, 157),
new Window(3, 211, 144, 157),
}),
new Room("Offices", "o", new Window[]{
new Window(1, 153, 144, 161),
new Window(2, 151, 144, 191),
new Window(3, 99, 144, 181),
new Window(4, 123, 144, 163),
new Window(5, 71, 144, 163),
}),
new Room("Head Manager's Office", "h", new Window[]{
new Window(1, 179, 158, 169),
new Window(2, 179, 158, 177),
new Window(3, 79, 158, 177),
new Window(4, 79, 158, 169),
}),
new Room("Basement Corridor", "bc", new Window[]{
new Window(1, 231, 130, 29),
new Window(2, 193, 130, 31),
}),
new Room("The Deep", "d", new Window[]{
new Window(1, 167, 126, -45),
new Window(2, 163, 122, 13),
new Window(3, 193, 122, 13),
}),
new Room("Boiler Room", "b", new Window[]{
new Window(1, 107, 126, -11),
new Window(2, 125, 126, 25),
new Window(3, 163, 130, -45),
new Window(4, 107, 130, -45),
}),
new Room("Yard", "y", new Window[]{
new Window(1, 185, 144, 79),
new Window(2, 189, 144, 119),
new Window(3, 107, 144, 121),
}),
new Room("Alleyway", "a", new Window[]{
new Window(1, 101, 144, 133),
new Window(2, 147, 144, 117)
}),
new Room("Guard's Gunroom", "gr", new Window[]{
new Window(1, 29, 148, 75),
new Window(2, 29, 144, 43),
new Window(3, 65, 126, 5),
}),
new Room("Guard's Quarters", "q", new Window[]{
new Window(1, 83, 148, 83),
new Window(2, 57, 148, 35),
}),
new Room("Stockage", "st", new Window[]{
new Window(1, 241, 130, -25),
new Window(2, 227, 130, -45),
}),
new Room("Kitchen", "k", new Window[]{
new Window(1, 261, 144, 33),
new Window(2, 271, 144, 45),
}),
new Room("Isolation", "i", new Window[]{
new Window(1, 75, 144, 91),
new Window(2, 29, 144, 87),
}),
new Room("Showers", "sh", new Window[]{
new Window(1, 37, 144, 15),
new Window(2, 37, 144, -11),
}),
new Room("???", "?", new Window[]{
new Window(1, 191, 126, -67),
new Window(2, 207, 126, -67),
}),
};
} }
public String getName() { public String getName() {

View file

@ -0,0 +1,32 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
import java.util.regex.Pattern;
public class ChatHandler {
private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("§[0-9A-FK-ORZ]", Pattern.CASE_INSENSITIVE);
public ChatHandler() {
}
@SubscribeEvent
public void difficultyChange(@NotNull ClientChatReceivedEvent event) {
if (!Timer.getInstance().isPresent()) return;
String message = STRIP_COLOR_PATTERN.matcher(event.message.getUnformattedText()).replaceAll("").trim();
GameMode gameMode = Timer.getInstance().get().getGameMode();
if (message.contains(":")) return;
if (LanguageSupport.containsHard(message)) {
gameMode.changeDifficulty(Difficulty.HARD);
} else if (LanguageSupport.containsRIP(message)) {
gameMode.changeDifficulty(Difficulty.RIP);
}
}
}

View file

@ -5,27 +5,21 @@ import net.minecraftforge.common.MinecraftForge;
public class Handlers { public class Handlers {
private final RenderGameOverlayHandler renderer; private final RenderGameOverlayHandler renderer;
private final RenderPlayerHandler renderPlayerHandler;
public Handlers() { public Handlers() {
renderer = new RenderGameOverlayHandler(); renderer = new RenderGameOverlayHandler();
renderPlayerHandler = new RenderPlayerHandler();
} }
public void registerAll() { public void registerAll() {
MinecraftForge.EVENT_BUS.register(ZombiesUtils.getInstance().getConfig()); MinecraftForge.EVENT_BUS.register(ZombiesUtils.getInstance().getConfig());
MinecraftForge.EVENT_BUS.register(renderer); MinecraftForge.EVENT_BUS.register(renderer);
MinecraftForge.EVENT_BUS.register(renderPlayerHandler);
MinecraftForge.EVENT_BUS.register(new TickHandler()); MinecraftForge.EVENT_BUS.register(new TickHandler());
MinecraftForge.EVENT_BUS.register(new ChatHandler()); MinecraftForge.EVENT_BUS.register(new ChatHandler());
MinecraftForge.EVENT_BUS.register(new KeyInputHandler()); MinecraftForge.EVENT_BUS.register(new KeyInputHandler());
MinecraftForge.EVENT_BUS.register(new RenderPlayerHandler());
} }
public RenderGameOverlayHandler getRenderer() { public RenderGameOverlayHandler getRenderer() {
return renderer; return renderer;
} }
public RenderPlayerHandler getRenderPlayerHandler() {
return renderPlayerHandler;
}
} }

View file

@ -17,14 +17,14 @@ public class KeyInputHandler {
if (event instanceof InputEvent.KeyInputEvent) { if (event instanceof InputEvent.KeyInputEvent) {
if (Keyboard.getEventKey() == '\0') return; if (Keyboard.getEventKey() == '\0') return;
if (Keyboard.getEventKeyState()) { if (Keyboard.getEventKeyState()) {
final Hotkeys hotkeys = ZombiesUtils.getInstance().getHotkeys(); Hotkeys hotkeys = ZombiesUtils.getInstance().getHotkeys();
if (Keyboard.getEventKey() == hotkeys.getChatMacro().getKeyCode()) Minecraft.getMinecraft().thePlayer if (Keyboard.getEventKey() == hotkeys.getChatMacro().getKeyCode()) {
.sendChatMessage(ZombiesUtils.getInstance().getConfig().getChatMacro()); Minecraft.getMinecraft().thePlayer.sendChatMessage(
else if (Keyboard.getEventKey() == hotkeys.getRlSpawn().getKeyCode()) { ZombiesUtils.getInstance().getConfig().getChatMacro()
);
} else if (Keyboard.getEventKey() == hotkeys.getRlSpawn().getKeyCode()) {
ZombiesUtils.getInstance().getHandlers().getRenderer().toggleRL(); ZombiesUtils.getInstance().getHandlers().getRenderer().toggleRL();
WaveTiming.toggleRL(); WaveTiming.toggleRL();
} else if (Keyboard.getEventKey() == hotkeys.getPlayerVisiblity().getKeyCode()) {
ZombiesUtils.getInstance().getHandlers().getRenderPlayerHandler().togglePlayerVisibility();
} }
} }
} else if (event instanceof InputEvent.MouseInputEvent) { } else if (event instanceof InputEvent.MouseInputEvent) {

View file

@ -1,11 +1,10 @@
package com.github.stachelbeere1248.zombiesutils.handlers; package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.waves.Prefix; import com.github.stachelbeere1248.zombiesutils.game.SLA;
import com.github.stachelbeere1248.zombiesutils.game.waves.Wave; import com.github.stachelbeere1248.zombiesutils.game.waves.Waves;
import com.github.stachelbeere1248.zombiesutils.game.windows.Room; import com.github.stachelbeere1248.zombiesutils.game.windows.Room;
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA; import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.timer.Game;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard; import com.github.stachelbeere1248.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;
@ -33,6 +32,13 @@ public class RenderGameOverlayHandler {
return String.format("%d:%02d.%d", minutesPart, secondsPart, tenthSecondsPart); return String.format("%d:%02d.%d", minutesPart, secondsPart, tenthSecondsPart);
} }
private static String getWaveString(long waveTicks, int wave) {
final long minutesPart = (waveTicks * 50) / 60000;
final long secondsPart = ((waveTicks * 50) % 60000) / 1000;
final long tenthSecondsPart = ((waveTicks * 50) % 1000) / 100;
return String.format("W%d %d:%02d.%d", wave, minutesPart, secondsPart, tenthSecondsPart);
}
void toggleRL() { void toggleRL() {
if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset(); if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset();
else rl = 0; else rl = 0;
@ -42,21 +48,23 @@ public class RenderGameOverlayHandler {
public void onRenderGameOverlay(RenderGameOverlayEvent.@NotNull Post event) { public void onRenderGameOverlay(RenderGameOverlayEvent.@NotNull Post event) {
if (event.type != RenderGameOverlayEvent.ElementType.TEXT) return; if (event.type != RenderGameOverlayEvent.ElementType.TEXT) return;
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent( Timer.getInstance().ifPresent(timer -> {
game -> { renderTime(timer.roundTime());
renderTime(game.getTimer().getRoundTime());
renderSpawnTime( renderSpawnTime(
game Waves.get(
); timer.getGameMode().getMap(),
} timer.getRound()
),
timer.roundTime()
); );
});
if (!Minecraft.getMinecraft().gameSettings.showDebugInfo)
SLA.getInstance().ifPresent(sla -> renderSla(sla.getRooms())); SLA.getInstance().ifPresent(sla -> renderSla(sla.getRooms()));
if (ZombiesUtils.getInstance().getConfig().getCpsToggle()) renderCPS(); if (ZombiesUtils.getInstance().getConfig().getCpsToggle()) renderCPS();
} }
private void renderTime(short timerTicks) { private void renderTime(long timerTicks) {
if (Scoreboard.isNotZombies()) return; if (Scoreboard.isNotZombies()) return;
final String time = getTimeString(timerTicks); final String time = getTimeString(timerTicks);
@ -88,51 +96,42 @@ public class RenderGameOverlayHandler {
} }
} }
private void renderSpawnTime(final Game game) { private void renderSpawnTime(byte @NotNull [] waveTimes, short roundTicks) {
if (!ZombiesUtils.getInstance().getConfig().getSST() || Scoreboard.isNotZombies()) return; if (Scoreboard.isNotZombies() || !ZombiesUtils.getInstance().getConfig().getSST()) return;
final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
final int screenWidth = scaledResolution.getScaledWidth(); final int length = waveTimes.length + 1;
final int screenHeight = scaledResolution.getScaledHeight();
final Wave[] round = ZombiesUtils.getInstance().getGameData().getRound(game.getGameMode(), game.getRound()).getWaves();
final int roundTime = game.getTimer().getRoundTime();
final int length = round.length + 1;
int heightIndex = 0; int heightIndex = 0;
int color = 0xFFFF55; int color = 0xFFFF55;
boolean faded = false;
for (Wave wave : round) { for (byte waveTime : waveTimes) {
final short spawnTime = (short) (wave.getTime() + rl); int clonedColor = color;
if (roundTime > spawnTime) { final short waveTicks = (short) ((waveTime * 20) + rl);
if (!ZombiesUtils.getInstance().getConfig().isSpawntimeShortened()) faded = true;
if (roundTicks > waveTicks) {
if (!ZombiesUtils.getInstance().getConfig().isSpawntimeShortened()) clonedColor = 0x555555;
else { else {
heightIndex++; heightIndex++;
continue; continue;
} }
} else faded = false;
final String spawnTimeString = " W" + (heightIndex + 1) + ": " + getTimeString(spawnTime);
int width = fontRenderer.getStringWidth(spawnTimeString);
fontRenderer.drawStringWithShadow(
spawnTimeString,
screenWidth - width,
screenHeight - fontRenderer.FONT_HEIGHT * (length - heightIndex),
faded ? 0x666666 : color
);
for (Prefix prefix : wave.getPrefixes()) {
final String prefixString = prefix.getPrefix() + " ";
width += fontRenderer.getStringWidth(prefixString);
fontRenderer.drawStringWithShadow(
prefixString,
screenWidth - width,
screenHeight - fontRenderer.FONT_HEIGHT * (length - heightIndex),
faded ? prefix.getFadedColor() : prefix.getColor()
);
} }
if (!faded) color = 0xAAAAAA;
final String time = getWaveString(waveTicks, heightIndex + 1);
final int width = fontRenderer.getStringWidth(time);
final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
final int screenWidth = scaledResolution.getScaledWidth();
final int screenHeight = scaledResolution.getScaledHeight();
fontRenderer.drawStringWithShadow(
time,
screenWidth - width,
screenHeight - fontRenderer.FONT_HEIGHT * (length - heightIndex),
clonedColor
);
if (clonedColor != 0x555555) color = 0xAAAAAA;
heightIndex++; heightIndex++;
} }
} }
public void renderCPS() { public void renderCPS() {
final String cps = String.format("%2d", getClicks()); final String cps = String.format("%2d", getClicks());
final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); final ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());

View file

@ -0,0 +1,22 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.util.Vec3;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
public class RenderPlayerHandler {
@SubscribeEvent
public void onRender(RenderPlayerEvent.@NotNull Pre event) {
if (event.entityPlayer.isPlayerSleeping() || event.entityPlayer.isUser()) return;
if (inRange(event.entityPlayer.getPositionVector())) {
event.setCanceled(!ZombiesUtils.getInstance().getConfig().getPlayerVis());
}
}
private boolean inRange(Vec3 playerOther) {
return playerOther.squareDistanceTo(Minecraft.getMinecraft().thePlayer.getPositionVector()) <= 16;
}
}

View file

@ -0,0 +1,21 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
public class Round1Correction {
@SubscribeEvent
public void onWaveSpawn(@NotNull EntityJoinWorldEvent event) {
final Entity entity = event.entity;
if (entity instanceof EntityZombie) {
Timer.getInstance().ifPresent(Timer::correctRn);
MinecraftForge.EVENT_BUS.unregister(this);
}
}
}

View file

@ -0,0 +1,109 @@
package com.github.stachelbeere1248.zombiesutils.mixin;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.network.play.server.S29PacketSoundEffect;
import net.minecraft.network.play.server.S45PacketTitle;
import net.minecraft.util.ChatComponentText;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(NetHandlerPlayClient.class)
public class MixinNetHandlerPlayClient {
@Unique
private boolean zombies_utils$alienUfoOpened;
@Inject(method = "handleSoundEffect", at = @At(value = "HEAD"))
private void handleSound(S29PacketSoundEffect packetIn, CallbackInfo ci) {
zombies_utils$handleSound(packetIn);
}
@Inject(method = "handleTitle", at = @At(value = "HEAD"))
private void handleTitle(S45PacketTitle packetIn, CallbackInfo ci) {
zombies_utils$handleTitle(packetIn);
}
@Unique
private void zombies_utils$handleSound(@NotNull S29PacketSoundEffect packet) {
if (Scoreboard.isNotZombies()) return;
final String soundEffect = packet.getSoundName();
if (!(
soundEffect.equals("mob.wither.spawn")
|| (soundEffect.equals("mob.guardian.curse") && !zombies_utils$alienUfoOpened)
)) return;
zombies_utils$alienUfoOpened = soundEffect.equals("mob.guardian.curse");
try {
if (!Timer.getInstance().isPresent()) {
Timer.instance = new Timer(
Scoreboard.getServerNumber().orElseThrow(Timer.TimerException.ServerNumberException::new),
Map.getMap().orElseThrow(Timer.TimerException.MapException::new),
Scoreboard.getRound()
);
return;
}
final Timer running = Timer.getInstance().get();
final byte round = Scoreboard.getRound();
if (round == 0) {
if (Scoreboard.getLineCount() < 13) Timer.instance = new Timer(
Scoreboard.getServerNumber().orElseThrow(Timer.TimerException.ServerNumberException::new),
Map.getMap().orElseThrow(Timer.TimerException.MapException::new),
round
);
return;
}
if (!running.equalsServerOrNull(Scoreboard.getServerNumber().orElse(null))) {
Timer.instance = new Timer(
Scoreboard.getServerNumber().orElseThrow(Timer.TimerException.ServerNumberException::new),
Map.getMap().orElseThrow(Timer.TimerException.MapException::new),
round
);
return;
}
running.split(round);
} catch (Timer.TimerException e) {
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cFailed to start or split timer. Please send a log to Stachelbeere1248."));
ZombiesUtils.getInstance().getLogger().warn(e);
}
}
@Unique
private void zombies_utils$handleTitle(@NotNull S45PacketTitle packet) {
if (packet.getType() != S45PacketTitle.Type.TITLE) return;
final String message = packet.getMessage().getUnformattedText().trim();
Timer.getInstance().ifPresent(timer -> {
if (Scoreboard.isNotZombies()) return;
if (LanguageSupport.isWin(message)) {
switch (timer.getGameMode().getMap()) {
case DEAD_END:
case BAD_BLOOD:
case PRISON: //TODO: Escape
timer.split((byte) 30);
Timer.dropInstances();
break;
case ALIEN_ARCADIUM:
timer.split((byte) 105);
Timer.dropInstances();
break;
}
} else if (LanguageSupport.isLoss(message)) Timer.dropInstances();
});
}
}

View file

@ -0,0 +1,101 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
import net.minecraft.client.Minecraft;
import net.minecraft.event.ClickEvent;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatStyle;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
public class RecordManager {
private static final String bar = "§l§a▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬";
public static void compareSegment(byte round, short roundTime, @NotNull Category category) throws IndexOutOfBoundsException {
@SuppressWarnings("OptionalGetWithoutIsPresent") final CategoryFile categoryFile = category.getByGameMode(Timer.getInstance().get().getGameMode());
final short bestSegment = categoryFile.getBestSegment(round);
final String timeString = formattedTime(roundTime);
String segmentMessage = bar + "\n§e Category: §d" + category.getName();
String deltaString = "";
if (bestSegment == (short) 0) {
categoryFile.setBestSegment(round, roundTime);
if (ZombiesUtils.getInstance().getConfig().getAnnouncePB())
segmentMessage += "\n§e§l***§6§l NEW BEST SEGMENT! §e§l***";
segmentMessage += "\n§cRound " + round + "§e took §a" + timeString + "§e!";
} else {
if (roundTime < bestSegment) {
if (ZombiesUtils.getInstance().getConfig().getAnnouncePB())
segmentMessage += "\n§e§l***§6§l NEW BEST SEGMENT! §e§l***";
categoryFile.setBestSegment(round, roundTime);
}
deltaString = formattedDelta(roundTime, bestSegment);
segmentMessage += "\n§cRound " + round + "§e took §a" + timeString + " §9" + deltaString;
if (ZombiesUtils.getInstance().getConfig().getCopyDelta()) deltaString = " (" + deltaString + ")";
}
segmentMessage += "\n" + bar;
final ChatComponentText message = new ChatComponentText(segmentMessage);
String copyString = String.format("Round %s took %s%s!", round, timeString, deltaString);
message.setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, copyString)));
Minecraft.getMinecraft().thePlayer.addChatMessage(message);
}
public static void compareBest(byte round, int gameTime, @NotNull Category category) throws IndexOutOfBoundsException {
@SuppressWarnings("OptionalGetWithoutIsPresent") final CategoryFile categoryFile = category.getByGameMode(Timer.getInstance().get().getGameMode());
final int personalBest = categoryFile.getPersonalBest(round);
String deltaString = "";
String bestMessage = bar + "\n§e Category: §d" + category.getName();
final String timeString = formattedTime(gameTime);
if (personalBest == 0) {
categoryFile.setPersonalBest(round, gameTime);
if (ZombiesUtils.getInstance().getConfig().getAnnouncePB())
bestMessage += "\n§e§l***§6§l NEW PERSONAL BEST! §e§l***";
bestMessage += "\n§cRound " + round + "§e finished at §a" + timeString + "§e!";
} else {
if (gameTime < personalBest) {
if (ZombiesUtils.getInstance().getConfig().getAnnouncePB())
bestMessage += "\n§e§l***§6§l NEW PERSONAL BEST! §e§l***";
categoryFile.setPersonalBest(round, gameTime);
}
deltaString = formattedDelta(gameTime, personalBest);
bestMessage += "\n§cRound " + round + "§e finished at §a" + timeString + " §9" + deltaString;
if (ZombiesUtils.getInstance().getConfig().getCopyDelta()) deltaString = " (" + deltaString + ")";
}
bestMessage += "\n" + bar;
final ChatComponentText message = new ChatComponentText(bestMessage);
String copyString = String.format("Round %s finished at %s%s!", round, timeString, deltaString);
message.setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, copyString)));
Minecraft.getMinecraft().thePlayer.addChatMessage(message);
}
@Contract(pure = true)
private static String formattedTime(int gameTime) {
gameTime *= 50;
return String.format("%d:%02d.%d%d",
gameTime / 60000,
(gameTime % 60000) / 1000,
(gameTime % 1000) / 100,
(gameTime % 100) / 10
);
}
@Contract(pure = true)
private static @NotNull String formattedDelta(int newTime, int prevTime) {
final double delta = (double) (newTime - prevTime) / 20;
return String.format("%+.2f", delta);
}
}

View file

@ -0,0 +1,151 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
import com.github.stachelbeere1248.zombiesutils.game.SLA;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.handlers.Round1Correction;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.GameFile;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
import net.minecraftforge.common.MinecraftForge;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
public class Timer {
public static Timer instance;
private final GameMode gameMode;
private final String serverNumber;
private final GameFile gameFile;
public Category category;
private long savedTotalWorldTime;
private int passedRoundsTickSum = 0;
private boolean pbTracking = false;
private int round;
private boolean r1Corrected = false;
/**
* @param serverNumber The game's server the timer should be bound to.
* @param map The map the timer should be started for.
* @param round If available, round to begin splitting.
*/
public Timer(@NotNull String serverNumber, @NotNull Map map, byte round) throws TimerException.ServerNumberException {
this.savedTotalWorldTime = getCurrentTotalWorldTime();
if (!serverNumber.trim().isEmpty()) this.serverNumber = serverNumber.trim();
else throw new Timer.TimerException.ServerNumberException();
this.category = new Category();
this.gameFile = new GameFile(serverNumber.trim(), map);
this.gameMode = new GameMode(map);
this.round = round;
if (ZombiesUtils.getInstance().getConfig().isSlaToggled()) SLA.instance = new SLA(map);
MinecraftForge.EVENT_BUS.register(new Round1Correction());
}
public static Optional<Timer> getInstance() {
return Optional.ofNullable(instance);
}
/**
* Call to invalidate {@link #instance} to trigger the garbage collector
*/
public static void dropInstances() {
instance = null;
}
/**
* The main splitting function.
* Cancels on the second occurring sound-effect, important for {@link RecordManager} to not override values incorrectly.
*
* @param passedRound The round that has been passed.
*/
public void split(byte passedRound) {
final int gameTime = gameTime();
final short roundTime = (short) (gameTime - passedRoundsTickSum);
if ((round == passedRound) || (passedRound == 0) || (roundTime < 100)) {
ZombiesUtils.getInstance().getLogger().debug("SPLIT CANCELLED");
return;
}
try {
record(passedRound, roundTime, gameTime);
} catch (Exception e) {
ZombiesUtils.getInstance().getLogger().error(ExceptionUtils.getStackTrace(e));
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Error saving splits"));
}
passedRoundsTickSum = gameTime;
round = passedRound;
}
public void correctRn() {
if (r1Corrected) return;
savedTotalWorldTime = getCurrentTotalWorldTime() - 200L;
r1Corrected = true;
}
private void record(byte passedRound, short roundTime, int gameTime) {
if (passedRound == (byte) 1) pbTracking = true;
try {
RecordManager.compareSegment(passedRound, roundTime, category);
if (pbTracking) RecordManager.compareBest(passedRound, gameTime, category);
gameFile.setSegment(passedRound, roundTime);
} catch (IndexOutOfBoundsException exception) {
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
String.format("Split not recorded. (invalid round parsed from scoreboard: %s)", passedRound)
));
}
}
private long getCurrentTotalWorldTime() {
if (Minecraft.getMinecraft() == null) return 0;
if (Minecraft.getMinecraft().theWorld == null) return 0;
return Minecraft.getMinecraft().theWorld.getTotalWorldTime();
}
public int gameTime() {
return (int) (getCurrentTotalWorldTime() - savedTotalWorldTime);
}
public short roundTime() {
return (short) (gameTime() - passedRoundsTickSum);
}
/**
* @param serverNumber Servernumber to be compared
* @return false, if and only if input exists and is unequal to {@link #serverNumber}
*/
public boolean equalsServerOrNull(String serverNumber) {
return (serverNumber == null || serverNumber.equals(this.serverNumber) || serverNumber.isEmpty());
}
public void setCategory(Category category) {
this.category = category;
}
public byte getRound() {
return (byte) (round + 1);
}
public GameMode getGameMode() {
return gameMode;
}
public static abstract class TimerException extends Exception {
public static class MapException extends TimerException {
}
public static class ServerNumberException extends TimerException {
}
}
}

View file

@ -0,0 +1,74 @@
package com.github.stachelbeere1248.zombiesutils.timer.recorder;
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.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.CategoryFile;
import org.jetbrains.annotations.NotNull;
import java.io.File;
public class Category {
private static String selectedCategory = ZombiesUtils.getInstance().getConfig().getDefaultCategory();
public final CategoryFile[] categoryFiles = new CategoryFile[10];
private final String name;
public Category() {
final File category;
if (ZombiesUtils.isHypixel()) category = new File(new File("zombies", "splits"), selectedCategory);
else category = new File(new File("zombies", "practise-splits"), selectedCategory);
categoryFiles[0] = new CategoryFile(category, new GameMode(Map.DEAD_END));
categoryFiles[1] = new CategoryFile(category, new GameMode(Map.DEAD_END, Difficulty.HARD));
categoryFiles[2] = new CategoryFile(category, new GameMode(Map.DEAD_END, Difficulty.RIP));
categoryFiles[3] = new CategoryFile(category, new GameMode(Map.BAD_BLOOD));
categoryFiles[4] = new CategoryFile(category, new GameMode(Map.BAD_BLOOD, Difficulty.HARD));
categoryFiles[5] = new CategoryFile(category, new GameMode(Map.BAD_BLOOD, Difficulty.RIP));
categoryFiles[6] = new CategoryFile(category, new GameMode(Map.ALIEN_ARCADIUM));
categoryFiles[7] = new CategoryFile(category, new GameMode(Map.PRISON));
categoryFiles[8] = new CategoryFile(category, new GameMode(Map.PRISON, Difficulty.HARD));
categoryFiles[9] = new CategoryFile(category, new GameMode(Map.PRISON, Difficulty.RIP));
this.name = Category.selectedCategory;
}
public static void setSelectedCategory(String selectedCategory) {
Category.selectedCategory = selectedCategory;
Timer.getInstance().ifPresent(timer -> timer.setCategory(new Category()));
}
public static String[] getCategories() {
File dir;
if (ZombiesUtils.isHypixel()) dir = new File("zombies" + File.separator + "splits");
else dir = new File("zombies" + File.separator + "practise-splits");
if (dir.isDirectory()) return dir.list();
else return new String[0];
}
public CategoryFile getByGameMode(@NotNull GameMode gameMode) {
if (gameMode.is(Map.DEAD_END, Difficulty.NORMAL)) return categoryFiles[0];
else if (gameMode.is(Map.DEAD_END, Difficulty.HARD)) return categoryFiles[1];
else if (gameMode.is(Map.DEAD_END, Difficulty.RIP)) return categoryFiles[2];
else if (gameMode.is(Map.BAD_BLOOD, Difficulty.NORMAL)) return categoryFiles[3];
else if (gameMode.is(Map.BAD_BLOOD, Difficulty.HARD)) return categoryFiles[4];
else if (gameMode.is(Map.BAD_BLOOD, Difficulty.RIP)) return categoryFiles[5];
else if (gameMode.is(Map.ALIEN_ARCADIUM, Difficulty.NORMAL)) return categoryFiles[6];
else if (gameMode.is(Map.PRISON, Difficulty.NORMAL)) return categoryFiles[7];
else if (gameMode.is(Map.PRISON, Difficulty.HARD)) return categoryFiles[8];
else if (gameMode.is(Map.PRISON, Difficulty.RIP)) return categoryFiles[9];
else throw new IllegalStateException("Unexpected value: " + gameMode);
}
public String getName() {
return name;
}
}

View file

@ -28,7 +28,7 @@ public class FileManager {
return gson.fromJson(dataJson, CategoryData.class); return gson.fromJson(dataJson, CategoryData.class);
} }
public static void createDataFile(@NotNull File file, ISplitsData data) { public static void createDataFile(@NotNull SplitsFile file, ISplitsData data) {
try { try {
//noinspection ResultOfMethodCallIgnored //noinspection ResultOfMethodCallIgnored
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
@ -40,7 +40,7 @@ public class FileManager {
} }
} }
public static void writeDataToFile(File file, @NotNull ISplitsData data) throws IOException { public static void writeDataToFile(SplitsFile file, @NotNull ISplitsData data) throws IOException {
FileUtils.writeStringToFile(file, data.toJSON(), StandardCharsets.UTF_16); FileUtils.writeStringToFile(file, data.toJSON(), StandardCharsets.UTF_16);
} }

View file

@ -0,0 +1,16 @@
package com.github.stachelbeere1248.zombiesutils.timer.recorder;
import org.jetbrains.annotations.NotNull;
import java.io.File;
public abstract class SplitsFile extends File {
public SplitsFile(String parent, @NotNull String child) {
super(parent, child);
}
public SplitsFile(File category, String child) {
super(category, child);
}
}

View file

@ -19,12 +19,9 @@ public class CategoryData implements ISplitsData {
break; break;
case DEAD_END: case DEAD_END:
case BAD_BLOOD: case BAD_BLOOD:
bestSegments = new short[30];
personalBests = new int[30];
break;
case PRISON: case PRISON:
bestSegments = new short[30]; bestSegments = new short[30];
personalBests = new int[31]; personalBests = new int[30];
break; break;
default: default:
throw new IllegalStateException("Not a map: " + map); throw new IllegalStateException("Not a map: " + map);
@ -48,8 +45,8 @@ public class CategoryData implements ISplitsData {
return personalBests[index]; return personalBests[index];
} }
public void setBestSegment(int index, int ticks) { public void setBestSegment(int index, short ticks) {
bestSegments[index] = (short) ticks; bestSegments[index] = ticks;
} }
public void setPersonalBest(int index, int ticks) { public void setPersonalBest(int index, int ticks) {

View file

@ -17,10 +17,8 @@ public class GameData implements ISplitsData {
break; break;
case DEAD_END: case DEAD_END:
case BAD_BLOOD: case BAD_BLOOD:
segments = new short[30];
break;
case PRISON: case PRISON:
segments = new short[31]; segments = new short[30];
break; break;
default: default:
throw new IllegalStateException("Not a map: " + map); throw new IllegalStateException("Not a map: " + map);
@ -35,7 +33,7 @@ public class GameData implements ISplitsData {
return gson.toJson(this.segments); return gson.toJson(this.segments);
} }
public void setSegment(int index, int ticks) { public void setSegment(int index, short ticks) {
segments[index] = (short) ticks; segments[index] = ticks;
} }
} }

View file

@ -3,6 +3,7 @@ package com.github.stachelbeere1248.zombiesutils.timer.recorder.files;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.GameMode; import com.github.stachelbeere1248.zombiesutils.game.GameMode;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager; import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.SplitsFile;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.CategoryData; import com.github.stachelbeere1248.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;
@ -11,14 +12,14 @@ import org.jetbrains.annotations.NotNull;
import java.io.File; import java.io.File;
public class CategoryFile extends File { public class CategoryFile extends SplitsFile {
private final CategoryData data; private final CategoryData data;
private final GameMode gameMode; private final GameMode gameMode;
public CategoryFile(File category, @NotNull GameMode gameMode) { public CategoryFile(File category, @NotNull GameMode gameMode) {
// Game-directory -> custom category -> file named "MAP_DIFFICULTY.times" // Game-directory -> custom category -> file named "MAP_DIFFICULTY.times"
// Content encoded in StandardCharsets.UTF_16 // Content encoded in StandardCharsets.UTF_16
super(category, gameMode + ".times"); super(category, gameMode.getMap() + "_" + gameMode.getDifficulty() + ".times");
this.gameMode = gameMode; this.gameMode = gameMode;
this.data = FileManager.categoryReadOrCreate(this); this.data = FileManager.categoryReadOrCreate(this);
} }
@ -27,7 +28,7 @@ public class CategoryFile extends File {
return this.data.getBestSegment(round - 1); return this.data.getBestSegment(round - 1);
} }
public void setBestSegment(int round, int ticks) { public void setBestSegment(int round, short ticks) {
this.data.setBestSegment(round - 1, ticks); this.data.setBestSegment(round - 1, ticks);
try { try {

View file

@ -4,6 +4,7 @@ package com.github.stachelbeere1248.zombiesutils.timer.recorder.files;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils; import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map; import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager; import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.SplitsFile;
import com.github.stachelbeere1248.zombiesutils.timer.recorder.data.GameData; import com.github.stachelbeere1248.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;
@ -15,7 +16,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
public class GameFile extends File { public class GameFile extends SplitsFile {
private final GameData data; private final GameData data;
public GameFile(String serverNumber, Map map) { public GameFile(String serverNumber, Map map) {
@ -30,7 +31,7 @@ public class GameFile extends File {
return dateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '-').replaceFirst("T", "_"); return dateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '-').replaceFirst("T", "_");
} }
public void setSegment(int round, int ticks) { public void setSegment(int round, short ticks) {
this.data.setSegment(round - 1, ticks); this.data.setSegment(round - 1, ticks);
try { try {

View file

@ -7,7 +7,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("SpellCheckingInspection") @SuppressWarnings("SpellCheckingInspection")
public class LanguageSupport { public class LanguageSupport {
private static final String[] LANGUAGES = { private static final String[] LANGUAGEs = {
"EN", "EN",
"FR", "FR",
"DE" "DE"
@ -52,13 +52,6 @@ public class LanguageSupport {
return Arrays.stream(words).anyMatch(input::contains); return Arrays.stream(words).anyMatch(input::contains);
} }
public static boolean isHelicopterIncoming(@NotNull String input) {
final String[] words = {
"The Helicopter is on its way! Hold out for 120 more seconds!"
};
return Arrays.stream(words).anyMatch(input::contains);
}
public static @NotNull Pattern roundPattern(@NotNull String language) { public static @NotNull Pattern roundPattern(@NotNull String language) {
switch (language) { switch (language) {
case "EN": case "EN":
@ -72,7 +65,20 @@ public class LanguageSupport {
} }
} }
public static @NotNull Pattern mapPattern(@NotNull String language) {
switch (language) {
case "EN":
return Pattern.compile("Map:.*(Dead End|Bad Blood|Alien Arcadium|Prison)");
case "FR":
return Pattern.compile("Carte:.*(Dead End|Bad Blood|Alien Arcadium|Prison)");
case "DE":
return Pattern.compile("Karte:.*(Dead End|Bad Blood|Alien Arcadium|Prison)");
default:
throw new IllegalStateException("Unexpected value: " + language);
}
}
public static String[] getLanguages() { public static String[] getLanguages() {
return LANGUAGES; return LANGUAGEs;
} }
} }

View file

@ -57,7 +57,7 @@ public class Scoreboard {
} }
} }
public static int getRound() { public static byte getRound() {
String line; String line;
try { try {
line = lines.get(2); line = lines.get(2);
@ -91,6 +91,39 @@ public class Scoreboard {
return Optional.ofNullable(string); return Optional.ofNullable(string);
} }
/* Outdated
public static Optional<Map> getMap() {
String line;
try {
line = lines.get(12); //This was changed!
} catch (Exception couldBePregame) {
try {
line = lines.get(2);
} catch (IndexOutOfBoundsException | NullPointerException ignored) {
return Optional.empty();
}
}
final Pattern MAP_PATTERN = LanguageSupport.mapPattern(ZombiesUtils.getInstance().getConfig().getLanguage());
String mapString = MAP_PATTERN.matcher(line).replaceAll("$1");
switch (mapString) {
case "Dead End":
return Optional.of(Map.DEAD_END);
case "Bad Blood":
return Optional.of(Map.BAD_BLOOD);
case "Alien Arcadium":
return Optional.of(Map.ALIEN_ARCADIUM);
case "Prison":
return Optional.of(Map.PRISON);
default:
return Optional.empty();
}
}
*/
public static int getLineCount() {
return lines.size();
}
public static boolean isNotZombies() { public static boolean isNotZombies() {
return (!"ZOMBIES".equals(title)); return (!"ZOMBIES".equals(title));
} }

View file

@ -1,22 +0,0 @@
package com.github.stachelbeere1248.zombiesutils;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Optional;
public class ResourceLoader {
public static Optional<JsonElement> readJsonResource(final String resourcePath) {
ResourceLocation resourceLocation = new ResourceLocation("zombiesutils", resourcePath);
try (Reader reader = new InputStreamReader(Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation).getInputStream())) {
return Optional.ofNullable(new JsonParser().parse(reader));
} catch (Exception e) {
ZombiesUtils.getInstance().getLogger().error(e.fillInStackTrace());
return Optional.empty();
}
}
}

View file

@ -1,57 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.game;
import com.github.stachelbeere1248.zombiesutils.ResourceLoader;
import com.github.stachelbeere1248.zombiesutils.game.waves.Round;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import org.jetbrains.annotations.NotNull;
public class GameData {
private final Round[][] roundData;
public GameData() {
roundData = new Round[10][];
roundData[0] = readFromFile("data/rounds/DEAD_END_NORMAL.json");
roundData[1] = readFromFile("data/rounds/DEAD_END_HARD.json");
roundData[2] = readFromFile("data/rounds/DEAD_END_RIP.json");
roundData[3] = readFromFile("data/rounds/BAD_BLOOD_NORMAL.json");
roundData[4] = readFromFile("data/rounds/BAD_BLOOD_HARD.json");
roundData[5] = readFromFile("data/rounds/BAD_BLOOD_RIP.json");
roundData[6] = readFromFile("data/rounds/ALIEN_ARCADIUM.json");
roundData[7] = readFromFile("data/rounds/PRISON_NORMAL.json");
roundData[8] = readFromFile("data/rounds/PRISON_HARD.json");
roundData[9] = readFromFile("data/rounds/PRISON_RIP.json");
}
public Round getRound(@NotNull GameMode gameMode, int round) {
switch (gameMode) {
case DEAD_END:
return roundData[0][round - 1];
case DEAD_END_HARD:
return roundData[1][round - 1];
case DEAD_END_RIP:
return roundData[2][round - 1];
case BAD_BLOOD:
return roundData[3][round - 1];
case BAD_BLOOD_HARD:
return roundData[4][round - 1];
case BAD_BLOOD_RIP:
return roundData[5][round - 1];
case ALIEN_ARCADIUM:
return roundData[6][round - 1];
case PRISON:
return roundData[7][round - 1];
case PRISON_HARD:
return roundData[8][round - 1];
case PRISON_RIP:
return roundData[9][round - 1];
default:
throw new IllegalStateException("Invalid GameMode: " + gameMode);
}
}
private Round[] readFromFile(final String resourcePath) {
final JsonElement roundsJsonElement = ResourceLoader.readJsonResource(resourcePath).orElseThrow(RuntimeException::new);
return new Gson().fromJson(roundsJsonElement, Round[].class);
}
}

View file

@ -1,84 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.game;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
public enum GameMode {
DEAD_END(Map.DEAD_END, Difficulty.NORMAL), DEAD_END_HARD(Map.DEAD_END, Difficulty.HARD), DEAD_END_RIP(Map.DEAD_END, Difficulty.RIP),
BAD_BLOOD(Map.BAD_BLOOD, Difficulty.NORMAL), BAD_BLOOD_HARD(Map.BAD_BLOOD, Difficulty.HARD), BAD_BLOOD_RIP(Map.BAD_BLOOD, Difficulty.RIP),
ALIEN_ARCADIUM(Map.ALIEN_ARCADIUM, Difficulty.NORMAL),
PRISON(Map.PRISON, Difficulty.NORMAL), PRISON_HARD(Map.PRISON, Difficulty.HARD), PRISON_RIP(Map.PRISON, Difficulty.RIP);
private final Map map;
private final Difficulty difficulty;
GameMode(final @NotNull Map map, final @NotNull Difficulty difficulty) {
this.map = map;
this.difficulty = difficulty;
}
@Contract(pure = true)
public static GameMode getNormalForMap(final @NotNull Map map) {
switch (map) {
case DEAD_END:
return DEAD_END;
case BAD_BLOOD:
return BAD_BLOOD;
case ALIEN_ARCADIUM:
return ALIEN_ARCADIUM;
case PRISON:
return PRISON;
default:
throw new IllegalStateException("Unexpected value: " + map);
}
}
public Map getMap() {
return this.map;
}
public Difficulty getDifficulty() {
return this.difficulty;
}
public GameMode appliedDifficulty(final Difficulty difficulty) {
switch (this.map) {
case DEAD_END:
switch (difficulty) {
case NORMAL:
return DEAD_END;
case HARD:
return DEAD_END_HARD;
case RIP:
return DEAD_END_RIP;
}
case BAD_BLOOD:
switch (difficulty) {
case NORMAL:
return BAD_BLOOD;
case HARD:
return BAD_BLOOD_HARD;
case RIP:
return BAD_BLOOD_RIP;
}
case PRISON:
switch (difficulty) {
case NORMAL:
return PRISON;
case HARD:
return PRISON_HARD;
case RIP:
return PRISON_RIP;
}
case ALIEN_ARCADIUM:
return ALIEN_ARCADIUM;
default:
throw new IllegalStateException("Invalid Map: " + this.map);
}
}
public boolean isMap(Map map) {
return this.getMap() == map;
}
}

View file

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

View file

@ -1,21 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.game.waves;
public class Round {
private final Wave[] waves;
public Round(final Wave[] waves) {
this.waves = waves;
}
public Wave[] getWaves() {
return waves;
}
public short[] getWaveTimes() {
short[] ret = new short[waves.length];
for (int i = 0; i < waves.length; i++) {
ret[i] = waves[i].getTime();
}
return ret;
}
}

View file

@ -1,25 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.game.waves;
@SuppressWarnings("DuplicatedCode")
public class Wave {
private final short ticks;
private final Prefix[] prefixes;
public Wave(final short ticks, final Prefix[] prefixes) {
this.ticks = ticks;
this.prefixes = prefixes;
}
public Wave(final short ticks) {
this.ticks = ticks;
this.prefixes = new Prefix[]{ Prefix.WINDOW };
}
public short getTime() {
return this.ticks;
}
public Prefix[] getPrefixes() {
return this.prefixes;
}
}

View file

@ -1,34 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.game.waves;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
import net.minecraft.client.Minecraft;
import java.util.Arrays;
public class WaveTiming {
public static int rl = 0;
public static void onTick() {
if (Scoreboard.isNotZombies()) return;
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
game -> {
short[] waves = ZombiesUtils.getInstance().getGameData().getRound(game.getGameMode(), game.getRound()).getWaveTimes();
final int roundTime = game.getTimer().getRoundTime();
final int[] auditory = ZombiesUtils.getInstance().getConfig().getAuditory();
for (short wave : waves) {
wave = (short) (wave + rl);
final Integer pre = roundTime - wave;
if (Arrays.stream(auditory).anyMatch(pre::equals)) {
Minecraft.getMinecraft().thePlayer.playSound("note.pling", 1, 2);
}
}
}
);
}
public static void toggleRL() {
if (rl == 0) rl = ZombiesUtils.getInstance().getConfig().getOffset();
else rl = 0;
}
}

View file

@ -1,35 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.utils.LanguageSupport;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
import java.util.regex.Pattern;
public class ChatHandler {
private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("§[0-9A-FK-ORZ]", Pattern.CASE_INSENSITIVE);
public ChatHandler() {
}
@SubscribeEvent
public void difficultyChange(@NotNull final ClientChatReceivedEvent event) {
if (event.message.getUnformattedText().contains(":")) return;
final String message = STRIP_COLOR_PATTERN.matcher(event.message.getUnformattedText()).replaceAll("").trim();
if (LanguageSupport.containsHard(message)) {
ZombiesUtils.getInstance().getGameManager().setDifficulty(Difficulty.HARD);
} else if (LanguageSupport.containsRIP(message)) {
ZombiesUtils.getInstance().getGameManager().setDifficulty(Difficulty.RIP);
} else {
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(
game -> {
if (LanguageSupport.isHelicopterIncoming(message)) game.helicopter();
}
);
}
}
}

View file

@ -1,43 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.Vec3;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
public class RenderPlayerHandler {
private boolean visible;
public RenderPlayerHandler() {
this.visible = ZombiesUtils.getInstance().getConfig().getPlayerVis();
}
@SubscribeEvent
public void onRender(RenderPlayerEvent.@NotNull Pre event) {
if (event.entityPlayer.isPlayerSleeping() || event.entityPlayer.isUser()) return;
if (inRange(event.entityPlayer.getPositionVector())) {
event.setCanceled(!visible);
}
}
private boolean inRange(@NotNull Vec3 playerOther) {
final int range = ZombiesUtils.getInstance().getConfig().getPlayerVisRange();
return playerOther.squareDistanceTo(Minecraft.getMinecraft().thePlayer.getPositionVector()) <= range * range;
}
public void togglePlayerVisibility() {
this.visible = !this.visible;
final String s;
if (this.visible) {
s = "§dPlayer Visibility §e is now §rON";
} else {
s = "§dPlayer Visibility §e is now §8OFF";
}
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
s
));
}
}

View file

@ -1,36 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.handlers;
import com.github.stachelbeere1248.zombiesutils.timer.Timer;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
public class Round1Correction {
private final Timer timer;
private final String serverNumber;
public Round1Correction(Timer timer, String serverNumber) {
this.timer = timer;
this.serverNumber = serverNumber;
}
@SubscribeEvent
public void onWaveSpawn(@NotNull EntityJoinWorldEvent event) {
if (!(event.entity instanceof EntityZombie)) return;
if (Scoreboard.isNotZombies()) return;
final Optional<String> s = Scoreboard.getServerNumber();
if (!s.isPresent()) return;
if (!s.get().equals(serverNumber)) {
MinecraftForge.EVENT_BUS.unregister(this);
return;
}
this.timer.correctStartTick();
MinecraftForge.EVENT_BUS.unregister(this);
}
}

View file

@ -1,188 +0,0 @@
package xyz.stachel.zombiesutils.init;
import org.spongepowered.asm.lib.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
/**
* A mixin plugin to automatically discover all mixins in the current JAR.
* <p>
* This mixin plugin automatically scans your entire JAR (or class directory, in case of an in-IDE launch) for classes inside of your
* mixin package and registers those. It does this recursively for sub packages of the mixin package as well. This means you will need
* to only have mixin classes inside of your mixin package, which is good style anyway.
*
* @author Linnea Gräf
*/
public class AutoDiscoveryMixinPlugin implements IMixinConfigPlugin {
private static final List<AutoDiscoveryMixinPlugin> mixinPlugins = new ArrayList<>();
public static List<AutoDiscoveryMixinPlugin> getMixinPlugins() {
return mixinPlugins;
}
private String mixinPackage;
@Override
public void onLoad(String mixinPackage) {
this.mixinPackage = mixinPackage;
mixinPlugins.add(this);
}
/**
* Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root.
* In either case the return value of this + the class name will resolve back to the original class url, or to other
* class urls for other classes.
*/
public URL getBaseUrlForClassUrl(URL classUrl) {
String string = classUrl.toString();
if (classUrl.getProtocol().equals("jar")) {
try {
return new URL(string.substring(4).split("!")[0]);
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
if (string.endsWith(".class")) {
try {
return new URL(string.replace("\\", "/")
.replace(getClass().getCanonicalName()
.replace(".", "/") + ".class", ""));
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
return classUrl;
}
/**
* Get the package that contains all the mixins. This value is set by mixin itself using {@link #onLoad}.
*/
public String getMixinPackage() {
return mixinPackage;
}
/**
* Get the path inside the class root to the mixin package
*/
public String getMixinBaseDir() {
return mixinPackage.replace(".", "/");
}
/**
* A list of all discovered mixins.
*/
private List<String> mixins = null;
/**
* Try to add mixin class ot the mixins based on the filepath inside of the class root.
* Removes the {@code .class} file suffix, as well as the base mixin package.
* <p><b>This method cannot be called after mixin initialization.</p>
*
* @param className the name or path of a class to be registered as a mixin.
*/
public void tryAddMixinClass(String className) {
String norm = (className.endsWith(".class") ? className.substring(0, className.length() - ".class".length()) : className)
.replace("\\", "/")
.replace("/", ".");
if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".")) {
mixins.add(norm.substring(getMixinPackage().length() + 1));
}
}
/**
* Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()}
*/
@Override
public List<String> getMixins() {
if (mixins != null) return mixins;
System.out.println("Trying to discover mixins");
mixins = new ArrayList<>();
URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation();
System.out.println("Found classes at " + classUrl);
Path file;
try {
file = Paths.get(getBaseUrlForClassUrl(classUrl).toURI());
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
System.out.println("Base directory found at " + file);
if (Files.isDirectory(file)) {
walkDir(file);
} else {
walkJar(file);
}
System.out.println("Found mixins: " + mixins);
return mixins;
}
/**
* Search through directory for mixin classes based on {@link #getMixinBaseDir}.
*
* @param classRoot The root directory in which classes are stored for the default package.
*/
private void walkDir(Path classRoot) {
System.out.println("Trying to find mixins from directory");
try (Stream<Path> classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) {
classes.map(it -> classRoot.relativize(it).toString())
.forEach(this::tryAddMixinClass);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
/**
* Read through a JAR file, trying to find all mixins inside.
*/
private void walkJar(Path file) {
System.out.println("Trying to find mixins from jar file");
try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) {
ZipEntry next;
while ((next = zis.getNextEntry()) != null) {
tryAddMixinClass(next.getName());
zis.closeEntry();
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
@Override
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
@Override
public String getRefMapperConfig() {
return null;
}
@Override
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
return true;
}
@Override
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
}
}

View file

@ -1,67 +0,0 @@
package com.github.stachelbeere1248.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 net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.network.play.server.S29PacketSoundEffect;
import net.minecraft.network.play.server.S45PacketTitle;
import net.minecraft.util.ChatComponentText;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(NetHandlerPlayClient.class)
public class MixinNetHandlerPlayClient {
@Unique
private boolean zombies_utils$alienUfoOpened;
@Inject(method = "handleSoundEffect", at = @At(value = "HEAD"))
private void handleSound(S29PacketSoundEffect packetIn, CallbackInfo ci) {
zombies_utils$handleSound(packetIn);
}
@Inject(method = "handleTitle", at = @At(value = "HEAD"))
private void handleTitle(S45PacketTitle packetIn, CallbackInfo ci) {
zombies_utils$handleTitle(packetIn);
}
@Unique
private void zombies_utils$handleSound(@NotNull S29PacketSoundEffect packet) {
if (Scoreboard.isNotZombies()) return;
final String soundEffect = packet.getSoundName();
if (!(
soundEffect.equals("mob.wither.spawn")
|| (soundEffect.equals("mob.guardian.curse")
&& !zombies_utils$alienUfoOpened)
)) return;
zombies_utils$alienUfoOpened = soundEffect.equals("mob.guardian.curse");
try {
ZombiesUtils.getInstance().getGameManager().splitOrNew(Scoreboard.getRound());
} catch (ScoardboardException | InvalidMapException e) {
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cFailed to start or split timer. Please send a log to Stachelbeere1248."));
ZombiesUtils.getInstance().getLogger().error(e.fillInStackTrace());
}
}
@Unique
private void zombies_utils$handleTitle(@NotNull S45PacketTitle packet) {
if (packet.getType() != S45PacketTitle.Type.TITLE) return;
if (Scoreboard.isNotZombies()) return;
final String message = packet.getMessage().getUnformattedText().trim();
String serverNumber;
serverNumber = Scoreboard.getServerNumber().orElse("");
if (LanguageSupport.isWin(message)) ZombiesUtils.getInstance().getGameManager().endGame(serverNumber, true);
if (LanguageSupport.isLoss(message)) ZombiesUtils.getInstance().getGameManager().endGame(serverNumber, false);
}
}

View file

@ -1,129 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import com.github.stachelbeere1248.zombiesutils.game.GameMode;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.game.windows.SLA;
import com.github.stachelbeere1248.zombiesutils.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 net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
import net.minecraftforge.common.MinecraftForge;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull;
public class Game {
private final Timer timer;
private final GameFile gameFile;
private final boolean roundOneRecorded;
private GameMode gameMode;
private Category category;
private int round;
private boolean escaping;
public Game(@NotNull final Map map, final String serverNumber) {
this.gameMode = GameMode.getNormalForMap(map);
this.timer = new Timer();
this.gameFile = new GameFile(serverNumber, map);
this.category = new Category();
this.round = 1;
this.roundOneRecorded = true;
MinecraftForge.EVENT_BUS.register(new Round1Correction(this.timer, serverNumber));
if (ZombiesUtils.getInstance().getConfig().isSlaToggled()) SLA.instance = new SLA(map);
}
public Game(@NotNull final Map map, final String serverNumber, final int round) {
this.gameMode = GameMode.getNormalForMap(map);
this.timer = new Timer();
this.gameFile = new GameFile(serverNumber, map);
this.category = new Category();
this.round = round;
this.roundOneRecorded = (round == 1);
MinecraftForge.EVENT_BUS.register(new Round1Correction(this.timer, serverNumber));
if (ZombiesUtils.getInstance().getConfig().isSlaToggled()) SLA.instance = new SLA(map);
}
public Timer getTimer() {
return this.timer;
}
public void setCategory(Category category) {
this.category = category;
}
public void changeDifficulty(final Difficulty difficulty) {
this.gameMode = this.gameMode.appliedDifficulty(difficulty);
}
public int getRound() {
return round;
}
public GameMode getGameMode() {
return gameMode;
}
public void pass(int round) {
if ((round == 0) || (this.round == round + 1) || (this.timer.getRoundTime() < 100)) {
ZombiesUtils.getInstance().getLogger().debug("SPLIT CANCELLED");
return;
}
try {
record();
} catch (Exception e) {
ZombiesUtils.getInstance().getLogger().error(ExceptionUtils.getStackTrace(e));
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cError recording splits"));
}
this.timer.split();
this.round = round + 1;
}
public void helicopter() {
if (!gameMode.isMap(Map.PRISON)) {
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cEscaping without playing prison???"));
ZombiesUtils.getInstance().getLogger().error(Thread.currentThread().getStackTrace());
return;
}
this.escaping = true;
this.pass(30);
}
private void record() {
this.compareSegment();
if (this.roundOneRecorded) this.compareBest();
this.gameFile.setSegment(this.round, this.timer.getRoundTime());
}
public void compareSegment() throws IndexOutOfBoundsException {
if (this.escaping) return;
final CategoryFile categoryFile = this.category.getByGameMode(this.gameMode);
final short bestSegment = categoryFile.getBestSegment(round);
final int roundTime = this.getTimer().getRoundTime();
if (bestSegment == (short) 0) categoryFile.setBestSegment(round, roundTime);
else if (roundTime < bestSegment) categoryFile.setBestSegment(round, roundTime);
final RecordMessageSender recordMessageSender = new RecordMessageSender(this.category.getName(), round, roundTime, bestSegment);
recordMessageSender.roundSplit();
recordMessageSender.sendRecordMessage();
}
public void compareBest() throws IndexOutOfBoundsException {
final CategoryFile categoryFile = this.category.getByGameMode(this.gameMode);
final int round = this.escaping ? 31 : this.round;
final int personalBest = categoryFile.getPersonalBest(round);
final int gameTime = this.timer.getGameTime();
if (personalBest == 0) categoryFile.setPersonalBest(round, gameTime);
else if (gameTime < personalBest) categoryFile.setPersonalBest(round, gameTime);
final RecordMessageSender recordMessageSender = new RecordMessageSender(category.getName(), round, gameTime, personalBest);
if (!escaping) recordMessageSender.gameSplit();
else recordMessageSender.helicopterSplit();
recordMessageSender.sendRecordMessage();
}
}

View file

@ -1,78 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import com.github.stachelbeere1248.zombiesutils.game.enums.Difficulty;
import com.github.stachelbeere1248.zombiesutils.game.enums.Map;
import com.github.stachelbeere1248.zombiesutils.utils.InvalidMapException;
import com.github.stachelbeere1248.zombiesutils.utils.ScoardboardException;
import com.github.stachelbeere1248.zombiesutils.utils.Scoreboard;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Optional;
import java.util.Set;
public class GameManager {
private final HashMap<String, Game> GAMES;
private Optional<Difficulty> queuedDifficulty = Optional.empty();
private String queuedDifficultyServer = "INVALID";
public GameManager() {
GAMES = new HashMap<>();
}
public Optional<Game> getGame() {
return Scoreboard.getServerNumber().map(GAMES::get);
}
public void endGame(final String serverNumber, final boolean isWin) {
if (!GAMES.containsKey(serverNumber)) return;
final Game game = GAMES.get(serverNumber);
if (isWin) {
switch (game.getGameMode().getMap()) {
case DEAD_END:
case BAD_BLOOD:
case PRISON:
game.pass(30);
break;
case ALIEN_ARCADIUM:
game.pass(105);
break;
}
}
GAMES.remove(serverNumber);
}
public void splitOrNew(int round) throws ScoardboardException, InvalidMapException {
final String serverNumber = Scoreboard.getServerNumber().orElseThrow(ScoardboardException::new);
if (GAMES.containsKey(serverNumber)) {
if (round == 0) newGame(serverNumber);
else GAMES.get(serverNumber).pass(round);
} else newGame(serverNumber);
}
private void newGame(@NotNull String serverNumber) throws InvalidMapException {
final Game game = new Game(Map.getMap().orElseThrow(InvalidMapException::new), serverNumber);
if (serverNumber.equals(queuedDifficultyServer)) {
this.queuedDifficulty.ifPresent(game::changeDifficulty);
}
this.queuedDifficulty = Optional.empty();
this.GAMES.put(serverNumber, game);
}
public void setDifficulty(@NotNull Difficulty difficulty) {
this.queuedDifficultyServer = Scoreboard.getServerNumber().orElse("INVALID");
if (this.GAMES.containsKey(this.queuedDifficultyServer)) {
this.GAMES.get(this.queuedDifficultyServer).changeDifficulty(difficulty);
} else this.queuedDifficulty = Optional.of(difficulty);
}
public Set<String> getGames() {
return this.GAMES.keySet();
}
public void killAll() {
GAMES.clear();
}
}

View file

@ -1,104 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import com.github.stachelbeere1248.zombiesutils.ZombiesUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.event.ClickEvent;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatStyle;
import org.jetbrains.annotations.Contract;
public class RecordMessageSender {
private final StringBuilder recordMessage;
private final int newTime;
private final int oldTime;
private final int round;
private final String deltaString;
private final String timeString;
private String copyString;
public RecordMessageSender(final String categoryName, final int round, final int newTime, final int oldTime) {
this.recordMessage = new StringBuilder(
"§l§a▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬\n§e Category: §d" + categoryName
);
this.newTime = newTime;
this.oldTime = oldTime;
this.deltaString = oldTime != 0 ? " " + formattedDelta(newTime, oldTime) : "";
this.timeString = formattedTime(newTime);
this.round = round;
}
public void sendRecordMessage() {
final ChatComponentText message = new ChatComponentText(
this.recordMessage
.append("\n§l§a▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬")
.toString()
);
message.setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, this.copyString)));
Minecraft.getMinecraft().thePlayer.addChatMessage(message);
}
public void gameSplit() {
final String announcement = newTime < oldTime && ZombiesUtils.getInstance().getConfig().getAnnouncePB() ?
"\n§e§l***§6§l NEW PERSONAL BEST! §e§l***" : "";
this.recordMessage.append(announcement)
.append("\n§cRound ")
.append(round)
.append("§e finished at §a")
.append(timeString)
.append("§9")
.append(deltaString)
.append("§e!");
this.copyString = deltaString.isEmpty() ?
String.format("Round %d finished at %s!", round, timeString) :
String.format("Round %d finished at %s (%s)!", round, timeString, deltaString);
}
public void roundSplit() {
final String announcement = newTime < oldTime && ZombiesUtils.getInstance().getConfig().getAnnouncePB() ?
"\n§e§l***§6§l NEW BEST SEGMENT! §e§l***" : "";
final String timeString = formattedTime(newTime);
final String deltaString = oldTime != 0 ? formattedDelta(newTime, oldTime) : "";
this.recordMessage.append(announcement)
.append("\n§cRound ")
.append(round)
.append("§e took §a")
.append(timeString)
.append("§9")
.append(deltaString)
.append("§e!");
this.copyString = deltaString.isEmpty() ?
String.format("Round %d took %s!", round, timeString) :
String.format("Round %d took %s (%s)!", round, timeString, deltaString);
}
public void helicopterSplit() {
final String announcement = newTime < oldTime && ZombiesUtils.getInstance().getConfig().getAnnouncePB() ?
"\n§e§l***§6§l NEW PERSONAL BEST! §e§l***" : "";
this.recordMessage.append(announcement)
.append("\n§8§lHelicopter §r§ecalled at §a")
.append(timeString)
.append("§9")
.append(deltaString)
.append("§e!");
this.copyString = deltaString.isEmpty() ?
String.format("Helicopter called at %s!", timeString) :
String.format("Helicopter called at %s (%s)!", timeString, deltaString);
}
@Contract(pure = true)
private String formattedTime(int time) {
time *= 50;
return String.format("%d:%02d.%d%d",
time / 60000,
(time % 60000) / 1000,
(time % 1000) / 100,
(time % 100) / 10
);
}
@Contract(pure = true)
private String formattedDelta(int newTime, int oldTime) {
final double delta = (double) (newTime - oldTime) / 20;
return String.format("%+.2f", delta);
}
}

View file

@ -1,35 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.timer;
import net.minecraft.client.Minecraft;
public class Timer {
private long startTick;
private int roundStart;
public Timer() {
this.startTick = this.getCurrentTick();
}
public void correctStartTick() {
this.startTick = this.getCurrentTick() - 200;
}
void split() {
this.roundStart = this.getGameTime();
}
public int getGameTime() {
return (int) (getCurrentTick() - startTick);
}
public short getRoundTime() {
return (short) (getGameTime() - roundStart);
}
private long getCurrentTick() {
if (Minecraft.getMinecraft() == null || Minecraft.getMinecraft().theWorld == null) return 0;
return Minecraft.getMinecraft().theWorld.getTotalWorldTime();
}
}

View file

@ -1,79 +0,0 @@
package com.github.stachelbeere1248.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 org.jetbrains.annotations.NotNull;
import java.io.File;
public class Category {
private static String selectedCategory = ZombiesUtils.getInstance().getConfig().getDefaultCategory();
public final CategoryFile[] categoryFiles = new CategoryFile[10];
private final String name;
public Category() {
final File category;
if (ZombiesUtils.isHypixel()) category = new File(new File("zombies", "splits"), selectedCategory);
else category = new File(new File("zombies", "practise-splits"), selectedCategory);
categoryFiles[0] = new CategoryFile(category, GameMode.DEAD_END);
categoryFiles[1] = new CategoryFile(category, GameMode.DEAD_END_HARD);
categoryFiles[2] = new CategoryFile(category, GameMode.DEAD_END_RIP);
categoryFiles[3] = new CategoryFile(category, GameMode.BAD_BLOOD);
categoryFiles[4] = new CategoryFile(category, GameMode.BAD_BLOOD_HARD);
categoryFiles[5] = new CategoryFile(category, GameMode.BAD_BLOOD_RIP);
categoryFiles[6] = new CategoryFile(category, GameMode.ALIEN_ARCADIUM);
categoryFiles[7] = new CategoryFile(category, GameMode.PRISON);
categoryFiles[8] = new CategoryFile(category, GameMode.PRISON_HARD);
categoryFiles[9] = new CategoryFile(category, GameMode.PRISON_RIP);
this.name = Category.selectedCategory;
}
public static void setSelectedCategory(String selectedCategory) {
Category.selectedCategory = selectedCategory;
ZombiesUtils.getInstance().getGameManager().getGame().ifPresent(game -> game.setCategory(new Category()));
}
public static String[] getCategories() {
File dir;
if (ZombiesUtils.isHypixel()) dir = new File("zombies" + File.separator + "splits");
else dir = new File("zombies" + File.separator + "practise-splits");
if (dir.isDirectory()) return dir.list();
else return new String[0];
}
public CategoryFile getByGameMode(@NotNull GameMode gameMode) {
switch (gameMode) {
case DEAD_END:
return categoryFiles[0];
case DEAD_END_HARD:
return categoryFiles[1];
case DEAD_END_RIP:
return categoryFiles[2];
case BAD_BLOOD:
return categoryFiles[3];
case BAD_BLOOD_HARD:
return categoryFiles[4];
case BAD_BLOOD_RIP:
return categoryFiles[5];
case ALIEN_ARCADIUM:
return categoryFiles[6];
case PRISON:
return categoryFiles[7];
case PRISON_HARD:
return categoryFiles[8];
case PRISON_RIP:
return categoryFiles[9];
default:
throw new IllegalStateException("Unexpected value: " + gameMode);
}
}
public String getName() {
return name;
}
}

View file

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

View file

@ -1,6 +0,0 @@
package com.github.stachelbeere1248.zombiesutils.utils;
public class ScoardboardException extends Exception {
public ScoardboardException() {
}
}

View file

@ -1,2 +0,0 @@
public net.minecraft.client.renderer.GlStateManager$Color

View file

@ -1,692 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"HBM",
"WINDOW"
]
}
]
}
]

View file

@ -1,687 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
}
]

View file

@ -1,697 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"SLIME"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"SLIME"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"WITHER_SKELETON"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"WITHER_SKELETON",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"WITHER_SKELETON",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"HBM"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"HBM",
"BOSS"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW",
"HBM",
"BOSS"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW",
"HBM"
]
}
]
}
]

View file

@ -1,658 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 960,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BLAZES"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 920,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BLAZES"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 980,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 720,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
}
]

View file

@ -1,655 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 960,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BLAZES"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 920,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BLAZES"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 980,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 720,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
}
]

View file

@ -1,663 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 760,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 960,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BLAZES"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 920,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 940,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 980,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 860,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 460,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 720,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 880,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW",
"BOSS"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW",
"BOSS"
]
}
]
}
]

View file

@ -1,738 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"CELL"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"CELL",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 900,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"BOSS",
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 0,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 300,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1200,
"prefixes": [
"BOSS",
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1800,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 2100,
"prefixes": [
"WINDOW"
]
}
]
}
]

View file

@ -1,738 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"CELL"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"CELL",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 900,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"BOSS",
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 0,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 300,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1200,
"prefixes": [
"BOSS",
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1800,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 2100,
"prefixes": [
"WINDOW"
]
}
]
}
]

View file

@ -1,738 +0,0 @@
[
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"CELL"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 340,
"prefixes": [
"CELL"
]
},
{
"ticks": 480,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 620,
"prefixes": [
"CELL",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"POLICE"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"CELL",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW",
"CELL"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW",
"CELL"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"CELL",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"CELL"
]
},
{
"ticks": 900,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW",
"POLICE"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 680,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 740,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 440,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 840,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"BOSS",
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 400,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 700,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 800,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1000,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1100,
"prefixes": [
"WINDOW"
]
}
]
},
{
"waves": [
{
"ticks": 200,
"prefixes": [
"BOSS"
]
}
]
},
{
"waves": [
{
"ticks": 0,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 300,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 600,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 900,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1200,
"prefixes": [
"BOSS",
"WINDOW"
]
},
{
"ticks": 1500,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 1800,
"prefixes": [
"WINDOW"
]
},
{
"ticks": 2100,
"prefixes": [
"WINDOW"
]
}
]
}
]

View file

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

View file

@ -1,8 +1,11 @@
{ {
"package": "${basePackage}.mixin", "package": "com.github.stachelbeere1248.zombiesutils.mixin",
"plugin": "${basePackage}.init.AutoDiscoveryMixinPlugin",
"refmap": "mixins.${modid}.refmap.json", "refmap": "mixins.${modid}.refmap.json",
"minVersion": "0.7", "minVersion": "0.7",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"__comment": "You do not need to manually register mixins in this template. Check the auto discovery mixin plugin for more info." "mixins": [
],
"client": [
"MixinNetHandlerPlayClient"
]
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

View file

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