Merge remote-tracking branch 'upstream/master' into expanded-trees

Author: TheThanathor

.github/workflows/main.yml

@@ -97,10 +97,10 @@ jobs:
             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.9'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.9/0.17.2/1.1.0/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/rWWImuoz/fabric-api-0.133.14%2B1.21.9.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
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

gm4/plugins/backwards.py

@@ -68,8 +68,8 @@ def backport(pack: Pack[Any], format: int, run: Callable[[str, NamespaceFile], N
       raise e
     if new_resource:
       overlay = pack.overlays[f"backport_{format}"]
-      overlay.supported_formats = { "min_inclusive": 0, "max_inclusive": format }
-      overlay.min_format = 0
+      overlay.supported_formats = { "min_inclusive": 1, "max_inclusive": format }
+      overlay.min_format = 1
       overlay.max_format = format
       overlay[path] = new_resource
 

gm4_bat_grenades/data/gm4_bat_grenades/test/boom.mcfunction

@@ -1,7 +1,7 @@
-# @template gm4:test_box
-# @dummy ~3 ~1 ~3
+# @template gm4:test_platform
+# @dummy ~1 ~1 ~1
 # @timeout 200
 
-summon bat ~3 ~2 ~3 {Tags:[gm4_test_bat]}
+summon bat ~1 ~2 ~1 {Tags:[gm4_test_bat]}
 
-await not entity @e[tag=gm4_test_bat,distance=..10]
+await not entity @e[tag=gm4_test_bat,dx=2,dy=2,dz=2]

gm4_block_compressors/data/gm4_block_compressors/test/destroy.mcfunction

@@ -1,5 +1,6 @@
 # @template gm4:test_platform
 # @dummy ~ ~1 ~
+# @optional
 
 execute positioned ~1.5 ~1.5 ~1.5 run function gm4_block_compressors:machine/create
 give @s diamond_pickaxe

gm4_book_binders/data/gm4_book_binders/test/debinding.mcfunction

@@ -12,5 +12,7 @@ dummy @s use entity @e[tag=gm4_book_binder,distance=..3,limit=1]
 
 await entity @s[advancements={gm4:book_binders_debind=true}]
 
+tp @e[type=item,dx=2,dy=2,dz=2] @s
+
 await items entity @s container.* minecraft:paper[enchantments={silk_touch:1},custom_data~{gm4_book_binders:{item:"enchanted_page"}}]
 assert items entity @s container.* minecraft:paper[enchantments={efficiency:3},custom_data~{gm4_book_binders:{item:"enchanted_page"}}]

gm4_cooler_caves/beet.yaml

@@ -6,9 +6,9 @@ data_pack:
   load: .
   overlays:
     - formats:
-        min_inclusive: 0
+        min_inclusive: 1
         max_inclusive: 81
-      min_format: 0
+      min_format: 1
       max_format: 81
       directory: backport_81
 

gm4_crossbow_cartridges/beet.yaml

@@ -6,9 +6,9 @@ data_pack:
   load: .
   overlays:
     - formats:
-        min_inclusive: 0
+        min_inclusive: 1
         max_inclusive: 81
-      min_format: 0
+      min_format: 1
       max_format: 81
       directory: backport_81
 

gm4_desire_lines/data/gm4_celaro_shamir/function/active.mcfunction

@@ -7,4 +7,4 @@
 scoreboard players remove $probability gm4_desire_lines 1000
 
 # secondary celaro effect: invisibility inside foliage
-execute if predicate gm4_celaro_shamir:stealth_active run effect give @s invisibility 1 0 true
+execute at @s if predicate gm4_celaro_shamir:stealth_active run effect give @s invisibility 1 0 true

gm4_desire_lines/data/gm4_desire_lines/function/init.mcfunction

@@ -4,8 +4,8 @@ scoreboard objectives add gm4_dl_affcoarse dummy
 # constants
 scoreboard players set #base_probability gm4_desire_lines 1
 scoreboard players set #sneak_penality gm4_desire_lines -5
-scoreboard players set #sprint_penalty gm4_desire_lines 5
-scoreboard players set #impact_penalty gm4_desire_lines 15
+scoreboard players set #sprint_penalty gm4_desire_lines 3
+scoreboard players set #impact_penalty gm4_desire_lines 8
 
 execute unless score desire_lines gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Desire Lines"}
 execute unless score desire_lines gm4_earliest_version < desire_lines gm4_modules run scoreboard players operation desire_lines gm4_earliest_version = desire_lines gm4_modules

gm4_disassemblers/generate_disassembly.py

@@ -55,6 +55,7 @@
   "shears": 239,
   "fishing_rod": 65,
   "flint_and_steel": 65,
+  "shield": 336,
 }
 
 
@@ -94,7 +95,9 @@ def beet_default(ctx: Context):
         })
         continue
 
-      if ingredient.startswith("#"):
+      if "wooden_tool_materials" in ingredient:
+        entry: Any = {"type": "minecraft:item", "name": "minecraft:stick"}
+      elif ingredient.startswith("#"):
         entry: Any = {"type": "minecraft:tag", "name": ingredient[1:], "expand": True}
       else:
         entry: Any = {"type": "minecraft:item", "name": ingredient}