Fixed incompatibility with Better Combat

*We're backporting to 1.19 first before releasing 1.19.2.

gradle.properties

@@ -1,11 +1,11 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.1
-loader_version=0.14.9
+minecraft_version=1.19
+yarn_mappings=1.19+build.1
+loader_version=0.14.6
 
-mod_version = 0.2.2
+mod_version = 0.2.3
 maven_group = com.github.clevernucleus
 archives_base_name = armorrenderlib
 
-fabric_api_version=0.59.0+1.19.2
+fabric_api_version=0.58.0+1.19

src/main/java/com/github/clevernucleus/armorrenderlib/impl/ArmorRenderLibImpl.java

@@ -33,7 +33,7 @@ private static <T extends LivingEntity, M extends BipedEntityModel<T>, A extends
 
 		if(item.getSlotType() != slot) return;
 		var entityRenderer = MinecraftClient.getInstance().getEntityRenderDispatcher().getRenderer(entity);
-		ArmorFeatureRenderer<T, M, A> armorFeatureRenderer = (ArmorFeatureRenderer<T, M, A>)((FeatureRendererAccessor<T, M>)entityRenderer).getFeatureRenderer(ArmorFeatureRenderer.class);
+		ArmorFeatureRenderer<T, M, A> armorFeatureRenderer = (ArmorFeatureRenderer<T, M, A>)((FeatureRendererAccessor<T, M>)entityRenderer).getFeatureRenderer();
 		A model = ((ArmorFeatureRendererInvoker<T, M, A>)armorFeatureRenderer).invokeGetArmor(slot);
 		contextModel.setAttributes((BipedEntityModel<LivingEntity>)model);
 		((ArmorFeatureRendererInvoker<T, M, A>)armorFeatureRenderer).invokeSetVisible(model, slot);

src/main/java/com/github/clevernucleus/armorrenderlib/impl/FeatureRendererAccessor.java

@@ -5,5 +5,5 @@
 import net.minecraft.entity.LivingEntity;
 
 public interface FeatureRendererAccessor<T extends LivingEntity, M extends EntityModel<T>> {
-	ArmorFeatureRenderer<?, ?, ?> getFeatureRenderer(Object key);
+	ArmorFeatureRenderer<?, ?, ?> getFeatureRenderer();
 }

src/main/java/com/github/clevernucleus/armorrenderlib/mixin/LivingEntityRendererMixin.java

@@ -1,19 +1,13 @@
 package com.github.clevernucleus.armorrenderlib.mixin;
 
-import java.util.List;
-import java.util.Map;
-
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.github.clevernucleus.armorrenderlib.impl.FeatureRendererAccessor;
 
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer;
 import net.minecraft.client.render.entity.feature.FeatureRenderer;
@@ -24,22 +18,17 @@
 abstract class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> implements FeatureRendererAccessor<T, M> {
 
 	@Unique
-	private final Map<Class<? extends FeatureRenderer<T, M>>, FeatureRenderer<T, M>> arl_features = new Object2ObjectArrayMap<>();
+	private FeatureRenderer<T, M> arl_armorFeature;
 
-	@SuppressWarnings("unchecked")
 	@Inject(method = "addFeature", at = @At("HEAD"), cancellable = true)
 	private void arl_addFeature(FeatureRenderer<T, M> feature, CallbackInfoReturnable<Boolean> info) {
-		this.arl_features.put((Class<? extends FeatureRenderer<T, M>>)feature.getClass(), feature);
-		info.setReturnValue(true);
-	}
-
-	@Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/entity/LivingEntityRenderer;features:Ljava/util/List;", opcode = Opcodes.GETFIELD))
-	private List<FeatureRenderer<T, M>> arl_get(LivingEntityRenderer<T, M> renderer) {
-		return this.arl_features.values().stream().toList();
+		if(feature instanceof ArmorFeatureRenderer) {
+			this.arl_armorFeature = feature;
+		}
 	}
 
 	@Override
-	public ArmorFeatureRenderer<?, ?, ?> getFeatureRenderer(Object key) {
-		return (ArmorFeatureRenderer<?, ?, ?>)this.arl_features.get(key);
+	public ArmorFeatureRenderer<?, ?, ?> getFeatureRenderer() {
+		return (ArmorFeatureRenderer<?, ?, ?>)this.arl_armorFeature;
 	}
 }

src/main/resources/fabric.mod.json

@@ -25,9 +25,9 @@
         "armorrenderlib.mixins.json"
     ],
     "depends": {
-        "fabricloader": ">=0.14.9",
-        "fabric-api": ">=0.59.0",
-        "minecraft": "1.19.2",
+        "fabricloader": ">=0.14.6",
+        "fabric": ">=0.58.0",
+        "minecraft": "1.19",
         "java": ">=17"
     }
 }