From 273fba879e11d4845abaae717bf8bb44e50d5aa3 Mon Sep 17 00:00:00 2001
From: D4rkr34lm <darth.m.frohn@gmail.com>
Date: Tue, 10 Oct 2023 00:17:38 +0200
Subject: [PATCH] Add Phase order upper limit

---
 .../bausystem/features/simulator2/data/SimulatorSetting.java  | 1 +
 .../features/simulator2/gui/SimulatorRedstonePhaseGui.java    | 4 ++--
 .../features/simulator2/gui/SimulatorTntPhaseGui.java         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java
index 47385a47..bcea1058 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java
@@ -25,6 +25,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public abstract class SimulatorSetting {
+    public static final int ORDER_LIMIT = 64;
     protected int tickOffset;
     protected int lifetime = 80;
     protected int order = 1;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorRedstonePhaseGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorRedstonePhaseGui.java
index 3a7ac38c..bb06e7cb 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorRedstonePhaseGui.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorRedstonePhaseGui.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.simulator2.gui;
 
 import de.steamwar.bausystem.features.simulator2.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator2.data.Simulator;
+import de.steamwar.bausystem.features.simulator2.data.SimulatorSetting;
 import de.steamwar.bausystem.features.simulator2.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator2.data.redstone.RedstoneSetting;
 import de.steamwar.bausystem.features.simulator2.gui.base.SimulatorBaseGui;
@@ -32,7 +33,6 @@ import org.bukkit.entity.Player;
 import java.util.Arrays;
 
 public class SimulatorRedstonePhaseGui extends SimulatorBaseGui {
-
     private final RedstoneElement redstoneElement;
     private final RedstoneSetting redstone;
     private final SimulatorBaseGui back;
@@ -115,7 +115,7 @@ public class SimulatorRedstonePhaseGui extends SimulatorBaseGui {
         //Order
         int order = redstone.getOrder();
         inventory.setItem(14, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            redstone.changeOrder(clickType.isShiftClick() ? 5 : 1);
+            redstone.setOrder(Math.min(SimulatorSetting.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         });
 
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorTntPhaseGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorTntPhaseGui.java
index db009b3c..9d732f03 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorTntPhaseGui.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorTntPhaseGui.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.simulator2.gui;
 
 import de.steamwar.bausystem.features.simulator2.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator2.data.Simulator;
+import de.steamwar.bausystem.features.simulator2.data.SimulatorSetting;
 import de.steamwar.bausystem.features.simulator2.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator2.data.redstone.RedstoneSetting;
 import de.steamwar.bausystem.features.simulator2.data.tnt.TNTElement;
@@ -136,7 +137,7 @@ public class SimulatorTntPhaseGui extends SimulatorBaseGui{
         //Order
         int order = tnt.getOrder();
         inventory.setItem(13, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            tnt.changeOrder(clickType.isShiftClick() ? 5 : 1);
+            tnt.setOrder(Math.min(SimulatorSetting.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         });