Cleanup codebase and update to 26.1

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '1.21.5'
+  VERSION: '26.1'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
 
 jobs:
@@ -86,22 +86,11 @@ jobs:
           # https://fabricmc.net/use/server/
           # https://modrinth.com/mod/fabric-api/versions
           # https://modrinth.com/mod/packtest/versions
-          - version: '1.21.5'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar
-          - version: '1.21.7'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.7/0.16.14/1.0.3/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/sLmbxWpX/fabric-api-0.128.1%2B1.21.7.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/PAYctH3X/packtest-2.2-mc1.21.7.jar
-          - version: '1.21.10'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.10/0.18.1/1.1.0/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dQ3p80zK/fabric-api-0.138.3%2B1.21.10.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/11yGLsYO/packtest-2.3-beta1-mc1.21.10.jar
-          - version: '1.21.11'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.11-rc2/0.18.1/1.1.0/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/RDb9rvBm/fabric-api-0.139.4%2B1.21.11.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/GN6fvTsW/packtest-2.4-beta2-mc1.21.11.jar
+          - version: '26.1'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.1-snapshot-6/0.18.4/1.1.1/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WAZ95Yd8/fabric-api-0.143.2%2B26.1.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/eupLiv70/packtest-2.5.0-beta1.jar
+            command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/DxBN5h3K/commandlimittracer-0.2.0.jar
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:
@@ -119,14 +108,15 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Download server files
         run: |
           curl -o server.jar ${{ matrix.fabric_server_url }}
           mkdir mods
           curl -o mods/fabric-api.jar ${{ matrix.fabric_api_url }}
           curl -o mods/packtest.jar ${{ matrix.packtest_url }}
+          curl -o mods/command_limit_tracer.jar ${{ matrix.command_limit_tracer_url }}
 
       - name: Copy packs to world
         run: |

base/beet.yaml

@@ -8,7 +8,6 @@ data_pack:
 resource_pack:
   load:
     assets: assets
-    backport_72: backport_72
 
 require:
   - gm4.plugins.resource_pack

base/data/gm4/tags/block/full_collision.json

@@ -1,6 +1,6 @@
 {
     "values": [
-        "#minecraft:dirt",
+        "#minecraft:substrate_overworld",
         "#minecraft:leaves",
         "#minecraft:logs",
         "#minecraft:planks",

base/data/gm4/tags/block/no_collision.json

@@ -27,7 +27,7 @@
     "minecraft:cave_vines_plant",
     "minecraft:cherry_sapling",
     "minecraft:cobweb",
-    {"id": "minecraft:copper_torch", "required": false},
+    "minecraft:copper_torch",
     "minecraft:crimson_fungus",
     "minecraft:crimson_roots",
     "minecraft:dark_oak_sapling",

base/data/gm4/tags/block/replaceable.json

@@ -1,31 +1,6 @@
 {
   "values": [
-    "#minecraft:air",
-    "#minecraft:fire",
-    "minecraft:bubble_column",
-    "minecraft:bush",
-    "minecraft:crimson_roots",
-    "minecraft:dead_bush",
-    "minecraft:fern",
-    "minecraft:glow_lichen",
-    "minecraft:short_dry_grass",
-    "minecraft:short_grass",
-    "minecraft:hanging_roots",
-    "minecraft:large_fern",
-    "minecraft:lava",
-    "minecraft:leaf_litter",
-    "minecraft:light",
-    "minecraft:nether_sprouts",
-    "minecraft:resin_clump",
-    "minecraft:sculk_vein",
-    "minecraft:seagrass",
-    "minecraft:snow",
-    "minecraft:structure_void",
-    "minecraft:tall_dry_grass",
-    "minecraft:tall_grass",
-    "minecraft:tall_seagrass",
-    "minecraft:vine",
-    "minecraft:warped_roots",
-    "minecraft:water"
+    "#minecraft:replaceable",
+    "minecraft:sculk_vein"
   ]
 }

base/data/gm4/tags/block/waterloggable.json

@@ -1,33 +1,32 @@
 {
   "values": [
     "#minecraft:all_signs",
-    {"id": "#minecraft:bars", "required": false},
+    "#minecraft:bars",
     "#minecraft:campfires",
     "#minecraft:candles",
-    {"id": "#minecraft:chains", "required": false},
-    {"id": "#minecraft:copper_chests", "required": false},
-    {"id": "#minecraft:copper_golem_statues", "required": false},
+    "#minecraft:chains",
+    "#minecraft:copper_chests",
+    "#minecraft:copper_golem_statues",
     "#minecraft:corals",
     "#minecraft:fences",
-    {"id": "#minecraft:lanterns", "required": false},
+    "#minecraft:lanterns",
     "#minecraft:leaves",
-    {"id": "#minecraft:lightning_rods", "required": false},
+    "#minecraft:lightning_rods",
     "#minecraft:rails",
     "#minecraft:slabs",
     "#minecraft:stairs",
     "#minecraft:trapdoors",
     "#minecraft:wall_corals",
     "#minecraft:wall_signs",
     "#minecraft:walls",
-    {"id": "#minecraft:wooden_shelves", "required": false},
+    "#minecraft:wooden_shelves",
     "minecraft:amethyst_cluster",
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:black_stained_glass_pane",
     "minecraft:blue_stained_glass_pane",
     "minecraft:brown_stained_glass_pane",
     "minecraft:calibrated_sculk_sensor",
-    { "id": "minecraft:chain", "required": false },
     "minecraft:chest",
     "minecraft:conduit",
     "minecraft:cyan_stained_glass_pane",
@@ -42,7 +41,7 @@
     "minecraft:dead_tube_coral_fan",
     "minecraft:dead_tube_coral",
     "minecraft:decorated_pot",
-    { "id": "minecraft:dried_ghast", "required": false },
+    "minecraft:dried_ghast",
     "minecraft:ender_chest",
     "minecraft:glass_pane",
     "minecraft:glow_lichen",

base/data/gm4/tags/entity_type/hostile.json

@@ -13,7 +13,7 @@
         "minecraft:hoglin",
         "minecraft:husk",
         "minecraft:magma_cube",
-        {"id": "minecraft:parched", "required": false},
+        "minecraft:parched",
         "minecraft:phantom",
         "minecraft:piglin_brute",
         "minecraft:pillager",

base/data/gm4/tags/entity_type/neutral_hostile.json

@@ -1,13 +1,13 @@
 {
     "values": [
-        {"id": "minecraft:camel_husk", "required": false},
+        "minecraft:camel_husk",
         "minecraft:cave_spider",
         "minecraft:creaking",
         "minecraft:drowned",
         "minecraft:enderman",
         "minecraft:piglin",
         "minecraft:spider",
-        {"id": "minecraft:zombie_nautilus", "required": false},
+        "minecraft:zombie_nautilus",
         "minecraft:zombified_piglin"
     ]
 }

base/data/gm4/tags/entity_type/non_living.json

@@ -3,7 +3,7 @@
         "minecraft:area_effect_cloud",
         "minecraft:arrow",
         "minecraft:block_display",
-        "#gm4:boats",
+        "#minecraft:boat",
         "minecraft:breeze_wind_charge",
         "#gm4:chest_boats",
         "minecraft:chest_minecart",

base/data/gm4/tags/entity_type/passive.json

@@ -8,16 +8,16 @@
         "minecraft:cat",
         "minecraft:chicken",
         "minecraft:cod",
-        {"id": "minecraft:copper_golem", "required": false},
+        "minecraft:copper_golem",
         "minecraft:cow",
         "minecraft:donkey",
         "minecraft:frog",
         "minecraft:glow_squid",
-        {"id": "minecraft:happy_ghast", "required": false},
+        "minecraft:happy_ghast",
         "minecraft:horse",
         "minecraft:mooshroom",
         "minecraft:mule",
-        {"id": "minecraft:nautilus", "required": false},
+        "minecraft:nautilus",
         "minecraft:ocelot",
         "minecraft:parrot",
         "minecraft:pig",

beet-dev.yaml

@@ -8,11 +8,9 @@ pipeline:
       - gm4.plugins.player_heads
       - gm4.plugins.resource_pack
       - gm4.plugins.backwards
-      - beet.contrib.model_merging
       - beet.contrib.optifine
       - beet.contrib.babelbox
       - gm4_guidebook.generate_guidebooks.load_page_data
-      - gm4_guidebook.generate_guidebooks.load_custom_recipes
       - gm4.plugins.test.load_tests
     pipeline:
       - gm4.plugins.write_mcmeta
@@ -30,16 +28,12 @@ pipeline:
         namespace: gm4_translations
         unicode_escape: True
         dialect: excel
-      model_merging:
-        predicate_order: [custom_model_data]
   - extend: beet.yaml
     directory: resource_pack
     pipeline:
       - resource_pack.dev_description
-  - gm4.plugins.resource_pack.pad_item_def_range_dispatch
   - gm4.plugins.resource_pack.link_resource_pack
   - gm4.plugins.output.resource_pack
-  - gm4.plugins.resource_pack.dump_registry
   - gm4.plugins.finished
 
 meta:

beet-release.yaml

@@ -40,11 +40,9 @@ pipeline:
       - gm4.plugins.player_heads
       - gm4.plugins.resource_pack
       - gm4.plugins.backwards
-      - beet.contrib.model_merging
       - beet.contrib.optifine
       - beet.contrib.babelbox
       - gm4_guidebook.generate_guidebooks.load_page_data
-      - gm4_guidebook.generate_guidebooks.load_custom_recipes
     pipeline:
       - gm4.plugins.manifest.write_credits
       - gm4.plugins.test.strip_tests
@@ -63,8 +61,6 @@ pipeline:
         namespace: gm4_translations
         unicode_escape: True
         dialect: excel
-      model_merging:
-        predicate_order: [custom_model_data]
 
   - pipeline:
     - gm4.plugins.worker.retrieve_and_run
@@ -82,7 +78,6 @@ pipeline:
       - gm4.plugins.output.release_resource_pack
       - gm4.plugins.write_mcmeta
       - gm4.plugins.manifest.update_patch
-      - gm4.plugins.resource_pack.pad_item_def_range_dispatch
     meta:
       pack_scan: resource_pack
 

beet-test.yaml

@@ -11,7 +11,6 @@ pipeline:
       - gm4.plugins.resource_pack
       - gm4.plugins.backwards
       - gm4_guidebook.generate_guidebooks.load_page_data
-      - gm4_guidebook.generate_guidebooks.load_custom_recipes
       - gm4.plugins.test.load_tests
       - gm4.plugins.test.skip_mecha_lint
     pipeline:

docs/code-conventions.md

@@ -6,7 +6,6 @@
   * [Function headers](#function-headers)
   * [Inline comments](#inline-comments)
 * [Smithed conventions](#smithed-conventions)
-  * [CMD prefixing](#cmd-prefixing)
   * [Tag specification](#tag-specification)
 
 ## Naming
@@ -36,7 +35,7 @@ All functions should start with a header comment that consists of:
     - a single function, if the function is run by `/function ...`: `# run from zauber_cauldrons:cauldron/create`.
     - a folder, if multiple functions call this function using `/function`: `# run from functions in gm4_pig_tractors:till/blocks/`.
     - a function from where it was scheduled: `# scheduled by zauber_cauldrons:cauldron/create`.
-    - a function and function-tag pair: `# run from gm4_custom_crafters-3.0:process_input/check_item via #gm4_custom_crafter:custom_item_checks`.
+    - a function and function-tag pair: `# run from gm4_trees:tick via #gm4_trees:destroy_leaf`.
     - an advancement reward: `# run from advancement damaged/armor/stall`
     - a combination of these, in which multiple lines may be used.
 
@@ -51,9 +50,6 @@ kill @s
 ## Smithed conventions
 We follow the Smithed conventions in our data pack. For the full documentation, see the [Smithed Wiki](https://wiki.smithed.dev/conventions/).
 
-### CMD prefixing
-All the custom model data values in GM4 are prefixed with `3420000`. As a module developer you don't need to worry about this, it is handled by our resource pack plugin. <!-- TODO: link to resource pack docs -->
-
 ### Tag specification
 Smithed defines a set of standard entity `/tag`s to ensure compatibility between different packs:
 * Custom entities need to get the `smithed.entity` tag

docs/getting-started.md

@@ -12,7 +12,7 @@ To contribute to our project you need to install [Git](https://git-scm.com/downl
 
 Our modules are built using [beet](https://github.com/mcbeet/beet), which is a Python framework that allows us to automatically validate and generate part of our data packs and resource packs.
 
-You will need to install [uv](https://docs.astral.sh/uv/) as project manager. If you don't already have Python installed, uv will do that automatically. We currently use Python 3.10.
+You will need to install [uv](https://docs.astral.sh/uv/) as project manager. If you don't already have Python installed, uv will do that automatically. We currently use Python 3.14.
 ```sh
 # MacOS, Linux, or Git Bash (recommended)
 curl -LsSf https://astral.sh/uv/install.sh | sh

docs/making-a-module.md

@@ -51,15 +51,13 @@ pipeline:
 
   # Include any libraries
   - gm4.plugins.include.lib_machines
-  - gm4.plugins.include.lib_custom_crafters
 
 # Metadata for the build and publishing on the website
 meta:
   gm4:
     versioning:
       # A list of minimum-required versions for libraries or other modules
       required:
-        - lib_custom_crafters: 3.0.0
         - lib_machines: 1.1.0
         - gm4_bat_grenades: 1.2.0
 
@@ -74,7 +72,7 @@ meta:
       # Any recommended modules
       recommended:
         - gm4_resource_pack
-        - gm4_relocators
+        - gm4_bat_grenades
       # Important notes for people when they download the module. This can be empty
       notes: []
       # Keywords used by gm4.co's search feature, may be omitted