Rewrote sub item system

Sub items are now converted into model overrides and added support for loaded overrides.
Closes #19
Fixes #24

9 files changed, 155 insertions, 55 deletions

diff --git a/build.gradle b/build.gradle
index 8bdfe42..df9124f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,10 @@ processResources {
     }
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/citresewn.accesswidener")
+}
+
 def targetJavaVersion = 16
 tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java b/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java
index 7d1d33e..cb765b4 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java
@@ -1,6 +1,7 @@
 package shcm.shsupercm.fabric.citresewn;
 
 import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;
@@ -53,18 +54,21 @@ public class ActiveCITs {
         citEnchantments.clear();
     }
 
-    public BakedModel getItemModel(ItemStack stack, BakedModel model, World world, LivingEntity entity) {
+    public BakedModel getItemModel(ItemStack stack, World world, LivingEntity entity, int seed) {
         BakedModel bakedModel = null;
         Hand hand = entity != null && stack == entity.getOffHandStack() ? Hand.OFF_HAND : Hand.MAIN_HAND;
 
         List<CITItem> citItems = this.citItems.get(stack.getItem());
         if (citItems != null)
             for (CITItem citItem : citItems) {
-                bakedModel = citItem.getItemModel(stack, hand, model, world, entity);
+                bakedModel = citItem.getItemModel(stack, hand, (ClientWorld) world, entity, seed);
                 if (bakedModel != null)
                     break;
             }
 
+        if (bakedModel != null && bakedModel.getOverrides() != null)
+            bakedModel = bakedModel.getOverrides().apply(bakedModel, stack, (ClientWorld) world, entity, seed);
+
         return bakedModel;
     }
 
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/ItemRendererMixin.java b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/ItemRendererMixin.java
index 1b39512..07a4f0d 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/ItemRendererMixin.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/ItemRendererMixin.java
@@ -15,12 +15,12 @@ import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
 
 @Mixin(ItemRenderer.class)
 public class ItemRendererMixin {
-    @Inject(method = "getHeldItemModel", cancellable = true, at = @At("RETURN"))
+    @Inject(method = "getHeldItemModel", cancellable = true, at = @At("HEAD"))
     public void getItemModel(ItemStack stack, World world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
         if (!CITResewnConfig.INSTANCE().enabled || CITResewn.INSTANCE.activeCITs == null)
             return;
 
-        BakedModel citModel = CITResewn.INSTANCE.activeCITs.getItemModel(stack, cir.getReturnValue(), world == null ? MinecraftClient.getInstance().world : world, entity);
+        BakedModel citModel = CITResewn.INSTANCE.activeCITs.getItemModel(stack, world == null ? MinecraftClient.getInstance().world : world, entity, seed);
         if (citModel != null)
             cir.setReturnValue(citModel);
     }
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/JsonUnbakedModelAccessor.java b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/JsonUnbakedModelAccessor.java
index aa582bf..f997d3e 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/JsonUnbakedModelAccessor.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/cititem/JsonUnbakedModelAccessor.java
@@ -1,4 +1,4 @@
-package shcm.shsupercm.fabric.citresewn.mixin.core;
+package shcm.shsupercm.fabric.citresewn.mixin.cititem;
 
 import com.mojang.datafixers.util.Either;
 import net.minecraft.client.render.model.json.JsonUnbakedModel;
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/ModelLoaderMixin.java b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/ModelLoaderMixin.java
index e6ac888..2083f55 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/ModelLoaderMixin.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/core/ModelLoaderMixin.java
@@ -3,6 +3,7 @@ package shcm.shsupercm.fabric.citresewn.mixin.core;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.client.render.model.*;
 import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.render.model.json.ModelOverride;
 import net.minecraft.client.texture.TextureManager;
 import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.client.util.SpriteIdentifier;
@@ -22,6 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import shcm.shsupercm.fabric.citresewn.ActiveCITs;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+import shcm.shsupercm.fabric.citresewn.mixin.cititem.JsonUnbakedModelAccessor;
 import shcm.shsupercm.fabric.citresewn.pack.CITParser;
 import shcm.shsupercm.fabric.citresewn.pack.ResewnItemModelIdentifier;
 import shcm.shsupercm.fabric.citresewn.pack.ResewnTextureIdentifier;
@@ -43,9 +45,6 @@ public abstract class ModelLoaderMixin {
     @Shadow @Final private Map<Identifier, UnbakedModel> unbakedModels;
     @Shadow @Final private Map<Identifier, UnbakedModel> modelsToBake;
     @Shadow @Final private Map<Identifier, BakedModel> bakedModels;
-    @Shadow protected abstract JsonUnbakedModel loadModelFromJson(Identifier id) throws IOException;
-
-    private Map<Identifier, BakedModel> citOverrideCacheMap = new HashMap<>();
 
     @Inject(method = "addModel", at = @At("TAIL"))
     public void loadCIT(ModelIdentifier eventModelId, CallbackInfo ci) { if (eventModelId != ModelLoader.MISSING_ID) return;
@@ -87,14 +86,6 @@ public abstract class ModelLoaderMixin {
             info("No cit packs found.");
     }
 
-    @Inject(method = "bake", at = @At("RETURN"))
-    public void onBake(Identifier id, ModelBakeSettings settings, CallbackInfoReturnable<BakedModel> cir) {
-        if (CITResewn.INSTANCE.activeCITs == null)
-            return;
-
-        this.citOverrideCacheMap.put(id, cir.getReturnValue());
-    }
-
     @Inject(method = "upload", at = @At("RETURN"))
     public void linkBakedModels(TextureManager textureManager, Profiler profiler, CallbackInfoReturnable<SpriteAtlasManager> cir) {
         if (CITResewn.INSTANCE.activeCITs == null)
@@ -105,31 +96,22 @@ public abstract class ModelLoaderMixin {
 
         if (CITResewn.INSTANCE.activeCITs != null) {
             for (CITItem citItem : CITResewn.INSTANCE.activeCITs.citItems.values().stream().flatMap(Collection::stream).distinct().collect(Collectors.toList())) {
-                for (Map.Entry<Identifier, JsonUnbakedModel> citModelEntry : citItem.unbakedAssets.entrySet()) {
+                for (Map.Entry<List<ModelOverride.Condition>, JsonUnbakedModel> citModelEntry : citItem.unbakedAssets.entrySet()) {
                     if (citModelEntry.getKey() == null) {
                         citItem.bakedModel = this.bakedModels.get(new ResewnItemModelIdentifier(citModelEntry.getValue().id));
                     } else {
-                        if (citItem.subItems == null)
-                            citItem.subItems = new HashMap<>();
-
-                        BakedModel override = citOverrideCacheMap.get(citModelEntry.getKey());
+                        BakedModel bakedModel = bakedModels.get(new ResewnItemModelIdentifier(citModelEntry.getValue().id));
 
-                        if (override == null)
-                            override = citOverrideCacheMap.get(new ModelIdentifier(citModelEntry.getKey().getNamespace(), citModelEntry.getKey().getPath().substring(5), "inventory"));
-
-                        if (override != null)
-                            citItem.subItems.put(override, this.bakedModels.get(new ResewnItemModelIdentifier(citModelEntry.getValue().id)));
-                        else {
-                            CITResewn.logErrorLoading("Skipping sub cit: No such sub item model \"" + citModelEntry.getKey().getPath().substring(5) + "\" in " + citItem.pack.resourcePack.getName() + " -> " + citItem.propertiesIdentifier.getPath());
-                        }
+                        if (bakedModel == null)
+                            CITResewn.logWarnLoading("Skipping sub cit: Failed loading model for \"" + citModelEntry.getValue().id + "\" in " + citItem.pack.resourcePack.getName() + " -> " + citItem.propertiesIdentifier.getPath());
+                        else
+                            citItem.bakedSubModels.override(citModelEntry.getKey(), bakedModel);
                     }
                 }
                 citItem.unbakedAssets = null;
             }
         }
 
-        this.citOverrideCacheMap = null;
-
         profiler.pop();
     }
 
@@ -168,6 +150,17 @@ public abstract class ModelLoaderMixin {
                     }
                 }
 
+                json.getOverrides().replaceAll(override -> {
+                    String[] modelIdPathSplit = override.getModelId().getPath().split("/");
+                    if (override.getModelId().getPath().startsWith("./") || (modelIdPathSplit.length > 2 && modelIdPathSplit[1].equals("cit"))) {
+                        Identifier resolvedOverridePath = CIT.resolvePath(id, override.getModelId().getPath(), ".json", identifier -> resourceManager.containsResource(identifier));
+                        if (resolvedOverridePath != null)
+                            return new ModelOverride(new ResewnItemModelIdentifier(resolvedOverridePath), override.streamConditions().collect(Collectors.toList()));
+                    }
+
+                    return override;
+                });
+
                 cir.setReturnValue(json);
             } catch (Exception ignored) {
             } finally {
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java
index a12c190..15cb9bd 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java
@@ -2,12 +2,18 @@ package shcm.shsupercm.fabric.citresewn.pack.cits;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.util.Either;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.render.model.json.ModelOverride;
+import net.minecraft.client.render.model.json.ModelOverrideList;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
@@ -20,23 +26,26 @@ import org.apache.commons.io.IOUtils;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.ex.CITLoadException;
 import shcm.shsupercm.fabric.citresewn.ex.CITParseException;
-import shcm.shsupercm.fabric.citresewn.mixin.core.JsonUnbakedModelAccessor;
+import shcm.shsupercm.fabric.citresewn.mixin.cititem.JsonUnbakedModelAccessor;
 import shcm.shsupercm.fabric.citresewn.pack.CITPack;
 import shcm.shsupercm.fabric.citresewn.pack.ResewnItemModelIdentifier;
 import shcm.shsupercm.fabric.citresewn.pack.ResewnTextureIdentifier;
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 public class CITItem extends CIT {
     public Map<Identifier, Identifier> assetIdentifiers = new LinkedHashMap<>();
-    public Map<Identifier, JsonUnbakedModel> unbakedAssets = new HashMap<>();
+    public Map<List<ModelOverride.Condition>, JsonUnbakedModel> unbakedAssets = new LinkedHashMap<>();
     private boolean isTexture = false;
 
     public BakedModel bakedModel = null;
-    public Map<BakedModel, BakedModel> subItems = null;
+    public CITOverrideList bakedSubModels = new CITOverrideList();
 
     public CITItem(CITPack pack, Identifier identifier, Properties properties) throws CITParseException {
         super(pack, identifier, properties);
@@ -93,10 +102,10 @@ public class CITItem extends CIT {
     public void loadUnbakedAssets(ResourceManager resourceManager) throws CITLoadException {
         try {
             if (isTexture) {
-                Function<Void, JsonUnbakedModel> itemModelGenerator = new Function<>() {
+                Supplier<JsonUnbakedModel> itemModelGenerator = new Supplier<>() {
                     private final Identifier firstItemIdentifier = Registry.ITEM.getId(items.iterator().next()), firstItemModelIdentifier = new Identifier(firstItemIdentifier.getNamespace(), "models/item/" + firstItemIdentifier.getPath() + ".json");
                     @Override
-                    public JsonUnbakedModel apply(Void v) {
+                    public JsonUnbakedModel get() {
                         Resource itemModelResource = null;
                         try {
                             return JsonUnbakedModel.deserialize(IOUtils.toString((itemModelResource = resourceManager.getResource(firstItemModelIdentifier)).getInputStream(), StandardCharsets.UTF_8));
@@ -108,7 +117,7 @@ public class CITItem extends CIT {
                     }
                 };
 
-                JsonUnbakedModel itemJson = itemModelGenerator.apply(null);
+                JsonUnbakedModel itemJson = itemModelGenerator.get();
                 Map<String, Either<SpriteIdentifier, String>> textureOverrideMap = new HashMap<>();
                 if (((JsonUnbakedModelAccessor) itemJson).getTextureMap().size() > 1) { // use(some/all of) the asset identifiers to build texture override in layered models
                     textureOverrideMap = ((JsonUnbakedModelAccessor) itemJson).getTextureMap();
@@ -133,16 +142,67 @@ public class CITItem extends CIT {
                 if (baseIdentifier != null)
                     unbakedAssets.put(null, loadUnbakedAsset(resourceManager, textureOverrideMap, itemModelGenerator, baseIdentifier));
 
-                for (Map.Entry<Identifier, Identifier> assetEntry : assetIdentifiers.entrySet())
-                    unbakedAssets.put(assetEntry.getKey(), loadUnbakedAsset(resourceManager, textureOverrideMap, itemModelGenerator, assetEntry.getValue()));
+                if (!assetIdentifiers.isEmpty()) { // contains sub models
+                    LinkedHashMap<Identifier, List<ModelOverride.Condition>> overrideConditions = new LinkedHashMap<>();
+                    for (Item item : this.items) {
+                        Identifier itemIdentifier = Registry.ITEM.getId(item);
+                        overrideConditions.put(new Identifier(itemIdentifier.getNamespace(), "item/" + itemIdentifier.getPath()), Collections.emptyList());
+
+                        Identifier itemModelIdentifier = new Identifier(itemIdentifier.getNamespace(), "models/item/" + itemIdentifier.getPath() + ".json");
+                        try (Resource itemModelResource = resourceManager.getResource(itemModelIdentifier); Reader resourceReader = new InputStreamReader(itemModelResource.getInputStream())) {
+                            JsonUnbakedModel itemModelJson = JsonUnbakedModel.deserialize(resourceReader);
+
+                            if (itemModelJson.getOverrides() != null && !itemModelJson.getOverrides().isEmpty())
+                                for (ModelOverride override : itemModelJson.getOverrides())
+                                    overrideConditions.put(override.getModelId(), override.streamConditions().toList());
+                        }
+                    }
+
+                    ArrayList<Identifier> overrideModels = new ArrayList<>(overrideConditions.keySet());
+                    Collections.reverse(overrideModels);
+
+                    for (Identifier overrideModel : overrideModels) {
+                        Identifier replacement = assetIdentifiers.remove(overrideModel);
+                        if (replacement == null)
+                            continue;
+
+                        List<ModelOverride.Condition> conditions = overrideConditions.get(overrideModel);
+                        unbakedAssets.put(conditions, loadUnbakedAsset(resourceManager, textureOverrideMap, itemModelGenerator, replacement));
+                    }
+                }
             } else {
                 Identifier baseIdentifier = assetIdentifiers.remove(null);
-
                 if (baseIdentifier != null)
                     unbakedAssets.put(null, loadUnbakedAsset(resourceManager, null, null, baseIdentifier));
 
-                for (Map.Entry<Identifier, Identifier> assetEntry : assetIdentifiers.entrySet())
-                    unbakedAssets.put(assetEntry.getKey(), loadUnbakedAsset(resourceManager, null, null, assetEntry.getValue()));
+                if (!assetIdentifiers.isEmpty()) { // contains sub models
+                    LinkedHashMap<Identifier, List<ModelOverride.Condition>> overrideConditions = new LinkedHashMap<>();
+                    for (Item item : this.items) {
+                        Identifier itemIdentifier = Registry.ITEM.getId(item);
+                        overrideConditions.put(new Identifier(itemIdentifier.getNamespace(), "item/" + itemIdentifier.getPath()), Collections.emptyList());
+
+                        Identifier itemModelIdentifier = new Identifier(itemIdentifier.getNamespace(), "models/item/" + itemIdentifier.getPath() + ".json");
+                        try (Resource itemModelResource = resourceManager.getResource(itemModelIdentifier); Reader resourceReader = new InputStreamReader(itemModelResource.getInputStream())) {
+                            JsonUnbakedModel itemModelJson = JsonUnbakedModel.deserialize(resourceReader);
+
+                            if (itemModelJson.getOverrides() != null && !itemModelJson.getOverrides().isEmpty())
+                                for (ModelOverride override : itemModelJson.getOverrides())
+                                    overrideConditions.put(override.getModelId(), override.streamConditions().toList());
+                        }
+                    }
+
+                    ArrayList<Identifier> overrideModels = new ArrayList<>(overrideConditions.keySet());
+                    Collections.reverse(overrideModels);
+
+                    for (Identifier overrideModel : overrideModels) {
+                        Identifier replacement = assetIdentifiers.remove(overrideModel);
+                        if (replacement == null)
+                            continue;
+
+                        List<ModelOverride.Condition> conditions = overrideConditions.get(overrideModel);
+                        unbakedAssets.put(conditions, loadUnbakedAsset(resourceManager, null, null, replacement));
+                    }
+                }
             }
         } catch (Exception e) {
             throw new CITLoadException(pack.resourcePack, propertiesIdentifier, (e.getClass() == Exception.class ? "" : e.getClass().getSimpleName() + ": ") + e.getMessage());
@@ -151,7 +211,7 @@ public class CITItem extends CIT {
         }
     }
 
-    private JsonUnbakedModel loadUnbakedAsset(ResourceManager resourceManager, Map<java.lang.String, Either<SpriteIdentifier, String>> textureOverrideMap, Function<Void, JsonUnbakedModel> itemModelGenerator, Identifier identifier) throws Exception {
+    private JsonUnbakedModel loadUnbakedAsset(ResourceManager resourceManager, Map<java.lang.String, Either<SpriteIdentifier, String>> textureOverrideMap, Supplier<JsonUnbakedModel> itemModelGenerator, Identifier identifier) throws Exception {
         JsonUnbakedModel json;
         if (identifier.getPath().endsWith(".json")) {
             InputStream is = null;
@@ -167,7 +227,7 @@ public class CITItem extends CIT {
                         String originalPath = left.get().getTextureId().getPath();
                         String[] split = originalPath.split("/");
                         if (originalPath.startsWith("./") || (split.length > 2 && split[1].equals("cit"))) {
-                            Identifier resolvedIdentifier = CIT.resolvePath(identifier, originalPath, ".png", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id));
+                            Identifier resolvedIdentifier = resolvePath(identifier, originalPath, ".png", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id));
                             if (resolvedIdentifier != null)
                                 return Either.left(new SpriteIdentifier(left.get().getAtlasId(), new ResewnTextureIdentifier(resolvedIdentifier)));
                         }
@@ -185,12 +245,23 @@ public class CITItem extends CIT {
                     }
                 }
 
+                json.getOverrides().replaceAll(override -> {
+                    String[] modelIdPathSplit = override.getModelId().getPath().split("/");
+                    if (override.getModelId().getPath().startsWith("./") || (modelIdPathSplit.length > 2 && modelIdPathSplit[1].equals("cit"))) {
+                        Identifier resolvedOverridePath = resolvePath(identifier, override.getModelId().getPath(), ".json", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id));
+                        if (resolvedOverridePath != null)
+                            return new ModelOverride(new ResewnItemModelIdentifier(resolvedOverridePath), override.streamConditions().collect(Collectors.toList()));
+                    }
+
+                    return override;
+                });
+
                 return json;
             } finally {
                 IOUtils.closeQuietly(is, resource);
             }
         } else if (identifier.getPath().endsWith(".png")) {
-            json = itemModelGenerator.apply(null);
+            json = itemModelGenerator.get();
             if (json == null)
                 json = new JsonUnbakedModel(new Identifier("minecraft", "item/generated"), new ArrayList<>(), ImmutableMap.of("layer0", Either.left(new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, new ResewnTextureIdentifier(identifier)))), true, JsonUnbakedModel.GuiLight.ITEM, ModelTransformation.NONE, new ArrayList<>());
             json.getOverrides().clear();
@@ -230,17 +301,32 @@ public class CITItem extends CIT {
         return null;
     }
 
-    public BakedModel getItemModel(ItemStack stack, Hand hand, BakedModel model, World world, LivingEntity entity) {
+    public BakedModel getItemModel(ItemStack stack, Hand hand, ClientWorld world, LivingEntity entity, int seed) {
         if (test(stack, hand, world, entity)) {
-            if (subItems != null) {
-                BakedModel subModel = subItems.get(model);
-                if (subModel != null)
-                    return subModel;
-            }
-
-            return this.bakedModel;
+            return bakedSubModels.apply(this.bakedModel, stack, world, entity, seed);
         }
 
         return null;
     }
+
+    public static class CITOverrideList extends ModelOverrideList {
+        public void override(List<ModelOverride.Condition> key, BakedModel bakedModel) {
+            Set<Identifier> conditionTypes = new HashSet<>(Arrays.asList(this.conditionTypes));
+            for (ModelOverride.Condition condition : key)
+                conditionTypes.add(condition.getType());
+            this.conditionTypes = conditionTypes.toArray(new Identifier[0]);
+
+            this.overrides = Arrays.copyOf(this.overrides, this.overrides.length + 1);
+
+            Object2IntMap<Identifier> object2IntMap = new Object2IntOpenHashMap<>();
+            for(int i = 0; i < this.conditionTypes.length; ++i)
+                object2IntMap.put(this.conditionTypes[i], i);
+
+            this.overrides[this.overrides.length - 1] = new BakedOverride(
+                    key.stream()
+                        .map((condition) -> new InlinedCondition(object2IntMap.getInt(condition.getType()), condition.getThreshold()))
+                        .toArray(InlinedCondition[]::new)
+                    , bakedModel);
+        }
+    }
 }
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 <init> ()V
+accessible   method  net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride <init> ([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 <init> (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"
   ],