From 93cd9e1732cbbdbbd091bbba4d3a7940277cfaed Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Tue, 8 Apr 2014 14:46:05 +0200 Subject: [PATCH] Backported changes to match NEI RC2 instead of NEI RC3_dev --- mcp/mobius/waila/client/KeyEvent.java | 2 +- mcp/mobius/waila/client/ProxyClient.java | 2 +- mcp/mobius/waila/gui/widgets/ItemStackDisplay.java | 2 +- mcp/mobius/waila/handlers/HUDHandlerBlocks.java | 2 +- mcp/mobius/waila/handlers/nei/HandlerEnchants.java | 2 +- mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java | 2 +- mcp/mobius/waila/network/WailaPacketHandler.java | 10 +++++++--- mcp/mobius/waila/overlay/OverlayRenderer.java | 4 ++-- mcp/mobius/waila/overlay/Tooltip.java | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mcp/mobius/waila/client/KeyEvent.java b/mcp/mobius/waila/client/KeyEvent.java index 28e4ceb..b7dec4b 100644 --- a/mcp/mobius/waila/client/KeyEvent.java +++ b/mcp/mobius/waila/client/KeyEvent.java @@ -5,7 +5,7 @@ import java.util.List; import org.lwjgl.input.Keyboard; import codechicken.nei.api.API; -import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.forge.GuiContainerManager; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import cpw.mods.fml.client.registry.ClientRegistry; diff --git a/mcp/mobius/waila/client/ProxyClient.java b/mcp/mobius/waila/client/ProxyClient.java index 32bec5c..cf2014b 100644 --- a/mcp/mobius/waila/client/ProxyClient.java +++ b/mcp/mobius/waila/client/ProxyClient.java @@ -46,7 +46,7 @@ import org.lwjgl.input.Keyboard; import mcp.mobius.waila.cbcore.LangUtil; import codechicken.nei.NEIClientConfig; -import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.forge.GuiContainerManager; //import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.Loader; //import cpw.mods.fml.common.registry.TickRegistry; diff --git a/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java index c30838a..9642e08 100644 --- a/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java +++ b/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; -import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.forge.GuiContainerManager; public class ItemStackDisplay extends WidgetBase { diff --git a/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 8871d95..029d3bd 100644 --- a/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -2,7 +2,7 @@ package mcp.mobius.waila.handlers; import java.util.List; -import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.forge.GuiContainerManager; import static mcp.mobius.waila.api.SpecialChars.*; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; diff --git a/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/mcp/mobius/waila/handlers/nei/HandlerEnchants.java index 8393d89..eb4a928 100644 --- a/mcp/mobius/waila/handlers/nei/HandlerEnchants.java +++ b/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -13,7 +13,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import codechicken.nei.NEIClientConfig; -import codechicken.nei.guihook.IContainerInputHandler; +import codechicken.nei.forge.IContainerInputHandler; public class HandlerEnchants implements IContainerInputHandler { diff --git a/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java index 4823f9a..e64f4f7 100644 --- a/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java +++ b/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -2,7 +2,7 @@ package mcp.mobius.waila.handlers.nei; import java.util.List; -import codechicken.nei.guihook.IContainerTooltipHandler; +import codechicken.nei.forge.IContainerTooltipHandler; import mcp.mobius.waila.utils.ModIdentification; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; diff --git a/mcp/mobius/waila/network/WailaPacketHandler.java b/mcp/mobius/waila/network/WailaPacketHandler.java index 76e657a..523ff9f 100644 --- a/mcp/mobius/waila/network/WailaPacketHandler.java +++ b/mcp/mobius/waila/network/WailaPacketHandler.java @@ -40,14 +40,16 @@ public enum WailaPacketHandler { String codec = channel.findChannelHandlerNameForType(WailaCodec.class); channel.pipeline().addAfter(codec, "ServerPing", new Message0x00ServerPing()); - channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData()); + channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData()); + channel.pipeline().addAfter("TENBTData", "EntNBTData", new Message0x04EntNBTData()); } private void addServerHandlers(){ FMLEmbeddedChannel channel = this.channels.get(Side.SERVER); String codec = channel.findChannelHandlerNameForType(WailaCodec.class); - channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest()); + channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest()); + channel.pipeline().addAfter("TERequest", "EntRequest", new Message0x03EntRequest()); } private class WailaCodec extends FMLIndexedMessageToMessageCodec @@ -56,7 +58,9 @@ public enum WailaPacketHandler { { addDiscriminator(0, Message0x00ServerPing.class); addDiscriminator(1, Message0x01TERequest.class); - addDiscriminator(2, Message0x02TENBTData.class); + addDiscriminator(2, Message0x02TENBTData.class); + addDiscriminator(3, Message0x03EntRequest.class); + addDiscriminator(4, Message0x04EntNBTData.class); } @Override diff --git a/mcp/mobius/waila/overlay/OverlayRenderer.java b/mcp/mobius/waila/overlay/OverlayRenderer.java index 0af5c03..e77ad4d 100644 --- a/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -3,8 +3,8 @@ package mcp.mobius.waila.overlay; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.guihook.GuiContainerManager; +import codechicken.core.gui.GuiDraw; +import codechicken.nei.forge.GuiContainerManager; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.utils.Constants; import net.minecraft.client.Minecraft; diff --git a/mcp/mobius/waila/overlay/Tooltip.java b/mcp/mobius/waila/overlay/Tooltip.java index aef1be8..eb2b903 100644 --- a/mcp/mobius/waila/overlay/Tooltip.java +++ b/mcp/mobius/waila/overlay/Tooltip.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; import java.awt.Dimension; import java.awt.Point; -import codechicken.lib.gui.GuiDraw; +import codechicken.core.gui.GuiDraw; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.api.impl.ConfigHandler;