From d33b0cc836fb188b3e63dd4cbe00b2c6e34be539 Mon Sep 17 00:00:00 2001 From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Date: Thu, 15 Sep 2022 20:35:53 +0300 Subject: [PATCH] ordering and fixing server crash --- src/main/java/vazkii/botania/common/Botania.java | 2 -- .../vazkii/botania/common/core/proxy/CommonProxy.java | 3 +++ .../vazkii/botania/common/network/PacketHandler.java | 6 +++--- .../vazkii/botania/common/network/PacketLokiToggle.java | 5 +++-- .../botania/common/network/PacketLokiToggleAck.java | 9 +++++---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 4656ee8d6..232f334cb 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -30,7 +30,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import vazkii.botania.common.network.PacketHandler; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { @@ -69,7 +68,6 @@ public class Botania { @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); - PacketHandler.initPackets(); } @EventHandler diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index e441a92b5..24c14e5f4 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -79,6 +79,7 @@ import vazkii.botania.common.integration.etfuturum.ModBanners; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; +import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; import cpw.mods.fml.common.FMLCommonHandler; @@ -116,6 +117,8 @@ public class CommonProxy { ModAchievements.init(); ModMultiblocks.init(); + PacketHandler.initPackets(); + if(Botania.etFuturumLoaded) ModBanners.init(); diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 8dcbff7eb..4bf548bb5 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -1,9 +1,9 @@ package vazkii.botania.common.network; +import vazkii.botania.common.lib.LibMisc; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import vazkii.botania.common.lib.LibMisc; public class PacketHandler { @@ -13,7 +13,7 @@ public class PacketHandler { NetworkRegistry.INSTANCE.newSimpleChannel(LibMisc.MOD_ID.toLowerCase()); public static void initPackets() { - INSTANCE.registerMessage(PacketLokiToggle.class, PacketLokiToggle.class, 0, Side.SERVER); - INSTANCE.registerMessage(PacketLokiToggleAck.class, PacketLokiToggleAck.class, 1, Side.CLIENT); + INSTANCE.registerMessage(PacketLokiToggle.class, PacketLokiToggle.class, 1, Side.SERVER); + INSTANCE.registerMessage(PacketLokiToggleAck.class, PacketLokiToggleAck.class, 2, Side.CLIENT); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java b/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java index 895df80d5..d9bebb039 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java @@ -1,12 +1,13 @@ package vazkii.botania.common.network; +import io.netty.buffer.ByteBuf; + +import vazkii.botania.common.item.relic.ItemLokiRing; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import vazkii.botania.common.item.relic.ItemLokiRing; public class PacketLokiToggle implements IMessage, IMessageHandler { diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java b/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java index 12033aae8..df5cb09ae 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java @@ -1,16 +1,16 @@ package vazkii.botania.common.network; +import io.netty.buffer.ByteBuf; + +import vazkii.botania.common.item.relic.ItemLokiRing; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import vazkii.botania.common.item.relic.ItemLokiRing; -@SideOnly(Side.CLIENT) public class PacketLokiToggleAck implements IMessage, IMessageHandler { @Override @@ -23,10 +23,11 @@ public class PacketLokiToggleAck implements IMessage, IMessageHandler