EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Attempts first code cleanup

Browse Source
This commit is contained in:
Kristian Knarvik
2025-12-17 14:58:48 +01:00
parent 4480e0994f
commit bece76fa8c
22 changed files with 715 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/knarcraft/blockhunt/util/SignsHelper.java
View File

@@ -2,7 +2,7 @@ package net.knarcraft.blockhunt.util;
import net.knarcraft.blockhunt.MemoryStorage;
import net.knarcraft.blockhunt.arena.Arena;
import net.knarcraft.blockhunt.arena.ArenaState;
import net.knarcraft.blockhunt.arena.ArenaGameState;
import net.knarcraft.blockhunt.config.ConfigKey;
import net.knarcraft.blockhunt.config.MessageKey;
import org.bukkit.Location;
@@ -28,7 +28,7 @@ public final class SignsHelper {
boolean saved = false;
Arena arena = MemoryStorage.arenaMap.get(lines[1].toLowerCase());
if (arena != null) {
saveSign(arena.arenaName, location);
saveSign(arena.getArenaOptions().arenaName(), location);
saved = true;
}
@@ -117,22 +117,22 @@ public final class SignsHelper {
//TODO: Store the relationships between signs and arenas directly
for (Arena arena : MemoryStorage.arenaMap.values()) {
//Find the correct arena
if (!arenaName.endsWith(arena.arenaName)) {
if (!arenaName.endsWith(arena.getArenaOptions().arenaName())) {
continue;
}
if (arena.gameState.equals(ArenaState.WAITING)) {
if (arena.getGameState().equals(ArenaGameState.WAITING)) {
drawSign(MemoryStorage.config.getFileConfiguration().getStringList(ConfigKey.SIGN_WAITING.getPath()), signBlock, arena);
} else if (arena.gameState.equals(ArenaState.STARTING)) {
} else if (arena.getGameState().equals(ArenaGameState.STARTING)) {
drawSign(MemoryStorage.config.getFileConfiguration().getStringList(ConfigKey.SIGN_STARTING.getPath()), signBlock, arena);
} else if (arena.gameState.equals(ArenaState.IN_GAME)) {
} else if (arena.getGameState().equals(ArenaGameState.IN_GAME)) {
drawSign(MemoryStorage.config.getFileConfiguration().getStringList(ConfigKey.SIGN_IN_GAME.getPath()), signBlock, arena);
}
}
}
private static void drawSign(List<String> signLines, Sign signBlock, Arena arena) {
drawSign(signLines, signBlock, "arenaName-" + arena.arenaName, "players-" + arena.playersInArena.size(),
"maxplayers-" + arena.maxPlayers, "timeleft-" + arena.timer);
drawSign(signLines, signBlock, "arenaName-" + arena.getArenaOptions().arenaName(), "players-" +
arena.getPlayersInArena().size(), "maxplayers-" + arena.getMaxPlayers(), "timeleft-" + arena.getTimer());
}
private static void drawSign(List<String> signLines, Sign signBlock, String... variables) {