startet implementation of buildBattle

src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java

@@ -3,6 +3,7 @@ package eu.mhsl.minenet.minigames.instance.game;
 import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.anvilRun.AnvilRunFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.bowSpleef.BowSpleefFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.buildBattle.BuildBattleFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.elytraRace.ElytraRaceFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.backrooms.BackroomsFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.bedwars.BedwarsFactory;
@@ -13,7 +14,6 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.minerun.MinerunFa
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.spleef.SpleefFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.stickfight.StickFightFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.TetrisFactory;
-import eu.mhsl.minenet.minigames.instance.game.stateless.types.test.SumoFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.tntrun.TntRunFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.towerdefense.TowerdefenseFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.trafficlightrace.TrafficLightRaceFactory;
@@ -34,7 +34,7 @@ public enum GameList {
     ELYTRARACE(new ElytraRaceFactory(), GameType.PVP),
     SPLEEF(new SpleefFactory(), GameType.PVP),
     JUMPDIVE(new JumpDiveFactory(), GameType.JUMPNRUN),
-    Test(new SumoFactory(), GameType.OTHER);
+    BUILDBATTLE(new BuildBattleFactory(), GameType.OTHER);
 
     private final GameFactory factory;
     private final GameType type;
@@ -47,6 +47,6 @@ public enum GameList {
     }
 
     public GameType getType() {
-        return this.type;
+        return type;
     }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/anvilRun/AnvilRunFactory.java

@@ -26,7 +26,7 @@ public class AnvilRunFactory implements GameFactory {
     public ConfigManager configuration() {
         return new ConfigManager()
             .addOption(new NumericOption("radius", Material.HEART_OF_THE_SEA, TranslatedComponent.byId("optionCommon#radius"), 5, 10, 15, 20, 25, 30))
-            .addOption(new NumericOption("seconds", Material.CLOCK, TranslatedComponent.byId("optionCommon#seconds"), 10, 30, 60, 90, 120));
+            .addOption(new NumericOption("seconds", Material.STICK, TranslatedComponent.byId("optionCommon#seconds"), 10, 30, 60, 90, 120));
     }
 
     @Override

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/buildBattle/BuildBattle.java

@@ -0,0 +1,13 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.buildBattle;
+
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.NoScore;
+
+public class BuildBattle extends StatelessGame {
+    public BuildBattle() {
+        super(Dimension.OVERWORLD.key, "buildBattle", new NoScore());
+    }
+
+
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/buildBattle/BuildBattleFactory.java

@@ -0,0 +1,21 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.buildBattle;
+
+import eu.mhsl.minenet.minigames.instance.game.Game;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
+import eu.mhsl.minenet.minigames.instance.room.Room;
+import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
+
+import java.util.Map;
+
+public class BuildBattleFactory implements GameFactory {
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_BuildBattle#name");
+    }
+
+    @Override
+    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
+        return new BuildBattle();
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/buildBattle/BuilderWorld.java

@@ -0,0 +1,12 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.buildBattle;
+
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.Score;
+import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.world.DimensionType;
+
+class BuilderWorld extends StatelessGame {
+    public BuilderWorld(DynamicRegistry.Key<DimensionType> dimensionType, String gameName, Score score) {
+        super(dimensionType, gameName, score);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java

@@ -8,7 +8,6 @@ import eu.mhsl.minenet.minigames.world.BlockPallet;
 import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGenerator;
 import io.github.togar2.pvp.feature.CombatFeatures;
 import net.minestom.server.coordinate.Pos;
-import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
 import org.jetbrains.annotations.NotNull;

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/test/Sumo.java

@@ -1,128 +0,0 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.test;
-
-import eu.mhsl.minenet.minigames.instance.Dimension;
-import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
-import eu.mhsl.minenet.minigames.score.LastWinsScore;
-import io.github.togar2.pvp.events.FinalAttackEvent;
-import io.github.togar2.pvp.events.PrepareAttackEvent;
-import io.github.togar2.pvp.feature.CombatFeatures;
-import net.minestom.server.MinecraftServer;
-import net.minestom.server.coordinate.Pos;
-import net.minestom.server.entity.GameMode;
-import net.minestom.server.entity.Player;
-import net.minestom.server.event.player.PlayerMoveEvent;
-import net.minestom.server.instance.block.Block;
-import net.minestom.server.timer.TaskSchedule;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.WeakHashMap;
-import java.util.concurrent.CompletableFuture;
-
-public class Sumo extends StatelessGame {
-    int radius;
-    int health;
-    int seconds;
-
-    int originalRadius;
-    int timer;
-
-    WeakHashMap<Player, Integer> healthMap = new WeakHashMap<>();
-
-    public Sumo(int radius, int health, int seconds) {
-        super(Dimension.OVERWORLD.key, "Sumo", new LastWinsScore());
-        this.getScore().setIgnoreLastPlayers(1);
-        this.setTime(6000);
-        this.setTimeRate(0);
-
-        this.radius = radius;
-        this.health = health;
-        this.seconds = seconds;
-
-        this.originalRadius = radius;
-        this.timer = seconds;
-
-        this.eventNode().addChild(
-                CombatFeatures.empty()
-                        .add(CombatFeatures.VANILLA_ATTACK)
-                        .add(CombatFeatures.VANILLA_DAMAGE)
-                        .add(CombatFeatures.VANILLA_KNOCKBACK)
-                        .build().createNode()
-        );
-
-        this.eventNode().addListener(PrepareAttackEvent.class, prepareAttackEvent -> {
-            if (this.isBeforeBeginning)
-                prepareAttackEvent.setCancelled(true);
-        });
-
-        this.eventNode().addListener(FinalAttackEvent.class, finalAttackEvent -> {
-            finalAttackEvent.setBaseDamage(0);
-            ((Player) finalAttackEvent.getTarget()).setHealth(20);
-        });
-    }
-
-    @Override
-    protected void start() {
-        this.getPlayers().forEach(player -> {
-            this.healthMap.put(player, this.health);
-            player.setLevel(this.healthMap.get(player));
-        });
-
-        MinecraftServer.getSchedulerManager().scheduleTask(
-            () -> {
-                if(this.isBeforeBeginning) return TaskSchedule.seconds(1);
-                this.timer--;
-                double percent = (double) this.timer / this.seconds;
-                int radius = (int) (this.originalRadius * percent);
-                if (this.radius >= 5) {
-                    this.radius = radius;
-                    this.generatePlatform();
-                    return TaskSchedule.seconds(1);
-                }
-
-                return TaskSchedule.stop();
-            },
-            TaskSchedule.seconds(1)
-        );
-
-        super.start();
-    }
-
-    @Override
-    protected void onLoad(@NotNull CompletableFuture<Void> callback) {
-        this.generatePlatform();
-    }
-
-    private void generatePlatform() {
-        int buffer = 5;
-        for(int x = -this.radius - buffer; x <= this.radius + buffer; x++) {
-            for(int z = -this.radius - buffer; z <= this.radius + buffer; z++) {
-                double distance = new Pos(x, 0, z).distance(new Pos(0, 0, 0));
-                if(distance <= this.radius) {
-                    boolean isEdge = this.radius - 1 < distance;
-                    this.setBlock(x, 0, z, isEdge ? Block.RED_CONCRETE : Block.WHITE_CONCRETE);
-                } else {
-                    this.setBlock(x, 0, z, Block.AIR);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
-        Player player = playerMoveEvent.getPlayer();
-        if(playerMoveEvent.getNewPosition().y() < -10) {
-            player.teleport(this.getSpawn());
-            this.healthMap.put(player, this.healthMap.get(player) - 1);
-            player.setLevel(this.healthMap.get(player));
-            if (this.healthMap.get(player) == 0) {
-                this.getScore().insertResult(player);
-                player.setGameMode(GameMode.SPECTATOR);
-            }
-        }
-    }
-
-    @Override
-    public Pos getSpawn() {
-        return  new Pos(0, 2, 0);
-    }
-}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/test/SumoFactory.java

@@ -1,33 +0,0 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.test;
-
-import eu.mhsl.minenet.minigames.instance.game.Game;
-import eu.mhsl.minenet.minigames.instance.game.stateless.config.ConfigManager;
-import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
-import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
-import eu.mhsl.minenet.minigames.instance.game.stateless.config.common.NumericOption;
-import eu.mhsl.minenet.minigames.instance.room.Room;
-import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
-import net.minestom.server.item.Material;
-
-import java.util.Map;
-
-public class SumoFactory implements GameFactory {
-    @Override
-    public TranslatedComponent name() {return TranslatedComponent.byId("game_Sumo#name");}
-    public TranslatedComponent description() {
-        return TranslatedComponent.byId("game_Sumo#description");
-    }
-
-    @Override
-    public ConfigManager configuration() {
-        return new ConfigManager()
-                .addOption(new NumericOption("radius", Material.HEART_OF_THE_SEA, TranslatedComponent.byId("optionCommon#radius"), 10, 20, 30))
-                .addOption(new NumericOption("health", Material.GOLDEN_APPLE, TranslatedComponent.byId("game_Sumo#lives"), 1, 2, 3, 4, 5))
-                .addOption(new NumericOption("seconds", Material.CLOCK, TranslatedComponent.byId("optionCommon#seconds"), 30, 60, 90, 120));
-    }
-
-    @Override
-    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
-        return new Sumo(configuration.get("radius").getAsInt(), configuration.get("health").getAsInt(), configuration.get("seconds").getAsInt()).setParent(parent);
-    }
-}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/Tetris.java

@@ -28,7 +28,7 @@ class Tetris extends StatelessGame {
     public Tetris(int nextTetrominoesCount, boolean isFast, boolean hasCombat) {
         super(Dimension.THE_END.key, "Tetris", new PointsWinScore());
 
-        this.eventNode()
+        eventNode()
             .addListener(PlayerUseItemEvent.class, this::onPlayerInteract)
             .addListener(PlayerHandAnimationEvent.class, this::onPlayerAttack)
             .addListener(PlayerTickEvent.class, this::onPlayerTick);
@@ -58,7 +58,7 @@ class Tetris extends StatelessGame {
     protected void onStop() {
         this.tetrisGames.forEach((player, tetrisGame) -> {
             tetrisGame.loose();
-            this.getScore().insertResult(player, tetrisGame.getScore());
+            getScore().insertResult(player, tetrisGame.getScore());
             tetrisGame.sidebar.removeViewer(player);
         });
     }
@@ -106,7 +106,7 @@ class Tetris extends StatelessGame {
         TetrisGame tetrisGame = this.tetrisGames.get(player);
         if(tetrisGame == null) return;
         if(tetrisGame.lost && player.getGameMode() != GameMode.SPECTATOR) {
-            this.letPlayerLoose(player);
+            letPlayerLoose(player);
         }
     }
 
@@ -114,15 +114,15 @@ class Tetris extends StatelessGame {
         TetrisGame tetrisGame = this.tetrisGames.get(player);
         player.setGameMode(GameMode.SPECTATOR);
         player.setInvisible(true);
-        this.getScore().insertResult(player, tetrisGame.getScore());
+        getScore().insertResult(player, tetrisGame.getScore());
 
         boolean allGamesLost = this.tetrisGames.values().stream()
             .filter(game -> !game.lost)
             .toList()
             .isEmpty();
-        if(!this.setTimeLimit && !allGamesLost) {
+        if(!setTimeLimit && !allGamesLost) {
             this.setTimeLimit(90);
-            this.setTimeLimit = true;
+            setTimeLimit = true;
         }
     }
 
@@ -134,7 +134,7 @@ class Tetris extends StatelessGame {
         if(this.tetrisGames.get(p) == null) {
             this.tetrisGames.put(p, new TetrisGame(
                 this,
-                this.getSpawn().sub(6, 8, 15).add(this.tetrisGames.size()*30, 0, 0),
+                getSpawn().sub(6, 8, 15).add(this.tetrisGames.size()*30, 0, 0),
                 Tetromino.Shape.J,
                 this.nextTetrominoesCount,
                 this.isFast,

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Playfield.java

@@ -74,10 +74,10 @@ public class Playfield {
             }
         }
 
-        batch.setBlock(this.getPlayerSpawnPosition().sub(0, 1, 0), Block.STONE);
+        batch.setBlock(getPlayerSpawnPosition().sub(0, 1, 0), Block.STONE);
-        batch.setBlock(this.getPlayerSpawnPosition().sub(1, 1, 0), Block.STONE);
+        batch.setBlock(getPlayerSpawnPosition().sub(1, 1, 0), Block.STONE);
-        batch.setBlock(this.getPlayerSpawnPosition().sub(1, 1, 1), Block.STONE);
+        batch.setBlock(getPlayerSpawnPosition().sub(1, 1, 1), Block.STONE);
-        batch.setBlock(this.getPlayerSpawnPosition().sub(0, 1, 1), Block.STONE);
+        batch.setBlock(getPlayerSpawnPosition().sub(0, 1, 1), Block.STONE);
 
         BatchUtil.loadAndApplyBatch(batch, this.instance, () -> {});
     }
@@ -90,7 +90,7 @@ public class Playfield {
                 if(this.instance.getBlock(this.lowerLeftCorner.add(x, y, 1)) == Block.AIR) isFullLine = false;
             }
             if(isFullLine) {
-                this.removeFullLine(y);
+                removeFullLine(y);
                 removedLinesCounter += 1;
                 y -= 1;
             }
@@ -99,10 +99,10 @@ public class Playfield {
     }
 
     public void addLines(int lines) {
-        int xPosMissing = this.random.nextInt(1, 10);
+        int xPosMissing = random.nextInt(1, 10);
 
         for (int i = 0; i < lines; i++) {
-            this.moveAllLinesUp();
+            moveAllLinesUp();
             for (int x = 1; x < 11; x++) {
                 if(x != xPosMissing) {
                     this.instance.setBlock(this.lowerLeftCorner.add(x, 1, 1), Block.LIGHT_GRAY_CONCRETE);

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java

@@ -121,8 +121,8 @@ public class TetrisGame {
 
     public void tick() {
         if(this.lost || this.paused) return;
-        if(!this.currentTetromino.moveDown()) {
+        if(!currentTetromino.moveDown()) {
-            this.setActiveTetrominoDown();
+            setActiveTetrominoDown();
         }
     }
 
@@ -176,7 +176,7 @@ public class TetrisGame {
     }
 
     private boolean switchHold() {
-        if(!this.holdPossible) return false;
+        if(!holdPossible) return false;
 
         Tetromino newCurrentTetromino;
         if(this.holdTetromino == null) {
@@ -194,7 +194,7 @@ public class TetrisGame {
 
         this.currentTetromino.setPosition(this.tetrominoSpawnPosition);
         this.currentTetromino.draw();
-        if(!this.currentTetromino.moveDown()) this.loose();
+        if(!this.currentTetromino.moveDown()) loose();
 
         double xChange = this.holdTetromino.getXChange();
         this.holdTetromino.setPosition(this.holdPosition.add(xChange, 0, 0));
@@ -312,7 +312,7 @@ public class TetrisGame {
         this.currentTetromino.setPosition(this.tetrominoSpawnPosition);
         this.currentTetromino.draw();
         if(!this.currentTetromino.moveDown()) {
-            this.loose();
+            loose();
         }
     }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Tetromino.java

@@ -38,13 +38,13 @@ public class Tetromino {
         this.uuid = UUID.randomUUID();
 
         switch (this.shape) {
-            case I -> this.shapeArray = new int[][]{{0, 0, 0, 0}, {1, 1, 1, 1}, {0, 0, 0, 0}, {0, 0, 0, 0}};
+            case I -> shapeArray = new int[][]{{0, 0, 0, 0}, {1, 1, 1, 1}, {0, 0, 0, 0}, {0, 0, 0, 0}};
-            case J -> this.shapeArray = new int[][]{{1,0,0}, {1,1,1}, {0,0,0}};
+            case J -> shapeArray = new int[][]{{1,0,0}, {1,1,1}, {0,0,0}};
-            case L -> this.shapeArray = new int[][]{{0,0,1}, {1,1,1}, {0,0,0}};
+            case L -> shapeArray = new int[][]{{0,0,1}, {1,1,1}, {0,0,0}};
-            case O -> this.shapeArray = new int[][]{{1,1}, {1,1}};
+            case O -> shapeArray = new int[][]{{1,1}, {1,1}};
-            case S -> this.shapeArray = new int[][]{{0,1,1}, {1,1,0}, {0,0,0}};
+            case S -> shapeArray = new int[][]{{0,1,1}, {1,1,0}, {0,0,0}};
-            case T -> this.shapeArray = new int[][]{{0,1,0}, {1,1,1}, {0,0,0}};
+            case T -> shapeArray = new int[][]{{0,1,0}, {1,1,1}, {0,0,0}};
-            case Z -> this.shapeArray = new int[][]{{1,1,0}, {0,1,1}, {0,0,0}};
+            case Z -> shapeArray = new int[][]{{1,1,0}, {0,1,1}, {0,0,0}};
         }
     }
 
@@ -58,22 +58,22 @@ public class Tetromino {
 
     public boolean rotate(boolean clockwise) {
         int[][] newShapeArray = this.getTurnedShapeArray(clockwise);
-        return this.checkCollisionAndMove(this.position, newShapeArray);
+        return checkCollisionAndMove(this.position, newShapeArray);
     }
 
     public boolean moveDown() {
         Pos newPosition = this.position.sub(0, 1, 0);
-        return this.checkCollisionAndMove(newPosition, this.shapeArray);
+        return checkCollisionAndMove(newPosition, this.shapeArray);
     }
 
     public boolean moveLeft() {
         Pos newPosition = this.position.sub(1, 0, 0);
-        return this.checkCollisionAndMove(newPosition, this.shapeArray);
+        return checkCollisionAndMove(newPosition, this.shapeArray);
     }
 
     public boolean moveRight() {
         Pos newPosition = this.position.add(1, 0, 0);
-        return this.checkCollisionAndMove(newPosition, this.shapeArray);
+        return checkCollisionAndMove(newPosition, this.shapeArray);
     }
 
     public void draw() {
@@ -83,11 +83,11 @@ public class Tetromino {
     public void draw(boolean withGhost) {
         if(withGhost) {
             Pos ghostPos = this.position;
-            while (!this.checkCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
+            while (!checkCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
                 ghostPos = ghostPos.sub(0, 1, 0);
             }
             Pos positionChange = this.position.sub(ghostPos);
-            this.getBlockPositions().forEach(pos -> {
+            getBlockPositions().forEach(pos -> {
                 Entity ghostBlock = new Entity(ghostEntityType);
                 ((FallingBlockMeta) ghostBlock.getEntityMeta()).setBlock(this.getGhostBlock());
                 ghostBlock.setNoGravity(true);
@@ -97,11 +97,11 @@ public class Tetromino {
             });
         }
 
-        this.getBlockPositions().forEach(pos -> this.instance.setBlock(pos, this.getColoredBlock()));
+        getBlockPositions().forEach(pos -> this.instance.setBlock(pos, this.getColoredBlock()));
     }
 
     public void drawAsEntities() {
-        this.getBlockPositions().forEach(pos -> {
+        getBlockPositions().forEach(pos -> {
             Entity ghostBlock = new Entity(ghostEntityType);
             ((FallingBlockMeta) ghostBlock.getEntityMeta()).setBlock(this.getColoredBlock());
             ghostBlock.setNoGravity(true);
@@ -222,10 +222,10 @@ public class Tetromino {
     }
 
     private boolean checkCollision(Pos newPosition, int[][] newShapeArray) {
-        List<Pos> newBlockPositions = this.getBlockPositions(newPosition, newShapeArray);
+        List<Pos> newBlockPositions = getBlockPositions(newPosition, newShapeArray);
 
         for(Pos pos : newBlockPositions) {
-            if(this.isPartOfTetromino(pos)) continue;
+            if(isPartOfTetromino(pos)) continue;
             if(this.instance.getBlock(pos) == this.getGhostBlock()) continue;
             if(this.instance.getBlock(pos) != Block.AIR) return true;
         }
@@ -234,7 +234,7 @@ public class Tetromino {
     }
 
     private boolean checkCollisionAndMove(Pos newPosition, int[][] newShapeArray) {
-        if(!this.checkCollision(newPosition, newShapeArray)) {
+        if(!checkCollision(newPosition, newShapeArray)) {
             this.remove();
             this.shapeArray = Arrays.stream(newShapeArray).map(int[]::clone).toArray(int[][]::new);
             this.setPosition(newPosition);

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/towerdefense/Towerdefense.java

@@ -3,74 +3,23 @@ package eu.mhsl.minenet.minigames.instance.game.stateless.types.towerdefense;
 import eu.mhsl.minenet.minigames.instance.Dimension;
 import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.towerdefense.generator.MazeGenerator;
-import eu.mhsl.minenet.minigames.score.LastWinsScore;
+import eu.mhsl.minenet.minigames.score.NoScore;
-import net.minestom.server.coordinate.Pos;
-import net.minestom.server.entity.EntityType;
 import net.minestom.server.entity.Player;
-import net.minestom.server.instance.batch.AbsoluteBlockBatch;
+import net.minestom.server.item.ItemStack;
-import net.minestom.server.instance.block.Block;
+import net.minestom.server.item.Material;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
 
 public class Towerdefense extends StatelessGame {
-    private final Random random = new Random();
-    private final AbsoluteBlockBatch mazeBatch = new AbsoluteBlockBatch();
-    private final List<Pos> mazePath = new ArrayList<>();
-    private List<TowerdefenseRoom> instances = new ArrayList<>();
-
     public Towerdefense() {
-        super(Dimension.NETHER.key, "Towerdefense", new LastWinsScore());
+        super(Dimension.NETHER.key, "Towerdefense", new NoScore());
 
         setGenerator(new MazeGenerator());
-        this.generateMaze();
-    }
-
-    private void generateMaze() {
-        Pos position = new Pos(0, 0, 0);
-        this.addMazePosition(position, Block.GREEN_WOOL);
-
-        List<Integer> previousDirections = new ArrayList<>();
-        int direction = 1;      // 0 -> right; 1 -> straight; 2 -> left
-        for (int i = 0; i < 9; i++) {
-            for (int j = 0; j < 3; j++) {
-                position = position.add(direction-1,0,direction%2);
-                this.addMazePosition(position, Block.WHITE_WOOL);
-            }
-
-            int origin = 0;
-            int bound = 3;
-            long rightLeftDifference = previousDirections.stream().filter(integer -> integer == 0).count() - previousDirections.stream().filter(integer -> integer == 2).count();
-            if(rightLeftDifference >= 2 || direction == 2) origin = 1;
-            if(rightLeftDifference <= -2 || direction == 0) bound = 2;
-            direction = this.random.nextInt(origin, bound);
-            previousDirections.add(direction);
-        }
-        this.addMazePosition(position, Block.WHITE_WOOL);
-        this.addMazePosition(position.add(0,0,1), Block.WHITE_WOOL);
-        this.addMazePosition(position.add(0,0,2), Block.RED_WOOL);
-    }
-
-    private void addMazePosition(Pos position, Block pathBlock) {
-        this.mazeBatch.setBlock(position, pathBlock);
-        this.mazePath.add(position.add(0.5,1,0.5));
-    }
-
-    public AbsoluteBlockBatch getMazeBatch() {
-        return this.mazeBatch;
-    }
-
-    public List<Pos> getMazePath() {
-        return this.mazePath;
     }
 
     @Override
     protected boolean onPlayerJoin(Player p) {
-        TowerdefenseRoom newRoom = new TowerdefenseRoom(p, this);
+        p.getInventory().setItemStack(1, ItemStack.of(Material.ARMOR_STAND));
-        this.instances.add(newRoom);
-        p.setInstance(newRoom);
-        newRoom.startWave(List.of(EntityType.ENDERMAN, EntityType.BLAZE, EntityType.PLAYER, EntityType.HORSE, EntityType.ARMOR_STAND, EntityType.SKELETON));
         return false;
     }
+
+    
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/towerdefense/TowerdefenseRoom.java

@@ -1,58 +0,0 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.towerdefense;
-
-import eu.mhsl.minenet.minigames.instance.Dimension;
-import eu.mhsl.minenet.minigames.instance.game.stateless.types.towerdefense.generator.MazeGenerator;
-import eu.mhsl.minenet.minigames.util.BatchUtil;
-import net.minestom.server.MinecraftServer;
-import net.minestom.server.entity.*;
-import net.minestom.server.entity.attribute.Attribute;
-import net.minestom.server.instance.InstanceContainer;
-import net.minestom.server.item.ItemStack;
-import net.minestom.server.item.Material;
-import net.minestom.server.timer.TaskSchedule;
-
-import java.util.List;
-import java.util.UUID;
-
-public class TowerdefenseRoom extends InstanceContainer {
-    private final Player player;
-    private final Towerdefense game;
-
-    public TowerdefenseRoom(Player player, Towerdefense game) {
-        super(UUID.randomUUID(), Dimension.OVERWORLD.key);
-        MinecraftServer.getInstanceManager().registerInstance(this);
-        this.player = player;
-        this.game = game;
-        this.player.setGameMode(GameMode.ADVENTURE);
-        this.player.setAllowFlying(true);
-        this.player.getInventory().setItemStack(0, ItemStack.of(Material.ARMOR_STAND));
-
-        setGenerator(new MazeGenerator());
-        BatchUtil.loadAndApplyBatch(this.game.getMazeBatch(), this, () -> {});
-    }
-
-    public void startWave(List<EntityType> entities) {
-        int counter = 0;
-        for(EntityType entityType : entities) {
-            MinecraftServer.getSchedulerManager().scheduleTask(() -> {
-                this.addEntity(new EntityCreature(entityType));
-                return TaskSchedule.stop();
-            }, TaskSchedule.millis(800L*counter));
-            counter++;
-        }
-    }
-
-    private void addEntity(EntityCreature entity) {
-        entity.setInstance(this, this.game.getMazePath().getFirst());
-        entity.getAttribute(Attribute.MOVEMENT_SPEED).setBaseValue(0.15);
-        entity.getNavigator().setPathTo(this.game.getMazePath().get(1), 0.7, () -> changeEntityGoal(entity, 1));
-    }
-
-    private void changeEntityGoal(EntityCreature entity, int positionIndex) {
-        if(positionIndex == this.game.getMazePath().size()-1) {
-            return;
-        }
-        entity.getNavigator().setPathTo(this.game.getMazePath().get(positionIndex+1), 0.7, () -> changeEntityGoal(entity, positionIndex+1));
-    }
-
-}

src/main/resources/lang/locales.map.csv

@@ -130,8 +130,3 @@ description;Run away from falling anvils;Renne von fallenden Ambossen davon
 ns:game_jumpDive#;;
 name;Jump dive;Wassersprung
 description;Jump into the water, avoiding already used spots!;Springe ins wasser an stellen, in denen noch niemand zuvor gelandet ist!
-;;
-ns:game_Sumo#;;
-name;Sumo;Sumo
-lives;Lives;Leben
-description;Knock your enemies off and stay on top!;Versuche deinen Gegner von der Plattform zu schubsen!