Update to 1.20.5 (Gamemode4Dev#993)

* Apply overlays

* Update version numbers and pack format for 1.20.5

* Update all tests to 1.20.5

* Temporarily disable player heads plugins

* Fix location predicates

* Fix nested loot tables

* Fix set lore mode field

* Fix block/fluid/item predicates

* Fix attribute operations

* Potion contents item sub predicates

* Enchantment item sub predicates

* Advancement icons

* Sweeping edge rename

* Update yellow shulker box loot table

* Fix set_nbt loot functions

* Fix component issues with last commit
- set_custom_data function only accepts stringified snbt
- profile properties were incorrectly upgraded
- written_book_content component had a typo

* Upgrade custom model data substitutions

* Fix advancement icon components

* More set_nbt fixes

* Misc errors

* Replace horse jump strength attribute with max_stack_size=1

* Remove lib player heads, update skin cache plugin

* Fix item predicate NBT field to sub predicates

* Count -> count

* scute -> turtle_scute

* Fix remaining issues in loot table, recipe, advancements ignoring copy_nbt

* Fix attribute operations in commands

* Update mecha

* Update copy_nbt in better armour stands, boots of ostara, chairs, and crossbow cartridges

* Update copy_nbt in arborenda and mountaineering

* Metallurgy item validity + update commands

* Update item nbt checks in a few places + sunken treasure

* Update lib trades, DecorItem -> body_armor_item

* Lib trees

* A bunch of tag -> components

* Fix machine block placing

* More tag -> components fixes + re-add b suffix in set_custom_data

* Update mecha

* Update particle syntax

* Display frames + lightning in a bottle

* Update to java 21 and 1.20.5-pre1

* Fix int providers no long wrapped in value field

* Fix remaining particle commands

* Update yellow shulker box loot table

* Some balloon animals updates

* Update packtest to 1.20.5

* Fix some errors in the tests

* Even more tag -> components fixes

* Final tag -> components fixes (except combat expanded)

* Temporarily disable guidebook copy_nbt functions

* Fix some leftover item nbt

* biome -> biomes, structure -> structures, potion

* Fix some more tests
- amplifier:0b is not stored
- add skyaccess to some tests
- replace ambient_entity_effect

* Combat expanded tag -> components fixes

* Replace CMD in item components

* Fix particles in area effect clouds

* Replace some item_used_on_block with default_block_use

* Fix a few more tests

* Fix auto crafting item tag predicates

* Random fixes (enchantment checks, phantom scarecrows, animi)

* Fix area effect cloud NBT

* Fix custom GUI fonts

* Update beet and support 1.20.6

* Remove non-modules from build artifact

* Substitute profile data in mcfunction files

* Update biome extensions to 1.20.5

* Remove debug commands in cozy campfires

* Fix poses pack and bookshelf book title

* Allow module aliases in beet dev

* Fix boots of ostara crafting

* Fix washing tanks not clearing dyed_color component

* Keep boots custom name when crafting boots of ostara

* Fix soul glass has_beam predicate

* Fix block compressors

* Fix Tunnel Bores item drops

* Fix tinkering compressors

*this one was Misodes fault*
And since we're retiring this in 1.21, I didn't do any efficiency refactors

* Remove redundant tc check

Actually we can make it  little better without major refactors yay

* Fix bookshelf inspectors

* Fix: Liquid Minecart breaking, glow ink signs, floating potion advancement

* Lightning in a bottle 1.20.5 (Gamemode4Dev#997)

* Fix brewing LiaB

* Fix lib brewing custom potion predicate

---------

Co-authored-by: Misode <[email protected]>

* Refactor supported versions and releases in beet.yaml

* Disable trouble modules

* Minor version bump for all modules

* Fix Relocators loot function (Gamemode4Dev#999)

* Update Balloon Animals to 1.20.5 (Gamemode4Dev#998)

- remove extra animal custom data value
- remove modifier since the loot table can now copy just the expected value
- Leash to leash
- loot table reference name key is now value
- animal type is now lead item name

* Fix crossbow cartridges tnt fuse

* Fix typo in record crafting

* Update beet to use latest vanilla assets
- fix turtle helmet disassembler issue
- fix issues in guidebook and crafting plugins

* Various fixes (moneo, standard crafting, teleportation anchors, dangerous dungeons)
- fix moneo netherrite update (blame Epyon)
- fix bamboo mosaic stairs decrafting (blame Special)
- fix unused teleportation anchors destroy (blame BPR)
- fix dangerous dungeons snowy tag (blame kruthers)
- fix moneo tools tag (blame Misode)

* Book Binders: 1.20.5 update (Gamemode4Dev#1000)

* Fix

* Fixes dupe by removing foot stored enchants
- Prevents duplicate enchant&level page from being absorbed
- Updated run from comment that misode pointed out

* Update mecha to 0.94.2

* Combat Expanded 1.20.5 (Gamemode4Dev#996)

* move tag storage to components

* update identification loot tables

* update identification loot tables

* remove use of item_modifiers

* honestly don't remember half of what this is... but updates?

* fix up boss fight and final few modifiers

* misode's review

* change armor toughness vanilla UUID

* Update mecha

* Disable zauber and guidebook in tests

* Switch to the ubuntu-24.04 beta runner

* Fix mountaineering crafting recipe

* Revert debug logging

* Store block compressor old components in a new field and merge old tag with custom data

* Remove tnt landmines

* Remove trapped signs

---------

Co-authored-by: SpecialBuilder <[email protected]>
Co-authored-by: Epyon <[email protected]>
Co-authored-by: Thanathor <[email protected]>

Author: 4 people

.github/workflows/main.yml

@@ -7,11 +7,11 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '1.20'
+  VERSION: '1.20.5'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
-  TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.20.4/0.15.3/0.11.2/server/jar
-  TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/JMCwDuki/fabric-api-0.92.0%2B1.20.4.jar
-  TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/18smpIeE/packtest-1.6-mc1.20.4.jar
+  TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.20.6/0.15.10/1.0.1/server/jar
+  TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/kAQqRNrK/fabric-api-0.97.8%2B1.20.6.jar
+  TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/UnZw9eUD/packtest-1.7-mc1.20.5.jar
 
 jobs:
   build:
@@ -67,6 +67,13 @@ jobs:
         env:
           LOG_LEVEL: ${{ runner.debug == 1 && 'DEBUG' || 'INFO'}}
 
+      - name: Remove non-modules for artifact
+        if: github.event_name == 'pull_request'
+        run: |
+          rm -r release/$VERSION/generated
+          rm release/$VERSION/lib_*
+          rm release/$VERSION/meta.json
+
       - name: Upload artifact
         if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
@@ -92,7 +99,7 @@ jobs:
           branch: release
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -126,7 +133,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Download server files
         run: |
@@ -138,6 +145,9 @@ jobs:
       - name: Copy packs to world
         run: |
           mkdir -p world/datapacks
+          rm out/gm4_guidebook.zip
+          rm out/gm4_zauber_cauldrons.zip
+          rm out/gm4_zauber_liquids.zip
           cp out/gm4_*.zip world/datapacks
 
       - name: Run test server

base/assets/gm4/font/container_gui.json

@@ -3,8 +3,8 @@
         {
             "type": "space",
             "advances": {
-                "\uf824": 3,
-                "\uf808": -10
+                "\uf824": 5,
+                "\uf808": -8
             }
         }
     ]

base/assets/gm4/font/default.json

@@ -1,18 +1,8 @@
 {
     "providers": [
         {
-            "type": "space",
-            "advances": {
-                " ": 4,
-                "\u200c": 0
-            }
-        },
-        {
-            "type": "ttf",
-            "file": "gm4:minecraft.ttf",
-            "shift": [0,-0.5],
-            "size": 13,
-            "oversample": 7
+            "type": "reference",
+            "id": "minecraft:default"
         }
     ]
 }