Stachelbeere1248/zombies-utils
1
Fork 0
Code Issues 2 Pull requests Releases 23 Wiki Activity Actions

finish v1.2.0

Browse source
This commit is contained in:
Stachelbeere1248 2023-11-26 18:35:56 +01:00
parent a3aaef41df
commit 1a888e0457
4 changed files with 7 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/github/stachelbeere1248/zombiesutils/config/ZombiesUtilsConfig.java
View file

@ -50,7 +50,7 @@ public class ZombiesUtilsConfig {
-28,
-200,
200,
"max: 200 ticks"
"ticks to be added to the wave spawn time"
);
shortSpawntime = config.getBoolean(
"passed wave spawns",

4
src/main/java/com/github/stachelbeere1248/zombiesutils/handlers/ChatHandler.java
View file

@ -26,10 +26,8 @@ public class ChatHandler {
if (message.contains("Hard Difficulty") || message.contains("困难") || message.contains("困難")) {
gameMode.changeDifficulty(Difficulty.HARD);
ZombiesUtils.getInstance().getLogger().debug("Changed to Hard");
} else if (message.contains("RIP Difficulty") || message.contains("安息") || message.contains("RIP")) {
} else if (message.contains("RIP") || message.contains("安息")) {
gameMode.changeDifficulty(Difficulty.RIP);
ZombiesUtils.getInstance().getLogger().debug("Changed to RIP");
}
}

27
src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java
View file

@ -36,33 +36,6 @@ public class MixinNetHandlerPlayClient {
|| (soundEffect.equals("mob.guardian.curse") && !zombies_utils$alienUfoOpened)
)) return;
zombies_utils$alienUfoOpened = soundEffect.equals("mob.guardian.curse");
/*if (!Timer.getInstance().isPresent()) {
new Timer(
Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
Scoreboard.getMap().orElseThrow(() -> new RuntimeException("cannot figure out map")).map
);
} else { Timer timer = Timer.getInstance().get();
final Scoreboard.MapContainer map = Scoreboard.getMap().orElse(new Scoreboard.MapContainer(
timer.getGameMode().getMap(),
false
));
if (map.pregame) {
new Timer(
Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
map.map
);
} else if (timer.equalsServerOrNull(Scoreboard.getServerNumber().orElse(null))) timer.split(Scoreboard.getRound());
else {
new Timer(
Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")),
map.map
);
}
}*/
try {
if (Timer.getInstance().isPresent()) {

7
src/main/java/com/github/stachelbeere1248/zombiesutils/render/RenderGameOverlayHandler.java
View file

@ -81,11 +81,14 @@ public class RenderGameOverlayHandler {
for (byte waveTime: waveTimes) {
int clonedColor = color;
final short waveTicks = (short) ((waveTime * 20)-rl);
final short waveTicks = (short) ((waveTime * 20)+rl);
if (roundTicks>waveTicks) {
if (ZombiesUtilsConfig.isSpawntimeNotShortened()) clonedColor = 0x555555;
else continue;
else {
heightIndex++;
continue;
}
}
final String time = getWaveString(waveTicks, heightIndex + 1);