From 77700a5a9381b6d69b5f4870053af38f9e24d9e1 Mon Sep 17 00:00:00 2001 From: unilock Date: Fri, 28 Jun 2024 08:28:56 -0400 Subject: [PATCH] Remove outdated Malum compat Malum 1.6 does not include a "spirit_reach" attribute, causing a crash when viewing the tooltip of Rings of Magnetization with Malum installed Signed-off-by: unilock --- .../bauble/RingOfMagnetizationItem.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/RingOfMagnetizationItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/RingOfMagnetizationItem.java index 603ecc47b6..e77c113415 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/RingOfMagnetizationItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/RingOfMagnetizationItem.java @@ -8,15 +8,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -57,17 +50,6 @@ public static void onTossItem(Player player) { } } - @Override - public Multimap getEquippedAttributeModifiers(ItemStack stack) { - if (XplatAbstractions.INSTANCE.isModLoaded("malum")) { - Multimap attributes = HashMultimap.create(); - attributes.put(BuiltInRegistries.ATTRIBUTE.get(new ResourceLocation("malum", "spirit_reach")), - new AttributeModifier(getBaubleUUID(stack), "Magnet Ring reach boost", 0.5, AttributeModifier.Operation.MULTIPLY_BASE)); - return attributes; - } - return super.getEquippedAttributeModifiers(stack); - } - @Override public void onWornTick(ItemStack stack, LivingEntity living) { super.onWornTick(stack, living);