highground finished

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

@@ -8,12 +8,13 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.backrooms.Backroo
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.bedwars.BedwarsFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.acidRain.AcidRainFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.deathcube.DeathcubeFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.highGround.HighGroundFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.jumpDive.JumpDiveFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.minerun.MinerunFactory;
 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.sumo.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 +35,8 @@ public enum GameList {
     ELYTRARACE(new ElytraRaceFactory(), GameType.PVP),
     SPLEEF(new SpleefFactory(), GameType.PVP),
     JUMPDIVE(new JumpDiveFactory(), GameType.JUMPNRUN),
-    SUMO(new SumoFactory(), GameType.PVP);
+    SUMO(new SumoFactory(), GameType.PVP),
+    HIGHGROUND(new HighGroundFactory(), GameType.PVP);
 
     private final GameFactory factory;
     private final GameType type;

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java

@@ -0,0 +1,126 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.highGround;
+
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.PointsWinScore;
+import eu.mhsl.minenet.minigames.world.BlockPallet;
+import io.github.togar2.pvp.events.EntityKnockbackEvent;
+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.coordinate.Pos;
+import net.minestom.server.entity.Player;
+import net.minestom.server.event.instance.InstanceTickEvent;
+import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.instance.block.Block;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.WeakHashMap;
+import java.util.concurrent.CompletableFuture;
+
+class HighGround extends StatelessGame {
+    private final int radius;
+    private final int seconds;
+    private final WeakHashMap<Player, Integer> scoreMap = new WeakHashMap<>();
+
+    HighGround(int radius, int seconds) {
+        super(Dimension.THE_END.key, "highground", new PointsWinScore());
+        this.radius = radius;
+        this.seconds = seconds;
+
+        this.eventNode().addChild(
+            CombatFeatures.empty()
+                .add(CombatFeatures.VANILLA_ATTACK)
+                .add(CombatFeatures.VANILLA_DAMAGE)
+                .add(CombatFeatures.VANILLA_KNOCKBACK)
+                .build()
+                .createNode()
+        );
+
+        this.eventNode().addListener(
+            FinalAttackEvent.class,
+            finalAttackEvent -> finalAttackEvent.setBaseDamage(0)
+        );
+
+        this.eventNode().addListener(PrepareAttackEvent.class, prepareAttackEvent -> {
+            if(this.isBeforeBeginning){
+                prepareAttackEvent.setCancelled(true);
+            }
+        });
+
+        this.eventNode().addListener(
+            EntityKnockbackEvent.class,
+            entityKnockbackEvent -> entityKnockbackEvent.setStrength(1.1f)
+        );
+
+        this.eventNode().addListener(InstanceTickEvent.class, instanceTickEvent ->  {
+            if (this.isBeforeBeginning || !this.isRunning) return;
+            this.getPlayers().forEach(player -> {
+                if((player.isOnGround() && player.getPosition().y() >= 1) || (!player.isOnGround() && player.getPosition().y() >= 1.5)){
+                    this.scoreMap.put(player, this.scoreMap.get(player) + 1);
+                    player.setLevel(this.scoreMap.get(player) / 20);
+                    player.setExp((this.scoreMap.get(player) % 20) / 20.0f);
+                }
+            });
+        });
+    }
+
+    @Override
+    protected void onLoad(@NotNull CompletableFuture<Void> callback) {
+        for (int y = 0; y >= -3; y--) {
+            int radius = (Math.abs(y) * 5) + this.radius;
+            for (int x = -radius; x <= radius; x++) {
+                for (int z = -radius; z <= radius; z++) {
+                    double distance = new Pos(x, 0, z).distance(0, 0, 0);
+                    if (distance <= radius) {
+                        this.setBlock(x, y, z, y == 0 ? Block.DIAMOND_BLOCK : Block.GRASS_BLOCK);
+                        Pos featurePosition = new Pos(x, y + 1, z);
+
+                        if(y >= 0 || this.getBlock(featurePosition).isSolid()) continue;
+                        if (this.rnd.nextDouble() < 0.1){
+                            this.setBlock(featurePosition, Block.SHORT_GRASS);
+                        }
+                        if (this.rnd.nextDouble() < 0.01){
+                            this.setBlock(featurePosition, BlockPallet.FLOWER.rnd());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
+        Player player = playerMoveEvent.getPlayer();
+        if(playerMoveEvent.getNewPosition().y() < -10){
+            player.teleport(this.getSpawn());
+        }
+    }
+
+    @Override
+    protected void start() {
+        this.getPlayers().forEach(player -> this.scoreMap.put(player, 0));
+        super.start();
+    }
+
+    @Override
+    protected void onStart() {
+        this.setTimeLimit(this.seconds);
+    }
+
+    @Override
+    protected void onStop() {
+        this.getPlayers().forEach(player -> this.getScore().insertResult(player, this.scoreMap.get(player)));
+    }
+
+    @Override
+    public Pos getSpawn() {
+        double theta = this.rnd.nextDouble() * 2 * Math.PI;
+
+        double spawnRadius = this.radius + 5;
+        double x = spawnRadius * Math.cos(theta);
+        double z = spawnRadius * Math.sin(theta);
+
+        return new Pos(x, 0, z).withLookAt(new Pos(0, 0, 0));
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGroundFactory.java

@@ -0,0 +1,36 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.highGround;
+
+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 HighGroundFactory implements GameFactory {
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_Highground#name");
+    }
+
+    @Override
+    public TranslatedComponent description() {
+        return TranslatedComponent.byId("game_Highground#description");
+    }
+
+    @Override
+    public ConfigManager configuration() {
+        return new ConfigManager()
+                .addOption(new NumericOption("radius", Material.HEART_OF_THE_SEA, TranslatedComponent.byId("optionCommon#radius"), 3, 5, 7, 10))
+                .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 HighGround(configuration.get("radius").getAsInt(), configuration.get("seconds").getAsInt()).setParent(parent);
+    }
+}

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

@@ -1,4 +1,4 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.test;
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.sumo;
 
 import eu.mhsl.minenet.minigames.instance.Dimension;
 import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
@@ -46,7 +46,8 @@ public class Sumo extends StatelessGame {
                         .add(CombatFeatures.VANILLA_ATTACK)
                         .add(CombatFeatures.VANILLA_DAMAGE)
                         .add(CombatFeatures.VANILLA_KNOCKBACK)
-                        .build().createNode()
+                        .build()
+                        .createNode()
         );
 
         this.eventNode().addListener(PrepareAttackEvent.class, prepareAttackEvent -> {

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

@@ -1,4 +1,4 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.test;
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.sumo;
 
 import eu.mhsl.minenet.minigames.instance.game.Game;
 import eu.mhsl.minenet.minigames.instance.game.stateless.config.ConfigManager;
@@ -13,7 +13,10 @@ import java.util.Map;
 
 public class SumoFactory implements GameFactory {
     @Override
-    public TranslatedComponent name() {return TranslatedComponent.byId("game_Sumo#name");}
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_Sumo#name");
+    }
+
     public TranslatedComponent description() {
         return TranslatedComponent.byId("game_Sumo#description");
     }

src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java

@@ -66,6 +66,8 @@ public class Room extends MineNetInstance implements Spawnable {
         p.getInventory().clear();
         p.setGameMode(GameMode.ADVENTURE);
         p.setInvisible(false);
+        p.setExp(0);
+        p.setLevel(0);
         rooms.add(room);
         players.put(p, room);
         MoveInstance.move(p, room);
@@ -88,29 +90,29 @@ public class Room extends MineNetInstance implements Spawnable {
     private Room(Player owner) {
         super(Dimension.THE_END.key);
         this.apiDriven = false;
-        construct();
+        this.construct();
-        setOwner(owner);
+        this.setOwner(owner);
     }
 
     protected Room() {
         super(Dimension.THE_END.key);
         this.apiDriven = true;
-        construct();
+        this.construct();
     }
 
     private void construct() {
         MinecraftServer.getInstanceManager().registerInstance(this);
-        setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath()));
+        this.setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath()));
 
         this.gameSelector = new GameSelector();
         this.gameSelector.setInstance(this, new Pos(0.5, 50, 19.5));
 
-        eventNode().addListener(PlayerBlockBreakEvent.class, CommonEventHandles::cancel);
+        this.eventNode().addListener(PlayerBlockBreakEvent.class, CommonEventHandles::cancel);
-        eventNode().addListener(PlayerDisconnectEvent.class, playerDisconnectEvent -> unsetRoom(playerDisconnectEvent.getPlayer()));
+        this.eventNode().addListener(PlayerDisconnectEvent.class, playerDisconnectEvent -> unsetRoom(playerDisconnectEvent.getPlayer()));
     }
 
     public Player getOwner() {
-        return owner;
+        return this.owner;
     }
 
     public void setOwner(Player newOwner) {
@@ -123,7 +125,7 @@ public class Room extends MineNetInstance implements Spawnable {
 
             if(p != this.owner) return;
 
-            getAllMembers().stream()
+            this.getAllMembers().stream()
                     .filter(player -> player != p) // exclude the current leaving owner
                     .findFirst()
                     .ifPresentOrElse(
@@ -133,8 +135,8 @@ public class Room extends MineNetInstance implements Spawnable {
 
             Room.unsetRoom(p);
 
-            new ChatMessage(Icon.ERROR).appendStatic("The room leader left!").send(getAllMembers());
+            new ChatMessage(Icon.ERROR).appendStatic("The room leader left!").send(this.getAllMembers());
-            new ChatMessage(Icon.SCIENCE).appendStatic(this.owner.getUsername()).appendStatic(" is the new Leader!").send(getAllMembers().stream().filter(player -> player != this.owner).collect(Collectors.toSet()));
+            new ChatMessage(Icon.SCIENCE).appendStatic(this.owner.getUsername()).appendStatic(" is the new Leader!").send(this.getAllMembers().stream().filter(player -> player != this.owner).collect(Collectors.toSet()));
             new ChatMessage(Icon.SUCCESS).appendStatic("You are now the leader.").send(this.owner);
         });
     }

src/main/java/eu/mhsl/minenet/minigames/world/BlockPallet.java

@@ -12,7 +12,7 @@ public enum BlockPallet {
     STONE(new Block[] {Block.CHISELED_STONE_BRICKS, Block.STONE_BRICKS, Block.POLISHED_ANDESITE, Block.POLISHED_BLACKSTONE, Block.POLISHED_DIORITE}),
     WINTER(new Block[] {Block.SNOW_BLOCK, Block.ICE, Block.PACKED_ICE, Block.BLUE_CONCRETE, Block.SEA_LANTERN}),
     STREET(new Block[] {Block.BLACK_CONCRETE_POWDER, Block.GRAY_CONCRETE_POWDER, Block.GRAVEL, Block.BLACK_CONCRETE, Block.GRAY_CONCRETE}),
-
+    FLOWER(new Block[] {Block.ORANGE_TULIP, Block.PINK_TULIP, Block.RED_TULIP, Block.WHITE_TULIP}),
     PRESSURE_PLATES(new Block[] {Block.ACACIA_PRESSURE_PLATE, Block.BIRCH_PRESSURE_PLATE, Block.CRIMSON_PRESSURE_PLATE, Block.JUNGLE_PRESSURE_PLATE, Block.OAK_PRESSURE_PLATE, Block.DARK_OAK_PRESSURE_PLATE, Block.HEAVY_WEIGHTED_PRESSURE_PLATE, Block.HEAVY_WEIGHTED_PRESSURE_PLATE, Block.POLISHED_BLACKSTONE_PRESSURE_PLATE, Block.SPRUCE_PRESSURE_PLATE, Block.STONE_PRESSURE_PLATE, Block.WARPED_PRESSURE_PLATE});
 
     final List<Block> list;

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

@@ -135,3 +135,7 @@ 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!
+;;
+ns:game_Highground#;;
+name;Highground;Hochburg
+description;Stay on the high ground to win!;Bleibe solange wie möglich auf der Hochburg, um zu gewinnen!