From 3dc05dc6d0ec1636c7e74eb8cf72985f608b3125 Mon Sep 17 00:00:00 2001
From: xypp <2952795729@qq.com>
Date: Thu, 18 Sep 2025 18:26:29 +0800
Subject: [PATCH] 1.21 compat

---
 build.gradle                                               | 4 ++--
 .../fantasyit/maid_useful_task/api/ItemLocateEvent.java    | 7 +++----
 .../fantasyit/maid_useful_task/task/MaidLocateTask.java    | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3a05059..fb0b089 100644
--- a/build.gradle
+++ b/build.gradle
@@ -103,8 +103,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "curse.maven:touhou-little-maid-355044:6885289"
-    runtimeOnly "curse.maven:touhou-little-maid-355044:6885289"
+    compileOnly "curse.maven:touhou-little-maid-355044:6988538"
+    runtimeOnly "curse.maven:touhou-little-maid-355044:6988538"
 //    compileOnly "libs:touhoulittlemaid-${minecraft_version}-release:1.3.7"
 //    runtimeOnly "libs:touhoulittlemaid-${minecraft_version}-release:1.3.7"
 
diff --git a/src/main/java/studio/fantasyit/maid_useful_task/api/ItemLocateEvent.java b/src/main/java/studio/fantasyit/maid_useful_task/api/ItemLocateEvent.java
index 0573128..02762b2 100644
--- a/src/main/java/studio/fantasyit/maid_useful_task/api/ItemLocateEvent.java
+++ b/src/main/java/studio/fantasyit/maid_useful_task/api/ItemLocateEvent.java
@@ -3,11 +3,10 @@ package studio.fantasyit.maid_useful_task.api;
 import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.eventbus.api.Cancelable;
-import net.minecraftforge.eventbus.api.Event;
+import net.neoforged.bus.api.Event;
+import net.neoforged.bus.api.ICancellableEvent;
 
-@Cancelable
-public class ItemLocateEvent extends Event {
+public class ItemLocateEvent extends Event implements ICancellableEvent {
     public final ItemStack itemStack;
     public final EntityMaid maid;
     public final BlockPos cache;
diff --git a/src/main/java/studio/fantasyit/maid_useful_task/task/MaidLocateTask.java b/src/main/java/studio/fantasyit/maid_useful_task/task/MaidLocateTask.java
index 64659d6..9471092 100644
--- a/src/main/java/studio/fantasyit/maid_useful_task/task/MaidLocateTask.java
+++ b/src/main/java/studio/fantasyit/maid_useful_task/task/MaidLocateTask.java
@@ -22,7 +22,7 @@ import net.minecraft.world.item.component.LodestoneTracker;
 import net.minecraft.world.item.component.MapDecorations;
 import net.minecraft.world.level.saveddata.maps.MapDecorationTypes;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
-import net.minecraftforge.common.MinecraftForge;
+import net.neoforged.neoforge.common.NeoForge;
 import org.jetbrains.annotations.Nullable;
 import studio.fantasyit.maid_useful_task.Config;
 import studio.fantasyit.maid_useful_task.MaidUsefulTask;
@@ -82,7 +82,8 @@ public class MaidLocateTask implements IMaidTask, IMaidFindTargetTask {
             MemoryUtil.clearCommonBlockCache(maid);
         }
         ItemLocateEvent event = new ItemLocateEvent(itemStack, maid, MemoryUtil.getCommonBlockCache(maid));
-        if (MinecraftForge.EVENT_BUS.post(event)) {
+        ItemLocateEvent posted = NeoForge.EVENT_BUS.post(event);
+        if (posted.isCanceled()) {
             target = event.getTarget();
         } else if (maid.getMainHandItem().is(Items.ENDER_EYE)) {
             target = MemoryUtil.getCommonBlockCache(maid);