From 8db86d6188ca11d112d29e63ce13b2f739625c33 Mon Sep 17 00:00:00 2001 From: pietru Date: Thu, 9 Jan 2025 11:59:08 +0100 Subject: [PATCH] enable ItemThingMixin --- .../net/pietru/cookie_utils/mixins/ItemThingMixin.java | 8 +------- src/main/resources/cookie_utils.mixins.json | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/pietru/cookie_utils/mixins/ItemThingMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/ItemThingMixin.java index c339986..6b65e83 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/ItemThingMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/ItemThingMixin.java @@ -3,19 +3,13 @@ package net.pietru.cookie_utils.mixins; import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.blocks.BlockPosition; -import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.entities.player.Player; import finalforeach.cosmicreach.items.ItemSlot; import finalforeach.cosmicreach.items.ItemThing; -import finalforeach.cosmicreach.networking.NetworkIdentity; -import finalforeach.cosmicreach.networking.NetworkSide; import finalforeach.cosmicreach.networking.packets.MessagePacket; -import finalforeach.cosmicreach.networking.packets.blocks.InteractBlockPacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; -import io.netty.channel.ChannelHandlerContext; import net.pietru.cookie_utils.permissions.Permissions; import org.spongepowered.asm.mixin.Mixin; -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; @@ -26,7 +20,7 @@ import static net.pietru.cookie_utils.api.Region.is_not_reloading; @Mixin(ItemThing.class) public class ItemThingMixin { - @Inject(method = "handle", at = @At("HEAD"), cancellable = true) + @Inject(method = "useItem", at = @At("HEAD"), cancellable = true) private void event_item_useItem(CallbackInfo ci, @Local ItemSlot itemSlot, @Local Player player, @Local BlockPosition targetBlockPos){ Account account = player.getAccount(); if (targetBlockPos!=null) { diff --git a/src/main/resources/cookie_utils.mixins.json b/src/main/resources/cookie_utils.mixins.json index c5fbd01..755c7b7 100644 --- a/src/main/resources/cookie_utils.mixins.json +++ b/src/main/resources/cookie_utils.mixins.json @@ -15,7 +15,8 @@ "NettyServerMixin", "ServerSingletonsMixin", "BlockEntitySignMixin", - "PlayerEntityMixin" + "PlayerEntityMixin", + "ItemThingMixin" ], "client": [], "injectors": {