Skip to content

Commit 36d93e5

Browse files
committed
Fix vanilla version after injecting (ugly hack)
1 parent 912f2d4 commit 36d93e5

File tree

8 files changed

+18
-3
lines changed

8 files changed

+18
-3
lines changed

gm4/plugins/resource_pack.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ def dump_registry(ctx: Context):
385385
def pad_model_overrides(ctx: Context):
386386
"""Adds overrides for the vanilla model, filling in gaps between CMD values"""
387387
vanilla = ctx.inject(Vanilla)
388+
vanilla.minecraft_version = '1.21.3'
388389
vanilla_models_jar = vanilla.mount("assets/minecraft/models/item")
389390

390391
for name, model in ctx.assets["minecraft"].models.items():
@@ -471,6 +472,7 @@ def update_modeldata_registry(self):
471472
def generate_model_overrides(self):
472473
"""Generates item model overrides in the 'minecraft' namespace, adding predicates for custom_model_data"""
473474
vanilla = self.ctx.inject(Vanilla)
475+
vanilla.minecraft_version = '1.21.3'
474476
vanilla_models_jar = vanilla.mount("assets/minecraft/models/item")
475477
# group models by item id
476478
for item_id in {i for m in self.opts.model_data for i in m.item.entries()}:
@@ -659,7 +661,9 @@ class TranslationLinter(Reducer):
659661
def __init__(self, ctx: Context):
660662
self.ctx = ctx
661663
self.mecha_database = ctx.inject(Mecha).database
662-
vanilla_lang = ctx.inject(Vanilla).mount("assets/minecraft/lang/en_us.json")
664+
vanilla = ctx.inject(Vanilla)
665+
vanilla.minecraft_version = '1.21.3'
666+
vanilla_lang = vanilla.mount("assets/minecraft/lang/en_us.json")
663667
self.vanilla_keys = set(vanilla_lang.assets.languages["minecraft:en_us"].data.keys())
664668
self.total_keys: set[str] = set()
665669
self.local_keys: set[str] = set()

gm4_auto_crafting/generate.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ class TagData:
264264

265265
def beet_default(ctx: Context):
266266
vanilla = ctx.inject(Vanilla)
267+
vanilla.minecraft_version = '1.21.3'
267268

268269
recipes: list[RecipeData] = []
269270

gm4_disassemblers/generate_disassembly.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
def beet_default(ctx: Context):
5252
"""Creates a loot table for dropping the 9 result items when disassembling an item."""
5353
vanilla = ctx.inject(Vanilla)
54+
vanilla.minecraft_version = '1.21.3'
5455
recipes = vanilla.data.recipes
5556

5657
for item, durability in ITEMS.items():

gm4_double_doors/generate.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class DoorSound():
3939

4040
def beet_default(ctx: Context):
4141
vanilla = ctx.inject(Vanilla)
42+
vanilla.minecraft_version = '1.21.3'
4243
wood_types = [s.removeprefix("minecraft:").removesuffix(
4344
"_door") for s in vanilla.data.block_tags["minecraft:wooden_doors"].data["values"]]
4445
# make list of wood types accessible for bolt

gm4_guidebook/generate_guidebooks.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,9 @@ def loottable_to_display(loottable: str, data: dict[Any,Any], ctx: Context) -> t
849849
# color = get_texture_color(skin)
850850

851851
# else:
852-
color = get_texture_color(intuit_item_texture(item_id, ctx.inject(Vanilla)))
852+
vanilla = ctx.inject(Vanilla)
853+
vanilla.minecraft_version = '1.21.3'
854+
color = get_texture_color(intuit_item_texture(item_id, vanilla))
853855

854856
# create slot
855857
slot: dict[Any, Any] = {
@@ -929,6 +931,7 @@ def loottable_to_display(loottable: str, data: dict[Any,Any], ctx: Context) -> t
929931
"""
930932
def item_to_display(ingredient: dict[Any, Any], ctx: Context) -> tuple[TextComponent, TextComponent]:
931933
vanilla = ctx.inject(Vanilla)
934+
vanilla.minecraft_version = '1.21.3'
932935
if ingredient.get("id") == "empty":
933936
# show empty slot ()
934937
slot = {
@@ -1101,7 +1104,9 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]:
11011104
item["display"] = ingr["guidebook"]
11021105
else:
11031106
if "tag" in ingr:
1104-
item["id"] = get_item_from_tag(ingr["tag"], ctx.inject(Vanilla))
1107+
vanilla = ctx.inject(Vanilla)
1108+
vanilla.minecraft_version = '1.21.3'
1109+
item["id"] = get_item_from_tag(ingr["tag"], vanilla)
11051110
else:
11061111
item["id"] = ingr["item"]
11071112
if "components" in ingr:

gm4_metallurgy/shamir_model_template.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ def beet_default(ctx: Context):
212212
# bind context object to a ClassVar so it can be accessed later during template processing
213213
ShamirTemplate.bound_ctx = ctx
214214
vanilla = ctx.inject(Vanilla)
215+
vanilla.minecraft_version = '1.21.3'
215216
ShamirTemplate.vanilla_models_jar = vanilla.mount("assets/minecraft/models/item")
216217
merge_policy(ctx)
217218

gm4_standard_crafting/generate_recipes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ def beet_default(ctx: Context):
1010
NOTE: only generates the guidebook definitions - future work will generate function definitions too"""
1111

1212
vanilla = ctx.inject(Vanilla)
13+
vanilla.minecraft_version = '1.21.3'
1314
item_tags = vanilla.mount("data/minecraft/tags/item").data.item_tags
1415
recipes = vanilla.mount("data/minecraft/recipe").data.recipes
1516

lib_custom_crafters/generate_item_tags.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
def beet_default(ctx: Context):
55
"""Creates a predicate for every vanilla item tag and a function checking all of these predicates."""
66
vanilla = ctx.inject(Vanilla)
7+
vanilla.minecraft_version = '1.21.3'
78
item_tags = vanilla.data.item_tags
89
item_tags = [id.removeprefix("minecraft:") for id in item_tags]
910

0 commit comments

Comments
 (0)