diff --git a/datapacks/dataLib/data/datalib/dialog/input_prompt.json b/datapacks/dataLib/data/datalib/dialog/input_prompt.json index 589c629e..d4ddabd6 100644 --- a/datapacks/dataLib/data/datalib/dialog/input_prompt.json +++ b/datapacks/dataLib/data/datalib/dialog/input_prompt.json @@ -26,7 +26,7 @@ }, "action": { "type": "minecraft:dynamic/run_command", - "template": "/function datalib:input/_private/dialog_capture {value:$(dl_input_text)}" + "template": "/function datalib:input/private/dialog_capture {value:$(dl_input_text)}" } } ] diff --git a/datapacks/dataLib/data/datalib/function/input/command_block_minecart.mcfunction b/datapacks/dataLib/data/datalib/function/input/command_block_minecart.mcfunction index cde1a6ce..3392f339 100644 --- a/datapacks/dataLib/data/datalib/function/input/command_block_minecart.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/command_block_minecart.mcfunction @@ -43,6 +43,6 @@ # Fast exit — nothing tagged, nothing to scan this tick. execute unless entity @e[type=minecraft:command_block_minecart,tag=datalib_input] run return 0 -execute as @e[type=minecraft:command_block_minecart,tag=datalib_input] run function datalib:input/_private/cbm_process +execute as @e[type=minecraft:command_block_minecart,tag=datalib_input] run function datalib:input/private/cbm_process return 1 diff --git a/datapacks/dataLib/data/datalib/function/input/dialog.mcfunction b/datapacks/dataLib/data/datalib/function/input/dialog.mcfunction index c1f05724..361b1a6a 100644 --- a/datapacks/dataLib/data/datalib/function/input/dialog.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/dialog.mcfunction @@ -9,7 +9,7 @@ # e.g. 'execute as run function datalib:input/dialog', or bound # to a right-click/other trigger by the caller). Submitted text lands in # datalib:input_prompt's action, which macro-calls -# datalib:input/_private/dialog_capture — capture only, no execution. +# datalib:input/private/dialog_capture — capture only, no execution. # # ASSUMPTION FLAGGED — CONFIRM WITH LEGENDS11: # This function assumes the caller decides WHEN to open the dialog diff --git a/datapacks/dataLib/data/datalib/function/input/_private/book_capture.mcfunction b/datapacks/dataLib/data/datalib/function/input/private/book_capture.mcfunction similarity index 95% rename from datapacks/dataLib/data/datalib/function/input/_private/book_capture.mcfunction rename to datapacks/dataLib/data/datalib/function/input/private/book_capture.mcfunction index 0fa0ac95..a77d6694 100644 --- a/datapacks/dataLib/data/datalib/function/input/_private/book_capture.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/private/book_capture.mcfunction @@ -1,5 +1,5 @@ # ====================================================================================== -# datalib:input/_private/book_capture [INTERNAL — do not call directly] +# datalib:input/private/book_capture [INTERNAL — do not call directly] # ====================================================================================== # # Runs with @s bound to a single player holding the marked written_book. diff --git a/datapacks/dataLib/data/datalib/function/input/_private/cbm_align_tp.mcfunction b/datapacks/dataLib/data/datalib/function/input/private/cbm_align_tp.mcfunction similarity index 91% rename from datapacks/dataLib/data/datalib/function/input/_private/cbm_align_tp.mcfunction rename to datapacks/dataLib/data/datalib/function/input/private/cbm_align_tp.mcfunction index c1d69fe6..1ed8a79e 100644 --- a/datapacks/dataLib/data/datalib/function/input/_private/cbm_align_tp.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/private/cbm_align_tp.mcfunction @@ -1,5 +1,5 @@ # ====================================================================================== -# datalib:input/_private/cbm_align_tp [INTERNAL — call explicitly, not auto-ticked] +# datalib:input/private/cbm_align_tp [INTERNAL — call explicitly, not auto-ticked] # ====================================================================================== # # Legends11's tested pattern: teleports the executing player to the nearest diff --git a/datapacks/dataLib/data/datalib/function/input/_private/cbm_capture.mcfunction b/datapacks/dataLib/data/datalib/function/input/private/cbm_capture.mcfunction similarity index 96% rename from datapacks/dataLib/data/datalib/function/input/_private/cbm_capture.mcfunction rename to datapacks/dataLib/data/datalib/function/input/private/cbm_capture.mcfunction index 2e36eee6..304f2481 100644 --- a/datapacks/dataLib/data/datalib/function/input/_private/cbm_capture.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/private/cbm_capture.mcfunction @@ -1,5 +1,5 @@ # ====================================================================================== -# datalib:input/_private/cbm_capture [INTERNAL — do not call directly] +# datalib:input/private/cbm_capture [INTERNAL — do not call directly] # ====================================================================================== # # Only reached when cbm_process confirmed Command is non-empty. Runs with diff --git a/datapacks/dataLib/data/datalib/function/input/_private/cbm_process.mcfunction b/datapacks/dataLib/data/datalib/function/input/private/cbm_process.mcfunction similarity index 87% rename from datapacks/dataLib/data/datalib/function/input/_private/cbm_process.mcfunction rename to datapacks/dataLib/data/datalib/function/input/private/cbm_process.mcfunction index 8e79dec7..498e84ab 100644 --- a/datapacks/dataLib/data/datalib/function/input/_private/cbm_process.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/private/cbm_process.mcfunction @@ -1,5 +1,5 @@ # ====================================================================================== -# datalib:input/_private/cbm_process [INTERNAL — do not call directly] +# datalib:input/private/cbm_process [INTERNAL — do not call directly] # ====================================================================================== # # Runs with @s bound to a single tagged command_block_minecart. Reads its @@ -13,4 +13,4 @@ data modify storage datalib:input _cbm.current set from entity @s Command # Compare the actual VALUE to "" — a compound match, not a path-existence # check. This is the fix for the false-positive-on-empty-Command bug. -execute unless data storage datalib:input {_cbm:{current:""}} run function datalib:input/_private/cbm_capture +execute unless data storage datalib:input {_cbm:{current:""}} run function datalib:input/private/cbm_capture diff --git a/datapacks/dataLib/data/datalib/function/input/_private/dialog_capture.mcfunction b/datapacks/dataLib/data/datalib/function/input/private/dialog_capture.mcfunction similarity index 94% rename from datapacks/dataLib/data/datalib/function/input/_private/dialog_capture.mcfunction rename to datapacks/dataLib/data/datalib/function/input/private/dialog_capture.mcfunction index 98d86ca0..dd2fe988 100644 --- a/datapacks/dataLib/data/datalib/function/input/_private/dialog_capture.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/private/dialog_capture.mcfunction @@ -1,5 +1,5 @@ # ====================================================================================== -# datalib:input/_private/dialog_capture [INTERNAL — do not call directly] +# datalib:input/private/dialog_capture [INTERNAL — do not call directly] # ====================================================================================== # # Called by the dialog system itself via its "run_command" action template diff --git a/datapacks/dataLib/data/datalib/function/input/writable_book.mcfunction b/datapacks/dataLib/data/datalib/function/input/writable_book.mcfunction index 84990cd7..03b97155 100644 --- a/datapacks/dataLib/data/datalib/function/input/writable_book.mcfunction +++ b/datapacks/dataLib/data/datalib/function/input/writable_book.mcfunction @@ -28,6 +28,6 @@ # Fast exit — skip entirely if no player is holding the marked book execute unless entity @a[nbt={SelectedItem:{components:{"minecraft:custom_data":{dataLib:{input:1b}}}}}] run return 0 -execute as @a[nbt={SelectedItem:{components:{"minecraft:custom_data":{dataLib:{input:1b}}}}}] run function datalib:input/_private/book_capture +execute as @a[nbt={SelectedItem:{components:{"minecraft:custom_data":{dataLib:{input:1b}}}}}] run function datalib:input/private/book_capture return 1 diff --git a/datapacks/dataLib/data/datalib/tags/function/loop.json b/datapacks/dataLib/data/datalib/tags/function/loop.json index c912df9a..c437d1d2 100644 --- a/datapacks/dataLib/data/datalib/tags/function/loop.json +++ b/datapacks/dataLib/data/datalib/tags/function/loop.json @@ -3,6 +3,6 @@ "datalib:input/writable_book", "datalib:input/command_block_minecart", "datalib:core/internal/api/cmd/freeze/tick", - "datalib:input/_private/cbm_align_tp" + "datalib:input/private/cbm_align_tp" ] }