Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gm4/plugins/resource_pack.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 0 additions & 3 deletions gm4_calling_bell/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ data_pack:
pipeline:
- gm4.plugins.extend.module

require:
- bolt

meta:
gm4:
versioning:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gm4_disassemblers/generate_disassembly.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion gm4_double_doors/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gm4_guidebook/generate_guidebooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion gm4_metallurgy/shamir_model_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 0 additions & 3 deletions gm4_mysterious_midnights/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ pipeline:
- gm4.plugins.extend.module
- gm4.plugins.include.lib_forceload

require:
- bolt

meta:
gm4:
versioning:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gm4_standard_crafting/generate_recipes.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def beet_default(ctx: Context):
"""

vanilla = ctx.inject(Vanilla)
vanilla.minecraft_version = '26.1-rc-3'
vanilla.minecraft_version = '26.1'
item_tags = vanilla.mount("data/minecraft/tags/item").data.item_tags
recipes = vanilla.mount("data/minecraft/recipe").data.recipes

Expand Down
3 changes: 0 additions & 3 deletions gm4_survival_refightalized/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ data_pack:
resource_pack:
load: .

require:
- bolt

pipeline:
- gm4.plugins.extend.module
- gm4.plugins.include.lib_forceload
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
schedule function gm4_survival_refightalized:slow_clock 30s

# TODO: remove raw and bolt require later
# get moon cycle (0 = new moon, 4 = full moon)
raw execute store result score $moon gm4_sr_data run time query day repetition
execute store result score $moon gm4_sr_data run time query day repetition
scoreboard players operation $moon gm4_sr_data %= #8 gm4_sr_data
scoreboard players set $8 gm4_sr_data 8
execute if score $moon gm4_sr_data matches ..3 store result score $moon gm4_sr_data run scoreboard players operation $8 gm4_sr_data -= $moon gm4_sr_data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# scheduled every 48t

# get current moon phase
# TODO: remove raw prefix when mecha is updated to 26.1
raw execute store result score $current gm4_zc_moon_phase run time query minecraft:moon
execute store result score $current gm4_zc_moon_phase run time query minecraft:moon
scoreboard players operation $current gm4_zc_moon_phase /= #24000 gm4_zc_moon_phase
scoreboard players operation $current gm4_zc_moon_phase %= #8 gm4_zc_moon_phase

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ authors = [
]
requires-python = ">=3.14"
dependencies = [
"beet>=0.114.0",
"mecha>=0.102.2",
"beet>=0.115.0",
"mecha>=0.103.0",
"bolt>=0.50.1",
"requests>=2.28.1",
"repro-zipfile>=0.1.0",
Expand Down
Loading
Loading