From b9832b076b981e33b6beb40a91f151b258f0fa88 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 25 Jan 2026 21:31:18 -0500
Subject: [PATCH] Holder-ize AttributeSupplier mixins

---
 .../AttributeSupplierBuilderMixin.java                       | 3 ++-
 .../attribute_supplier_dedup/AttributeSupplierMixin.java     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierBuilderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierBuilderMixin.java
index 2953a86a..116e954d 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierBuilderMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierBuilderMixin.java
@@ -1,5 +1,6 @@
 package org.embeddedt.modernfix.common.mixin.perf.attribute_supplier_dedup;
 
+import net.minecraft.core.Holder;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@@ -17,7 +18,7 @@ import java.util.Map;
 public class AttributeSupplierBuilderMixin {
     @Shadow
     @Final
-    private Map<Attribute, AttributeInstance> builder;
+    private Map<Holder<Attribute>, AttributeInstance> builder;
 
     /**
      * @author embeddedt
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierMixin.java
index 5ffc3489..c214cba0 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierMixin.java
@@ -1,5 +1,6 @@
 package org.embeddedt.modernfix.common.mixin.perf.attribute_supplier_dedup;
 
+import net.minecraft.core.Holder;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@@ -18,7 +19,7 @@ public class AttributeSupplierMixin {
     @Shadow
     @Final
     @Mutable
-    private Map<Attribute, AttributeInstance> instances;
+    private Map<Holder<Attribute>, AttributeInstance> instances;
 
     /**
      * @author embeddedt
@@ -26,7 +27,7 @@ public class AttributeSupplierMixin {
      * care about insertion order in this context
      */
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void useCompactJavaMap(Map<Attribute, AttributeInstance> instances, CallbackInfo ci) {
+    private void useCompactJavaMap(Map<Holder<Attribute>, AttributeInstance> instances, CallbackInfo ci) {
         this.instances = Map.copyOf(this.instances);
     }
 }
\ No newline at end of file