From adc5e8b5bdcf23e37b91409733a7c1005d0ae84a Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Sat, 18 Sep 2021 11:01:27 +0300 Subject: Rewrote sub item system Sub items are now converted into model overrides and added support for loaded overrides. Closes #19 Fixes #24 --- src/main/resources/citresewn.accesswidener | 12 ++++++++++++ src/main/resources/citresewn.mixins.json | 2 +- src/main/resources/fabric.mod.json | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/citresewn.accesswidener (limited to 'src/main/resources') diff --git a/src/main/resources/citresewn.accesswidener b/src/main/resources/citresewn.accesswidener new file mode 100644 index 0000000..68faa6f --- /dev/null +++ b/src/main/resources/citresewn.accesswidener @@ -0,0 +1,12 @@ +accessWidener v1 named + +# net.minecraft.client.render.model.json.ModelOverrideList +accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride +accessible class net/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition +accessible method net/minecraft/client/render/model/json/ModelOverrideList ()V +accessible method net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride ([Lnet/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition;Lnet/minecraft/client/render/model/BakedModel;)V +accessible method net/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition (IF)V +accessible field net/minecraft/client/render/model/json/ModelOverrideList overrides [Lnet/minecraft/client/render/model/json/ModelOverrideList$BakedOverride; +mutable field net/minecraft/client/render/model/json/ModelOverrideList overrides [Lnet/minecraft/client/render/model/json/ModelOverrideList$BakedOverride; +accessible field net/minecraft/client/render/model/json/ModelOverrideList conditionTypes [Lnet/minecraft/util/Identifier; +mutable field net/minecraft/client/render/model/json/ModelOverrideList conditionTypes [Lnet/minecraft/util/Identifier; diff --git a/src/main/resources/citresewn.mixins.json b/src/main/resources/citresewn.mixins.json index 49a3a19..90a3cd1 100644 --- a/src/main/resources/citresewn.mixins.json +++ b/src/main/resources/citresewn.mixins.json @@ -12,8 +12,8 @@ "citarmor.ArmorFeatureRendererMixin", "citelytra.ElytraFeatureRendererMixin", "cititem.ItemRendererMixin", + "cititem.JsonUnbakedModelAccessor", "core.GroupResourcePackAccessor", - "core.JsonUnbakedModelAccessor", "core.ModelLoaderMixin", "core.NbtCompoundAccessor", "core.SpriteAtlasTextureMixin", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 45c4721..da29cc0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,6 +19,7 @@ "shcm.shsupercm.fabric.citresewn.config.CITResewnModMenu" ] }, + "accessWidener" : "citresewn.accesswidener", "mixins": [ "citresewn.mixins.json" ], -- cgit