From e8eeeb729a71a384c7eeba653d748236ba25c698 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Mon, 22 Apr 2024 22:49:13 +0200 Subject: [PATCH 1/3] Changed behavior of trace deletion while being recorded --- .../steamwar/bausystem/features/tracer/TraceManager.java | 6 ------ .../steamwar/bausystem/features/tracer/TraceRecorder.java | 7 ++----- .../bausystem/features/tracer/TraceRecordingWrapper.java | 5 +---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java index 582ddba7..d735fe8d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java @@ -132,11 +132,6 @@ public class TraceManager implements Listener { * @param trace the trace to be removed */ public boolean remove(Trace trace) { - Optional activeTrace = TraceRecorder.instance.getActiveTraceForRegion(trace.getRegion()); - if (activeTrace.isPresent() && activeTrace.get() == trace) { - TraceRecorder.instance.stopRecording(trace.getRegion()); - } - Map traces = tracesByRegion.getOrDefault(trace.getRegion(), Collections.emptyMap()); Integer traceId = traces.entrySet().stream() .filter(entry -> entry.getValue() == trace) @@ -153,7 +148,6 @@ public class TraceManager implements Listener { * Clears all traces */ public void clear(Region region) { - TraceRecorder.instance.stopRecording(region); showDataPerRegionPerPlayer.getOrDefault(region, new HashMap<>()) .keySet() .forEach(player -> { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java index 76a76025..a252f208 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java @@ -104,14 +104,11 @@ public class TraceRecorder implements Listener { * * @param region region to be recorded */ - public int startRecording(Region region) { - if (activeTraces.containsKey(region)) { - return -1; - } + public void startRecording(Region region) { + if (activeTraces.containsKey(region)) return; TraceRecordingWrapper wrappedTrace = new TraceRecordingWrapper(region); activeTraces.put(region, wrappedTrace); - return TraceManager.instance.add(wrappedTrace.getTrace()); } /** diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java index cb9aafd9..7f23bb32 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java @@ -89,9 +89,6 @@ public class TraceRecordingWrapper { protected void finalizeRecording() { recordsOutputStream.flush(); recordsOutputStream.close(); - - if (trace.getRecords().isEmpty()) { - TraceManager.instance.remove(trace); - } + TraceManager.instance.add(trace); } } From 18430e13fe63d9e10cf44fbe0060a9cf00719b35 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Mon, 22 Apr 2024 22:51:28 +0200 Subject: [PATCH 2/3] Renamed trace share to trace broadcast --- BauSystem_Main/src/BauSystem.properties | 50 ++----------------- BauSystem_Main/src/BauSystem_de.properties | 6 +-- .../features/tracer/TraceCommand.java | 6 +-- 3 files changed, 9 insertions(+), 53 deletions(-) diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 6acb0e3e..7559c65f 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -21,15 +21,12 @@ TIME=HH:mm:ss DATE=........ COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===--- ONLY_SCHEMS=§cFolders are unselectable - PAGE_LIST=§e Page ({0}/{1}) »» LIST_PREVIOUS_PAGE=§ePrevious page LIST_NEXT_PAGE=§eNext page - # Permissions NO_PERMISSION=You are not allowed to use that here SPECTATOR=§fSpectator - # Scoreboard SCOREBOARD_TIME=Time SCOREBOARD_REGION=Region @@ -44,7 +41,6 @@ SCOREBOARD_LOCK_TEAM=Bau Lock§8: §eTeam SCOREBOARD_LOCK_TEAM_AND_SERVERTEAM=Bau Lock§8: §e(Server) Team SCOREBOARD_LOCK_SERVERTEAM=Bau Lock§8: §eServer Team SCOREBOARD_LOCK_NOBODY=Bau Lock§8: §cNobody - # Flags FLAG_COLOR=Color FLAG_TNT=TNT @@ -89,12 +85,10 @@ FLAG_TESTBLOCK_NORTH=§eNorth FLAG_TESTBLOCK_SOUTH=§eSouth FLAG_CHANGED_NO_CHANGE=§cNo FLAG_CHANGED_HAS_CHANGE=§aYes - # Region REGION_TYPE_NORMAL=Normal REGION_TYPE_BUILD=Build area REGION_TYPE_ONLY_TB=Dummy - # AttributesCopy ATTRIBUTES_CANT_COPY=§cYou need to hold the same item type and hover over the same block to copy. ATTRIBUTES_NO_COPY=§cNo attributes to copy. @@ -103,7 +97,6 @@ ATTRIBUTE_REMOVE_COMMAND_HELP=§8/§eattributeremove §8[§eattribute§8|§7all ATTRIBUTE_REMOVE_ALL=§eAll attributes removed. ATTRIBUTE_REMOVE_SINGLE=§eAttribute §7{0}§e removed. ATTRIBUTE_REMOVE_NOT_FOUND=§cAttribute not found - # AutoStart AUTOSTART_COMMAND_HELP=§8/§etimer §8- §7Retrieve AutostartTimer Tool AUTOSTART_ITEM_NAME=§eAutostartTimer @@ -114,7 +107,6 @@ AUTOSTART_MESSAGE_START=§eAutostartTimer started AUTOSTART_MESSAGE_RESULT1=§eTime §7until §eexplosion §7at enemy§8:§e {0}§7 game ticks AUTOSTART_MESSAGE_RESULT2=§7Time difference in §egame-ticks §7until {0} seconds§8:§e {1} AUTOSTART_MESSAGE_RESULT3=§7positive, if too few, negative if too many - # Backup BACKUP_HELP_CREATE=§8/§ebackup create §8- §7Create a region backup BACKUP_HELP_LOAD=§8/§ebackup load §8[§7BackupName§8] §8- §7Load a region backup @@ -131,7 +123,6 @@ BACKUP_LOAD=§7Backup loaded BACKUP_INV_NAME=§eBackup BACKUP_ITEM_NAME=§eBackup §7from §e{0} BACKUP_LORE=§eClick to load - # Bau BAU_COMMAND_HELP_INFO=§8/§ebau info §8- §7Alias for §8/§ebauinfo BAU_INFO_ITEM_NAME=§eBau-Management @@ -147,7 +138,6 @@ BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0} BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2} BAU_INFO_COMMAND_FLAG=§7{0}§8: §7{1} BAU_INFO_COMMAND_TPS=§7TPS§8:§e - # Countingwand COUNTINGWAND_COMMAND_HELP=§8/§ecountingwand §8- §7Receive a CountingWand COUNTINGWAND_ITEM_NAME=§eMeterstick @@ -157,13 +147,11 @@ COUNTINGWAND_MESSAGE_RCLICK=§7First position at: §8[§7{0}§8, §7{1}§8, §7{ COUNTINGWAND_MESSAGE_LCLICK=§7Second position at: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) ({4}§8) COUNTINGWAND_MESSAGE_VOLUME=§e{0} COUNTINGWAND_MESSAGE_DIMENSION=§e{0}§8, §e{1}§8, §e{2} - # Design Endstone DESIGN_ENDSTONE_COMMAND_HELP=§8/§edesignendstone §8- §7Highlight endstone in design DESIGN_ENDSTONE_REGION_ERROR=§cThis region has no build area DESIGN_ENDSTONE_ENABLE=§aEndstone is highlighted DESIGN_ENDSTONE_DISABLE=§cEndstone is no longer hightlighted - # Detonator DETONATOR_LOC_REMOVE=§e{0} removed DETONATOR_LOC_ADD=§e{0} added @@ -213,19 +201,16 @@ GUI_EDITOR_ITEM_TRASH_LORE=§7Drop item here GUI_EDITOR_ITEM_MORE=§eMore items GUI_EDITOR_ITEM_CLOSE=§eClose GUI_EDITOR_TITLE_MORE=Select item - # Script ## Errors SCRIPT_ERROR_GUI=§cError in parsing script: Line {0} SCRIPT_ERROR_GLOBAL=§cError in global script: Line {0} SCRIPT_ERROR_CLICK=§cError in script: Line {0} SCRIPT_ERROR_ONLY_IN_GLOBAL=§cThis function is only available in global scripts - ## CustomScript SCRIPT_HOTKEY_ITEM_NAME=§7Hotkey§8: §e{0} SCRIPT_EVENT_ITEM_NAME=§7Event§8: §e{0} SCRIPT_COMMAND_ITEM_NAME=§7Command§8: §e/{0} - ## Script Menu GUI SCRIPT_MENU_GUI_ITEM_LORE_1=§7Click to retrieve SCRIPT_MENU_GUI_ITEM_LORE_2=§7Shift-Click to copy @@ -236,7 +221,6 @@ SCRIPT_MENU_GUI_ITEM_ADD_NAME=§eInsert SCRIPT_MENU_GUI_ITEM_ADD_LORE=§7Click with a book to insert SCRIPT_MENU_GUI_ENTER_NAME=§eEnter a name SCRIPT_DEPRECATED=§cThe function §8\'§e{0}§8\'§c is deprecated and will be removed in the future. Please use §8\'§e{1}§8\'§c instead. - # Shield Printing SHIELD_PRINTING_HELP_START=§8/§eshieldprinting start §8- §7Starts the shield printing SHIELD_PRINTING_HELP_COPY=§8/§eshieldprinting copy §8- §7Copies the shield configuration @@ -274,10 +258,8 @@ SHIELD_PRINTING_START=§aThe shield printing has been started. SHIELD_PRINTING_COPY=§aThe shield has been copied. SHIELD_PRINTING_APPLY=§aThe shield has been applied. SHIELD_PRINTING_STOP=§aThe shield printing has been stopped. - # Unsign Book UNSIGN_HELP=§8/§eunsign §8- §7Make a signed book writable again - # Simulator SIMULATOR_HELP=§8/§esimulator §8-§7 Gives you the simulator wand SIMULATOR_CREATE_HELP=§8/§esimulator create §8[§7name§8] §8-§7 Create a new simulator @@ -308,7 +290,6 @@ SIMULATOR_WAND_LORE_3=§eLeft click §8- §7Start the simulation SIMULATOR_WAND_LORE_4=§eRight click in air §8- §7Opens the gui SIMULATOR_WAND_LORE_5=§eDouble Sneak §8- §7Swap between TNT and Redstone Block SIMULATOR_REGION_FROZEN=§cSimulator cannot be used inside frozen regions - ## Other SIMULATOR_PLUS_ONE=§7+1 SIMULATOR_PLUS_PIXEL_SHIFT=§eShift §7Click for §e+0,0625 @@ -322,7 +303,6 @@ SIMULATOR_POSITION_Z=§7z-Position SIMULATOR_BACK=§eBack SIMULATOR_GUI_TOTAL_TNT=§7Total TNT§8: §e{0} SIMULATOR_DELETED=§cSimulator deleted - ## GUI SIMULATOR_POSITION_EDIT=§eEdit position SIMULATOR_POSITION_ADD=§eSet position @@ -393,19 +373,16 @@ SIMULATOR_TNT_SPAWN_ADD_IGNITION_PHASE=§eAdd prime phase SIMULATOR_TNT_SPAWN_ADD_TNT=§eAdd TNT SIMULATOR_TNT_SPAWN_REMOVE_TNT=§cRemove SIMULATOR_TNT_SPAWN_POSITION_ANVIL_GUI_NAME=Position - # SmartPlace SMART_PLACE_HELP=§8/§esmartplace §8-§7 Toggles SmartPlace SMART_PLACE_INFO=§7Places rotatable blocks §eaway§7 from you when §esneaking§7. SMART_PLACE_ENABLE=§aSmartPlace activated SMART_PLACE_DISABLE=§cSmartPlace deactivated - # InventoryFiller INVENTORY_FILL_HELP=§8/§einventoryfill §8- §7Toggles InventoryFill INVENTORY_FILL_INFO=§7Helps you fill containers by looking at them while sneaking and dropping the item. Or just scroll on a container to change the amount of the item inside. INVENTORY_FILL_ENABLE=§aInventoryFiller activated INVENTORY_FILL_DISABLE=§cInventoryFiller deactivated - # Killchecker KILLCHECKER_HELP_ENABLE=§8/§ekillchecker enable §8- §7Enables Killchecker / Recalculates kills KILLCHECKER_HELP_DISABLE=§8/§ekillchecker disable §8- §7Disables Killchecker @@ -414,7 +391,6 @@ KILLCHECKER_INFO2=§7Only colorable blocks like Wool, Terractotta, Stained Glass KILLCHECKER_ENABLE=§aKillchecker activated KILLCHECKER_DISABLE=§cKillchecker deactivated KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7) §e§l{2}§7 cannons - # BlockCounter BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Toggle on/off BLOCK_COUNTER_HELP_ENABLE=§8/§eblockcounter enable §8- §7Toggles BlockCounter on @@ -423,13 +399,11 @@ BLOCK_COUNTER_MESSAGE=§7Damage §8> §e{0} §7Blocks §e{1} §7TNT §e{2} §7 BLOCK_COUNTER_MESSAGE_SECOND=§7Damage §8> §e{0} §7Blocks §e{1} §7TNT §e{2} §7Blocks/TNT §e{3} §7Blocks/s BLOCK_COUNTER_ENABLE=§7BlockCounter activated BLOCK_COUNTER_DISABLE=§7BlockCounter deactivated - # DepthCounter DEPTH_COUNTER_MESSAGE=§7Depth §8> §7 DEPTH_COUNTER_COUNT={0}{1}§8×{2}{3}§8×{4}{5} DEPTH_COUNTER_HOVER=§7X§8ק7Y§8ק7Z DEPTH_COUNTER_TNT=§7 TNT§8: §e{0} - # TPSLimit TPSLIMIT_FREEZE_HELP=§8/§etpslimit 0 §8-§7 Freeze TPS TPSLIMIT_LIMIT_HELP=§8/§etpslimit §8[§720>x>0.5§8] §8-§7 Slow TPS down @@ -452,7 +426,6 @@ TPSLIMIT_ANVIL_GUI=New TPS limit TPSLIMIT_CURRENT=§7Current TPS limit§8: §e{0} TPSLIMIT_SET=§eSet TPS limit to {0} TPSLIMIT_FROZEN=§eTPS frozen - # Trace TRACE_RECORD=§aon TRACE_HAS_TRACES=§ehas Traces @@ -471,12 +444,11 @@ TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions shown from {0} to {1} TRACE_MESSAGE_SHOW_TO_SMALLER=§cTo must be bigger then from TRACE_MESSAGE_CLICK_ISOLATE=§eClick to §aisolate§8/§cunisolate TRACE_MESSAGE_ISOLATE=§eTNT Positions have been isolated -TRACE_MESSAGE_SHARE=§e{0} shared his trace show state. -TRACE_MESSAGE_SHARE_HOVER=§eClick to view +TRACE_MESSAGE_BROADCAST=§e{0} shared his trace show state. +TRACE_MESSAGE_BROADCAST_HOVER=§eClick to view TRACE_MESSAGE_FOLLOW=§aYou are now following {0} Trace show state TRACE_MESSAGE_FOLLOW_SELF=§cYou cannot follow yourself! TRACE_MESSAGE_UNFOLLOW=§cYou are no longer following a Trace show state - TRACE_COMMAND_HELP_START=§8/§etrace start §8- §7Starts recording of all TNT-positions TRACE_COMMAND_HELP_STOP=§8/§etrace stop §8- §7Stops the TNT-Tracer TRACE_COMMAND_HELP_AUTO=§8/§etrace toggleauto §8- §7Automatic start of recording @@ -490,7 +462,7 @@ TRACE_COMMAND_HELP_SHOW_FROM_TO_WITH=§8/§etrace show §7from §8<§eFROM§8> TRACE_COMMAND_HELP_HIDE=§8/§etrace hide §8- §7Hides all TNT-positions TRACE_COMMAND_HELP_DELETE=§8/§etrace delete §8[§eTrace§8] §8- §7Deletes all TNT-positions or a Trace TRACE_COMMAND_HELP_ISOLATE=§8/§etrace isolate §8[§eTrace§8] §8[§eTNT§8] §8- §7Isolates specific TNTs from the Trace -TRACE_COMMAND_HELP_SHARE=§8/§etrace share §8- §7Share your current Trace show state with others +TRACE_COMMAND_HELP_BROADCAST=§8/§etrace share §8- §7Share your current Trace show state with others TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Follow a players Trace show state TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Unfollow the Trace show state TRACE_GUI_ITEM_NAME=§eTracer @@ -502,14 +474,12 @@ TRACE_GUI_TRACE_ACTIVE_AUTO=§eAuto-Trace is active TRACE_GUI_AUTO_TRACE_INACTIVE=§eacitvate Auto-Tracer TRACE_GUI_AUTO_TRACE_ACTIVE=§edeactivate Auto-Tracer TRACE_GUI_DELETE=§eDelete trace - # Loader LOADER_SETUP=§eSetup LOADER_RUNNING=§aRunning LOADER_PAUSE=§7Pause LOADER_END=§8Finished LOADER_SINGLE=§aSingle - LOADER_MESSAGE_INTERACT=§e{0} added {1} LOADER_MESSAGE_UNINTERACT=§eRemoved Element LOADER_BUTTON_TNT=TNT @@ -527,7 +497,6 @@ LOADER_BUTTON_LECTERN=Lectern LOADER_BUTTON_TRAPDOOR=Trapdoor LOADER_BUTTON_DOOR=Door LOADER_BUTTON_FENCEGATE=Fencegate - LOADER_HELP_SETUP=§8/§eloader setup §8- §7Starts recording actions LOADER_SETUP_STOP_FIRST=§cPlease stop the current loader first! LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded actions @@ -563,7 +532,6 @@ LOADER_GUI_SETTINGS_COPY=§7Copy LOADER_GUI_SETTINGS_DELETE=§cDelete LOADER_GUI_WAIT_TITLE=Settings LOADER_GUI_WAIT_BACK=§8Back - LOADER_GUI_CLICK_TO_EDIT=§7Click to edit LOADER_GUI_ITEM_NAME=§7{0}§8: §e{1} LOADER_SETTING_NAME=§7{0} @@ -598,7 +566,6 @@ LOADER_INTERACTION_OPEN=Open LOADER_INTERACTION_CLOSED=Closed LOADER_INTERACTION_COMPARE=Compare LOADER_INTERACTION_SUBTRACT=Subtract - # Loadtimer LOADTIMER_HELP_OVERVIEW=§7Compete with your friends loading your cannon and get information about the cannon LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Starts the simple Loadtimer @@ -628,7 +595,6 @@ LOADTIMER_SUMARY_TIMES_LAST=§7\\/ LOADTIMER_SUMARY_STATS_HEAD=§7Cannon-Stats§8: LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0} LOADTIMER_SUMARY_STATS_FREQ=§7Loading frequency: §e{0}/m§8, §7Shot frequency: §e{1}/m - # Observer OBSERVER_HELP=§7Right-Click an Observer to get the Trace. Flame particles have to be enabled. The Particles will be shown in the block. OBSERVER_HELP_ENABLE=§8/§eobserver enable §8-§7 Activates the Observer-Tracer @@ -640,7 +606,6 @@ OBSERVER_DISABLE=§7Observer trace stopped OBSERVER_DELETE=§7Observer trace deleted OBSERVER_RETRACE_DONE=§7Observer trace retraced OBSERVER_RETRACE_NO_TRACE=§7No Observer trace to retrace - # Other OTHER_ITEMS_TELEPORT_NAME=§eTeleporter OTHER_ITEMS_TELEPORT_GUI_NAME=Teleport @@ -708,7 +673,6 @@ NIGHT_VISION_OFF=§eNightvision deactivated NIGHT_VISION_ON=§eNightvision activated NIGHT_VISION_ITEM_ON=§7Nightvision: §eActivated NIGHT_VISION_ITEM_OFF=§7Nightvision: §eDeactivated - #Navigation Wand NAVIGATION_WAND=§eNavigation Wand NAVIGATION_WAND_LEFT_CLICK=§eLeft click: jump to location @@ -854,7 +818,6 @@ PANZERN_PREPARE4=§74. Standing in the region that is being armored can improve PANZERN_NO_WORLDEDIT=§cYou have no WorldEdit selcetion PANZERN_PROGRESS=§e{0} §7Blocks left, §e{1} §7Blocks per second, §e{2} §7block delta PANZERN_DONE=§aDone - # Laufbau LAUFBAU_HELP=§8/§elaufbau §8[§7smallest§8|§7blastresistant§8] §8- §7Build a barrel in your WorldEdit selection using the traces LAUFBAU_HELP_SETTINGS=§8/§elaufbau settings §8- §7Opens the settings GUI @@ -953,7 +916,6 @@ LAUFBAU_SHAPE_OUTER_LEFT=§8-§7 Shape outer links LAUFBAU_SHAPE_INNER_LEFT=§8-§7 Shape inner left LAUFBAU_TILT_NONE=§8-§7 Tilt none LAUFBAU_TILT_PARTIAL=§8-§7 Tilt partial - # UTILS SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Select a region type SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Select a region type with or without extension @@ -1001,7 +963,6 @@ PISTON_HELP_1=§7Right click on piston with a slime ball to calculate the moved PISTON_HELP_2=§7Count is red, if one unmoveable block is present. PISTON_HELP_3=§7Count is yellow, if too many blocks are present. PISTON_INFO=§7Moved Blocks {0}{1}§8/§712 - # Warp WARP_LOC_X=§7X§8: §e{0} WARP_LOC_Y=§7Y§8: §e{0} @@ -1029,23 +990,18 @@ WARP_HELP_LIST=§8/§ewarp list §8- §7List all warps STOP_HELP=§8/§estop §8- §7Stops the server STOP_MESSAGE=§eServer is stopping KICKALL_HELP=§8/§ekickall §8- §7Kick all players from the server except the owner - # Techhider TECHHIDER_HELP=§8/§etechhider §8- §7Toggle Techhider TECHHIDER_GLOBAL=§cNo techhider in global region TECHHIDER_ON=§aTechhider activated TECHHIDER_OFF=§cTechhider deactivated - # XRAY XRAY_HELP=§8/§exray §8- §7Toggle Xray XRAY_GLOBAL=§cNo xray in global region XRAY_ON=§aXray activated XRAY_OFF=§cXray deactivated - - # WorldEdit COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another - # Schematic SCHEMATIC_GUI_ITEM=§eSchematics diff --git a/BauSystem_Main/src/BauSystem_de.properties b/BauSystem_Main/src/BauSystem_de.properties index 0e13deef..9e0f6df1 100644 --- a/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem_Main/src/BauSystem_de.properties @@ -402,14 +402,14 @@ TRACE_MESSAGE_CLICK_ISOLATE=§eKlicken zum §aisolieren§8/§causblenden TRACE_MESSAGE_SHOW_AT=§aTNT-positions angezeigt bei {0} TRACE_MESSAGE_SHOW_FROM=§aAll TNT-positions angezeigt von {0} TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions angezeigt von {0} bis {1} -TRACE_MESSAGE_SHARE=§e{0} teilte seinen Trace-Show-Status. -TRACE_MESSAGE_SHARE_HOVER=§eZum Ansehen klicken. +TRACE_MESSAGE_BROADCAST=§e{0} teilte seinen Trace-Show-Status. +TRACE_MESSAGE_BROADCAST_HOVER=§eZum Ansehen klicken. TRACE_MESSAGE_FOLLOW=§aSie folgen nun {0} Trace show state TRACE_MESSAGE_FOLLOW_SELF=§cSie können sich selbst nicht folgen! TRACE_MESSAGE_UNFOLLOW=§cSie folgen nicht mehr dem Status einer Trace-Show TRACE_MESSAGE_SHOW_TO_SMALLER=§cBis muss größer als von sein TRACE_MESSAGE_ISOLATE=§eTNT Positionen wurden isoliert -TRACE_COMMAND_HELP_SHARE=§8/§etrace share §8- §7Teilt den aktuellen Trace-Show-Status mit anderen +TRACE_COMMAND_HELP_BROADCAST=§8/§etrace share §8- §7Teilt den aktuellen Trace-Show-Status mit anderen TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Verfolgen eines Spielers Status anzeigen TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Den Status der Trace-Anzeige aufheben TRACE_COMMAND_HELP_START=§8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index db643190..01e833db 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -153,9 +153,9 @@ public class TraceCommand extends SWCommand { BauSystem.MESSAGE.send("TRACE_MESSAGE_ISOLATE", player); } - @Register(value = "share", description = "TRACE_COMMAND_HELP_SHARE") - public void share(@Validator Player player) { - BauSystem.MESSAGE.broadcast("TRACE_MESSAGE_SHARE", "TRACE_MESSAGE_SHARE_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace follow " + player.getName()), player.getName()); + @Register(value = "broadcast", description = "TRACE_COMMAND_HELP_BROADCAST") + public void broadcast(@Validator Player player) { + BauSystem.MESSAGE.broadcast("TRACE_MESSAGE_BROADCAST", "TRACE_MESSAGE_BROADCAST_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace follow " + player.getName()), player.getName()); } @Register(value = "follow", description = "TRACE_COMMAND_HELP_FOLLOW") From 2861a4e19b4ca16d194fab72fac7073b878830cf Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Mon, 22 Apr 2024 22:56:14 +0200 Subject: [PATCH 3/3] fixed help messag --- BauSystem_Main/src/BauSystem.properties | 2 +- BauSystem_Main/src/BauSystem_de.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 7559c65f..f2ad2a8c 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -462,7 +462,7 @@ TRACE_COMMAND_HELP_SHOW_FROM_TO_WITH=§8/§etrace show §7from §8<§eFROM§8> TRACE_COMMAND_HELP_HIDE=§8/§etrace hide §8- §7Hides all TNT-positions TRACE_COMMAND_HELP_DELETE=§8/§etrace delete §8[§eTrace§8] §8- §7Deletes all TNT-positions or a Trace TRACE_COMMAND_HELP_ISOLATE=§8/§etrace isolate §8[§eTrace§8] §8[§eTNT§8] §8- §7Isolates specific TNTs from the Trace -TRACE_COMMAND_HELP_BROADCAST=§8/§etrace share §8- §7Share your current Trace show state with others +TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Share your current Trace show state with others TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Follow a players Trace show state TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Unfollow the Trace show state TRACE_GUI_ITEM_NAME=§eTracer diff --git a/BauSystem_Main/src/BauSystem_de.properties b/BauSystem_Main/src/BauSystem_de.properties index 9e0f6df1..872b7993 100644 --- a/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem_Main/src/BauSystem_de.properties @@ -409,7 +409,7 @@ TRACE_MESSAGE_FOLLOW_SELF=§cSie können sich selbst nicht folgen! TRACE_MESSAGE_UNFOLLOW=§cSie folgen nicht mehr dem Status einer Trace-Show TRACE_MESSAGE_SHOW_TO_SMALLER=§cBis muss größer als von sein TRACE_MESSAGE_ISOLATE=§eTNT Positionen wurden isoliert -TRACE_COMMAND_HELP_BROADCAST=§8/§etrace share §8- §7Teilt den aktuellen Trace-Show-Status mit anderen +TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Teilt den aktuellen Trace-Show-Status mit anderen TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Verfolgen eines Spielers Status anzeigen TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Den Status der Trace-Anzeige aufheben TRACE_COMMAND_HELP_START=§8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen