ordering and fixing server crash

This commit is contained in:
BlueWeabo committed 2022-09-15 20:35:53 +03:00
1 parent 5d5277c50b
commit d33b0cc836
5 files changed
+14 -11

No files matched your search

@@ -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
@@ -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();
@@ -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);
}
}
@@ -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<PacketLokiToggle, IMessage> {
@@ -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<PacketLokiToggleAck, IMessage> {
@Override
@@ -23,10 +23,11 @@ public class PacketLokiToggleAck implements IMessage, IMessageHandler<PacketLoki
// not needed
}
@SideOnly(Side.CLIENT)
@Override
public IMessage onMessage(PacketLokiToggleAck message, MessageContext ctx) {
Minecraft mc = Minecraft.getMinecraft();
final ItemStack aRing = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer) ;
final ItemStack aRing = ItemLokiRing.getLokiRing(mc.thePlayer) ;
if (aRing != null) {
ItemLokiRing.renderHUDNotification();
}