Backported changes to match NEI RC2 instead of NEI RC3_dev

This commit is contained in:
Thomas Guimbretiere committed 2014-04-08 14:46:05 +02:00
1 parent e12a2d8ed7
commit 93cd9e1732
9 files changed
+16 -12

No files matched your search

+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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;
@@ -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<IWailaMessage>
@@ -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
@@ -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;
+1 -1
View File
@@ -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;