From f040f66bf9a33727e1c1d1c905eb4e5db1a04a52 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 9 Jul 2023 19:02:59 -0400 Subject: [PATCH] Make backing maps in ItemProperties thread-safe Helps prevent CMEs on Forge 1.16 --- .../mixin/safety/ItemPropertiesMixin.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java new file mode 100644 index 00000000..7429ea3d --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java @@ -0,0 +1,30 @@ +package org.embeddedt.modernfix.common.mixin.safety; + +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.client.renderer.item.ItemPropertyFunction; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Mixin(value = ItemProperties.class, priority = 700) +@ClientOnlyMixin +public class ItemPropertiesMixin { + @Shadow @Final @Mutable private static Map GENERIC_PROPERTIES; + @Shadow @Final @Mutable private static Map> PROPERTIES; + + @Inject(method = "", at = @At("RETURN")) + private static void useConcurrentMaps(CallbackInfo ci) { + GENERIC_PROPERTIES = new ConcurrentHashMap<>(GENERIC_PROPERTIES); + PROPERTIES = new ConcurrentHashMap<>(PROPERTIES); + } +}