From c369662a28f89a756e311d1aec9997b3885fa268 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Tue, 2 Apr 2024 22:35:27 +0200 Subject: [PATCH 1/7] Fixed #227 and made subpixelalignment more user friendly --- .../simulator/data/tnt/TNTElement.java | 33 ++++---- .../gui/SimulatorGroupSettingsGui.java | 76 +++++++++++++------ .../gui/SimulatorTNTSettingsGui.java | 35 +++++---- 3 files changed, 88 insertions(+), 56 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java index 29e90d83..bb3a659d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java @@ -26,12 +26,17 @@ import de.steamwar.bausystem.features.simulator.gui.SimulatorTNTGui; import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; +import lombok.Getter; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.util.Vector; public final class TNTElement extends SimulatorElement { + public static final double SUB_PIXEL = 0.0999999046326; + @Getter + private final Vector alignment = new Vector(); + public TNTElement(Vector position) { super(Material.TNT, position); } @@ -47,26 +52,16 @@ public final class TNTElement extends SimulatorElement { position.setZ(position.getZ() + z); } - public void align(Vector offset) { - if (offset.getX() != 0) { - if (position.getX() - (int) position.getX() == 0.49) { - position.setX(position.getX() + 0.02); - } - if (position.getX() - (int) position.getX() == -0.49) { - position.setX(position.getX() - 0.02); - } - position.setX(position.getBlockX() + offset.getX()); - } + public void alignX(int direction) { + position.setX(position.getX() - SUB_PIXEL * alignment.getX()); + alignment.setX(direction); + position.setX(position.getX() + SUB_PIXEL * alignment.getX()); + } - if (offset.getZ() != 0) { - if (position.getZ() - (int) position.getZ() == 0.49) { - position.setZ(position.getZ() + 0.02); - } - if (position.getZ() - (int) position.getZ() == -0.49) { - position.setZ(position.getZ() - 0.02); - } - position.setZ(position.getBlockZ() + offset.getZ()); - } + public void alignZ(int direction) { + position.setZ(position.getZ() - SUB_PIXEL * alignment.getZ()); + alignment.setZ(direction); + position.setZ(position.getZ() + SUB_PIXEL * alignment.getZ()); } @Override diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java index e9439ce9..0a66e21d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java @@ -97,41 +97,69 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { if (allTNT) { // Subpixel Alignment inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> { - simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> { - tnt.align(new Vector(0.5, 0, 0.5)); - }); + simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .forEach(tntElement -> { + tntElement.alignX(0); + tntElement.alignZ(0); + }); SimulatorWatcher.update(simulator); })); // Z - inventory.setItem(20, new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> { - simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> { - tnt.align(new Vector(0, 0, 0.49)); - }); + SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> { + simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .forEach(tntElement -> { + if (tntElement.getAlignment().getZ() != -1) tntElement.alignZ(-1); + }); SimulatorWatcher.update(simulator); - })); + }); + negativZItem.setEnchanted(simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .allMatch(tntElement -> tntElement.getAlignment().getZ() == -1)); + inventory.setItem(20, negativZItem); - inventory.setItem(22, new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> { - simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> { - tnt.align(new Vector(0, 0, 0.51)); - }); + SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> { + simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .forEach(tntElement -> { + if (tntElement.getAlignment().getZ() != 1) tntElement.alignZ(1); + }); SimulatorWatcher.update(simulator); - })); + }); + positivZItem.setEnchanted(simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .allMatch(tntElement -> tntElement.getAlignment().getZ() == 1)); + inventory.setItem(22, positivZItem); // X - inventory.setItem(12, new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> { - simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> { - tnt.align(new Vector(0.49, 0, 0)); - }); - SimulatorWatcher.update(simulator); - })); + SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> { + simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .forEach(tntElement -> { + if (tntElement.getAlignment().getX() != -1) tntElement.alignX(-1); + }); - inventory.setItem(30, new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> { - simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> { - tnt.align(new Vector(0.51, 0, 0)); - }); SimulatorWatcher.update(simulator); - })); + }); + negativXItem.setEnchanted(simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .allMatch(tntElement -> tntElement.getAlignment().getX() == -1)); + inventory.setItem(12, negativXItem); + + SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> { + simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .forEach(tntElement -> { + if (tntElement.getAlignment().getX() != 1) tntElement.alignX(1); + }); + SimulatorWatcher.update(simulator); + }); + positivXItem.setEnchanted(simulatorGroup.getElements().stream() + .map(TNTElement.class::cast) + .allMatch(tntElement -> tntElement.getAlignment().getX() == -1)); + inventory.setItem(30, positivXItem); } //Pos X diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java index 1dcf005c..24dbb22e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java @@ -99,31 +99,40 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui { // Subpixel Alignment inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> { - tnt.align(new Vector(0.5, 0, 0.5)); + tnt.alignX(0); + tnt.alignZ(0); SimulatorWatcher.update(simulator); })); // Z - inventory.setItem(20, new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> { - tnt.align(new Vector(0, 0, 0.49)); + SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> { + if (tnt.getAlignment().getZ() != -1) tnt.alignZ(-1); SimulatorWatcher.update(simulator); - })); + }); + negativZItem.setEnchanted(tnt.getAlignment().getZ() == -1); + inventory.setItem(20, negativZItem); - inventory.setItem(22, new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> { - tnt.align(new Vector(0, 0, 0.51)); + SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> { + if (tnt.getAlignment().getZ() != 1) tnt.alignZ(1); SimulatorWatcher.update(simulator); - })); + }); + positivZItem.setEnchanted(tnt.getAlignment().getZ() == 1); + inventory.setItem(22, positivZItem); // X - inventory.setItem(12, new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> { - tnt.align(new Vector(0.49, 0, 0)); + SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> { + if (tnt.getAlignment().getX() != -1) tnt.alignX(-1); SimulatorWatcher.update(simulator); - })); + }); + negativXItem.setEnchanted(tnt.getAlignment().getX() == -1); + inventory.setItem(12, negativXItem); - inventory.setItem(30, new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> { - tnt.align(new Vector(0.51, 0, 0)); + SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> { + if(tnt.getAlignment().getX() != 1) tnt.alignX(1); SimulatorWatcher.update(simulator); - })); + }); + positivXItem.setEnchanted(tnt.getAlignment().getX() == 1); + inventory.setItem(30, positivXItem); // Pos X inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> { From eefe92309de042d0cad4d43a21caec9d5e60bb05 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Tue, 2 Apr 2024 22:59:40 +0200 Subject: [PATCH 2/7] Fixed #226 Added text input for simulator group --- .../simulator/data/SimulatorGroup.java | 18 ++++++++++++++ .../gui/SimulatorGroupSettingsGui.java | 24 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java index 8031dd1c..4e96c452 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java @@ -69,6 +69,24 @@ public final class SimulatorGroup { }); } + public void moveToX(double x) { + elements.forEach(simulatorElement -> { + simulatorElement.getPosition().setX(x); + }); + } + + public void moveToY(double y) { + elements.forEach(simulatorElement -> { + simulatorElement.getPosition().setX(y); + }); + } + + public void moveToZ(double z) { + elements.forEach(simulatorElement -> { + simulatorElement.getPosition().setX(z); + }); + } + public SWItem toItem(Player player, InvCallback groupCallback, InvCallback itemCallback) { if (elements.size() == 1) { return elements.get(0).toItem(player, itemCallback); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java index 0a66e21d..8c871526 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java @@ -168,6 +168,14 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> { + new SimulatorAnvilGui<>(player, "X", "", Double::parseDouble, number -> { + if(!allTNT){ + number = (double) Math.round(number); + } + simulatorGroup.moveToX(number); + SimulatorWatcher.update(simulator); + return true; + }, this).setItem(Material.PAPER).open(); })); inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> { simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0); @@ -180,6 +188,14 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> { + new SimulatorAnvilGui<>(player, "Y", "", Double::parseDouble, number -> { + if(!allTNT){ + number = (double) Math.round(number); + } + simulatorGroup.moveToY(number); + SimulatorWatcher.update(simulator); + return true; + }, this).setItem(Material.PAPER).open(); })); inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> { simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0); @@ -192,6 +208,14 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> { + new SimulatorAnvilGui<>(player, "Z", "", Double::parseDouble, number -> { + if(!allTNT){ + number = (double) Math.round(number); + } + simulatorGroup.moveToZ(number); + SimulatorWatcher.update(simulator); + return true; + }, this).setItem(Material.PAPER).open(); })); inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> { simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1); From 41fab57e1a5271d96c14c74189d0653002690fd4 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sun, 7 Apr 2024 12:46:39 +0200 Subject: [PATCH 3/7] Fixed Sub_Pixel to big --- .../bausystem/features/simulator/data/tnt/TNTElement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java index bb3a659d..3d5bda32 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java @@ -33,7 +33,7 @@ import org.bukkit.util.Vector; public final class TNTElement extends SimulatorElement { - public static final double SUB_PIXEL = 0.0999999046326; + public static final double SUB_PIXEL = 0.00999999046326; @Getter private final Vector alignment = new Vector(); From 687cb4451e93f218ab513045d48c49decbb10a71 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sun, 7 Apr 2024 12:56:26 +0200 Subject: [PATCH 4/7] Made text input move of group relativ --- .../simulator/data/SimulatorGroup.java | 18 ------------------ .../gui/SimulatorGroupSettingsGui.java | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java index 4e96c452..8031dd1c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java @@ -69,24 +69,6 @@ public final class SimulatorGroup { }); } - public void moveToX(double x) { - elements.forEach(simulatorElement -> { - simulatorElement.getPosition().setX(x); - }); - } - - public void moveToY(double y) { - elements.forEach(simulatorElement -> { - simulatorElement.getPosition().setX(y); - }); - } - - public void moveToZ(double z) { - elements.forEach(simulatorElement -> { - simulatorElement.getPosition().setX(z); - }); - } - public SWItem toItem(Player player, InvCallback groupCallback, InvCallback itemCallback) { if (elements.size() == 1) { return elements.get(0).toItem(player, itemCallback); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java index 8c871526..7017074b 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java @@ -172,7 +172,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { if(!allTNT){ number = (double) Math.round(number); } - simulatorGroup.moveToX(number); + simulatorGroup.move(number, 0, 0); SimulatorWatcher.update(simulator); return true; }, this).setItem(Material.PAPER).open(); @@ -192,7 +192,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { if(!allTNT){ number = (double) Math.round(number); } - simulatorGroup.moveToY(number); + simulatorGroup.move(0, number, 0); SimulatorWatcher.update(simulator); return true; }, this).setItem(Material.PAPER).open(); @@ -212,7 +212,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { if(!allTNT){ number = (double) Math.round(number); } - simulatorGroup.moveToZ(number); + simulatorGroup.move(0, 0, number); SimulatorWatcher.update(simulator); return true; }, this).setItem(Material.PAPER).open(); From 3b53926195abcd7a23848514b0482a541044a06e Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sun, 7 Apr 2024 12:57:50 +0200 Subject: [PATCH 5/7] Updated ui name --- .../features/simulator/gui/SimulatorGroupSettingsGui.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java index 7017074b..09dc59c3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java @@ -168,7 +168,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> { - new SimulatorAnvilGui<>(player, "X", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relativ X", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); } @@ -188,7 +188,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> { - new SimulatorAnvilGui<>(player, "Y", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relativ Y", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); } @@ -208,7 +208,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> { - new SimulatorAnvilGui<>(player, "Z", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relativ Z", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); } From 4a0cd6c51e1b0da81f4d8a970682537a09142daa Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sun, 7 Apr 2024 13:05:25 +0200 Subject: [PATCH 6/7] Add subpixel alignment to storage --- .../features/simulator/data/tnt/TNTElement.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java index 3d5bda32..4fbede7e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java @@ -30,6 +30,7 @@ import lombok.Getter; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.util.Vector; +import yapion.hierarchy.types.YAPIONObject; public final class TNTElement extends SimulatorElement { @@ -97,4 +98,16 @@ public final class TNTElement extends SimulatorElement { public String getType() { return "TNT"; } + + @Override + public void saveExtra(YAPIONObject elementObject) { + elementObject.add("alignmentX", alignment.getX()); + elementObject.add("alignmentZ", alignment.getZ()); + } + + @Override + public void loadExtra(YAPIONObject elementObject) { + alignment.setX(elementObject.getDoubleOrSetDefault("alignmentX", 0)); + alignment.setZ(elementObject.getDoubleOrSetDefault("alignmentZ", 0)); + } } From ae470ffadde9a6df3e9a4ba3e9ba94c8d56793be Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sun, 7 Apr 2024 13:06:58 +0200 Subject: [PATCH 7/7] Fixed spelling --- .../features/simulator/gui/SimulatorGroupSettingsGui.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java index 09dc59c3..ba5b984e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java @@ -168,7 +168,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> { - new SimulatorAnvilGui<>(player, "Relativ X", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relative X", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); } @@ -188,7 +188,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> { - new SimulatorAnvilGui<>(player, "Relativ Y", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relative Y", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); } @@ -208,7 +208,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui { SimulatorWatcher.update(simulator); }); inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> { - new SimulatorAnvilGui<>(player, "Relativ Z", "", Double::parseDouble, number -> { + new SimulatorAnvilGui<>(player, "Relative Z", "", Double::parseDouble, number -> { if(!allTNT){ number = (double) Math.round(number); }