From 20b93cc9ae7990f8de329773bd85fe0fb0366fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 4 Oct 2025 21:34:40 +0200 Subject: [PATCH 01/10] added BlockBreakRace game and related assets --- .../minigames/instance/game/GameList.java | 4 +- .../types/blockBreakRace/BlockBreakRace.java | 76 +++++++++++++++++++ .../blockBreakRace/BlockBreakRaceFactory.java | 40 ++++++++++ .../BlockBreakRaceGenerator.java | 67 ++++++++++++++++ src/main/resources/lang/locales.map.csv | 5 ++ 5 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java create mode 100644 src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceFactory.java create mode 100644 src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceGenerator.java diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java index a20e115..150a603 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java @@ -2,6 +2,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.blockBreakRace.BlockBreakRaceFactory; import eu.mhsl.minenet.minigames.instance.game.stateless.types.bowSpleef.BowSpleefFactory; import eu.mhsl.minenet.minigames.instance.game.stateless.types.elytraRace.ElytraRaceFactory; import eu.mhsl.minenet.minigames.instance.game.stateless.types.backrooms.BackroomsFactory; @@ -38,7 +39,8 @@ public enum GameList { JUMPDIVE(new JumpDiveFactory(), GameType.JUMPNRUN), SUMO(new SumoFactory(), GameType.PVP), HIGHGROUND(new HighGroundFactory(), GameType.PVP), - FASTBRIDGE(new FastbridgeFactory(), GameType.OTHER); + FASTBRIDGE(new FastbridgeFactory(), GameType.OTHER), + BLOCKBREAKRACE(new BlockBreakRaceFactory(), GameType.OTHER); private final GameFactory factory; private final GameType type; diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java new file mode 100644 index 0000000..b123f86 --- /dev/null +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java @@ -0,0 +1,76 @@ +package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBreakRace; + +import eu.mhsl.minenet.minigames.instance.Dimension; +import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame; +import eu.mhsl.minenet.minigames.score.FirstWinsScore; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.event.player.PlayerBlockBreakEvent; +import net.minestom.server.event.player.PlayerMoveEvent; +import net.minestom.server.inventory.PlayerInventory; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public class BlockBreakRace extends StatelessGame { + private int spawnCount = 0; + private final int height; + + public BlockBreakRace(int height) { + super(Dimension.OVERWORLD.key, "blockBreakRace", new FirstWinsScore()); + this.height = height; + this.setGenerator(new BlockBreakRaceGenerator(height)); + } + + @Override + protected void onStart() { + this.getPlayers().forEach(player -> { + PlayerInventory inv = player.getInventory(); + inv.addItemStack(ItemStack.of(Material.DIAMOND_PICKAXE)); + inv.addItemStack(ItemStack.of(Material.DIAMOND_AXE)); + inv.addItemStack(ItemStack.of(Material.DIAMOND_SHOVEL)); + player.setGameMode(GameMode.SURVIVAL); + }); + } + + @Override + protected void onBlockBreak(@NotNull PlayerBlockBreakEvent event) { + List allowedMaterials = List.of(Material.STONE, Material.OAK_PLANKS, Material.DIRT); + if(!allowedMaterials.contains(event.getBlock().registry().material())) event.setCancelled(true); + if(this.isBeforeBeginning) event.setCancelled(true); + } + + @Override + protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) { + if(this.isBeforeBeginning) return; + if(playerMoveEvent.getNewPosition().y() < BlockBreakRaceGenerator.BOTTOM_Y) { + Player player = playerMoveEvent.getPlayer(); + this.getScore().insertResult(player); + player.setGameMode(GameMode.SPECTATOR); + player.getInventory().clear(); + } + } + + @Override + public Pos getSpawn() { + int idx = this.spawnCount++; + + int cols = BlockBreakRaceGenerator.ROW_OFFSETS_X.length; + int rows = BlockBreakRaceGenerator.ROW_OFFSETS_Z.length; + int perChunk = cols * rows; + int zChunk = idx / perChunk; + + int gridIndex = idx % perChunk; + int xIndex = gridIndex % cols; + int zIndex = gridIndex / cols; + + int localX = BlockBreakRaceGenerator.ROW_OFFSETS_X[xIndex]; + int localZ = BlockBreakRaceGenerator.ROW_OFFSETS_Z[zIndex]; + + int absZ = (zChunk * 16) + localZ; + return new Pos(localX, BlockBreakRaceGenerator.BOTTOM_Y + this.height + 1, absZ).add(0.5); + } +} diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceFactory.java new file mode 100644 index 0000000..7ff5f1f --- /dev/null +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceFactory.java @@ -0,0 +1,40 @@ +package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBreakRace; + +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 BlockBreakRaceFactory implements GameFactory { + @Override + public TranslatedComponent name() { + return TranslatedComponent.byId("game_BlockBreakRace#name"); + } + + @Override + public Material symbol() { + return Material.DIAMOND_PICKAXE; + } + + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_BlockBreakRace#description"); + } + + @Override + public ConfigManager configuration() { + return new ConfigManager() + .addOption(new NumericOption("height", Material.SCAFFOLDING, TranslatedComponent.byId("optionCommon#height"), 20, 30, 40, 50)); + } + + @Override + public Game manufacture(Room parent, Map> configuration) throws Exception { + return new BlockBreakRace(configuration.get("height").getAsInt()).setParent(parent); + } +} diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceGenerator.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceGenerator.java new file mode 100644 index 0000000..768bf72 --- /dev/null +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRaceGenerator.java @@ -0,0 +1,67 @@ +package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBreakRace; + +import eu.mhsl.minenet.minigames.world.generator.featureEnriched.ValeGenerator; +import eu.mhsl.minenet.minigames.world.generator.terrain.BaseGenerator; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.generator.GenerationUnit; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +public class BlockBreakRaceGenerator extends BaseGenerator { + public static final int BOTTOM_Y = 50; + public final int TOP_Y; + public static final int[] ROW_OFFSETS_X = {4, 8, 12}; + public static final int[] ROW_OFFSETS_Z = {4, 8, 12}; + + private static final Block[] FILL_BLOCKS = { + Block.STONE, + Block.DIRT, + Block.OAK_PLANKS + }; + + private final Random random = ThreadLocalRandom.current(); + + public BlockBreakRaceGenerator(int height) { + this.TOP_Y = BOTTOM_Y + height; + ValeGenerator vale = new ValeGenerator(); + vale.setXShiftMultiplier(i -> 0.5d); + vale.setHeightNoiseMultiplier(i -> 2); + vale.setXShiftOffset(i -> 40d); + this.addMixIn(vale); + + this.addMixIn(unit -> { + if(unit.absoluteStart().chunkX() != 0) return; + + for (int localX : ROW_OFFSETS_X) { + for (int localZ : ROW_OFFSETS_Z) { + final int absZ = unit.absoluteStart().blockZ() + localZ; + this.placeTube(unit, localX, absZ); + } + } + }); + } + + private void placeTube(GenerationUnit unit, int x, int z) { + for (int y = BOTTOM_Y; y < this.TOP_Y; y++) { + Block fill = FILL_BLOCKS[this.random.nextInt(FILL_BLOCKS.length)]; + unit.modifier().fill( + new Pos(x, y, z), + new Pos(x, y, z).add(1), + fill + ); + } + + for (int dx = -1; dx <= 1; dx++) { + for (int dz = -1; dz <= 1; dz++) { + if (dx == 0 && dz == 0) continue; // Zentrum überspringen + unit.modifier().fill( + new Pos(x + dx, BOTTOM_Y, z + dz), + new Pos(x + dx, this.TOP_Y + 3, z + dz).add(1), + Block.BARRIER + ); + } + } + } +} diff --git a/src/main/resources/lang/locales.map.csv b/src/main/resources/lang/locales.map.csv index 46b4bb2..d2167ae 100644 --- a/src/main/resources/lang/locales.map.csv +++ b/src/main/resources/lang/locales.map.csv @@ -143,3 +143,8 @@ description;Stay on the high ground to win!;Bleibe solange wie möglich auf der ns:game_Fastbridge#;; name;Fastbridge;Fastbridge description;Speedbridge to the other platform. The first one there wins!;Baue dich so schnell wie möglich zur anderen Plattform. Wer zuerst dort ist, gewinnt! +;; +ns:game_BlockBreakRace#;; +name;Block Break Race;Blockbruch-Rennen +description;Dig down through the tubes using the right tools. The first player to reach the bottom wins!;Grabe dich durch die Röhren nach unten und verwende dabei das richtige Werkzeug. Wer zuerst unten ankommt, gewinnt! +;; \ No newline at end of file From a2afc49d20a114fcb58c172a976e5250f8c3e65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 4 Oct 2025 21:38:50 +0200 Subject: [PATCH 02/10] refactored BlockBreakRace to show players all items before the game starts --- .../types/blockBreakRace/BlockBreakRace.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java index b123f86..8bc5a8b 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBreakRace/BlockBreakRace.java @@ -25,15 +25,18 @@ public class BlockBreakRace extends StatelessGame { this.setGenerator(new BlockBreakRaceGenerator(height)); } + @Override + protected boolean onPlayerJoin(Player p) { + PlayerInventory inv = p.getInventory(); + inv.addItemStack(ItemStack.of(Material.DIAMOND_PICKAXE)); + inv.addItemStack(ItemStack.of(Material.DIAMOND_AXE)); + inv.addItemStack(ItemStack.of(Material.DIAMOND_SHOVEL)); + return super.onPlayerJoin(p); + } + @Override protected void onStart() { - this.getPlayers().forEach(player -> { - PlayerInventory inv = player.getInventory(); - inv.addItemStack(ItemStack.of(Material.DIAMOND_PICKAXE)); - inv.addItemStack(ItemStack.of(Material.DIAMOND_AXE)); - inv.addItemStack(ItemStack.of(Material.DIAMOND_SHOVEL)); - player.setGameMode(GameMode.SURVIVAL); - }); + this.getPlayers().forEach(player -> player.setGameMode(GameMode.SURVIVAL)); } @Override From 398c3666e42fe57d373104b25cf2596d9580d786 Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 12:00:12 +0200 Subject: [PATCH 03/10] deathcube spectator mode when done --- .../instance/game/stateless/types/deathcube/Deathcube.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java index 4f0e7fb..7eff456 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java +++ b/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 From 14a7e0c25f1a7aa20149bc55c6718b46f6c4dbe9 Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 15:09:43 +0200 Subject: [PATCH 04/10] removed knockback for finished players in TrafficLightRace --- .../game/stateless/types/trafficlightrace/TrafficLightRace.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRace.java index d69dfd4..2793273 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRace.java +++ b/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)); From 368356c739e74805350b1d8d22f8b171a90688bb Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 15:20:43 +0200 Subject: [PATCH 05/10] fixed unbreakable snow in Spleef --- .../instance/game/stateless/types/spleef/Spleef.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java index d0b5969..093661d 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java +++ b/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); From dccb57b0563fcb8d09d405b1f21ccb0ea155dabe Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 16:15:02 +0200 Subject: [PATCH 06/10] added LowestPointsWinScore and Stickfight win condition --- .../types/stickfight/Stickfight.java | 22 ++++++++++++++----- .../minigames/score/LowestPointsWinScore.java | 16 ++++++++++++++ .../minigames/score/PointsWinScore.java | 2 +- .../mhsl/minenet/minigames/util/MapUtil.java | 17 ++++++++++---- 4 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 src/main/java/eu/mhsl/minenet/minigames/score/LowestPointsWinScore.java diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java index d3c6d02..26709ec 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java +++ b/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,17 @@ 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 WeakHashMap spawnPoints = new WeakHashMap<>(); + private final Map scoreMap = new WeakHashMap<>(); public Stickfight() { - super(Dimension.OVERWORLD.key, "Stickfight", new LastWinsScore()); + super(Dimension.OVERWORLD.key, "Stickfight", new LowestPointsWinScore()); eventNode().addChild( CombatFeatures.empty() @@ -66,6 +68,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 +85,22 @@ public class Stickfight extends StatelessGame { @Override protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) { - if(!spawnPoints.containsKey(playerMoveEvent.getPlayer())) { + Player player = playerMoveEvent.getPlayer(); + if(!spawnPoints.containsKey(player)) { 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); } } diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/LowestPointsWinScore.java b/src/main/java/eu/mhsl/minenet/minigames/score/LowestPointsWinScore.java new file mode 100644 index 0000000..4ff4444 --- /dev/null +++ b/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 p, int currentPoints) { + this.scoreOrder.put(p, currentPoints); + this.scoreOrder = MapUtil.sortReversedByValue(this.scoreOrder); + getScores().clear(); + this.scoreOrder.forEach((player, integer) -> getScores().addFirst(player)); + } +} diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java b/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java index d9190f7..c8ca7bf 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java +++ b/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, Integer> scoreOrder = new HashMap<>(); + Map, Integer> scoreOrder = new HashMap<>(); @Override protected void insertResultImplementation(Set p, int currentPoints) { diff --git a/src/main/java/eu/mhsl/minenet/minigames/util/MapUtil.java b/src/main/java/eu/mhsl/minenet/minigames/util/MapUtil.java index ac5506b..a94cf9c 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/util/MapUtil.java +++ b/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.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class MapUtil { public static > Map sortByValue(Map map) { @@ -17,4 +14,16 @@ public class MapUtil { return result; } + + public static > Map sortReversedByValue(Map map) { + List> list = new ArrayList<>(map.entrySet()); + list.sort(Map.Entry.comparingByValue().reversed()); + + Map result = new LinkedHashMap<>(); + for (Map.Entry entry : list) { + result.put(entry.getKey(), entry.getValue()); + } + + return result; + } } \ No newline at end of file From 90832aacd08a6772c93573d2afa56b192da7ce67 Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 16:56:26 +0200 Subject: [PATCH 07/10] added some globalRestrictions --- .../game/stateless/types/bowSpleef/BowSpleefFactory.java | 8 ++++++++ .../stateless/types/highGround/HighGroundFactory.java | 8 ++++++++ .../instance/game/stateless/types/sumo/SumoFactory.java | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java index 0466661..0694ce2 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java +++ b/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> configuration) throws Exception { return new BowSpleef().setParent(parent); } + + @Override + public RestrictionHandler globalRestrictions() { + return new RestrictionHandler() + .addRestriction(new MinimalPlayeramountGameRestriction(2)); + } } diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGroundFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGroundFactory.java index 24e82c5..3c2a527 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGroundFactory.java +++ b/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> 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)); + } } diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/sumo/SumoFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/sumo/SumoFactory.java index 414d998..d6bb2f5 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/sumo/SumoFactory.java +++ b/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> 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)); + } } From c3f5170c3343c5a106fedf7d1fcd9d5eb36b6358 Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 10 Oct 2025 22:53:56 +0200 Subject: [PATCH 08/10] added random height variations for elytra race gates --- .../instance/game/stateless/types/elytraRace/ElytraRace.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java index 27cd19f..9f7a446 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java +++ b/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 generateRing(int zPos) { From 097438886c7b4ee54ea4dbfefb22ca5c318c4cad Mon Sep 17 00:00:00 2001 From: lars Date: Sat, 11 Oct 2025 12:22:50 +0200 Subject: [PATCH 09/10] added stickfight start and working length option --- .../types/stickfight/StickFightFactory.java | 4 ++-- .../types/stickfight/Stickfight.java | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java index f3be090..5fc1b12 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java +++ b/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> configuration) { - return new Stickfight().setParent(parent); + return new Stickfight(configuration.get("length").getAsInt()).setParent(parent); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java index 26709ec..5afb4c6 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java @@ -18,12 +18,14 @@ 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 spawnPoints = new WeakHashMap<>(); private final Map scoreMap = new WeakHashMap<>(); + private boolean countdownStarted = false; - public Stickfight() { + public Stickfight(int length) { super(Dimension.OVERWORLD.key, "Stickfight", new LowestPointsWinScore()); + this.radius = length; eventNode().addChild( CombatFeatures.empty() @@ -34,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); }); @@ -43,14 +46,26 @@ public class Stickfight extends StatelessGame { @Override protected void onLoad(@NotNull CompletableFuture 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 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)); @@ -87,7 +102,8 @@ public class Stickfight extends StatelessGame { protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) { Player player = playerMoveEvent.getPlayer(); if(!spawnPoints.containsKey(player)) { - playerMoveEvent.setCancelled(true); + if(playerMoveEvent.getNewPosition().y() < 45) player.teleport(this.getSpawn()); + if(this.countdownStarted) playerMoveEvent.setCancelled(true); return; } From c4aaa7acf926268c6af5c167022b736fe6af7ac4 Mon Sep 17 00:00:00 2001 From: lars Date: Sat, 11 Oct 2025 15:17:23 +0200 Subject: [PATCH 10/10] added flowers and grass to HeightTerrainGenerator --- .../mhsl/minenet/minigames/world/BlockPallet.java | 2 +- .../generator/terrain/HeightTerrainGenerator.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/world/BlockPallet.java b/src/main/java/eu/mhsl/minenet/minigames/world/BlockPallet.java index 483d893..9dde82b 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/world/BlockPallet.java +++ b/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 list; diff --git a/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java b/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java index 362d3fe..a3a1c08 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java +++ b/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);