Update beet & mecha to 26.1 (#1286)

* update beet and mecha

* replace `26.1-rc3` with `26.1`

* remove temp raw and bolt requires

Author: runcows

gm4/plugins/resource_pack.py

@@ -43,7 +43,7 @@
 
 JsonType = dict[str,Any]
 
-MINECRAFT_REFERENCE_VERSION = "26.1-rc-3"
+MINECRAFT_REFERENCE_VERSION = "26.1"
 
 parent_logger = logging.getLogger("gm4.resource_pack")
 

gm4_calling_bell/beet.yaml

@@ -8,9 +8,6 @@ data_pack:
 pipeline:
   - gm4.plugins.extend.module
 
-require:
-  - bolt
-
 meta:
   gm4:
     versioning:

gm4_calling_bell/data/gm4_calling_bell/function/on_bell_interact.mcfunction

@@ -4,9 +4,8 @@
 
 advancement revoke @s only gm4_calling_bell:ring_bell
 
-# TODO: remove raw and bolt require later
 # fail if player already used today
-raw execute store result score $day gm4_calling_bell run time query day repetition
+execute store result score $day gm4_calling_bell run time query day repetition
 execute if score @s gm4_calling_bell = $day gm4_calling_bell run return run playsound entity.wandering_trader.no neutral @a[distance=..16] ~ ~ ~ 1 1 0.6
 
 execute store result score $ray gm4_calling_bell run attribute @s minecraft:block_interaction_range get 10

gm4_disassemblers/generate_disassembly.py

@@ -66,7 +66,7 @@
 def beet_default(ctx: Context):
   """Creates a loot table for dropping the 9 result items when disassembling an item."""
   vanilla = ctx.inject(Vanilla)
-  vanilla.minecraft_version = '26.1-rc-3'
+  vanilla.minecraft_version = '26.1'
   recipes = vanilla.data.recipes
 
   for item, durability in ITEMS.items():

gm4_double_doors/generate.py

@@ -63,7 +63,7 @@ def beet_default(ctx: Context):
     # prepare list of door materials
     door_materials = [
         door.removeprefix("minecraft:").removesuffix("_door")
-        for door in resolve_blocktag(ctx, "26.1-rc-3", "minecraft:mob_interactable_doors")
+        for door in resolve_blocktag(ctx, "26.1", "minecraft:mob_interactable_doors")
     ]
     # make list of wood types accessible for bolt
     ctx.meta['door_materials'] = door_materials

gm4_guidebook/generate_guidebooks.py

@@ -789,7 +789,7 @@ def generate_lectern_header(book: Book) -> list[dict[Any, Any]|str]:
 """
 def item_to_display(item: str, components: dict[str, Any] | None, ctx: Context) -> tuple[TextComponent, TextComponent]:
   vanilla = ctx.inject(Vanilla)
-  vanilla.minecraft_version = '26.1-rc-3'
+  vanilla.minecraft_version = '26.1'
   if item == "air":
     # show empty slot
     slot = {
@@ -947,7 +947,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]:
             ingr = ingr[0]
           elif ingr.startswith("#"):
             vanilla = ctx.inject(Vanilla)
-            vanilla.minecraft_version = '26.1-rc-3'
+            vanilla.minecraft_version = '26.1'
             ingr = get_item_from_tag(ctx, ingr, vanilla)
           ingredients.append(ingr)
 
@@ -980,7 +980,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]:
         ingr = ingr[0]
       elif ingr.startswith("#"):
         vanilla = ctx.inject(Vanilla)
-        vanilla.minecraft_version = '26.1-rc-3'
+        vanilla.minecraft_version = '26.1'
         ingr = get_item_from_tag(ctx, ingr, vanilla)
       ingredients.append(ingr)
     while len(ingredients) < 9:

gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt

@@ -9,7 +9,7 @@ from bolt.contrib.defer import Defer
 from gm4.utils import add_namespace
 
 from gm4_liquid_tanks.mcmeta_stacksize import retrieve_stacksizes
-unstackables, stackable_16, _ = retrieve_stacksizes(ctx.cache, "26.1-rc-3")
+unstackables, stackable_16, _ = retrieve_stacksizes(ctx.cache, "26.1")
 
 # function that generates no mcfunction
 def emptyfunc():

gm4_metallurgy/shamir_model_template.py

@@ -221,7 +221,7 @@ def beet_default(ctx: Context):
     # bind context object to a ClassVar so it can be accessed later during template processing
     ShamirTemplate.bound_ctx = ctx
     vanilla = ctx.inject(Vanilla)
-    vanilla.minecraft_version = '26.1-rc-3'
+    vanilla.minecraft_version = '26.1'
     ShamirTemplate.vanilla_models_jar = vanilla.mount("assets/minecraft/items")
     merge_policy(ctx)
 

gm4_mysterious_midnights/beet.yaml

@@ -9,9 +9,6 @@ pipeline:
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_forceload
 
-require:
-  - bolt
-
 meta:
   gm4:
     versioning:

gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction

@@ -2,9 +2,8 @@
 # at 29999998 1 7134 (forceloaded chunk)
 # run from gm4_mysterious_midnights:start_midnight
 
-# TODO: remove raw and bolt require later
 # generate random number from 0 to 15
-raw execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day repetition
+execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day repetition
 function gm4_mysterious_midnights:roll_difficulty with storage gm4_mysterious_midnights:temp
 scoreboard players set 16 gm4_mm_data 16
 scoreboard players operation difficulty gm4_mm_data %= 16 gm4_mm_data