Merge branch 'develop' into develop-spaceSnake

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java

@@ -3,6 +3,8 @@ package eu.mhsl.minenet.minigames.instance.game.stateless.types.bowSpleef;
 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.game.stateless.config.restriction.RestrictionHandler;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.restriction.common.MinimalPlayeramountGameRestriction;
 import eu.mhsl.minenet.minigames.instance.room.Room;
 import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
 import net.minestom.server.item.Material;
@@ -29,4 +31,10 @@ public class BowSpleefFactory implements GameFactory {
     public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
         return new BowSpleef().setParent(parent);
     }
+
+    @Override
+    public RestrictionHandler globalRestrictions() {
+        return new RestrictionHandler()
+                .addRestriction(new MinimalPlayeramountGameRestriction(2));
+    }
 }

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

@@ -8,7 +8,7 @@ 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.entity.GameMode;
 import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
 import org.jetbrains.annotations.NotNull;
@@ -69,7 +69,9 @@ class Deathcube extends StatelessGame {
             playerMoveEvent.setCancelled(true);
             return;
         }
-        if(playerMoveEvent.getNewPosition().y() > height) getScore().insertResult(playerMoveEvent.getPlayer());
+        if(playerMoveEvent.getNewPosition().y() <= height) return;
+        getScore().insertResult(playerMoveEvent.getPlayer());
+        playerMoveEvent.getPlayer().setGameMode(GameMode.SPECTATOR);
     }
 
     @Override

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java

@@ -33,6 +33,7 @@ import org.jetbrains.annotations.NotNull;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 
 
@@ -183,7 +184,8 @@ public class ElytraRace extends StatelessGame {
     }
 
     private Point getRingPositionAtZ(int z) {
-        return new Pos(vale.getXShiftAtZ(z), -45, z);
+        Random random = new Random(this.hashCode() + z);
+        return new Pos(vale.getXShiftAtZ(z), -45 + random.nextInt(-5, 15), z);
     }
 
     private CompletableFuture<Void> generateRing(int zPos) {

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

@@ -5,6 +5,8 @@ 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.game.stateless.config.restriction.RestrictionHandler;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.restriction.common.MinimalPlayeramountGameRestriction;
 import eu.mhsl.minenet.minigames.instance.room.Room;
 import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
 import net.minestom.server.item.Material;
@@ -38,4 +40,10 @@ public class HighGroundFactory implements GameFactory {
     public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
         return new HighGround(configuration.get("radius").getAsInt(), configuration.get("seconds").getAsInt()).setParent(parent);
     }
+
+    @Override
+    public RestrictionHandler globalRestrictions() {
+        return new RestrictionHandler()
+                .addRestriction(new MinimalPlayeramountGameRestriction(2));
+    }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java

@@ -9,6 +9,7 @@ import eu.mhsl.minenet.minigames.world.BlockPallet;
 import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGenerator;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.GameMode;
+import net.minestom.server.event.player.PlayerBlockBreakEvent;
 import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.event.player.PlayerStartDiggingEvent;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
@@ -77,6 +78,15 @@ public class Spleef extends StatelessGame {
         }
     }
 
+    @Override
+    protected void onBlockBreak(@NotNull PlayerBlockBreakEvent event) {
+        if(!isRunning) {
+            event.setCancelled(true);
+            return;
+        }
+        setBlock(event.getBlockPosition(), Block.AIR);
+    }
+
     private void destroyBlock(PlayerStartDiggingEvent event) {
         if(!isRunning) return;
         setBlock(event.getBlockPosition(), Block.AIR);

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java

@@ -28,7 +28,7 @@ public class StickFightFactory implements GameFactory {
     @Override
     public ConfigManager configuration() {
         return new ConfigManager()
-                .addOption(new NumericOption("length", Material.SANDSTONE, TranslatedComponent.byId("optionCommon#length"), 5, 7, 9, 11));
+                .addOption(new NumericOption("length", Material.SANDSTONE, TranslatedComponent.byId("optionCommon#length"), 7, 10, 13, 16, 19));
     }
 
     @Override
@@ -40,7 +40,7 @@ public class StickFightFactory implements GameFactory {
 
     @Override
     public Game manufacture(Room parent, Map<String, Option<?>> configuration) {
-        return new Stickfight().setParent(parent);
+        return new Stickfight(configuration.get("length").getAsInt()).setParent(parent);
     }
 
     @Override

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java

@@ -2,7 +2,7 @@ package eu.mhsl.minenet.minigames.instance.game.stateless.types.stickfight;
 
 import eu.mhsl.minenet.minigames.instance.Dimension;
 import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
-import eu.mhsl.minenet.minigames.score.LastWinsScore;
+import eu.mhsl.minenet.minigames.score.LowestPointsWinScore;
 import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGenerator;
 import io.github.togar2.pvp.events.FinalAttackEvent;
 import io.github.togar2.pvp.feature.CombatFeatures;
@@ -13,15 +13,19 @@ import net.minestom.server.instance.block.Block;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.CompletableFuture;
 
 public class Stickfight extends StatelessGame {
-    private final double radius = 20;
+    private final double radius;
     private final WeakHashMap<Player, Pos> spawnPoints = new WeakHashMap<>();
+    private final Map<Player, Integer> scoreMap = new WeakHashMap<>();
+    private boolean countdownStarted = false;
 
-    public Stickfight() {
+    public Stickfight(int length) {
-        super(Dimension.OVERWORLD.key, "Stickfight", new LastWinsScore());
+        super(Dimension.OVERWORLD.key, "Stickfight", new LowestPointsWinScore());
+        this.radius = length;
 
         eventNode().addChild(
             CombatFeatures.empty()
@@ -32,6 +36,7 @@ public class Stickfight extends StatelessGame {
         );
 
         eventNode().addListener(FinalAttackEvent.class, finalAttackEvent -> {
+            if(isBeforeBeginning) finalAttackEvent.setCancelled(true);
             finalAttackEvent.setBaseDamage(0);
             ((Player) finalAttackEvent.getTarget()).setHealth(20);
         });
@@ -41,14 +46,26 @@ public class Stickfight extends StatelessGame {
 
     @Override
     protected void onLoad(@NotNull CompletableFuture<Void> callback) {
-        setBlock(0, 50, 0, Block.DIAMOND_BLOCK);
+        this.replaceCircle(Block.SANDSTONE);
+    }
+
+    private void replaceCircle(Block block) {
+        int radius = 8;
+        for (int x = -radius; x <= radius; x++) {
+            for (int z = -radius; z <= radius; z++) {
+                Pos blockPosition = this.getSpawn().add(x, -1, z);
+                if(blockPosition.distance(this.getSpawn().sub(0, 1, 0)) <= radius) this.setBlock(blockPosition, block);
+            }
+        }
     }
 
     @Override
     protected void start() {
         List<Player> players = getPlayers().stream().toList();
         int numPlayers = players.size();
+        this.countdownStarted = true;
 
+        this.replaceCircle(Block.AIR);
         for (int i = 0; i < numPlayers; i++) {
             double angle = (2 * Math.PI / numPlayers) * i;
             int spawnX = (int) (radius * Math.cos(angle));
@@ -66,6 +83,11 @@ public class Stickfight extends StatelessGame {
         super.start();
     }
 
+    @Override
+    protected void onStop() {
+        this.scoreMap.forEach((player, score) -> getScore().insertResult(player, score));
+    }
+
     private void generateBridge(int startX, int startY, int startZ) {
         int steps = (int) (radius * 1.5);
         for (int i = 0; i < steps; i++) {
@@ -78,19 +100,23 @@ public class Stickfight extends StatelessGame {
 
     @Override
     protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
-        if(!spawnPoints.containsKey(playerMoveEvent.getPlayer())) {
+        Player player = playerMoveEvent.getPlayer();
-            playerMoveEvent.setCancelled(true);
+        if(!spawnPoints.containsKey(player)) {
+            if(playerMoveEvent.getNewPosition().y() < 45) player.teleport(this.getSpawn());
+            if(this.countdownStarted) playerMoveEvent.setCancelled(true);
             return;
         }
 
         if(isBeforeBeginning) {
-            if(spawnPoints.get(playerMoveEvent.getPlayer()).distance(playerMoveEvent.getNewPosition()) < 1) return;
+            if(spawnPoints.get(player).distance(playerMoveEvent.getNewPosition()) < 1) return;
             playerMoveEvent.setCancelled(true);
-            playerMoveEvent.getPlayer().teleport(spawnPoints.get(playerMoveEvent.getPlayer()));
+            player.teleport(spawnPoints.get(player));
         }
 
         if(playerMoveEvent.getNewPosition().y() < 40) {
-            playerMoveEvent.getPlayer().teleport(spawnPoints.get(playerMoveEvent.getPlayer()));
+            player.teleport(spawnPoints.get(player));
+            this.scoreMap.putIfAbsent(player, 0);
+            this.scoreMap.put(player, this.scoreMap.get(player) + 1);
         }
     }
 

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

@@ -5,6 +5,8 @@ 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.game.stateless.config.restriction.RestrictionHandler;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.restriction.common.MinimalPlayeramountGameRestriction;
 import eu.mhsl.minenet.minigames.instance.room.Room;
 import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
 import net.minestom.server.item.Material;
@@ -38,4 +40,10 @@ public class SumoFactory implements GameFactory {
     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);
     }
+
+    @Override
+    public RestrictionHandler globalRestrictions() {
+        return new RestrictionHandler()
+                .addRestriction(new MinimalPlayeramountGameRestriction(2));
+    }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRace.java

@@ -156,6 +156,7 @@ class TrafficLightRace extends StatelessGame {
     @Override
     protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
         if(isBeforeBeginning) return;
+        if(getScore().hasResult(playerMoveEvent.getPlayer())) return;
 
         if(phase.equals(LightPhase.RED) && playerMoveEvent.getNewPosition().z()-0.01 > playerMoveEvent.getPlayer().getPosition().z()) {
             playerMoveEvent.getPlayer().setVelocity(new Vec(0, 8, -15));

src/main/java/eu/mhsl/minenet/minigames/score/LowestPointsWinScore.java

@@ -0,0 +1,16 @@
+package eu.mhsl.minenet.minigames.score;
+
+import eu.mhsl.minenet.minigames.util.MapUtil;
+import net.minestom.server.entity.Player;
+
+import java.util.Set;
+
+public class LowestPointsWinScore extends PointsWinScore {
+    @Override
+    protected void insertResultImplementation(Set<Player> p, int currentPoints) {
+        this.scoreOrder.put(p, currentPoints);
+        this.scoreOrder = MapUtil.sortReversedByValue(this.scoreOrder);
+        getScores().clear();
+        this.scoreOrder.forEach((player, integer) -> getScores().addFirst(player));
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java

@@ -12,7 +12,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class PointsWinScore extends Score {
-    private Map<Set<Player>, Integer> scoreOrder = new HashMap<>();
+    Map<Set<Player>, Integer> scoreOrder = new HashMap<>();
 
     @Override
     protected void insertResultImplementation(Set<Player> p, int currentPoints) {

src/main/java/eu/mhsl/minenet/minigames/util/MapUtil.java

@@ -1,9 +1,6 @@
 package eu.mhsl.minenet.minigames.util;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 public class MapUtil {
     public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {
@@ -17,4 +14,16 @@ public class MapUtil {
 
         return result;
     }
+
+    public static <K, V extends Comparable<? super V>> Map<K, V> sortReversedByValue(Map<K, V> map) {
+        List<Map.Entry<K, V>> list = new ArrayList<>(map.entrySet());
+        list.sort(Map.Entry.<K, V>comparingByValue().reversed());
+
+        Map<K, V> result = new LinkedHashMap<>();
+        for (Map.Entry<K, V> entry : list) {
+            result.put(entry.getKey(), entry.getValue());
+        }
+
+        return result;
+    }
 }

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}),
+    FLOWER(new Block[] {Block.ORANGE_TULIP, Block.PINK_TULIP, Block.RED_TULIP, Block.WHITE_TULIP, Block.DANDELION, Block.POPPY, Block.CORNFLOWER}),
     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/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java

@@ -55,7 +55,19 @@ public class HeightTerrainGenerator extends BaseGenerator {
                 synchronized (batches) {
                     double batchNoise = batches.getNoise(bottomPoint.x(), bottomPoint.z());
 
-                    unit.modifier().fill(bottomPoint, bottomPoint.add(1, heightModifier, 1), batchNoise < 0.9 ? batchNoise > 0 ? Block.GRASS_BLOCK : Block.SOUL_SAND : Block.STONE);
+                    Block block = batchNoise < 0.9 ? batchNoise > -0.2 ? Block.GRASS_BLOCK : Block.SOUL_SAND : Block.STONE;
+                    unit.modifier().fill(bottomPoint, bottomPoint.add(1, heightModifier, 1), block);
+                    if(rnd.nextInt(0, 5) < 1 && block == Block.GRASS_BLOCK) {
+                        int randomInt = rnd.nextInt(0, 6);
+                        if(randomInt > 1) {
+                            unit.modifier().setBlock(bottomPoint.add(0, heightModifier, 0), Block.SHORT_GRASS);
+                        } else if(randomInt > 0) {
+                            unit.modifier().setBlock(bottomPoint.add(0, heightModifier, 0), BlockPallet.FLOWER.rnd());
+                        } else {
+                            unit.modifier().setBlock(bottomPoint.add(0, heightModifier, 0), Block.TALL_GRASS);
+                            unit.modifier().setBlock(bottomPoint.add(0, heightModifier+1, 0), Block.TALL_GRASS.withProperty("half", "upper"));
+                        }
+                    }
 
                     if(calculateSeaLevel != null) {
                         Point absoluteHeight = bottomPoint.add(0, heightModifier, 0);