R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Holder-ize AttributeSupplier mixins

Browse Source
This commit is contained in:
embeddedt 2026-01-25 21:31:18 -05:00
parent 49a88c8bba
commit b9832b076b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierBuilderMixin.java
View File

@ -1,5 +1,6 @@
package org.embeddedt.modernfix.common.mixin.perf.attribute_supplier_dedup; 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.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@ -17,7 +18,7 @@ import java.util.Map;
public class AttributeSupplierBuilderMixin { public class AttributeSupplierBuilderMixin {
@Shadow @Shadow
@Final @Final
private Map<Attribute, AttributeInstance> builder; private Map<Holder<Attribute>, AttributeInstance> builder;
/** /**
* @author embeddedt * @author embeddedt

5
src/main/java/org/embeddedt/modernfix/common/mixin/perf/attribute_supplier_dedup/AttributeSupplierMixin.java
View File

@ -1,5 +1,6 @@
package org.embeddedt.modernfix.common.mixin.perf.attribute_supplier_dedup; 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.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@ -18,7 +19,7 @@ public class AttributeSupplierMixin {
@Shadow @Shadow
@Final @Final
@Mutable @Mutable
private Map<Attribute, AttributeInstance> instances; private Map<Holder<Attribute>, AttributeInstance> instances;
/** /**
* @author embeddedt * @author embeddedt
@ -26,7 +27,7 @@ public class AttributeSupplierMixin {
* care about insertion order in this context * care about insertion order in this context
*/ */
@Inject(method = "<init>", at = @At("RETURN")) @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); this.instances = Map.copyOf(this.instances);
} }
} }