From 1840280ef4c506e31df30074adaef473ee4b52c8 Mon Sep 17 00:00:00 2001 From: Nick Hensel Date: Sun, 15 Sep 2024 04:10:33 +0200 Subject: [PATCH] the last prog --- .../java/club/devcord/gamejam/commands/GameCommand.java | 2 -- .../java/club/devcord/gamejam/level/LevelPipeline.java | 9 +++++++++ .../club/devcord/gamejam/level/eyes/BlockShower.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/club/devcord/gamejam/commands/GameCommand.java b/src/main/java/club/devcord/gamejam/commands/GameCommand.java index 645f88d..f8d2945 100644 --- a/src/main/java/club/devcord/gamejam/commands/GameCommand.java +++ b/src/main/java/club/devcord/gamejam/commands/GameCommand.java @@ -66,8 +66,6 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command }); scheduler.runTaskLater(plugin, () -> { - team.players().forEach(p -> p.showTitle(Title.title(MiniMessage.miniMessage().deserialize("Jetzt"), Component.empty()))); - LevelPipeline levelPipeline = new LevelPipeline(team, plugin); levelPipeline.start(); plugin.teamPipelines().put(team, levelPipeline); diff --git a/src/main/java/club/devcord/gamejam/level/LevelPipeline.java b/src/main/java/club/devcord/gamejam/level/LevelPipeline.java index 670fadc..2185a74 100644 --- a/src/main/java/club/devcord/gamejam/level/LevelPipeline.java +++ b/src/main/java/club/devcord/gamejam/level/LevelPipeline.java @@ -8,6 +8,7 @@ import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.title.Title; import org.bukkit.Bukkit; @@ -46,7 +47,10 @@ public void next() { team.players().forEach( p -> p.playSound(Sound.sound(Key.key("minecraft:effect.achievementcompleted"), Sound.Source.MASTER, 100, 1)) ); + levels.peek().start(); + + showLevelTitle(); } else { endTime = Instant.now(); team.players().forEach(player -> { @@ -65,10 +69,15 @@ public void next() { } } + private void showLevelTitle() { + team.players().forEach(player -> player.showTitle(Title.title(Component.text("Level %s".formatted(level())).color(NamedTextColor.AQUA), Component.empty()))); + } + public void start() { levels.peek().start(); startTime = Instant.now(); + showLevelTitle(); } public int level() { diff --git a/src/main/java/club/devcord/gamejam/level/eyes/BlockShower.java b/src/main/java/club/devcord/gamejam/level/eyes/BlockShower.java index dd6ed8f..a8c6d67 100644 --- a/src/main/java/club/devcord/gamejam/level/eyes/BlockShower.java +++ b/src/main/java/club/devcord/gamejam/level/eyes/BlockShower.java @@ -45,7 +45,7 @@ private void switchItems() { if(inventory.getItemInMainHand().isSimilar(TheJumpLevel.THE_EYE) && random.nextInt(0, 100) < 40) { var newSlot = random.nextInt(0, 8); while(inventory.getItem(newSlot) != null - && inventory.getItem(newSlot).isEmpty()) { + && !inventory.getItem(newSlot).isEmpty()) { newSlot = random.nextInt(0, 8); }