From cf2b986dcbfce8c907f187e3aca8292920fb3861 Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Wed, 28 Sep 2022 22:24:09 +0800 Subject: [PATCH] refactor(next): ServerLoginEvent --- .../org/auioc/mcmod/arnicalib/Initialization.java | 2 +- .../impl => game/event/server}/ServerLoginEvent.java | 2 +- .../mixin/server/MixinServerLifecycleHooks.java | 11 +++++++---- .../{ => mod}/server/event/AHServerEventFactory.java | 4 ++-- .../{ => mod}/server/event/AHServerEventHandler.java | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) rename src/main/java/org/auioc/mcmod/arnicalib/{server/event/impl => game/event/server}/ServerLoginEvent.java (95%) rename src/main/java/org/auioc/mcmod/arnicalib/{ => mod}/server/event/AHServerEventFactory.java (92%) rename src/main/java/org/auioc/mcmod/arnicalib/{ => mod}/server/event/AHServerEventHandler.java (90%) diff --git a/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java index c2ac5edc..a9529892 100644 --- 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/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/game/event/server/ServerLoginEvent.java similarity index 95% rename from src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/game/event/server/ServerLoginEvent.java index c84fcda1..8325a7cd 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/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 index 56f1279f..a1ec15c9 100644 --- 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/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/event/AHServerEventFactory.java similarity index 92% rename from src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java rename to src/main/java/org/auioc/mcmod/arnicalib/mod/server/event/AHServerEventFactory.java index 95498558..bea8830d 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mod/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/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/event/AHServerEventHandler.java similarity index 90% rename from src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/mod/server/event/AHServerEventHandler.java index 0d8aadc9..2e9d84dd 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mod/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;