Fix TheidenHD#4

.gitignore

@@ -7,6 +7,7 @@ Thumbs.db
 
 ## ForgeGradle
 /run
+/runs
 
 ## eclipse
 /.settings

src/main/java/vazkii/psi/client/model/ArmorModels.java

@@ -8,43 +8,11 @@
  */
 package vazkii.psi.client.model;
 
-import net.minecraft.client.model.geom.ModelLayerLocation;
-import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-
-import vazkii.psi.common.item.armor.ItemPsimetalArmor;
-
-import javax.annotation.Nullable;
-
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.Map;
 
 public class ArmorModels {
-	private static Map<EquipmentSlot, ModelArmor> exosuit = Collections.emptyMap();
-
-	private static Map<EquipmentSlot, ModelArmor> make(EntityRendererProvider.Context ctx, ModelLayerLocation inner, ModelLayerLocation outer) {
-		Map<EquipmentSlot, ModelArmor> ret = new EnumMap<>(EquipmentSlot.class);
-		for(var slot : EquipmentSlot.values()) {
-			var mesh = ctx.bakeLayer(slot == EquipmentSlot.LEGS ? inner : outer);
-			ret.put(slot, new ModelArmor(mesh, slot));
-		}
-		return ret;
-	}
-
-	public static void init(EntityRendererProvider.Context ctx) {
-		exosuit = make(ctx, ModModelLayers.PSIMETAL_EXOSUIT_INNER_ARMOR, ModModelLayers.PSIMETAL_EXOSUIT_OUTER_ARMOR);
-	}
-
-	@Nullable
-	public static ModelArmor get(ItemStack stack) {
-		Item item = stack.getItem();
-		if(item instanceof ItemPsimetalArmor armor) {
-			return exosuit.get(armor.getEquipmentSlot());
-		}
-
-		return null;
+	public static ModelArmor get(EquipmentSlot equipmentSlot) {
+		return new ModelArmor(Minecraft.getInstance().getEntityModels().bakeLayer(equipmentSlot == EquipmentSlot.LEGS ? ModModelLayers.PSIMETAL_EXOSUIT_INNER_ARMOR : ModModelLayers.PSIMETAL_EXOSUIT_OUTER_ARMOR), equipmentSlot);
 	}
 }

src/main/java/vazkii/psi/client/render/entity/RenderSpellCircle.java

@@ -53,8 +53,6 @@ public class RenderSpellCircle extends EntityRenderer<EntitySpellCircle> {
 
 	public RenderSpellCircle(EntityRendererProvider.Context ctx) {
 		super(ctx);
-		// Ugly hack to get context
-		ArmorModels.init(ctx);
 	}
 
 	@Override

src/main/java/vazkii/psi/common/item/armor/ItemPsimetalArmor.java

@@ -188,7 +188,7 @@ public void initializeClient(Consumer<IClientItemExtensions> consumer) {
 		consumer.accept(new IClientItemExtensions() {
 			@Override
 			public @NotNull HumanoidModel<?> getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel<?> original) {
-				return ArmorModels.get(itemStack);
+				return ArmorModels.get(equipmentSlot);
 			}
 		});
 	}