Update to 1.21.11 (#1226)

* Add 1.21.11 to test matrix

* Update packtest version to fix crash

* Rename gamerules

* Exclude enchantable/sword in custom crafter item tags

* Update pack format

* Add `on_pass` item modifier for lightning in a bottle

* Update AngryAt and AngerTime bee fields

* Add new entities to reeling interactions (#1227)

* Don't include minor pack format in pack.mcmeta

* Update biome-extensions library for cooler caves

* Remove unused poetry.lock file

* Fix invalid llama Items NBT and HandItems

* Update entity type tags with new mobs

* Add spears to disassemblers

* Clear disassemblers armor stand mainhand after process

* Add nautlius and zombie nautilus to reeling leashable (#1229)

* 1.21.11 Lunge Enchantment Compat (#1230)

* Bookshelf Inspectors

* Enchantment Extractors

* Book Binders

---------

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

Author: misode

.github/workflows/main.yml

@@ -101,6 +101,10 @@ jobs:
             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
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

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

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

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

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

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

@@ -17,6 +17,7 @@
         "minecraft:horse",
         "minecraft:mooshroom",
         "minecraft:mule",
+        {"id": "minecraft:nautilus", "required": false},
         "minecraft:ocelot",
         "minecraft:parrot",
         "minecraft:pig",

gm4/plugins/backwards.py

@@ -1,6 +1,7 @@
 import logging
+import re
 from typing import Any, Tuple, Callable
-from beet import Context, Pack, NamespaceFile, ItemModel
+from beet import Context, Pack, NamespaceFile, ItemModel, Function
 
 logger = logging.getLogger("gm4.backwards")
 
@@ -11,38 +12,65 @@ def beet_default(ctx: Context):
   # edited item model definition - replaced head with player_head
   backport(ctx.assets, 63, playerhead_models_1_21_5)
 
+  # renamed gamerules
+  backport(ctx.data, 92, rename_gamerules)
+
 
 def playerhead_models_1_21_5(id: str, resource: NamespaceFile):
   if not isinstance(resource, ItemModel):
     return None
+  if id != "minecraft:player_head":
+    return None
+
+  def recursive_replace(compound: dict[str,Any]):
+    for key, val in compound.items():
+      # recurse down the tree
+      if isinstance(val, list):
+        for subval in val: # type: ignore
+          if isinstance(subval, dict):
+            recursive_replace(subval) # type: ignore
+      elif isinstance(val, dict):
+        recursive_replace(val) # type: ignore
+        # then replace matching compounds
+        match val:
+          case {
+            "type": "minecraft:special",
+            "model": {
+                "type": "minecraft:player_head"
+            }
+          }:
+            compound[key]["model"]["type"] = "minecraft:head"
+            compound[key]["model"]["kind"] = "player"
+          case _: # type: ignore
+            pass
+
+  overlay = resource.copy()
+  recursive_replace(overlay.data)
+  return overlay
+
+
+# Only gamerules that are actually used are replaced
+GAMERULES_RENAMES = {
+  "command_block_output": "commandBlockOutput",
+  "spawn_phantoms": "doInsomnia",
+  "natural_health_regeneration": "naturalRegeneration",
+  "random_tick_speed": "randomTickSpeed",
+  "send_command_feedback": "sendCommandFeedback",
+  "show_death_messages": "showDeathMessages",
+}
+
+
+def rename_gamerules(id: str, resource: NamespaceFile):
+  if not isinstance(resource, Function):
+    return None
+  text = resource.text
+  for new_gamerule, old_gamerule in GAMERULES_RENAMES.items():
+    text = re.sub(f"gamerule (minecraft:)?{new_gamerule}\\b", f"gamerule {old_gamerule}", text)
+  if text == resource.text:
+    return None
   overlay = resource.copy()
-  json = overlay.data
-  if id=="minecraft:player_head":
-    def recursive_replace(compound: dict[str,Any]):
-      for key, val in compound.items():
-        # recurse down the tree
-        if isinstance(val, list):
-          for subval in val: # type: ignore
-            if isinstance(subval, dict):
-              recursive_replace(subval) # type: ignore
-        elif isinstance(val, dict):
-          recursive_replace(val) # type: ignore
-          # then replace matching compounds
-          match val:
-            case {
-              "type": "minecraft:special",
-              "model": {
-                  "type": "minecraft:player_head"
-              }
-            }:
-              compound[key]["model"]["type"] = "minecraft:head"
-              compound[key]["model"]["kind"] = "player"
-            case _: # type: ignore
-              pass
-
-    recursive_replace(json)
-    return overlay
-  return None
+  overlay.text = text
+  return overlay
 
 
 def backport(pack: Pack[Any], format: int, run: Callable[[str, NamespaceFile], NamespaceFile | None]):

gm4/plugins/manifest.py

@@ -21,7 +21,7 @@
 
 parent_logger = logging.getLogger("gm4.manifest")
 
-SUPPORTED_GAME_VERSIONS = ["1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"]
+SUPPORTED_GAME_VERSIONS = ["1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"]
 
 # config models for beet.yaml metas
 CreditsModel = dict[str, list[str]]

gm4/plugins/write_mcmeta.py

@@ -10,21 +10,21 @@ def beet_default(ctx: Context):
 	manifest_entry = {v.id:v for v in (manifest.modules|manifest.libraries).values()}.get(ctx.project_id, NoneAttribute())
 
 	ctx.data.pack_format = 71
-	ctx.data.supported_formats = {"min_inclusive": 71, "max_inclusive": 88}
+	ctx.data.supported_formats = {"min_inclusive": 71, "max_inclusive": 94}
 	ctx.data.min_format = 71
-	ctx.data.max_format = (88, 0)
+	ctx.data.max_format = 94
 
 	ctx.assets.pack_format = 55
-	ctx.assets.supported_formats = {"min_inclusive": 55, "max_inclusive": 69}
+	ctx.assets.supported_formats = {"min_inclusive": 55, "max_inclusive": 75}
 	ctx.assets.min_format = 55
-	ctx.assets.max_format = (69, 0)
+	ctx.assets.max_format = 75
 
 	for pack in ctx.packs:
 		pack.description = [
 			ctx.project_name,
 			"\n",
 			{
-				"text": f"Gamemode 4 (1.21.5 - 1.21.9)",
+				"text": f"Gamemode 4 (1.21.5+)",
 				"color": "#4AA0C7"
 			}
 		]

gm4_apple_trees/data/gm4_apple_trees/function/wandering_trader/register_trade.mcfunction

@@ -4,6 +4,6 @@
 # run from gm4_fruiting_trees:wandering_trader/add_trade
 
 # apple sapling
-execute if predicate gm4_apple_trees:overworld run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{},{id:"minecraft:emerald",count:5,Slot:1b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
+execute if predicate gm4_apple_trees:overworld run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{id:"minecraft:emerald",count:5,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
 loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot gm4_apple_trees:items/apple_tree_sapling
 tag @e[type=trader_llama] remove gm4_new_trade_option

gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_bee_nest.mcfunction

@@ -4,6 +4,6 @@
 
 tp @s ~ 0 ~
 
-data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{},{id:"minecraft:emerald",count:8,Slot:1b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
+data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:8,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
 
 loot replace entity @s horse.0 loot gm4_balloon_animals:bee_nest

gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_chicken_egg.mcfunction

@@ -4,7 +4,7 @@
 
 tp @s ~ 0 ~
 
-data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{},{id:"minecraft:emerald",count:2,Slot:1b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1b,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:4,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
+data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:2,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1b,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:4,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}}
 
 
 execute store result score $variant_id gm4_balloon_animals_data run random value 0..2