From af0b7b519ae7c674ec8e42c06f40d13b1b181e04 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Sat, 9 Dec 2023 18:08:23 +0700 Subject: [PATCH] 1.20.1 --- .../me/melontini/andromeda/modules/items/magnet/Content.java | 3 ++- .../andromeda/modules/items/magnet/items/MagnetItem.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/melontini/andromeda/modules/items/magnet/Content.java b/src/main/java/me/melontini/andromeda/modules/items/magnet/Content.java index bc8cc642..c11de1fe 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/magnet/Content.java +++ b/src/main/java/me/melontini/andromeda/modules/items/magnet/Content.java @@ -8,6 +8,7 @@ import me.melontini.andromeda.modules.items.magnet.items.MagnetItem; import me.melontini.dark_matter.api.content.ContentBuilder; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; import static me.melontini.andromeda.common.registries.Common.id; @@ -15,7 +16,7 @@ public class Content { public static final Keeper MAGNET = Common.start(() -> ContentBuilder.ItemBuilder .create(id("magnet"), () -> new MagnetItem(new FabricItemSettings().maxCount(1))) - .itemGroup(ItemGroups.TOOLS) + .itemGroup(Registries.ITEM_GROUP.get(ItemGroups.TOOLS)) .register(() -> ModuleManager.quick(Magnet.class).enabled())) .afterInit(m -> AndromedaItemGroup.accept(a -> a.item(ModuleManager.quick(Magnet.class), m))); diff --git a/src/main/java/me/melontini/andromeda/modules/items/magnet/items/MagnetItem.java b/src/main/java/me/melontini/andromeda/modules/items/magnet/items/MagnetItem.java index 09757267..307e8e6d 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/magnet/items/MagnetItem.java +++ b/src/main/java/me/melontini/andromeda/modules/items/magnet/items/MagnetItem.java @@ -115,7 +115,7 @@ public class MagnetItem extends Item { public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { if (!world.isClient()) { if (entity instanceof LivingEntity pe) { //selected doesn't account for offhand - if (!stack.isItemEqual(pe.getStackInHand(Hand.MAIN_HAND)) && !stack.isItemEqual(pe.getStackInHand(Hand.OFF_HAND))) + if (!ItemStack.areItemsEqual(stack, pe.getStackInHand(Hand.MAIN_HAND)) && !ItemStack.areItemsEqual(stack, pe.getStackInHand(Hand.OFF_HAND))) return; } else if (!selected) return; -- 2.51.2