Remove InvokeOnJsonNbt and other mecha rules

Author: misode

gm4/plugins/player_heads.py

@@ -24,8 +24,6 @@
 from nbtlib import String # type: ignore
 from PIL.Image import Image
 
-from gm4.utils import InvokeOnJsonNbt
-
 parent_logger = logging.getLogger("gm4.player_heads")
 
 USER_AGENT = "Gamemode4Dev/GM4_Datapacks/player_head_management (gamemode4official@gmail.com)"
@@ -50,7 +48,7 @@ class Skin(PngFile):
     image: ClassVar[FileDeserialize[Image]] = FileDeserialize() # purely here to solve type-warnings on PIL images
 
 
-class SkinNbtTransformer(MutatingReducer, InvokeOnJsonNbt):
+class SkinNbtTransformer(MutatingReducer):
     """Reducer class defining custom mecha parsing rules for skin texture data, and storing needed data for those operations"""
     def __init__(self, ctx: Context):
         self.ctx: Context = ctx

gm4/plugins/resource_pack.py

@@ -25,24 +25,10 @@
 from beet.contrib.vanilla import Vanilla, ClientJar
 from beet.core.utils import format_validation_error
 from mecha import (
-    AstCommand,
-    AstItemComponent,
-    AstItemPredicateTestComponent,
-    AstJson,
     AstJsonObject,
-    AstJsonObjectEntry,
-    AstJsonObjectKey,
     AstNbtCompound,
-    AstNbtCompoundEntry,
-    AstNbtCompoundKey,
-    AstNbtPath,
-    AstNbtPathKey,
-    AstNbtValue,
     Diagnostic,
-    DiagnosticCollection,
-    DiagnosticError,
     Mecha,
-    MutatingReducer,
     Reducer,
     rule,
 )
@@ -51,10 +37,8 @@
 from tokenstream import set_location
 
 from gm4.utils import (
-    InvokeOnJsonNbt,
     MapOption,
     add_namespace,
-    propagate_location,
 )
 
 JsonType = dict[str,Any]
@@ -295,7 +279,6 @@ def beet_default(ctx: Context):
     tl = ctx.inject(TranslationLinter)
     ctx.require("mecha.contrib.json_files")
     # mecha register
-    ctx.inject(Mecha).transform.extend(rp)
     ctx.inject(Mecha).lint.extend(tl)
 
     logging.getLogger("beet.contrib.babelbox").addFilter(block_incomplete_translation)
@@ -358,7 +341,7 @@ def link_resource_pack(ctx: Context):
 
     lm.data_pack = dp_dir # restore the DP link
 
-class GM4ResourcePack(MutatingReducer, InvokeOnJsonNbt):
+class GM4ResourcePack:
     """Service Object handling custom_model_data and generated item models"""
 
     def __init__(self, ctx: Context):
@@ -420,42 +403,6 @@ def generate_item_definitions(self):
 
             self.ctx.assets.item_models[f"minecraft:{item_id}"] = ItemModel(new_itemdef)
 
-
-    #== Mecha Transformer Rules ==#
-    @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value="minecraft:custom_model_data"))
-    def json_substitutions(self, node: AstJsonObjectEntry, **kwargs: Any):
-        # TODO: validate custom model data strings
-        return node
-
-    @rule(AstJsonObject)
-    def json_substitutions_item_modifier(self, node: AstJsonObject, **kwargs: Any):
-        # TODO: validate custom model data strings
-        return node
-
-    @rule(AstNbtCompoundEntry, key=AstNbtCompoundKey(value="minecraft:custom_model_data"))
-    def cmd_substitutions_nbt(self, node: AstNbtCompoundEntry, **kwargs: Any):
-        # TODO: validate custom model data strings
-        return node
-
-    @rule(AstItemComponent)
-    @rule(AstItemPredicateTestComponent)
-    def cmd_substitutions_component(self, node: AstItemComponent | AstItemPredicateTestComponent, **kwargs: Any):
-        # TODO: validate custom model data strings
-        return node
-
-    @rule(AstCommand, identifier="data:modify:storage:target:targetPath:set:value:value")
-    @rule(AstCommand, identifier="data:modify:block:targetPos:targetPath:set:value:value")
-    @rule(AstCommand, identifier="data:modify:entity:target:targetPath:set:value:value")
-    def cmd_substitutions_datamodify(self, node: AstCommand):
-        _ast_target, ast_target_path, ast_nbt = node.arguments
-        match ast_target_path, ast_nbt:
-            case AstNbtPath(components=[*_, AstNbtPathKey(value="minecraft:custom_model_data")]), AstNbtValue(value=String(_reference)):
-                pass # TODO: validate custom model data strings
-            case _:
-                pass
-        return node
-
-
     #== Model file generation ==#
     def generate_model_files(self):
         """Create individual models for each item/block according to its config"""
@@ -521,19 +468,6 @@ def __init__(self, ctx: Context):
         self.ignored_keys: set[str] = set(ctx.validate("gm4", TranslationLinterOptions).translation_linter_ignores)
         super().__init__()
 
-    @rule(AstNbtValue)
-    def check_nbt_json(self, node: AstNbtValue):
-        mc = self.ctx.inject(Mecha)
-        if isinstance(node.value, (String, str)):
-            try:
-                json_ast = mc.parse(node.value, type=AstJson)
-                with self.use_diagnostics(collec:=DiagnosticCollection()):
-                    self.invoke(json_ast) # process new node with reducer rules
-                for exc in collec.exceptions:
-                    yield propagate_location(exc, node)
-            except DiagnosticError:
-                pass # string is not json
-
     @rule(AstNbtCompound)
     @rule(AstJsonObject)
     def missing_en_us_translations(self, node: Union[AstNbtCompound, AstJsonObject]):

gm4/utils.py

@@ -1,24 +1,11 @@
 import subprocess
 import warnings
-from contextlib import contextmanager
-from dataclasses import asdict, dataclass, replace
+from dataclasses import asdict, dataclass
 from functools import total_ordering
-from typing import Any, Generic, Iterator, List, TypeVar
-
-from beet import Advancement, Context, ItemModifier, ListOption, LootTable, Predicate
-from mecha import (
-    AbstractNode,
-    AstJsonObjectEntry,
-    AstJsonObjectKey,
-    AstJsonValue,
-    AstNbtCompound,
-    DiagnosticCollection,
-    DiagnosticError,
-    Mecha,
-    rule,
-)
+from typing import Any, Generic, List, TypeVar
+
+from beet import ListOption
 from pydantic import RootModel, field_validator
-from tokenstream import SourceLocation, set_location
 
 T = TypeVar('T')
 import csv
@@ -142,62 +129,6 @@ def validate_root(cls, value: list[T]|dict[str,T]|T) -> list[T]|dict[str,T]:
             value = [value]
         return value # type: ignore
 
-# TODO 1.20.5: might not need this anymore
-class InvokeOnJsonNbt:
-    """Extendable mixin to run MutatingReducer's rules on nbt within advancements, loot_tables ect..."""
-    def __init__(self, ctx: Context):
-        self.ctx = ctx
-        raise RuntimeError("InvokeOnJsonNbt should not be directly instantiated. It is a mixin for MutatingReducers and should be interited instead")
-
-    @contextmanager
-    def use_diagnostics(self, diagnostics: DiagnosticCollection) -> Iterator[None]:
-        """Class is mixed into MutatingReducer, who does have this method. Passed here for type completion"""
-        raise NotImplementedError()
-
-    def invoke(self, node: AbstractNode, *args: Any, **kwargs: Any) -> Any:
-        """Class is mixed into MutatingReducer, who does have this method. Passed here for type completion"""
-        raise NotImplementedError()
-
-
-    @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value='nbt'))
-    @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value='tag'))
-    def process_nbt_in_json(self, node: AstJsonObjectEntry):
-        mc = self.ctx.inject(Mecha)
-        if isinstance(mc.database.current, (Advancement, LootTable, ItemModifier, Predicate)):
-            if isinstance(node.value, AstJsonValue) and isinstance(node.value.value, str) \
-                and node.value.value.startswith("{") and node.value.value.endswith("}"): # excludes location check block/fluid tags - easier than making rule that checks for 'set_nbt' functions on the same json level
-                try:
-                    nbt = mc.parse(node.value.value.replace("\n", "\\\\n"), type=AstNbtCompound)
-                except DiagnosticError as exc:
-                    # if parsing failed, give pretty traceback
-                    for d in exc.diagnostics.exceptions:
-                        yield set_location(replace(d, file=mc.database.current), node.value)
-                    return replace(node, value="{}")
-
-                ## TEMP - trial on yielding children rather than using invoke
-                # with self.use_diagnostics(captured_diagnostics:=DiagnosticCollection()):
-                # 	nbt = yield nbt # run all rules on child-node
-                # print(captured_diagnostics.exceptions)
-                # print(nbt)
-                # new_node = replace(node, value=AstJsonValue(value=mc.serialize(nbt, type=AstNbtCompound)))
-
-                with self.use_diagnostics(captured_diagnostics:=DiagnosticCollection()):
-                    processed_nbt = mc.serialize(self.invoke(nbt, type=AstNbtCompound))
-                for exc in captured_diagnostics.exceptions:
-                    yield propagate_location(exc, node.value)  # set error location to nbt key-value that caused the problem and pass diagnostic back to mecha
-
-                new_node = replace(node, value=AstJsonValue(value=processed_nbt))
-                if new_node != node:
-                    return new_node
-
-        return node
-
-def propagate_location(obj: T, parent_location_obj: Any) -> T:
-    """a set_location like function propagating diagnostic information for manually invoked rules"""
-    return set_location(obj,
-        SourceLocation(pos=parent_location_obj.location.pos+obj.location.pos, lineno=parent_location_obj.location.lineno, colno=parent_location_obj.location.colno+obj.location.colno), # type: ignore
-        SourceLocation(pos=parent_location_obj.location.pos+obj.end_location.pos, lineno=parent_location_obj.location.lineno, colno=parent_location_obj.location.colno+obj.end_location.colno) # type: ignore
-    )
 
 # CSV READING UTILS
 class CSVCell(str):