From 7489d030ad2548d7c5c6ca97772b91db7754451f Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Fri, 15 Mar 2024 20:26:45 -0600 Subject: [PATCH] Remove ItemStack mixin to fix flickering --- .../pm/c7/scout/mixin/ItemStackMixin.java | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/main/java/pm/c7/scout/mixin/ItemStackMixin.java diff --git a/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java b/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java deleted file mode 100644 index 5188cd6..0000000 --- a/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -package pm.c7.scout.mixin; - -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import pm.c7.scout.item.BaseBagItem; - -@Mixin(ItemStack.class) -public class ItemStackMixin { - // Trinkets calls areEqual to check whether it should unequip old and equip new (https://github.com/emilyploszaj/trinkets/blob/7cb63ce0/src/main/java/dev/emi/trinkets/mixin/LivingEntityMixin.java#L155-L158) - // Excluding ourselves from this check to force unequip/equip when switching bag items fixes a duplication bug - // Gross and hacky but oh well, can't mixin mixins. - @Inject(method = "areEqual", at = @At("HEAD"), cancellable = true) - private static void scout$grossTrinketsEquipFix(ItemStack stack, ItemStack otherStack, CallbackInfoReturnable callbackInfo) { - if (stack.getItem() instanceof BaseBagItem && otherStack.getItem() instanceof BaseBagItem) { - callbackInfo.setReturnValue(false); - } - } -}