Loads of untested work on turbine interface

This commit is contained in:
aidancbrady committed 2016-01-25 00:13:42 -05:00
1 parent afe8969c37
commit 2984bf45a8
34 files changed
+511 -82

No files matched your search

@@ -1,11 +1,16 @@
package mekanism.common.network;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.base.IGuiProvider;
import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage;
import mekanism.common.tile.TileEntityBasicBlock;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -17,10 +22,10 @@ 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;
public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessage>
{
public static List<IGuiProvider> handlers = new ArrayList<IGuiProvider>();
@Override
public IMessage onMessage(SimpleGuiMessage message, MessageContext context)
{
@@ -37,11 +42,11 @@ public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessa
return null;
}
SimpleGuiMessage.openServerGui(message.guiId, (EntityPlayerMP)player, player.worldObj, message.coord4D);
SimpleGuiMessage.openServerGui(message.guiHandler, message.guiId, (EntityPlayerMP)player, player.worldObj, message.coord4D);
}
}
else {
FMLCommonHandler.instance().showGuiScreen(SimpleGuiMessage.getGui(message.guiId, player, player.worldObj, message.coord4D));
FMLCommonHandler.instance().showGuiScreen(SimpleGuiMessage.getGui(message.guiHandler, message.guiId, player, player.worldObj, message.coord4D));
player.openContainer.windowId = message.windowId;
}
@@ -51,6 +56,8 @@ public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessa
public static class SimpleGuiMessage implements IMessage
{
public Coord4D coord4D;
public int guiHandler;
public int guiId;
@@ -58,36 +65,37 @@ public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessa
public SimpleGuiMessage() {}
public SimpleGuiMessage(Coord4D coord, int gui)
public SimpleGuiMessage(Coord4D coord, int handler, int gui)
{
coord4D = coord;
guiHandler = handler;
guiId = gui;
}
public SimpleGuiMessage(Coord4D coord, int gui, int id)
public SimpleGuiMessage(Coord4D coord, int handler, int gui, int id)
{
this(coord, gui);
this(coord, handler, gui);
windowId = id;
}
public static void openServerGui(int id, EntityPlayerMP playerMP, World world, Coord4D obj)
public static void openServerGui(int handler, int id, EntityPlayerMP playerMP, World world, Coord4D obj)
{
playerMP.closeContainer();
playerMP.getNextWindowId();
int window = playerMP.currentWindowId;
Mekanism.packetHandler.sendTo(new SimpleGuiMessage(obj, id, window), playerMP);
Mekanism.packetHandler.sendTo(new SimpleGuiMessage(obj, handler, id, window), playerMP);
playerMP.openContainer = Mekanism.proxy.getServerGui(id, playerMP, world, obj.xCoord, obj.yCoord, obj.zCoord);
playerMP.openContainer = handlers.get(handler).getServerGui(id, playerMP, world, obj.xCoord, obj.yCoord, obj.zCoord);
playerMP.openContainer.windowId = window;
playerMP.openContainer.addCraftingToCrafters(playerMP);
}
@SideOnly(Side.CLIENT)
public static GuiScreen getGui(int id, EntityPlayer player, World world, Coord4D obj)
public static GuiScreen getGui(int handler, int id, EntityPlayer player, World world, Coord4D obj)
{
return (GuiScreen)Mekanism.proxy.getClientGui(id, player, world, obj.xCoord, obj.yCoord, obj.zCoord);
return (GuiScreen)handlers.get(handler).getClientGui(id, player, world, obj.xCoord, obj.yCoord, obj.zCoord);
}
@Override