干掉部分事件，mixin

Anvil-Dev · Sep 28, 2024 · 0e487f4 · 0e487f4
1 parent daac432
commit 0e487f4
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 213 deletions.
diff --git a/src/main/java/dev/dubhe/anvilcraft/api/event/forge/DataPackReloadedEvent.java b/src/main/java/dev/dubhe/anvilcraft/api/event/forge/DataPackReloadedEvent.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerEndDataPackReloadEvent.java b/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerEndDataPackReloadEvent.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerEvent.java b/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerEvent.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerStartedEvent.java b/src/main/java/dev/dubhe/anvilcraft/api/event/server/ServerStartedEvent.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/event/forge/ServerLifecycleEventListener.java b/src/main/java/dev/dubhe/anvilcraft/event/forge/ServerLifecycleEventListener.java
@@ -3,17 +3,12 @@
 import dev.dubhe.anvilcraft.AnvilCraft;
 import dev.dubhe.anvilcraft.api.RipeningManager;
 import dev.dubhe.anvilcraft.api.chargecollector.ThermoManager;
-import dev.dubhe.anvilcraft.api.event.forge.DataPackReloadedEvent;
-import dev.dubhe.anvilcraft.api.event.server.ServerEndDataPackReloadEvent;
 import dev.dubhe.anvilcraft.api.power.PowerGrid;
 import dev.dubhe.anvilcraft.api.world.load.RandomChuckTickLoadManager;
 import dev.dubhe.anvilcraft.recipe.anvil.cache.RecipeCaches;
 
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.packs.resources.CloseableResourceManager;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import net.neoforged.neoforge.event.server.ServerStoppedEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 import net.neoforged.neoforge.event.tick.ServerTickEvent;
@@ -22,24 +17,6 @@
 
 @EventBusSubscriber(modid = AnvilCraft.MOD_ID)
 public class ServerLifecycleEventListener {
-    /**
-     * @param event 服务器启动事件
-     */
-    @SubscribeEvent
-    public static void serverStarted(@NotNull ServerStartedEvent event) {
-        AnvilCraft.EVENT_BUS.post(new dev.dubhe.anvilcraft.api.event.server.ServerStartedEvent(event.getServer()));
-    }
-
-    /**
-     * @param event 数据包重载事件
-     */
-    @SubscribeEvent
-    public static void onDataPackReloaded(@NotNull DataPackReloadedEvent event) {
-        MinecraftServer server = event.getServer();
-        CloseableResourceManager resourceManager = event.getResourceManager();
-        AnvilCraft.EVENT_BUS.post(new ServerEndDataPackReloadEvent(server, resourceManager));
-    }
-
     /**
      * @param event 服务器刻事件
      */

diff --git a/src/main/java/dev/dubhe/anvilcraft/event/server/ServerEventListener.java b/src/main/java/dev/dubhe/anvilcraft/event/server/ServerEventListener.java
@@ -1,30 +1,20 @@
 package dev.dubhe.anvilcraft.event.server;
 
-import dev.dubhe.anvilcraft.api.event.server.ServerEndDataPackReloadEvent;
-import dev.dubhe.anvilcraft.api.event.server.ServerStartedEvent;
 import dev.dubhe.anvilcraft.api.hammer.HammerManager;
 import dev.dubhe.anvilcraft.api.world.load.LevelLoadManager;
 import dev.dubhe.anvilcraft.init.ModHammerInits;
 
-import net.neoforged.bus.api.SubscribeEvent;
-
-import org.jetbrains.annotations.NotNull;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
 
 public class ServerEventListener {
     /**
      * 服务器开启事件
      *
      * @param event 事件
      */
-    @SuppressWarnings("unused")
-    @SubscribeEvent
-    public void onServerStarted(@NotNull ServerStartedEvent event) {
+    public static void onServerStarted(ServerStartedEvent event) {
         ModHammerInits.init();
         HammerManager.register();
         LevelLoadManager.notifyServerStarted();
     }
-
-    @SuppressWarnings("unused")
-    @SubscribeEvent
-    public void onServerEndDataPackReload(@NotNull ServerEndDataPackReloadEvent event) {}
 }
diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModEvents.java b/src/main/java/dev/dubhe/anvilcraft/init/ModEvents.java
@@ -13,6 +13,7 @@
 import dev.dubhe.anvilcraft.event.client.ClientPlayerDisconnectEventListener;
 import dev.dubhe.anvilcraft.event.giantanvil.GiantAnvilLandingEventListener;
 import dev.dubhe.anvilcraft.event.server.ServerEventListener;
+import net.neoforged.neoforge.common.NeoForge;
 
 public class ModEvents {
     /**
@@ -21,7 +22,6 @@ public class ModEvents {
     public static void register() {
         AnvilCraft.EVENT_BUS.register(new AnvilEventListener());
         AnvilCraft.EVENT_BUS.register(new LightningEventListener());
-        AnvilCraft.EVENT_BUS.register(new ServerEventListener());
         AnvilCraft.EVENT_BUS.register(new PlayerEventListener());
         AnvilCraft.EVENT_BUS.register(new AnvilHitPiezoelectricCrystalBlockEventListener());
         AnvilCraft.EVENT_BUS.register(new AnvilHurtVillagerEventListener());
@@ -31,5 +31,7 @@ public static void register() {
         AnvilCraft.EVENT_BUS.register(new GiantAnvilLandingEventListener());
         AnvilCraft.EVENT_BUS.register(new ServerBlockEntityEventListener());
         AnvilCraft.EVENT_BUS.register(new ClientPlayerDisconnectEventListener());
+
+        NeoForge.EVENT_BUS.addListener(ServerEventListener::onServerStarted);
     }
 }
diff --git a/src/main/java/dev/dubhe/anvilcraft/mixin/accessor/ItemInHandRendererAccessor.java b/src/main/java/dev/dubhe/anvilcraft/mixin/accessor/ItemInHandRendererAccessor.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/mixin/accessor/LootContextParamSetsAccessor.java b/src/main/java/dev/dubhe/anvilcraft/mixin/accessor/LootContextParamSetsAccessor.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/mixin/forge/MinecraftServerMixin.java b/src/main/java/dev/dubhe/anvilcraft/mixin/forge/MinecraftServerMixin.java
diff --git a/src/main/java/dev/dubhe/anvilcraft/mixin/forge/accessor/PistonStructorResolverAccessor.java b/src/main/java/dev/dubhe/anvilcraft/mixin/forge/accessor/PistonStructorResolverAccessor.java
diff --git a/src/main/javaOldSrc/dev/dubhe/anvilcraft/event/forge/ServerLifecycleEventListener.java b/src/main/javaOldSrc/dev/dubhe/anvilcraft/event/forge/ServerLifecycleEventListener.java
@@ -3,8 +3,6 @@
 import dev.dubhe.anvilcraft.AnvilCraft;
 import dev.dubhe.anvilcraft.api.RipeningManager;
 import dev.dubhe.anvilcraft.api.chargecollector.ThermoManager;
-import dev.dubhe.anvilcraft.api.event.forge.DataPackReloadedEvent;
-import dev.dubhe.anvilcraft.api.event.server.ServerEndDataPackReloadEvent;
 import dev.dubhe.anvilcraft.api.power.PowerGrid;
 import dev.dubhe.anvilcraft.api.world.load.RandomChuckTickLoadManager;
 import net.minecraft.server.MinecraftServer;

diff --git a/src/main/javaOldSrc/dev/dubhe/anvilcraft/event/server/ServerEventListener.java b/src/main/javaOldSrc/dev/dubhe/anvilcraft/event/server/ServerEventListener.java
@@ -1,7 +1,5 @@
 package dev.dubhe.anvilcraft.event.server;
 
-import dev.dubhe.anvilcraft.api.event.server.ServerEndDataPackReloadEvent;
-import dev.dubhe.anvilcraft.api.event.server.ServerStartedEvent;
 import dev.dubhe.anvilcraft.api.hammer.HammerManager;
 import dev.dubhe.anvilcraft.api.recipe.AnvilRecipeManager;
 import dev.dubhe.anvilcraft.api.world.load.LevelLoadManager;

diff --git a/src/main/javaOldSrc/dev/dubhe/anvilcraft/mixin/forge/MinecraftServerMixin.java b/src/main/javaOldSrc/dev/dubhe/anvilcraft/mixin/forge/MinecraftServerMixin.java
@@ -1,6 +1,5 @@
 package dev.dubhe.anvilcraft.mixin.forge;
 
-import dev.dubhe.anvilcraft.api.event.forge.DataPackReloadedEvent;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.packs.resources.CloseableResourceManager;
 import net.minecraftforge.common.MinecraftForge;

diff --git a/src/main/javaOldSrc/dev/dubhe/anvilcraft/mixin/forge/ZetaPistonCompatMixin.java b/src/main/javaOldSrc/dev/dubhe/anvilcraft/mixin/forge/ZetaPistonCompatMixin.java
@@ -1,7 +1,6 @@
 package dev.dubhe.anvilcraft.mixin.forge;
 
 import dev.dubhe.anvilcraft.event.PistonMoveBlockListener;
-import dev.dubhe.anvilcraft.mixin.forge.accessor.PistonStructorResolverAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Final;

diff --git a/src/main/resources/anvilcraft.mixins.json b/src/main/resources/anvilcraft.mixins.json
@@ -27,22 +27,18 @@
     "ServerLevelMixin",
     "SolidBucketItemMixin",
     "accessor.BaseSpawnerAccessor",
-    "accessor.LootContextParamSetsAccessor",
     "forge.BucketItemMixin",
     "forge.FallingBlockEntityMixin",
     "forge.LevelChunkMixin",
     "forge.LightningBoltMixin",
-    "forge.MinecraftServerMixin",
-    "forge.PistonMovingBlockEntityMixin",
-    "forge.accessor.PistonStructorResolverAccessor"
+    "forge.PistonMovingBlockEntityMixin"
   ],
   "client": [
     "ClientLevelMixin",
     "ClientPacketListenerMixin",
     "ItemBlockRenderTypesMixin",
     "ItemInHandRendererMixin",
-    "SoundEngineMixin",
-    "accessor.ItemInHandRendererAccessor"
+    "SoundEngineMixin"
   ],
   "plugin": "dev.dubhe.anvilcraft.mixin.plugin.AnvilCraftMixinPlugin",
   "injectors": {