From ef474951ece7460059fc95931b67d3f36d6f258f Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:03:34 +0300 Subject: [PATCH 1/7] Update PACK_FORMAT to 107 in generate_wrappers.py --- scripts/generate_wrappers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_wrappers.py b/scripts/generate_wrappers.py index a75ebd1..b816428 100644 --- a/scripts/generate_wrappers.py +++ b/scripts/generate_wrappers.py @@ -28,7 +28,7 @@ HANDLER_DIR = PACK / "data" / "rtwrapper" / "function" / "core" / "wrappers" / "handler" TARGET = "Java Edition 26.2" -PACK_FORMAT = 104 +PACK_FORMAT = 107 # Java Edition 26.2 normal commands and aliases. COMMANDS = [ From c3b1babf4dd4325497a3cf0bd998ccbe6c263320 Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:13:27 +0300 Subject: [PATCH 2/7] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c87270d..451e5df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: printf "online-mode=false\nserver-port=25565\n" > run/server.properties - name: Validate datapack - run: python3 scripts/validate_datapack.py + run: cd datapack/RTWrapper-Datapack/pack.mcmeta && python3 scripts/validate_datapack.py && cd .. - name: Build mod, datapack zip, and run server GameTests run: gradle build - name: Store reports From 0c623d1043d52fa4f0510d6d9f0f4fbe6d50fb19 Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:14:56 +0300 Subject: [PATCH 3/7] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 451e5df..c92bd43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: printf "online-mode=false\nserver-port=25565\n" > run/server.properties - name: Validate datapack - run: cd datapack/RTWrapper-Datapack/pack.mcmeta && python3 scripts/validate_datapack.py && cd .. + run: cd datapack/RTWrapper-Datapack && python3 scripts/validate_datapack.py && cd .. - name: Build mod, datapack zip, and run server GameTests run: gradle build - name: Store reports From fdac6b025b3796beab31c751d211f1a463baa67c Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:16:50 +0300 Subject: [PATCH 4/7] Simplify datapack validation command --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c92bd43..c87270d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: printf "online-mode=false\nserver-port=25565\n" > run/server.properties - name: Validate datapack - run: cd datapack/RTWrapper-Datapack && python3 scripts/validate_datapack.py && cd .. + run: python3 scripts/validate_datapack.py - name: Build mod, datapack zip, and run server GameTests run: gradle build - name: Store reports From eff7b6df8937301484e9d54de6c8aa37d4300d56 Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 07:37:03 +0000 Subject: [PATCH 5/7] . --- scripts/validate_datapack.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/validate_datapack.py b/scripts/validate_datapack.py index 27c7d4f..d2c1862 100644 --- a/scripts/validate_datapack.py +++ b/scripts/validate_datapack.py @@ -44,7 +44,7 @@ def main() -> None: load_json(path) pack_mcmeta = load_json(PACK / 'pack.mcmeta') - if pack_mcmeta.get('pack', {}).get('pack_format') != 1097: + if pack_mcmeta.get('pack', {}).get('pack_format') != 107: fail('pack.mcmeta pack_format must be 107 for the 26.2 target') required_tag_values = { @@ -145,8 +145,8 @@ def main() -> None: if ADV_REVOKE_RE.search(line): fail(f'advancement revoke is not allowed for loaded-pack registry at {rel}:{i}') - print(f'[validateDatapack] OK: {len(expected)} wrappers, {variant_count} named variants, runtoolkit advancements use minecraft:tick, pack_format=104') + print(f'[validateDatapack] OK: {len(expected)} wrappers, {variant_count} named variants, runtoolkit advancements use minecraft:tick, pack_format=107') if __name__ == '__main__': - main() + main() \ No newline at end of file From ddae7378c1f11475eca047086674794a18543ba3 Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 07:40:42 +0000 Subject: [PATCH 6/7] Update .devcontainer/devcontainer.json --- .devcontainer/devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8319d3e..2c30819 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,5 @@ { "name": "Minecraft Fabric + Datapack Dev", - "image": "mcr.microsoft.com/devcontainers/java:1-25-bookworm", "features": { "ghcr.io/devcontainers/features/java:1": { From e2f2e79bf119cea4f07ed06a9753fb9f6c08ad19 Mon Sep 17 00:00:00 2001 From: IronCrest <234182831+IronCrest-sudo@users.noreply.github.com> Date: Thu, 2 Jul 2026 07:52:49 +0000 Subject: [PATCH 7/7] Create datapack/RTWrapper-Datapack/data/runtoolkit/advancement/root.json & datapack/RTWrapper-Datapack/data/runtoolkit/advancement/packs/rtwrapper.json --- .../advancement/packs/rtwrapper.json | 37 +++++++++++++++++++ .../data/runtoolkit/advancement/root.json | 27 ++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 datapack/RTWrapper-Datapack/data/runtoolkit/advancement/packs/rtwrapper.json create mode 100644 datapack/RTWrapper-Datapack/data/runtoolkit/advancement/root.json diff --git a/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/packs/rtwrapper.json b/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/packs/rtwrapper.json new file mode 100644 index 0000000..ca089e1 --- /dev/null +++ b/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/packs/rtwrapper.json @@ -0,0 +1,37 @@ +{ + "parent": "runtoolkit:root", + "display": { + "icon": { + "id": "minecraft:command_block" + }, + "title": { + "text": "RTWrapper", + "color": "aqua", + "bold": true + }, + "description": [ + { + "text": "Loaded: ", + "color": "gray" + }, + { + "text": "RTWrapper 1.0.0+26.2", + "color": "green" + }, + { + "text": "Macro command wrapper API for Runtoolkit datapacks.", + "color": "dark_gray" + } + ], + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "hidden": false + }, + "criteria": { + "loaded": { + "trigger": "minecraft:tick" + } + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/root.json b/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/root.json new file mode 100644 index 0000000..ec49edc --- /dev/null +++ b/datapack/RTWrapper-Datapack/data/runtoolkit/advancement/root.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "id": "minecraft:knowledge_book" + }, + "title": { + "text": "Runtoolkit", + "color": "gold", + "bold": true + }, + "description": { + "text": "Loaded Runtoolkit datapacks/modules", + "color": "yellow" + }, + "background": "minecraft:block/deepslate_tiles", + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "hidden": false + }, + "criteria": { + "loaded": { + "trigger": "minecraft:tick" + } + }, + "sends_telemetry_event": false +} \ No newline at end of file