Merge pull request 'Finalized ColorJump' (#13) from develop-jannis into develop

Reviewed-on: #13
Reviewed-by: Lars Neuhaus <larslukasneuhaus@gmx.de>

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

@@ -52,7 +52,7 @@ public enum GameList {
     BOATRACE(new BoatRaceFactory(), GameType.OTHER),
     PILLARS(new PillarsFactory(), GameType.PROTOTYPE),
     BLOCKBATTLE(new BlockBattleFactory(), GameType.PVP),
-    COLORJUMP(new ColorJumpFactory(), GameType.PROTOTYPE);
+    COLORJUMP(new ColorJumpFactory(), GameType.JUMPNRUN);
 
     private final GameFactory factory;
     private final GameType type;

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/colorJump/ColorJump.java

@@ -8,10 +8,13 @@ import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGen
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.GameMode;
+import net.minestom.server.event.inventory.InventoryPreClickEvent;
 import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.event.player.PlayerSwapItemEvent;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.ItemStack;
+import net.minestom.server.timer.Scheduler;
 import net.minestom.server.timer.TaskSchedule;
 import org.jetbrains.annotations.NotNull;
 
@@ -32,13 +35,25 @@ public class ColorJump extends StatelessGame {
         Block.PINK_CONCRETE
     );
     private Block currentBlock;
+    private Block blockLastRound;
     private double roundTime = 5;
+    private final double multiplierNextRoundTime = 0.9;
 
     public ColorJump() {
         super(Dimension.THE_END.key, "ColorJump", new LastWinsScore());
         this.getScore().setIgnoreLastPlayers(1);
 
         this.setGenerator(new CircularPlateTerrainGenerator(100));
+
+        this.eventNode().addListener(
+            InventoryPreClickEvent.class,
+            inventoryPreClickEvent -> inventoryPreClickEvent.setCancelled(true)
+        );
+
+        this.eventNode().addListener(
+            PlayerSwapItemEvent.class,
+            playerSwapItemEvent -> playerSwapItemEvent.setCancelled(true)
+        );
     }
 
     @Override
@@ -53,8 +68,11 @@ public class ColorJump extends StatelessGame {
 
     private void nextRound() {
         this.generate();
-
+        do {
             this.currentBlock = this.blocks.get(ThreadLocalRandom.current().nextInt(this.blocks.size()));
+        } while(this.currentBlock == this.blockLastRound);
+        this.blockLastRound = this.currentBlock;
+
         ItemStack item = ItemStack.of(Objects.requireNonNull(this.currentBlock.registry().material()));
         this.getPlayers().forEach(player -> {
             player.getInventory().clear();
@@ -67,26 +85,43 @@ public class ColorJump extends StatelessGame {
         TaskSchedule stop = TaskSchedule.stop();
 
         scheduler.scheduleTask(() -> {
+            if(!this.isRunning) return stop;
             this.destroyAllExcept(this.currentBlock);
 
             scheduler.scheduleTask(() -> {
-                this.nextRound();
+                if(this.isRunning) this.nextRound();
                 return stop;
             }, TaskSchedule.seconds(3));
             return stop;
         }, TaskSchedule.seconds((long) this.roundTime));
-        if(this.roundTime > 0.5)
-            this.roundTime = this.roundTime * 0.9;
+        this.roundTime = this.roundTime * this.multiplierNextRoundTime;
+        if(this.roundTime <= 1) this.roundTime = 1;
 
-        long secondsLeft = Math.max(0, (long) this.roundTime);
-
-        for (int i = Math.min(3, (int) secondsLeft); i >= 0; i--) {
-            int level = i;
-            scheduler.scheduleTask(() -> {
-                this.getPlayers().forEach(player -> player.setLevel(level));
-                return stop;
-            }, TaskSchedule.seconds(secondsLeft-i));
+        long totalTicks = (long) (this.roundTime * 20);
+        this.scheduleExpUpdate(scheduler, totalTicks, totalTicks);
     }
+
+    private void scheduleExpUpdate(Scheduler scheduler, long remainingTicks, long totalTicks) {
+        if (!this.isRunning) return;
+
+        if (remainingTicks <= 0) {
+            this.getPlayers().forEach(player -> {
+                player.setExp(0f);
+                player.setLevel(0);
+            });
+            return;
+        }
+
+        float progress = (float) remainingTicks / totalTicks;
+
+        this.getPlayers().forEach(player -> {
+            player.setExp(progress);
+            player.setLevel((int) Math.ceil(remainingTicks / 20.0));
+        });
+        scheduler.scheduleTask(() -> {
+            this.scheduleExpUpdate(scheduler, remainingTicks -1, totalTicks);
+            return TaskSchedule.stop();
+        }, TaskSchedule.tick(1));
     }
 
     private void generate() {