From 0e5a03e1394ad9f7cb9165f541a48a20613a6bc9 Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 4 Nov 2025 15:18:29 +0000 Subject: [PATCH 1/6] Added tls toggle --- .../bausystem/features/tntlistener/TLSCommand.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java index 355803dc..fbf2cf62 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java @@ -43,4 +43,13 @@ public class TLSCommand extends SWCommand { public void stop(@Validator Player player) { listener.stopListening(player); } + + @Register(description = "TLS_TOGGLE_HELP") + public void toggle(@Validator Player player) { + if (listener.isActiveFor(player)) { + listener.stopListening(player); + } else { + listener.startListening(player); + } + } } From ca3a7a82be671c92303a66348d200c9c79f756fd Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 4 Nov 2025 15:52:41 +0000 Subject: [PATCH 2/6] Add /tb default subcommand --- .../features/region/TestblockCommand.java | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java index d09c06a0..fc5ce274 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java @@ -73,6 +73,16 @@ public class TestblockCommand extends SWCommand { resetRegion(p, node, isExtension ? RegionExtensionType.EXTENSION : RegionExtensionType.NORMAL, isIgnoreAir, isOnlyColor, replaceTNT, replaceWater); } + @Register(value="default") + public void setTestblockDefault(Player p) { + Region region = regionCheck(p); + if (region == null) { + return; + } + region.getRegionData().setTestblockSchematic(null); + resetRegion(p, null, RegionExtensionType.EXTENSION, false, false, false, false); + } + private void resetRegion(Player p, SchematicNode node, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors, boolean removeTNT, boolean removeWater) { Region region = regionCheck(p); if (region == null) return; @@ -93,29 +103,10 @@ public class TestblockCommand extends SWCommand { } } - // Beta Tester enabled - switch (BauServer.getInstance().getOwnerID()) { - case 245: - case 403: - case 1898: - case 3320: - case 4603: - case 5262: - case 5399: - case 6032: - case 7862: - case 11077: - case 11888: - case 12258: - case 16009: - if (node == null) { - node = region.getRegionData().getTestblockSchematic(); - } else { - region.getRegionData().setTestblockSchematic(node); - } - break; - default: - break; + if (node == null) { + node = region.getRegionData().getTestblockSchematic(); + } else { + region.getRegionData().setTestblockSchematic(node); } PasteBuilder.ClipboardProvider clipboardProvider; From acf9325179136b28495f19d232487870dfa24e78 Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 4 Nov 2025 21:02:57 +0000 Subject: [PATCH 3/6] Add Help messages and small refactor --- BauSystem/BauSystem_Main/src/BauSystem.properties | 3 ++- BauSystem/BauSystem_Main/src/BauSystem_de.properties | 3 ++- .../bausystem/features/{tntlistener => tls}/TLSCommand.java | 2 +- .../bausystem/features/{tntlistener => tls}/TLSListener.java | 2 +- .../features/{tntlistener => tls}/TLSScoreboardElement.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/{tntlistener => tls}/TLSCommand.java (97%) rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/{tntlistener => tls}/TLSListener.java (98%) rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/{tntlistener => tls}/TLSScoreboardElement.java (96%) diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties index 432ac00a..fe17bee6 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem.properties @@ -1033,4 +1033,5 @@ TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon \ No newline at end of file +TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon +TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener \ No newline at end of file diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties index 453b4079..432815c3 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties @@ -963,4 +963,5 @@ SCHEMATIC_GUI_ITEM=§eSchematics TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan \ No newline at end of file +TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan +TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle den TNT Listener \ No newline at end of file diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSCommand.java similarity index 97% rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSCommand.java index fbf2cf62..252482b6 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSCommand.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.tntlistener; +package de.steamwar.bausystem.features.tls; import de.steamwar.command.SWCommand; import de.steamwar.linkage.Linked; diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSListener.java similarity index 98% rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSListener.java index 9b587d8f..20e7f161 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSListener.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.tntlistener; +package de.steamwar.bausystem.features.tls; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.features.tpslimit.TPSUtils; diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSScoreboardElement.java similarity index 96% rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSScoreboardElement.java index 0dec6609..8744e1f0 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSScoreboardElement.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.tntlistener; +package de.steamwar.bausystem.features.tls; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.Permission; From a9e278ccd98d4b7ba08e735cf609bb5f456615b0 Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 25 Nov 2025 12:43:38 +0000 Subject: [PATCH 4/6] Fix spelling (s.a. PR) --- BauSystem/BauSystem_Main/src/BauSystem.properties | 2 +- BauSystem/BauSystem_Main/src/BauSystem_de.properties | 4 ++-- .../steamwar/bausystem/features/region/TestblockCommand.java | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties index fe17bee6..18a06582 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem.properties @@ -1033,5 +1033,5 @@ TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon +TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aon TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener \ No newline at end of file diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties index 432815c3..54baef3f 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties @@ -963,5 +963,5 @@ SCHEMATIC_GUI_ITEM=§eSchematics TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan -TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle den TNT Listener \ No newline at end of file +TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aan +TLS_TOGGLE_HELP=§8/§etls §8: §7Toggle den TNT Listener \ No newline at end of file diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java index fc5ce274..d9010c74 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java @@ -76,9 +76,7 @@ public class TestblockCommand extends SWCommand { @Register(value="default") public void setTestblockDefault(Player p) { Region region = regionCheck(p); - if (region == null) { - return; - } + if (region == null) return; region.getRegionData().setTestblockSchematic(null); resetRegion(p, null, RegionExtensionType.EXTENSION, false, false, false, false); } From 8a5c5794c06723e89ff5bfd8eee96e78db89a95a Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 25 Nov 2025 12:54:10 +0000 Subject: [PATCH 5/6] Replace - with : in translation --- BauSystem/BauSystem_Main/src/BauSystem.properties | 4 ++-- BauSystem/BauSystem_Main/src/BauSystem_de.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties index 18a06582..79989ef6 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem.properties @@ -1029,8 +1029,8 @@ TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Rep # Schematic SCHEMATIC_GUI_ITEM=§eSchematics # TNTListener -TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} -TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) +TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} +TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aon diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties index 54baef3f..ad94ee72 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties @@ -960,7 +960,7 @@ COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- § TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen # Schematics SCHEMATIC_GUI_ITEM=§eSchematics -TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) +TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aan From e284f8f08c41f27061c37c81271c194c0cbd1bd3 Mon Sep 17 00:00:00 2001 From: PhiRobot Date: Tue, 25 Nov 2025 12:57:28 +0000 Subject: [PATCH 6/6] Fix PR --- BauSystem/BauSystem_Main/src/BauSystem.properties | 10 +++++----- BauSystem/BauSystem_Main/src/BauSystem_de.properties | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties index 79989ef6..627e162d 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem.properties @@ -1029,9 +1029,9 @@ TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Rep # Schematic SCHEMATIC_GUI_ITEM=§eSchematics # TNTListener -TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} -TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) -TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener -TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aon +TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} +TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8) +TLS_START_HELP=§8/§etls start §8- §7Start the TNT Listener +TLS_STOP_HELP=§8/§etls stop §8- §7Stop the TNT Listener +TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener \ No newline at end of file diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties index ad94ee72..f0d55c5c 100644 --- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties @@ -960,8 +960,8 @@ COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- § TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen # Schematics SCHEMATIC_GUI_ITEM=§eSchematics -TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8: §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) -TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener -TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener -TLS_SCOREBOARD_ELEMENT=§eTLS §8: §aan +TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8) +TLS_START_HELP=§8/§etls start §8- §7Starte den TNT Listener +TLS_STOP_HELP=§8/§etls stop §8- §7Stope den TNT Listener +TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan TLS_TOGGLE_HELP=§8/§etls §8: §7Toggle den TNT Listener \ No newline at end of file