From a1acde76fd5ed31896dbc3b4d792d2878bec4069 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 19 Aug 2023 12:43:30 +0200 Subject: [PATCH] Update styling --- .../steamwar/towerrun/config/WorldConfig.java | 3 ++- .../towerrun/countdowns/Countdown.java | 8 ++++++-- .../towerrun/countdowns/EndCountdown.java | 2 +- .../steamwar/towerrun/game/TowerRunGame.java | 18 +++++++++--------- .../towerrun/generator/TowerGenerator.java | 4 ++-- .../towerrun/listener/IngameListener.java | 4 ++-- .../towerrun/listener/LobbyListener.java | 2 +- .../state/GameStateToggleListener.java | 3 ++- .../winconditions/LastOutsideWincondition.java | 6 +++--- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/de/steamwar/towerrun/config/WorldConfig.java b/src/de/steamwar/towerrun/config/WorldConfig.java index f26e12e..1f84875 100644 --- a/src/de/steamwar/towerrun/config/WorldConfig.java +++ b/src/de/steamwar/towerrun/config/WorldConfig.java @@ -58,6 +58,7 @@ public class WorldConfig { public static final TowerGeneratorConfig TOWER_GENERATOR_CONFIG; public static final List WINCONDITIONS = new ArrayList<>(); + static { WINCONDITIONS.add(new LastRemainingWincondition()); WINCONDITIONS.add(new LastOutsideWincondition()); @@ -65,7 +66,7 @@ public class WorldConfig { } private static Location parseLocation(ConfigurationSection section) { - Location loc = new Location( + Location loc = new Location( Bukkit.getWorlds().get(0), section.getDouble("x"), section.getDouble("y"), diff --git a/src/de/steamwar/towerrun/countdowns/Countdown.java b/src/de/steamwar/towerrun/countdowns/Countdown.java index 538eac5..465aa2a 100644 --- a/src/de/steamwar/towerrun/countdowns/Countdown.java +++ b/src/de/steamwar/towerrun/countdowns/Countdown.java @@ -38,9 +38,13 @@ public abstract class Countdown extends GameStateToggleListener { super(enabledStates); } - int defaultTime() {return 0;} + int defaultTime() { + return 0; + } void timerEnd() {} - boolean timerShouldCancel() {return true;} + boolean timerShouldCancel() { + return true; + } void run() {} void timerStart() {} void timerReset() {} diff --git a/src/de/steamwar/towerrun/countdowns/EndCountdown.java b/src/de/steamwar/towerrun/countdowns/EndCountdown.java index b93b9d7..95aa367 100644 --- a/src/de/steamwar/towerrun/countdowns/EndCountdown.java +++ b/src/de/steamwar/towerrun/countdowns/EndCountdown.java @@ -32,7 +32,7 @@ public class EndCountdown extends Countdown { private final LobbyCountdown lobbyCountdown; - private static boolean RESETS = Objects.requireNonNull(Bukkit.getWorlds().get(0).getWorldFolder().list((dir, name) -> name.equals("backup"))).length > 0; + private static final boolean RESETS = Objects.requireNonNull(Bukkit.getWorlds().get(0).getWorldFolder().list((dir, name) -> name.equals("backup"))).length > 0; public EndCountdown(LobbyCountdown lobbyCountdown) { super(EnumSet.of(GameStates.ENDING)); diff --git a/src/de/steamwar/towerrun/game/TowerRunGame.java b/src/de/steamwar/towerrun/game/TowerRunGame.java index 04824a8..c1e17b8 100644 --- a/src/de/steamwar/towerrun/game/TowerRunGame.java +++ b/src/de/steamwar/towerrun/game/TowerRunGame.java @@ -137,33 +137,33 @@ public class TowerRunGame { }); } - private static double posToChunk(int pos){ + private static double posToChunk(int pos) { return pos / 16.0; } - private static int getMinChunkX(){ + private static int getMinChunkX() { return (int) Math.floor(posToChunk(WorldConfig.MAP_MIN_X)); } - private static int getMaxChunkX(){ + private static int getMaxChunkX() { return (int) Math.ceil(posToChunk(WorldConfig.MAP_MAX_X)); } - private static int getMinChunkZ(){ + private static int getMinChunkZ() { return (int) Math.floor(posToChunk(WorldConfig.MAP_MIN_Z)); } - private static int getMaxChunkZ(){ + private static int getMaxChunkZ() { return (int) Math.ceil(posToChunk(WorldConfig.MAP_MAX_Z)); } private static void forEachChunk(ObjIntConsumer executor) { - for(int x = getMinChunkX(); x <= getMaxChunkX(); x++) - for(int z = getMinChunkZ(); z <= getMaxChunkZ(); z++) + for (int x = getMinChunkX(); x <= getMaxChunkX(); x++) + for (int z = getMinChunkZ(); z <= getMaxChunkZ(); z++) executor.accept(x, z); } - private static void resetWorld(){ + private static void resetWorld() { world.getEntities().stream().filter(entity -> entity.getType() != EntityType.PLAYER).forEach(Entity::remove); World backup = new WorldCreator(world.getName() + "/backup").createWorld(); @@ -178,7 +178,7 @@ public class TowerRunGame { System.arraycopy(backupChunk.d(), 0, chunk.d(), 0, chunk.d().length); - for(Player p : Bukkit.getOnlinePlayers()) + for (Player p : Bukkit.getOnlinePlayers()) CraftbukkitWrapper.impl.sendChunk(p, x, z); } } diff --git a/src/de/steamwar/towerrun/generator/TowerGenerator.java b/src/de/steamwar/towerrun/generator/TowerGenerator.java index ee026d7..03d6318 100644 --- a/src/de/steamwar/towerrun/generator/TowerGenerator.java +++ b/src/de/steamwar/towerrun/generator/TowerGenerator.java @@ -31,8 +31,8 @@ public class TowerGenerator { private static final Random random = new Random(); private final WorldConfig.TowerGeneratorConfig config; - private List allSchematics; - private Clipboard roof; + private final List allSchematics; + private final Clipboard roof; @Getter private int height; diff --git a/src/de/steamwar/towerrun/listener/IngameListener.java b/src/de/steamwar/towerrun/listener/IngameListener.java index 5c56088..396e6b1 100644 --- a/src/de/steamwar/towerrun/listener/IngameListener.java +++ b/src/de/steamwar/towerrun/listener/IngameListener.java @@ -48,7 +48,7 @@ import java.util.*; public class IngameListener extends GameStateBukkitListener { private int time = 0; - private Map> blocksToMelt = new HashMap<>(); + private final Map> blocksToMelt = new HashMap<>(); private BukkitRunnable runnable; public IngameListener() { @@ -123,7 +123,7 @@ public class IngameListener extends GameStateBukkitListener { @EventHandler public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { - if(event.getDamager().getType() == EntityType.PLAYER) { + if (event.getDamager().getType() == EntityType.PLAYER) { event.setCancelled(true); } } diff --git a/src/de/steamwar/towerrun/listener/LobbyListener.java b/src/de/steamwar/towerrun/listener/LobbyListener.java index 5c937ed..eb2cb15 100644 --- a/src/de/steamwar/towerrun/listener/LobbyListener.java +++ b/src/de/steamwar/towerrun/listener/LobbyListener.java @@ -57,7 +57,7 @@ public class LobbyListener extends GameStateBukkitListener { if (TowerRun.getTowerGenerator() != null) { return; } - if(event.getTo().getY() < WorldConfig.SPAWN.getY() - 10) { + if (event.getTo().getY() < WorldConfig.SPAWN.getY() - 10) { event.getPlayer().teleport(WorldConfig.SPAWN); } } diff --git a/src/de/steamwar/towerrun/state/GameStateToggleListener.java b/src/de/steamwar/towerrun/state/GameStateToggleListener.java index 85aa0f1..c8ba553 100644 --- a/src/de/steamwar/towerrun/state/GameStateToggleListener.java +++ b/src/de/steamwar/towerrun/state/GameStateToggleListener.java @@ -28,12 +28,13 @@ public abstract class GameStateToggleListener extends GameStateListener { protected GameStateToggleListener(EnumSet enabledStates) { super(); this.enabledStates = enabledStates; - if(enabledStates.contains(GameState.getCurrentState())) { + if (enabledStates.contains(GameState.getCurrentState())) { enable(); } } public abstract void enable(); + public abstract void disable(); @Override diff --git a/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java b/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java index 7784452..260ed0f 100644 --- a/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java +++ b/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java @@ -26,7 +26,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.PlayerDeathEvent; -public class LastOutsideWincondition extends OutsideWincondition{ +public class LastOutsideWincondition extends OutsideWincondition { public LastOutsideWincondition() { super("LAST_OUTSIDE"); } @@ -42,8 +42,8 @@ public class LastOutsideWincondition extends OutsideWincondition{ @EventHandler(priority = EventPriority.LOW) public void onPlayerDeath(PlayerDeathEvent event) { - if(TowerRunGame.PLAYERS_ALIVE.isEmpty()) { - if(TowerRunGame.PLAYERS_ESCAPED.isEmpty()) { + if (TowerRunGame.PLAYERS_ALIVE.isEmpty()) { + if (TowerRunGame.PLAYERS_ESCAPED.isEmpty()) { TowerRunGame.tie(); return; }