Cleanup code base (#31)

theEvilReaper · web-flow · commit c8afae67c689 · 2025-08-20T08:51:35.000+02:00
* Remove NonExtendable annotation usage

* Remove unused code from the class

* Cleanup imports

* Remove push value state-related code

* Improve switch statement

* Improve file handler usage

* Cleanup lambda usage

---------

Co-authored-by: theEvilReaper &lt;theEvilReaper@users.noreply.github.com&gt;
diff --git a/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java b/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java
@@ -3,7 +3,6 @@
 import net.minestom.server.coordinate.Pos;
 import net.theevilreaper.aves.map.BaseMap;
 import net.theevilreaper.bounce.common.push.PushData;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -14,7 +13,6 @@
  * @version 1.1.0
  * @since 0.1.0
  */
-@ApiStatus.NonExtendable
 public final class GameMap extends BaseMap {
 
     private final Pos gameSpawn;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/BounceSetup.java b/setup/src/main/java/net/theevilreaper/bounce/setup/BounceSetup.java
@@ -20,7 +20,6 @@
 import net.theevilreaper.bounce.setup.dialog.DialogRegistry;
 import net.theevilreaper.bounce.setup.dialog.SetupDialogRegistry;
 import net.theevilreaper.bounce.setup.dialog.event.PlayerDialogRequestEvent;
-import net.theevilreaper.bounce.setup.event.AbstractStateNotifyEvent;
 import net.theevilreaper.bounce.setup.event.map.MapSetupSelectEvent;
 import net.theevilreaper.bounce.setup.event.ground.PlayerGroundBlockSelectEvent;
 import net.theevilreaper.bounce.setup.event.SetupInventorySwitchEvent;
@@ -43,7 +42,6 @@
 import net.theevilreaper.bounce.setup.listener.push.PlayerPushBlockSelectListener;
 import net.theevilreaper.bounce.setup.listener.push.PlayerPushIndexChangeListener;
 import net.theevilreaper.bounce.setup.listener.state.GameMapBuilderStateNotifyListener;
-import net.theevilreaper.bounce.setup.listener.state.PushValueStateNotifierListener;
 import net.theevilreaper.bounce.setup.map.BounceSetupMapProvider;
 import net.theevilreaper.bounce.setup.util.SetupItems;
 import org.jetbrains.annotations.NotNull;
@@ -64,11 +62,11 @@ public final class BounceSetup implements ListenerHandling {
 
     public BounceSetup() {
         Path path = Path.of("");
-        this.mapProvider = new BounceSetupMapProvider(path);
+        this.fileHandler = new GsonFileHandler(GsonUtil.GSON);
+        this.mapProvider = new BounceSetupMapProvider(this.fileHandler, path);
         this.setupDataService = SetupDataService.create();
         this.inventoryService = new InventoryService(this.mapProvider::getEntries);
         this.setupItems = new SetupItems();
-        this.fileHandler = new GsonFileHandler(GsonUtil.GSON);
         this.dialogRegistry = new SetupDialogRegistry();
         MinecraftServer.getSchedulerManager().buildShutdownTask(this::onShutdown);
     }
@@ -106,7 +104,6 @@ private void registerListener(@NotNull EventNode<Event> node) {
         node.addListener(PlayerGroundBlockSelectEvent.class, new PlayerBlockSelectListener(this.setupDataService::get));
         node.addListener(SetupInventorySwitchEvent.class, new SetupInventorySwitchListener(this.inventoryService, this.setupDataService::get));
         node.addListener(GameMapBuilderStateNotifyEvent.class, new GameMapBuilderStateNotifyListener());
-        node.addListener(AbstractStateNotifyEvent.PushDataStateNotifyEvent.class, new PushValueStateNotifierListener());
         node.addListener(PlayerPushBlockSelectEvent.class, new PlayerPushBlockSelectListener(this.setupDataService::get));
         node.addListener(PlayerPushIndexChangeEvent.class, new PlayerPushIndexChangeListener(this.setupDataService::get));
         node.addListener(PlayerDeletePromptEvent.class, new PlayerDeletePromptListener(dialogRegistry));
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/command/part/SetupPositionCommand.java b/setup/src/main/java/net/theevilreaper/bounce/setup/command/part/SetupPositionCommand.java
@@ -8,7 +8,6 @@
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.command.builder.arguments.ArgumentWord;
 import net.minestom.server.command.builder.condition.Conditions;
-import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.EventDispatcher;
 import net.onelitefeather.guira.data.SetupData;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/data/BounceData.java b/setup/src/main/java/net/theevilreaper/bounce/setup/data/BounceData.java
@@ -74,9 +74,9 @@ public void reset() {
             this.overviewInventory.unregister();
         }
 
-        MinecraftServer.getSchedulerManager().scheduleNextTick(() -> {
-            MinecraftServer.getInstanceManager().unregisterInstance(this.instance);
-        });
+        MinecraftServer.getSchedulerManager().scheduleNextTick(() ->
+                MinecraftServer.getInstanceManager().unregisterInstance(this.instance)
+        );
     }
 
     @Override
@@ -86,9 +86,10 @@ public void loadData() {
         } else {
             Optional<GameMap> mapData = this.fileHandler.load(mapEntry.getMapFile(), GameMap.class);
             // Initialize with a new BaseMap if loading fails
-            mapData.ifPresentOrElse(gameMap -> {
-                this.gameMapBuilder = new GameMapBuilder(gameMap);
-            }, () -> this.gameMapBuilder = new GameMapBuilder());
+            mapData.ifPresentOrElse(gameMap ->
+                    this.gameMapBuilder = new GameMapBuilder(gameMap),
+                    () -> this.gameMapBuilder = new GameMapBuilder()
+            );
         }
 
         this.groundViewInventory = new GroundViewInventory(this.player, this.gameMapBuilder);
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/event/AbstractStateNotifyEvent.java b/setup/src/main/java/net/theevilreaper/bounce/setup/event/AbstractStateNotifyEvent.java
@@ -1,7 +1,6 @@
 package net.theevilreaper.bounce.setup.event;
 
 import net.minestom.server.event.Event;
-import net.theevilreaper.bounce.common.push.PushDataBuilder;
 import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
 import net.theevilreaper.bounce.setup.data.BounceData;
 import org.jetbrains.annotations.NotNull;
@@ -37,24 +36,6 @@ public enum StateChange {
         }
     }
 
-    public record PushDataState(@NotNull PushDataBuilder pushDataBuilder, @NotNull BounceData bounceData    ) implements StateModel {
-    }
-
-    public final class PushDataStateNotifyEvent extends AbstractStateNotifyEvent {
-
-        public PushDataStateNotifyEvent(PushDataState pushDataState) {
-            super(pushDataState);
-        }
-
-        @Override
-        public @NotNull PushDataState getStateModel() {
-            if (!(this.stateModel instanceof PushDataState pushDataState)) {
-                throw new IllegalStateException("State model is not of type PushDataState");
-            }
-            return pushDataState;
-        }
-    }
-
     public static final class GameMapBuilderStateNotifyEvent extends AbstractStateNotifyEvent {
 
         public GameMapBuilderStateNotifyEvent(@NotNull GameMapBuilderState gameMapBuilderState) {
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/InventoryService.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/InventoryService.java
@@ -4,19 +4,22 @@
 import net.theevilreaper.aves.map.MapEntry;
 import net.theevilreaper.bounce.setup.inventory.ground.GroundBlockOverviewInventory;
 import net.theevilreaper.bounce.setup.inventory.push.PushBlockInventory;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.function.Supplier;
 
-@ApiStatus.NonExtendable
 public final class InventoryService {
 
     private final MapSetupInventory mapSetupInventory;
     private final GroundBlockOverviewInventory groundBlockOverviewInventory;
     private final PushBlockInventory pushBlockInventory;
 
+    /**
+     * Creates a new {@link InventoryService} instance.
+     *
+     * @param entries the list of map entries to be displayed in the map setup inventory
+     */
     public InventoryService(@NotNull Supplier<List<MapEntry>> entries) {
         this.mapSetupInventory = new MapSetupInventory(entries);
 
@@ -28,6 +31,9 @@ public InventoryService(@NotNull Supplier<List<MapEntry>> entries) {
         this.pushBlockInventory.register();
     }
 
+    /**
+     * Cleans up the inventory service.
+     */
     public void cleanup() {
         this.mapSetupInventory.unregister();
         this.groundBlockOverviewInventory.unregister();
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/SetupBlocks.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/SetupBlocks.java
@@ -5,7 +5,6 @@
 
 import java.util.List;
 
-@ApiStatus.NonExtendable
 @ApiStatus.Internal
 public final class SetupBlocks {
 
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java
@@ -5,7 +5,6 @@
 import net.minestom.server.event.EventDispatcher;
 import net.minestom.server.inventory.InventoryType;
 import net.minestom.server.inventory.click.Click;
-import net.minestom.server.inventory.click.ClickType;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.theevilreaper.aves.inventory.InventoryLayout;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/slot/StringSlot.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/slot/StringSlot.java
@@ -6,7 +6,6 @@
 import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
-import net.theevilreaper.bounce.setup.dialog.event.PlayerDialogRequestEvent;
 import net.theevilreaper.bounce.setup.event.map.PlayerDeletePromptEvent;
 import net.theevilreaper.bounce.setup.inventory.overview.OverviewType;
 import org.jetbrains.annotations.NotNull;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/listener/PlayerItemListener.java b/setup/src/main/java/net/theevilreaper/bounce/setup/listener/PlayerItemListener.java
@@ -2,7 +2,6 @@
 
 import net.onelitefeather.guira.data.SetupData;
 import net.onelitefeather.guira.functional.OptionalSetupDataGetter;
-import net.onelitefeather.guira.functional.SetupDataGetter;
 import net.theevilreaper.aves.util.functional.PlayerConsumer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerUseItemEvent;
@@ -11,9 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
-import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import static net.theevilreaper.bounce.setup.util.SetupItems.ITEM_TAG;
 import static net.theevilreaper.bounce.setup.util.SetupItems.OVERVIEW_FLAG;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/listener/push/PlayerPushIndexChangeListener.java b/setup/src/main/java/net/theevilreaper/bounce/setup/listener/push/PlayerPushIndexChangeListener.java
@@ -4,7 +4,6 @@
 import net.minestom.server.entity.Player;
 import net.onelitefeather.guira.data.SetupData;
 import net.onelitefeather.guira.functional.OptionalSetupDataGetter;
-import net.onelitefeather.guira.functional.SetupDataGetter;
 import net.theevilreaper.bounce.setup.data.BounceData;
 import net.theevilreaper.bounce.setup.event.push.PlayerPushIndexChangeEvent;
 import org.jetbrains.annotations.NotNull;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/listener/state/PushValueStateNotifierListener.java b/setup/src/main/java/net/theevilreaper/bounce/setup/listener/state/PushValueStateNotifierListener.java
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/map/BounceSetupMapProvider.java b/setup/src/main/java/net/theevilreaper/bounce/setup/map/BounceSetupMapProvider.java
@@ -1,22 +1,21 @@
 package net.theevilreaper.bounce.setup.map;
 
 import net.minestom.server.MinecraftServer;
-import net.theevilreaper.aves.file.GsonFileHandler;
+import net.theevilreaper.aves.file.FileHandler;
 import net.theevilreaper.aves.map.BaseMap;
 import net.theevilreaper.aves.map.MapEntry;
 import net.theevilreaper.aves.map.provider.AbstractMapProvider;
 import net.theevilreaper.bounce.common.map.GameMap;
 import net.theevilreaper.bounce.common.map.MapFilters;
-import net.theevilreaper.bounce.common.util.GsonUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
 import java.util.Optional;
 
 public final class BounceSetupMapProvider extends AbstractMapProvider {
 
-    public BounceSetupMapProvider(@NotNull Path path) {
-        super(new GsonFileHandler(GsonUtil.GSON), MapFilters::filterMapsForSetup);
+    public BounceSetupMapProvider(@NotNull FileHandler fileHandler, @NotNull Path path) {
+        super(fileHandler, MapFilters::filterMapsForSetup);
         this.mapEntries = loadMapEntries(path.resolve("maps"));
 
         Optional<MapEntry> fetchedEntry = this.mapEntries.stream()
@@ -25,7 +24,7 @@ public BounceSetupMapProvider(@NotNull Path path) {
                 .findFirst();
 
         if (fetchedEntry.isEmpty()) {
-            throw new RuntimeException("Lobby map file not found!");
+            throw new IllegalStateException("Lobby map file not found!");
         }
 
         MapEntry lobbyEntry = fetchedEntry.get();
@@ -36,12 +35,15 @@ public BounceSetupMapProvider(@NotNull Path path) {
         Optional<BaseMap> loadedMap = this.fileHandler.load(lobbyEntry.getMapFile(), BaseMap.class);
 
         if (loadedMap.isEmpty()) {
-            throw new RuntimeException("Failed to load lobby map file: " + lobbyEntry.getMapFile());
+            throw new IllegalStateException("Failed to load lobby map file: " + lobbyEntry.getMapFile());
         }
 
         this.activeMap = loadedMap.get();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void saveMap(@NotNull Path path, @NotNull BaseMap baseMap) {
         this.fileHandler.save(path, baseMap instanceof GameMap gameMap ? gameMap : baseMap);
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/util/SetupTags.java b/setup/src/main/java/net/theevilreaper/bounce/setup/util/SetupTags.java
@@ -3,7 +3,6 @@
 import net.minestom.server.tag.Tag;
 import org.jetbrains.annotations.ApiStatus;
 
-@ApiStatus.NonExtendable
 @ApiStatus.Internal
 public final class SetupTags {
 
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/item/SetupItemTestBase.java b/setup/src/test/java/net/theevilreaper/bounce/setup/item/SetupItemTestBase.java
@@ -6,7 +6,6 @@
 import net.theevilreaper.aves.file.GsonFileHandler;
 import net.theevilreaper.aves.util.functional.PlayerConsumer;
 import net.theevilreaper.bounce.common.util.GsonUtil;
-import net.theevilreaper.bounce.setup.data.BounceData;
 import net.theevilreaper.bounce.setup.inventory.MapDataTestBase;
 import net.theevilreaper.bounce.setup.util.SetupItems;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/src/main/java/net/theevilreaper/bounce/jump/PlayerJumpTask.java b/src/main/java/net/theevilreaper/bounce/jump/PlayerJumpTask.java
@@ -12,12 +12,10 @@
 import net.theevilreaper.bounce.common.map.GameMap;
 import net.theevilreaper.bounce.common.push.PushData;
 import net.theevilreaper.bounce.event.PlayerLavaEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-@ApiStatus.NonExtendable
 public final class PlayerJumpTask {
 
     private static final long PUSH_COOLDOWN_MS = 200; // 200 ms cooldown
diff --git a/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java b/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java
@@ -33,9 +33,7 @@ public void accept(@NotNull PlayerDisconnectEvent event) {
         switch (phase) {
             case LobbyPhase lobbyPhase -> handleLobbyQuit(lobbyPhase, player);
             case PlayingPhase playingPhase -> handleGameQuit(playingPhase, player);
-            default -> {
-                Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player));
-            }
+            default -> this.handleDefaultLeave(player);
         }
     }
 
@@ -52,12 +50,22 @@ private void handleLobbyQuit(@NotNull LobbyPhase lobbyPhase, @NotNull Player pla
 
     /**
      * Handles the quit logic for the {@link PlayingPhase}.
+     *
      * @param playingPhase the reference from the phase
-     * @param player the player which is involved
+     * @param player       the player which is involved
      */
     private void handleGameQuit(@NotNull PlayingPhase playingPhase, @NotNull Player player) {
         Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player));
         this.playerLeave.accept(player);
         playingPhase.handlePlayerCheck();
     }
+
+    /**
+     * Handles the default quit logic.
+     *
+     * @param player the player which is involved
+     */
+    private void handleDefaultLeave(@NotNull Player player) {
+        Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player));
+    }
 }
diff --git a/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java b/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java
@@ -120,48 +120,3 @@ public boolean isForceStarted() {
         return forceStarted;
     }
 }
-
-    /*@Override
-    public void onStart() {
-        game.setGameState(GameState.LOBBY);
-    }
-
-    @Override
-    public void onEnd() {
-        Bukkit.broadcastMessage(game.getPrefix() + "§eAlle Spieler werden in die Arena teleportiert");
-        game.getGameUtil().preparePlayers();
-        new TeleportTask(game).start();
-    }
-
-    @Override
-    public void onTick() {
-        if (game.getMapManager().getMap().getMinPlayers() > Bukkit.getOnlinePlayers().size()) {
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                TitleManager.sendActionBar(player, Messages.NOT_ENOUGH_PLAYERS.toString());
-            }
-            setTime(getStartTime());
-            return;
-        }
-
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            player.setLevel(getCurrentTime());
-        }
-
-        switch (getCurrentTime()) {
-            case 10:
-            case 3:
-            case 2:
-                Bukkit.broadcastMessage(game.getPrefix() + "§7Das Spiel startet in §3" + getCurrentTime() + " §7Sekunden");
-                break;
-            case 1:
-                Bukkit.broadcastMessage(game.getPrefix() + "§7Das Spiel startet in §3" + getCurrentTime() + " §7Sekunde");
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void start() {
-        this.start(game, 0, 20);
-    }*/
