Allow level dropping to be disabled (#56)

NucleoidMC · Aug 16, 2023 · 7ed1e43 · 7ed1e43
1 parent 0e00e7a
commit 7ed1e43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/xyz/nucleoid/spleef/game/SpleefActive.java b/src/main/java/xyz/nucleoid/spleef/game/SpleefActive.java
@@ -136,7 +136,9 @@ private void tick() {
             this.map.tickLavaRise(this.world, time, lavaRise);
         }
 
-        if (time > this.nextLevelDropTime) {
+        if (this.config.levelBreakInterval() < 0) {
+            this.timerBar.setBarNone();
+        } else if (time > this.nextLevelDropTime) {
             if (this.nextLevelDropTime != -1) {
                 this.map.tryDropLevel(this.world);
             }

diff --git a/src/main/java/xyz/nucleoid/spleef/game/SpleefTimerBar.java b/src/main/java/xyz/nucleoid/spleef/game/SpleefTimerBar.java
@@ -7,15 +7,17 @@
 import xyz.nucleoid.plasmid.game.common.widget.BossBarWidget;
 
 public final class SpleefTimerBar {
+    private static final Text NONE_TITLE = getBarTitle(Text.translatable("text.spleef.bar.dropping.none"), Formatting.GREEN);
+    private static final Text LAVA_TITLE = getBarTitle(Text.translatable("game.spleef.lava.msg"), Formatting.RED);
+
     private final BossBarWidget widget;
 
     SpleefTimerBar(BossBarWidget widget) {
         this.widget = widget;
     }
 
     static SpleefTimerBar create(GlobalWidgets widgets) {
-        var title = getBarTitle(Text.translatable("text.spleef.bar.dropping.none"), Formatting.GREEN);
-        return new SpleefTimerBar(widgets.addBossBar(title, BossBar.Color.GREEN, BossBar.Style.NOTCHED_10));
+        return new SpleefTimerBar(widgets.addBossBar(NONE_TITLE, BossBar.Color.GREEN, BossBar.Style.NOTCHED_10));
     }
 
     public void update(long ticksUntilDrop, long totalTicksUntilDrop) {
@@ -25,8 +27,13 @@ public void update(long ticksUntilDrop, long totalTicksUntilDrop) {
         }
     }
 
+    public void setBarNone() {
+        this.widget.setTitle(NONE_TITLE);
+        this.widget.setProgress(1f);
+    }
+
     public void setBarLava(){
-        this.widget.setTitle(getBarTitle(Text.translatable("game.spleef.lava.msg"), Formatting.RED));
+        this.widget.setTitle(LAVA_TITLE);
         this.widget.setStyle(BossBar.Color.RED, BossBar.Style.NOTCHED_10);
         this.widget.setProgress(1f);
     }