refactor(next): ServerLoginEvent

auioc · Sep 28, 2022 · cf2b986 · cf2b986
1 parent 77a25a0
commit cf2b986
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java
@@ -2,10 +2,10 @@
 
 import org.auioc.mcmod.arnicalib.mod.client.config.AHClientConfig;
 import org.auioc.mcmod.arnicalib.mod.client.event.AHClientEventHandler;
+import org.auioc.mcmod.arnicalib.mod.server.event.AHServerEventHandler;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHGlobalLootModifiers;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemConditions;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemFunctions;
-import org.auioc.mcmod.arnicalib.server.event.AHServerEventHandler;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;

diff --git a/...b/server/event/impl/ServerLoginEvent.java → ...b/game/event/server/ServerLoginEvent.java b/...b/server/event/impl/ServerLoginEvent.java → ...b/game/event/server/ServerLoginEvent.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.server.event.impl;
+package org.auioc.mcmod.arnicalib.game.event.server;
 
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerLifecycleHooks.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerLifecycleHooks.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.server;
 
-import org.auioc.mcmod.arnicalib.server.event.AHServerEventFactory;
+import org.auioc.mcmod.arnicalib.mod.server.event.AHServerEventFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,12 +10,15 @@
 import net.minecraftforge.server.ServerLifecycleHooks;
 
 @Mixin(value = ServerLifecycleHooks.class)
-public abstract class MixinServerLifecycleHooks {
+public class MixinServerLifecycleHooks {
 
-    // @org.spongepowered.asm.mixin.Debug(export = true, print = true)
     @Inject(
         method = "Lnet/minecraftforge/server/ServerLifecycleHooks;handleServerLogin(Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;Lnet/minecraft/network/Connection;)Z",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;getIntention()Lnet/minecraft/network/ConnectionProtocol;", ordinal = 0),
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;getIntention()Lnet/minecraft/network/ConnectionProtocol;",
+            ordinal = 0
+        ),
         require = 1,
         allow = 1,
         cancellable = true

diff --git a/...ib/server/event/AHServerEventFactory.java → ...od/server/event/AHServerEventFactory.java b/...ib/server/event/AHServerEventFactory.java → ...od/server/event/AHServerEventFactory.java
@@ -1,10 +1,10 @@
-package org.auioc.mcmod.arnicalib.server.event;
+package org.auioc.mcmod.arnicalib.mod.server.event;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
-import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
+import org.auioc.mcmod.arnicalib.game.event.server.ServerLoginEvent;
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
 import net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;

diff --git a/...ib/server/event/AHServerEventHandler.java → ...od/server/event/AHServerEventHandler.java b/...ib/server/event/AHServerEventHandler.java → ...od/server/event/AHServerEventHandler.java
@@ -1,10 +1,10 @@
-package org.auioc.mcmod.arnicalib.server.event;
+package org.auioc.mcmod.arnicalib.mod.server.event;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
+import org.auioc.mcmod.arnicalib.game.event.server.ServerLoginEvent;
 import org.auioc.mcmod.arnicalib.mod.server.command.AHServerCommands;
-import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;