diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 1dbc7f3d..c2a35375 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -64,7 +64,6 @@ import crazypants.enderio.machine.reservoir.ReservoirRenderer; import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRenderer; -import crazypants.enderio.machine.tank.BlockItemTank; import crazypants.enderio.machine.tank.TankFluidRenderer; import crazypants.enderio.machine.tank.TankItemRenderer; import crazypants.enderio.machine.tank.TileTank; diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index c6dca1e0..6b68dd0c 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -384,7 +384,6 @@ public class EnderIO { @EventHandler public void postInit(FMLPostInitializationEvent event) { - packetPipeline.postInitialise(); MaterialRecipes.addOreDictionaryRecipes(); MachineRecipes.addOreDictionaryRecipes(); ItemRecipes.addOreDictionaryRecipes(); diff --git a/src/main/java/crazypants/enderio/EnderIOTab.java b/src/main/java/crazypants/enderio/EnderIOTab.java index 260e2b2a..4798c0a7 100644 --- a/src/main/java/crazypants/enderio/EnderIOTab.java +++ b/src/main/java/crazypants/enderio/EnderIOTab.java @@ -1,9 +1,9 @@ package crazypants.enderio; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.item.Item; public class EnderIOTab extends CreativeTabs { diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 50169769..0f00ddf2 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -44,6 +44,7 @@ import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.render.BoundingBox; import crazypants.util.Util; @@ -56,12 +57,12 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance); FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance); - EnderIO.packetPipeline.registerPacket(PacketFluidLevel.class); - EnderIO.packetPipeline.registerPacket(PacketExtractMode.class); - EnderIO.packetPipeline.registerPacket(PacketConnectionMode.class); - EnderIO.packetPipeline.registerPacket(PacketItemConduitFilter.class); - EnderIO.packetPipeline.registerPacket(PacketRedstoneConduitSignalColor.class); - EnderIO.packetPipeline.registerPacket(PacketOpenConduitUI.class); + PacketHandler.INSTANCE.registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketExtractMode.class, PacketExtractMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitSignalColor.class, PacketRedstoneConduitSignalColor.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER); BlockConduitBundle result = new BlockConduitBundle(); result.init(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index c00c215e..b100c5d9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -8,12 +8,12 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.Lang; @@ -95,12 +95,12 @@ public class BaseSettingsPanel implements ISettingsPanel { public void actionPerformed(GuiButton guiButton) { if(guiButton.id == PREV_MODE_B) { con.setConnectionMode(gui.dir, con.getPreviousConnectionMode(gui.dir)); - EnderIO.packetPipeline.sendToServer(new PacketConnectionMode(con, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.dir)); connectionModeChanged(con.getConectionMode(gui.dir)); } else if(guiButton.id == NEXT_MODE_B) { con.setConnectionMode(gui.dir, con.getNextConnectionMode(gui.dir)); - EnderIO.packetPipeline.sendToServer(new PacketConnectionMode(con, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.dir)); connectionModeChanged(con.getConectionMode(gui.dir)); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 33222585..5a95be3b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -15,6 +15,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.BlockCoord; @@ -36,7 +37,7 @@ public class GuiExternalConnectionSelector extends GuiScreen { ForgeDirection dir = ForgeDirection.values()[b.id]; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; BlockCoord loc = cb.getBlockCoord(); - EnderIO.packetPipeline.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); + PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, loc.x, loc.y, loc.z); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java index 67630637..f1d67570 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java @@ -3,11 +3,11 @@ package crazypants.enderio.conduit.gui; import java.awt.Color; import java.awt.Rectangle; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; -import crazypants.enderio.EnderIO; + +import org.lwjgl.opengl.GL11; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.item.IItemConduit; @@ -21,6 +21,7 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; @@ -102,7 +103,7 @@ public class ItemSettings extends BaseSettingsPanel { RedstoneControlMode curMode = getRedstoneControlMode(); itemConduit.setExtractionRedstoneMode(mode, gui.dir); if(curMode != mode) { - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.dir)); } } @@ -342,23 +343,23 @@ public class ItemSettings extends BaseSettingsPanel { } else if(guiButton.id == ID_COLOR_BUTTON) { itemConduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]); - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.dir)); } else if(guiButton.id == ID_LOOP) { itemConduit.setSelfFeedEnabled(gui.dir, !itemConduit.isSelfFeedEnabled(gui.dir)); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } else if(guiButton.id == ID_ROUND_ROBIN) { itemConduit.setRoundRobinEnabled(gui.dir, !itemConduit.isRoundRobinEnabled(gui.dir)); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } else if(guiButton.id == ID_PRIORITY_UP) { itemConduit.setOutputPriority(gui.dir, itemConduit.getOutputPriority(gui.dir) + 1); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } else if(guiButton.id == ID_PRIORITY_DOWN) { itemConduit.setOutputPriority(gui.dir, itemConduit.getOutputPriority(gui.dir) - 1); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } else if(guiButton.id == ID_CHANNEL) { @@ -379,7 +380,7 @@ public class ItemSettings extends BaseSettingsPanel { } else { return; } - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } } @@ -389,7 +390,7 @@ public class ItemSettings extends BaseSettingsPanel { if(activeFilter != null) { ConnectionMode mode = con.getConectionMode(gui.dir); boolean inputActive = (mode == ConnectionMode.IN_OUT && inOutShowIn) || (mode == ConnectionMode.INPUT); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index a17d8560..bf9bc978 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -3,7 +3,6 @@ package crazypants.enderio.conduit.gui; import java.awt.Color; import net.minecraft.client.gui.GuiButton; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; @@ -13,6 +12,7 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -46,7 +46,7 @@ public class LiquidSettings extends BaseSettingsPanel { RedstoneControlMode curMode = getRedstoneControlMode(); conduit.setExtractionRedstoneMode(mode, gui.dir); if(curMode != mode) { - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(conduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir)); } } @@ -68,7 +68,7 @@ public class LiquidSettings extends BaseSettingsPanel { super.actionPerformed(guiButton); if(guiButton.id == ID_COLOR_BUTTON) { conduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]); - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(conduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir)); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java index 5c2ff7bb..1b0153a3 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -1,16 +1,17 @@ package crazypants.enderio.conduit.gui; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +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 crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.network.MessageTileEntity; -public class PacketOpenConduitUI extends MessageTileEntity { +public class PacketOpenConduitUI extends MessageTileEntity implements IMessageHandler{ private ForgeDirection dir; @@ -23,20 +24,20 @@ public class PacketOpenConduitUI extends MessageTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.toBytes(ctx, buf); + public void toBytes(ByteBuf buf) { buf.writeShort(dir.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.fromBytes(ctx, buf); + public void fromBytes(ByteBuf buf) { dir = ForgeDirection.values()[buf.readShort()]; } - @Override - protected void handleServerSide(EntityPlayer player, World worldObj, TileEntity tile) { - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity tile = getWorld(ctx).getTileEntity(x, y, z); + player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + return null; } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index 910c44dd..5d218ea7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -1,7 +1,6 @@ package crazypants.enderio.conduit.gui; import net.minecraft.client.gui.GuiButton; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.power.IPowerConduit; @@ -10,6 +9,7 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -37,7 +37,7 @@ public class PowerSettings extends BaseSettingsPanel { RedstoneControlMode curMode = getRedstoneControlMode(); conduit.setExtractionRedstoneMode(mode, gui.dir); if(curMode != mode) { - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(conduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir)); } } @@ -60,7 +60,7 @@ public class PowerSettings extends BaseSettingsPanel { super.actionPerformed(guiButton); if(guiButton.id == ID_COLOR_BUTTON) { conduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]); - EnderIO.packetPipeline.sendToServer(new PacketExtractMode(conduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir)); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index 3d8440a0..3120cd59 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -3,12 +3,12 @@ package crazypants.enderio.conduit.gui; import java.awt.Color; import net.minecraft.client.gui.GuiButton; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -39,7 +39,7 @@ public class RedstoneSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if(guiButton.id == ID_COLOR_BUTTON) { - EnderIO.packetPipeline.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.dir)); } } diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java index 1f4595ae..7c965d6a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -1,9 +1,9 @@ package crazypants.enderio.conduit.item; -import cofh.api.transport.IItemDuct; import net.minecraft.inventory.IInventory; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.transport.IItemDuct; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; import crazypants.util.DyeColor; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 03eb371b..f5de913d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -17,7 +17,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 8a2cc3e6..a3fc857c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -26,6 +26,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.network.PacketHandler; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; @@ -107,7 +108,7 @@ public class LiquidConduit extends AbstractTankConduit { //need to send a custom packet as we don't want want to trigger a full chunk update, just //need to get the required values to the entity renderer BlockCoord loc = getLocation(); - EnderIO.packetPipeline.sendToAllAround(new PacketFluidLevel(this), new TargetPoint(world.provider.dimensionId, loc.x, loc.y, loc.z, 64)); + PacketHandler.INSTANCE.sendToAllAround(new PacketFluidLevel(this), new TargetPoint(world.provider.dimensionId, loc.x, loc.y, loc.z, 64)); lastSyncRatio = tank.getFilledRatio(); } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java index b2d97734..21acf351 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java @@ -1,19 +1,18 @@ package crazypants.enderio.conduit.liquid; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.TileConduitBundle; +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 crazypants.enderio.network.MessageTileEntity; +import crazypants.util.ClientUtil; -public class PacketFluidLevel extends MessageTileEntity { +public class PacketFluidLevel extends MessageTileEntity implements IMessageHandler{ - NBTTagCompound tc; + public NBTTagCompound tc; public PacketFluidLevel() { } @@ -25,28 +24,20 @@ public class PacketFluidLevel extends MessageTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.toBytes(ctx, buf); + public void toBytes(ByteBuf buf) { ByteBufUtils.writeTag(buf, tc); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.fromBytes(ctx, buf); + public void fromBytes(ByteBuf buf) { tc = ByteBufUtils.readTag(buf); } + @Override - protected void handleClientSide(EntityPlayer player, World worldObj, TileEntity tile) { - if(tc == null || !(tile instanceof IConduitBundle)) { - return; - } - IConduitBundle bundle = (IConduitBundle) tile; - ILiquidConduit con = bundle.getConduit(ILiquidConduit.class); - if(con == null) { - return; - } - con.readFromNBT(tc, TileConduitBundle.NBT_VERSION); + public IMessage onMessage(PacketFluidLevel message, MessageContext ctx) + { + ClientUtil.doFluidLevelUpdate(message.x, message.y, message.z, message); + return null; } - } diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java index d4fadda7..198ef4ad 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java @@ -1,9 +1,6 @@ package crazypants.enderio.conduit.packet; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.network.MessageTileEntity; public abstract class AbstractConduitBundlePacket extends MessageTileEntity { @@ -14,32 +11,4 @@ public abstract class AbstractConduitBundlePacket extends MessageTileEntity extends AbstractConduitBundlePacket { - private ConTypeEnum conType; - + protected ConTypeEnum conType; + public AbstractConduitPacket() { } public AbstractConduitPacket(TileEntity tile, ConTypeEnum conType) { super(tile); this.conType = conType; - } - - @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.toBytes(ctx, buf); - buf.writeShort(conType.ordinal()); + + protected Class getConType() + { + return conType.getBaseType(); } - - @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.fromBytes(ctx, buf); - conType = ConTypeEnum.values()[buf.readShort()]; + + @SuppressWarnings("unchecked") + protected T getTileCasted(MessageContext ctx) + { + return (T) getTileEntity(getWorld(ctx)); } - - @Override - protected void handleClientSide(EntityPlayer player, World worldObj, IConduitBundle tile) { - super.handleClientSide(player, worldObj, tile); - IConduit conduit = tile.getConduit(conType.getBaseType()); - if(conduit != null) { - handleClientSide(player, worldObj, tile, (T) conduit); - } - } - - protected void handleClientSide(EntityPlayer player, World worldObj, IConduitBundle tile, T conduit) { - handle(player, worldObj, tile, conduit); - } - - @Override - protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile) { - super.handleServerSide(player, worldObj, tile); - IConduit conduit = tile.getConduit(conType.getBaseType()); - if(conduit != null) { - handleServerSide(player, worldObj, tile, (T) conduit); - } - } - - protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile, T conduit) { - handle(player, worldObj, tile, conduit); - } - - protected void handle(EntityPlayer player, World worldObj, IConduitBundle tile, T conduit) { - - } - } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java index 9b20f043..5e1a2106 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java @@ -1,15 +1,14 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +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 crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; -public class PacketConnectionMode extends AbstractConduitPacket { +public class PacketConnectionMode extends AbstractConduitPacket implements IMessageHandler{ private ForgeDirection dir; private ConnectionMode mode; @@ -24,24 +23,23 @@ public class PacketConnectionMode extends AbstractConduitPacket { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { buf.writeShort(dir.ordinal()); buf.writeShort(mode.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, buf); + public void fromBytes(ByteBuf buf) { dir = ForgeDirection.values()[buf.readShort()]; mode = ConnectionMode.values()[buf.readShort()]; } @Override - protected void handle(EntityPlayer player, World worldObj, IConduitBundle tile, IConduit conduit) { - conduit.setConnectionMode(dir, mode); - worldObj.markBlockForUpdate(x, y, z); + public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) { + getTileCasted(ctx).setConnectionMode(dir, mode); + getWorld(ctx).markBlockForUpdate(x, y, z); + return null; } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java index 9939268e..b075d1dd 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java @@ -1,16 +1,15 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.conduit.IConduitBundle; +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 crazypants.enderio.conduit.IExtractor; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.util.DyeColor; -public class PacketExtractMode extends AbstractConduitPacket { +public class PacketExtractMode extends AbstractConduitPacket implements IMessageHandler { private ForgeDirection dir; private RedstoneControlMode mode; @@ -27,26 +26,25 @@ public class PacketExtractMode extends AbstractConduitPacket { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { buf.writeShort(dir.ordinal()); buf.writeShort(mode.ordinal()); buf.writeShort(color.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, buf); + public void fromBytes(ByteBuf buf) { dir = ForgeDirection.values()[buf.readShort()]; mode = RedstoneControlMode.values()[buf.readShort()]; color = DyeColor.values()[buf.readShort()]; } @Override - protected void handle(EntityPlayer player, World worldObj, IConduitBundle tile, IExtractor conduit) { - conduit.setExtractionRedstoneMode(mode, dir); - conduit.setExtractionSignalColor(dir, color); - worldObj.markBlockForUpdate(x, y, z); + public IMessage onMessage(PacketExtractMode message, MessageContext ctx) { + getTileCasted(ctx).setExtractionRedstoneMode(mode, dir); + getTileCasted(ctx).setExtractionSignalColor(dir, color); + getWorld(ctx).markBlockForUpdate(x, y, z); + return null; } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java index 5f6920fe..30c48af7 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -1,16 +1,15 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.conduit.IConduitBundle; +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 crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.ItemFilter; import crazypants.util.DyeColor; -public class PacketItemConduitFilter extends AbstractConduitPacket { +public class PacketItemConduitFilter extends AbstractConduitPacket implements IMessageHandler { private ForgeDirection dir; private boolean loopMode; @@ -39,8 +38,7 @@ public class PacketItemConduitFilter extends AbstractConduitPacket } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { buf.writeShort(dir.ordinal()); buf.writeBoolean(loopMode); buf.writeBoolean(roundRobin); @@ -60,8 +58,7 @@ public class PacketItemConduitFilter extends AbstractConduitPacket } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, buf); + public void fromBytes(ByteBuf buf) { dir = ForgeDirection.values()[buf.readShort()]; loopMode = buf.readBoolean(); roundRobin = buf.readBoolean(); @@ -84,7 +81,8 @@ public class PacketItemConduitFilter extends AbstractConduitPacket } @Override - protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile, IItemConduit conduit) { + public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) { + IItemConduit conduit = getTileCasted(ctx); conduit.setSelfFeedEnabled(dir, loopMode); conduit.setRoundRobinEnabled(dir, roundRobin); conduit.setInputColor(dir, colIn); @@ -93,7 +91,8 @@ public class PacketItemConduitFilter extends AbstractConduitPacket applyFilter(conduit, inputFilter, true); applyFilter(conduit, outputFilter, false); - worldObj.markBlockForUpdate(x, y, z); + getWorld(ctx).markBlockForUpdate(x, y, z); + return null; } private void applyFilter(IItemConduit conduit, ItemFilter filter, boolean isInput) { diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java index 6965f1d7..e4b6481f 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java @@ -1,15 +1,14 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.conduit.IConduitBundle; +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 crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.util.DyeColor; -public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket { +public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket implements IMessageHandler { private ForgeDirection dir; private DyeColor col; @@ -24,23 +23,22 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket { int x; int y; @@ -40,28 +41,22 @@ public class PacketOpenRemoteUi implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); } - @Override - public void handleClientSide(EntityPlayer player) { - } - - @Override - public void handleServerSide(EntityPlayer p) { - - EntityPlayerMP player = (EntityPlayerMP) p; + public IMessage onMessage(PacketOpenRemoteUi message, MessageContext ctx) { + EntityPlayerMP player = (EntityPlayerMP) ctx.getServerHandler().playerEntity; net.minecraft.inventory.Container c = player.openContainer; PlayerProxy pp = new PlayerProxy(player, x, y, z); EntityPlayerMP proxy = createPlayerProxy(player, pp); @@ -81,7 +76,7 @@ public class PacketOpenRemoteUi implements IMessage { if(c != proxy.openContainer) { player.openContainer = proxy.openContainer; } - + return null; } public static T createPlayerProxy(EntityPlayerMP player, PlayerProxy proxy) { diff --git a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java index c9da199d..299bb21a 100644 --- a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java @@ -1,10 +1,10 @@ package crazypants.enderio.enderface; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.teleport.TileTravelAnchor; import crazypants.enderio.teleport.TravelController; -import net.minecraft.nbt.NBTTagCompound; public class TileEnderIO extends TileTravelAnchor { diff --git a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java index 20bd168b..c21d2996 100644 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java @@ -1,15 +1,17 @@ package crazypants.enderio.gui; -import crazypants.gui.GuiToolTip; -import crazypants.gui.IGuiScreen; -import crazypants.render.RenderUtil; +import java.awt.Rectangle; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; -import java.awt.*; +import crazypants.gui.GuiToolTip; +import crazypants.gui.IGuiScreen; +import crazypants.render.RenderUtil; public class IconButtonEIO extends GuiButton { diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index fa6777bf..abeac22f 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -35,6 +35,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.PacketIoMode; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.TravelController; import crazypants.render.BoundingBox; import crazypants.render.ColorUtil; @@ -172,7 +173,7 @@ public class IoConfigRenderer { if(Mouse.getEventButton() == 1) { if(selection != null) { selection.config.toggleIoModeForFace(selection.face); - EnderIO.packetPipeline.sendToServer(new PacketIoMode(selection.config,selection.face)); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(selection.config,selection.face)); } } else if(Mouse.getEventButton() == 0 && inNeigButBounds) { renderNeighbours = !renderNeighbours; diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index ea2c2992..2b6d63ca 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -1,10 +1,10 @@ package crazypants.enderio.gui; import net.minecraft.client.Minecraft; -import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.IGuiScreen; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -68,7 +68,7 @@ public class RedstoneModeButton extends IconButtonEIO { setIcon(ICONS[mode.ordinal()]); model.setRedstoneControlMode(mode); if(bc != null) { - EnderIO.packetPipeline.sendToServer(new PacketRedstoneMode(model, bc.x, bc.y, bc.z)); + PacketHandler.INSTANCE.sendToServer(new PacketRedstoneMode(model, bc.x, bc.y, bc.z)); } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 0625a7e8..109e5bdf 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemBow; diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 700fb2df..c756f91b 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -2,6 +2,13 @@ package crazypants.enderio.item; import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import cofh.api.energy.ItemEnergyContainer; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -11,23 +18,10 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.power.PowerDisplayUtil.PowerType; -import crazypants.enderio.material.Material; -import crazypants.enderio.teleport.TravelController; import crazypants.util.ItemUtil; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index aac775f1..d2a2aa41 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -12,17 +12,17 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Config; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.network.PacketHandler; public class ItemYetaWrench extends Item implements IToolWrench, IResourceTooltipProvider { public static ItemYetaWrench create() { if(Config.useSneakMouseWheelYetaWrench) { - EnderIO.packetPipeline.registerPacket(YetaWrenchPacketProcessor.class); + PacketHandler.INSTANCE.registerMessage(YetaWrenchPacketProcessor.class, YetaWrenchPacketProcessor.class, PacketHandler.nextID(), Side.SERVER); } ItemYetaWrench result = new ItemYetaWrench(); result.init(); diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 59389ddb..9722f0a9 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -11,10 +11,7 @@ import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Config; -import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; public class MagnetController implements IEntitySelector { diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java index 4a381eee..64edfc74 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java @@ -1,13 +1,13 @@ package crazypants.enderio.item; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +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 crazypants.enderio.conduit.ConduitDisplayMode; -import crazypants.enderio.network.IMessage; -public class YetaWrenchPacketProcessor implements IMessage { +public class YetaWrenchPacketProcessor implements IMessage, IMessageHandler { private int slot; private ConduitDisplayMode mode; @@ -21,32 +21,26 @@ public class YetaWrenchPacketProcessor implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { buffer.writeInt(slot); buffer.writeShort(mode.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { slot = buffer.readInt(); mode = ConduitDisplayMode.values()[buffer.readShort()]; } @Override - public void handleClientSide(EntityPlayer player) { - - } - - @Override - public void handleServerSide(EntityPlayer player) { + public IMessage onMessage(YetaWrenchPacketProcessor message, MessageContext ctx) { ItemStack stack = null; if(slot > -1 && slot < 9) { - stack = player.inventory.getStackInSlot(slot); + stack = ctx.getServerHandler().playerEntity.inventory.getStackInSlot(slot); } - if(stack == null) { - return; + if(stack != null) { + ConduitDisplayMode.setDisplayMode(stack, mode); } - ConduitDisplayMode.setDisplayMode(stack, mode); + return null; } - } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java b/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java index da56878a..eeb57ba4 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java @@ -11,8 +11,8 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConduitDisplayMode; +import crazypants.enderio.network.PacketHandler; public class YetaWrenchTickHandler { protected int slotSelected = -1; @@ -56,7 +56,7 @@ public class YetaWrenchTickHandler { ConduitDisplayMode.setDisplayMode(stack, newMode); } if(newMode != null) { - EnderIO.packetPipeline.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode)); + PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode)); } } slotSelected = -1; diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 1a3780f4..f1dca977 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -17,6 +17,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; public class DarkSteelController { @@ -42,7 +43,7 @@ public class DarkSteelController { private int ticksSinceLastJump; private DarkSteelController() { - EnderIO.packetPipeline.registerPacket(PacketDarkSteelPowerPacket.class); + PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); } @SubscribeEvent @@ -179,7 +180,7 @@ public class DarkSteelController { player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount; ticksSinceLastJump = 0; usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, requiredPower); - EnderIO.packetPipeline.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, EnderIO.itemDarkSteelBoots.armorType)); + PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, EnderIO.itemDarkSteelBoots.armorType)); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index a9646ccb..bdbff6a1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -8,7 +8,6 @@ import java.util.Map; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 2e9d0284..c6287738 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -23,7 +23,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 7a9b6a99..869b46d4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -8,28 +8,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import cofh.api.energy.IEnergyContainerItem; - -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.Config; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.material.Alloy; -import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; @@ -41,6 +24,18 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.oredict.OreDictionary; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.Config; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.util.BlockCoord; +import crazypants.util.ItemUtil; +import crazypants.util.Lang; public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index b82a5f91..c17bbf9f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -23,7 +23,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 15d25136..c0c2747d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -28,7 +28,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java index 3cf34a67..dc1d60fb 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java @@ -1,11 +1,11 @@ package crazypants.enderio.item.darksteel; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class PacketDarkSteelPowerPacket implements IMessage { +public class PacketDarkSteelPowerPacket implements IMessage, IMessageHandler { private int powerUse; private short armorType; @@ -19,25 +19,21 @@ public class PacketDarkSteelPowerPacket implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { buffer.writeInt(powerUse); buffer.writeShort(armorType); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { powerUse = buffer.readInt(); armorType = buffer.readShort(); } - @Override - public void handleClientSide(EntityPlayer player) { - } - - @Override - public void handleServerSide(EntityPlayer player) { - DarkSteelController.instance.usePlayerEnergy(player, ItemDarkSteelArmor.forArmorType(armorType), powerUse); - player.fallDistance = 0; + public IMessage onMessage(PacketDarkSteelPowerPacket message, MessageContext ctx) { + DarkSteelController.instance.usePlayerEnergy(ctx.getServerHandler().playerEntity, ItemDarkSteelArmor.forArmorType(armorType), powerUse); + ctx.getServerHandler().playerEntity.fallDistance = 0; + return null; } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 69ee77cc..4817af8f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -30,6 +30,7 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.network.PacketHandler; public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IResourceTooltipProvider { @@ -53,9 +54,9 @@ public abstract class AbstractMachineBlock exte protected final Class teClass; static { - EnderIO.packetPipeline.registerPacket(PacketIoMode.class); - EnderIO.packetPipeline.registerPacket(PacketPowerStorage.class); - EnderIO.packetPipeline.registerPacket(PacketCurrentTask.class); + PacketHandler.INSTANCE.registerPacket(PacketIoMode.class); + PacketHandler.INSTANCE.registerPacket(PacketPowerStorage.class); + PacketHandler.INSTANCE.registerPacket(PacketCurrentTask.class); } protected AbstractMachineBlock(ModObject mo, Class teClass, Material mat) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index c68b649d..16fba859 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -5,8 +5,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,6 +20,7 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerReceptor; @@ -338,7 +337,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi markDirty(); } else if(powerChanged) { lastSyncPowerStored = storedEnergy; - EnderIO.packetPipeline.sendToAllAround(new PacketPowerStorage(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketPowerStorage(this), this); } if(notifyNeighbours) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index dab0b612..7781e32e 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.network.PacketHandler; public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { @@ -106,7 +105,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { startFailed = !started; //requiresClientSync |= started; if(started) { - EnderIO.packetPipeline.sendToAllAround(new PacketCurrentTask(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketCurrentTask(this), this); } } else { startFailed = true; @@ -128,7 +127,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { return false; } - EnderIO.packetPipeline.sendToAllAround(new PacketCurrentTask(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketCurrentTask(this), this); return false; } @@ -155,7 +154,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { } markDirty(); currentTask = null; - EnderIO.packetPipeline.sendToAllAround(new PacketCurrentTask(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketCurrentTask(this), this); } protected void mergeResults(ResultStack[] results) { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 8e06f440..cc1cd431 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -12,7 +12,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; diff --git a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java index e04c9fc8..f2ca4282 100644 --- a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java +++ b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java @@ -1,11 +1,9 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import crazypants.enderio.machine.tank.TileTank; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 9ff19680..c22ed995 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; public class PacketIoMode implements IMessage { @@ -27,7 +27,7 @@ public class PacketIoMode implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -37,7 +37,7 @@ public class PacketIoMode implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java index 90b70ff7..ff6f8de4 100644 --- a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java @@ -4,8 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; public class PacketPowerStorage implements IMessage { @@ -25,7 +24,7 @@ public class PacketPowerStorage implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -34,7 +33,7 @@ public class PacketPowerStorage implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java index 7c27a0b7..eda647c4 100644 --- a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java index 0aa8820f..5dc8e1e3 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.alloy; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java index 1dae5ac4..7dbb3a9b 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java @@ -3,14 +3,9 @@ package crazypants.enderio.machine.crafter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.alloy.BlockAlloySmelter; -import crazypants.enderio.machine.alloy.ContainerAlloySmelter; -import crazypants.enderio.machine.alloy.PacketClientState; -import crazypants.enderio.machine.alloy.TileAlloySmelter; public class BlockCrafter extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java index 0e8194b9..94409a95 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java @@ -2,13 +2,11 @@ package crazypants.enderio.machine.crafter; import java.awt.Point; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import crazypants.enderio.machine.AbstractMachineContainer; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.gui.TemplateSlot; public class ContainerCrafter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java b/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java index b5fd8007..c8ce0268 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java +++ b/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java @@ -1,15 +1,12 @@ package crazypants.enderio.machine.crafter; import java.util.List; -import java.util.Map.Entry; -import crazypants.enderio.machine.IoMode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.ForgeDirection; public class DummyCraftingGrid implements IInventory { diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index eaee3cc0..816fee68 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -1,20 +1,11 @@ package crazypants.enderio.machine.crafter; -import java.awt.Color; -import java.awt.Point; - -import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; -import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiCrafter extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java index 061d2509..b02cc979 100644 --- a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -8,15 +8,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.network.PacketHandler; public class BlockFarmStation extends AbstractMachineBlock { public static BlockFarmStation create() { - EnderIO.packetPipeline.registerPacket(PacketFarmAction.class); + PacketHandler.INSTANCE.registerPacket(PacketFarmAction.class); BlockFarmStation result = new BlockFarmStation(); result.init(); return result; diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java b/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java index c91f334f..d8daa92a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java @@ -3,12 +3,7 @@ package crazypants.enderio.machine.farm; import java.util.ArrayList; import java.util.List; -import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import crazypants.util.BlockCoord; diff --git a/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java index d1a2e62f..a07bd4e8 100644 --- a/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.farm; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index c7680578..601edb01 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.util.BlockCoord; public class PacketFarmAction implements IMessage { @@ -25,7 +25,7 @@ public class PacketFarmAction implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { int size = coords.size(); buffer.writeInt(size); for (BlockCoord coord : coords) { @@ -37,7 +37,7 @@ public class PacketFarmAction implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { int size = buffer.readInt(); coords = new ArrayList(size); for (int i = 0; i < size; i++) { diff --git a/src/main/java/crazypants/enderio/machine/farm/PickableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/PickableFarmer.java index da83678d..28f602e0 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PickableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/PickableFarmer.java @@ -1,16 +1,14 @@ package crazypants.enderio.machine.farm; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import crazypants.util.BlockCoord; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import crazypants.util.BlockCoord; public class PickableFarmer extends SeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index ccef983f..cc33397f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -1,31 +1,18 @@ package crazypants.enderio.machine.farm; -import java.util.List; - -import buildcraft.api.power.PowerHandler.Type; import net.minecraft.block.Block; -import net.minecraft.command.IEntitySelector; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; -import net.minecraftforge.common.IExtendedEntityProperties; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.power.PowerHandler.Type; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; @@ -40,9 +27,7 @@ import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; import crazypants.util.Util; public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEntitySelector*/ { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index c5cce428..0466d296 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -3,20 +3,17 @@ package crazypants.enderio.machine.generator.combustion; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.network.PacketHandler; import crazypants.util.FluidUtil; import crazypants.util.Util; @@ -25,7 +22,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { super.fromBytes(ctx, buf); nbtRoot = NetworkUtil.readNBTTagCompound(buf); } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 95605598..118ff067 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -15,13 +15,12 @@ import buildcraft.api.fuels.IronEngineCoolant.Coolant; import buildcraft.api.fuels.IronEngineFuel; import buildcraft.api.fuels.IronEngineFuel.Fuel; import buildcraft.api.power.IPowerEmitter; -import crazypants.enderio.Config; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.PowerDistributor; +import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; @@ -170,7 +169,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } if(tanksDirty) { - EnderIO.packetPipeline.sendToAllAround(new PacketTanks(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketTanks(this), this); tanksDirty = false; } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java index 6e3302b4..60418a83 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java @@ -2,17 +2,16 @@ package crazypants.enderio.machine.generator.stirling; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.PacketPowerStorage; +import crazypants.enderio.network.PacketHandler; public class BlockStirlingGenerator extends AbstractMachineBlock { public static BlockStirlingGenerator create() { - EnderIO.packetPipeline.registerPacket(PacketBurnTime.class); + PacketHandler.INSTANCE.registerPacket(PacketBurnTime.class); BlockStirlingGenerator gen = new BlockStirlingGenerator(); gen.init(); diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java index f7207a0a..7db74980 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java @@ -1,11 +1,9 @@ package crazypants.enderio.machine.generator.stirling; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.MessageTileNBT; public class PacketBurnTime extends MessageTileEntity { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index f84d9b63..260412a5 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -8,12 +8,12 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerEmitter; import buildcraft.api.power.PowerHandler.Type; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.PowerDistributor; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.util.BlockCoord; @@ -172,7 +172,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement } } if(!needsUpdate && sendBurnTimePacket) { - EnderIO.packetPipeline.sendToAllAround(new PacketBurnTime(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketBurnTime(this), this); } return needsUpdate; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index 58d15804..a8e30684 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -10,10 +10,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.network.PacketHandler; import crazypants.util.FluidUtil; import crazypants.util.Util; @@ -21,7 +21,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { super.fromBytes(ctx, buf); nbtRoot = NetworkUtil.readNBTTagCompound(buf); } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 016bfa84..537b99a5 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -1,20 +1,14 @@ package crazypants.enderio.machine.generator.zombie; import net.minecraft.block.Block; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.fuels.IronEngineCoolant; -import buildcraft.api.fuels.IronEngineFuel; -import buildcraft.api.fuels.IronEngineCoolant.Coolant; -import buildcraft.api.fuels.IronEngineFuel.Fuel; import buildcraft.api.power.IPowerEmitter; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; @@ -23,7 +17,7 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.PowerDistributor; -import crazypants.enderio.machine.generator.combustion.PacketTanks; +import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; @@ -163,7 +157,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower } if(tanksDirty) { - EnderIO.packetPipeline.sendToAllAround(new PacketTank(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketTank(this), this); tanksDirty = false; } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 791aac4e..8ce5a90b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -1,16 +1,5 @@ package crazypants.enderio.machine.generator.zombie; -import org.lwjgl.opengl.GL11; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.generator.combustion.CombustionGeneratorModel; -import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -20,13 +9,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import org.lwjgl.opengl.GL11; + +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Vector3d; + public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { private static final String TEXTURE = "enderio:models/ZombieJar.png"; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 4f4bce51..20a75153 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -29,6 +29,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.Util; @@ -38,9 +39,9 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo public static BlockHyperCube create() { - EnderIO.packetPipeline.registerPacket(PacketChannelList.class); - EnderIO.packetPipeline.registerPacket(PacketClientState.class); - EnderIO.packetPipeline.registerPacket(PacketAddRemoveChannel.class); + PacketHandler.INSTANCE.registerPacket(PacketChannelList.class); + PacketHandler.INSTANCE.registerPacket(PacketClientState.class); + PacketHandler.INSTANCE.registerPacket(PacketAddRemoveChannel.class); BlockHyperCube result = new BlockHyperCube(); result.init(); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java index f655df21..e170dc5c 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java @@ -4,15 +4,15 @@ import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; -import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; public class ConnectionHandler { //to lazy to create a new class @SubscribeEvent public void onPlayerLoggon(PlayerLoggedInEvent evt) { - EnderIO.packetPipeline.sendTo(new PacketChannelList(evt.player, true), (EntityPlayerMP) evt.player); - EnderIO.packetPipeline.sendTo(new PacketChannelList(evt.player, false), (EntityPlayerMP) evt.player); + PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, true), (EntityPlayerMP) evt.player); + PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, false), (EntityPlayerMP) evt.player); } @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 8a00e2ab..9ddd7073 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -11,7 +11,6 @@ import net.minecraft.client.gui.GuiTextField; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; @@ -19,6 +18,7 @@ import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiScreenBase; import crazypants.gui.GuiScrollableList; import crazypants.gui.GuiToolTip; @@ -246,7 +246,7 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.FLUID, nextMode); updateIoButtons(); - EnderIO.packetPipeline.sendToServer(new PacketClientState(cube)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); } else if(par1GuiButton.id == POWER_MODE_BUTTON_ID) { @@ -255,7 +255,7 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.POWER, nextMode); updateIoButtons(); - EnderIO.packetPipeline.sendToServer(new PacketClientState(cube)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); } else if(par1GuiButton.id == ITEM_MODE_BUTTON_ID) { @@ -264,7 +264,7 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.ITEM, nextMode); updateIoButtons(); - EnderIO.packetPipeline.sendToServer(new PacketClientState(cube)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); } else if(par1GuiButton.id == ADD_BUTTON_ID) { @@ -275,7 +275,7 @@ public class GuiHyperCube extends GuiScreenBase { c = new Channel(newChannelTF.getText(), null); } ClientChannelRegister.instance.addChannel(c); - EnderIO.packetPipeline.sendToServer(new PacketAddRemoveChannel(true, c)); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(true, c)); setActiveChannel(c); if(privateButton.isSelected()) { @@ -296,7 +296,7 @@ public class GuiHyperCube extends GuiScreenBase { setActiveChannel(null); } ClientChannelRegister.instance.channelRemoved(c); - EnderIO.packetPipeline.sendToServer(new PacketAddRemoveChannel(false, c)); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(false, c)); } } @@ -307,7 +307,7 @@ public class GuiHyperCube extends GuiScreenBase { publicChannelList.setActiveChannel(isPublic(c) ? c : null); privateChannelList.setActiveChannel(isPrivate(c) ? c : null); - EnderIO.packetPipeline.sendToServer(new PacketClientState(cube)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index 550dc462..c0a8108a 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.ByteBufUtils; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import crazypants.enderio.network.PacketHandler; public class PacketAddRemoveChannel implements IMessage { @@ -21,7 +21,7 @@ public class PacketAddRemoveChannel implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeBoolean(isAdd); buf.writeBoolean(channel.isPublic()); ByteBufUtils.writeUTF8String(buf, channel.name); @@ -31,7 +31,7 @@ public class PacketAddRemoveChannel implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf data) { + public void fromBytes(ByteBuf data) { isAdd = data.readBoolean(); boolean isPublic = data.readBoolean(); @@ -59,7 +59,7 @@ public class PacketAddRemoveChannel implements IMessage { } else { HyperCubeRegister.instance.removeChannel(channel); } - EnderIO.packetPipeline.sendToAll(new PacketAddRemoveChannel(isAdd, channel)); + PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(isAdd, channel)); } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index 3e745d30..f6d5779d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -8,7 +8,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.ByteBufUtils; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; public class PacketChannelList implements IMessage { @@ -45,7 +45,7 @@ public class PacketChannelList implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { buffer.writeBoolean(isPrivate); if(isPrivate) { ByteBufUtils.writeUTF8String(buffer, userId); @@ -58,7 +58,7 @@ public class PacketChannelList implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { isPrivate = buffer.readBoolean(); if(isPrivate) { userId = ByteBufUtils.readUTF8String(buffer); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index 34486605..3f39feb0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -9,9 +9,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; -import crazypants.enderio.network.IMessage; public class PacketClientState implements IMessage { @@ -36,7 +36,7 @@ public class PacketClientState implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -59,7 +59,7 @@ public class PacketClientState implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index f16ad690..b85aa0de 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 229eb4dd..4715b264 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -6,18 +6,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.network.PacketHandler; import crazypants.util.DyeColor; public class BlockPowerMonitor extends AbstractMachineBlock implements ITileEntityProvider { public static BlockPowerMonitor create() { - EnderIO.packetPipeline.registerPacket(PacketPowerMonitor.class); - EnderIO.packetPipeline.registerPacket(PacketPowerInfo.class); + PacketHandler.INSTANCE.registerPacket(PacketPowerMonitor.class); + PacketHandler.INSTANCE.registerPacket(PacketPowerInfo.class); BlockPowerMonitor result = new BlockPowerMonitor(); result.init(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 8286793b..0a12642f 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -13,9 +13,9 @@ import net.minecraft.client.gui.GuiTextField; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; import crazypants.enderio.gui.CheckBoxEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiScreenBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; @@ -204,7 +204,7 @@ public class GuiPowerMonitor extends GuiScreenBase { if(i >= 0) { te.stopLevel = te.asPercentFloat(i); } - EnderIO.packetPipeline.sendToServer(new PacketPowerMonitor(te)); + PacketHandler.INSTANCE.sendToServer(new PacketPowerMonitor(te)); } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java index ded15682..43799cf4 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java @@ -21,6 +21,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.network.PacketHandler; public class ItemConduitProbe extends Item implements IResourceTooltipProvider { @@ -28,7 +29,7 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { public static ItemConduitProbe create() { - EnderIO.packetPipeline.registerPacket(PacketConduitProbe.class); + PacketHandler.INSTANCE.registerPacket(PacketConduitProbe.class); ItemConduitProbe result = new ItemConduitProbe(); result.init(); @@ -71,7 +72,7 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof IConduitBundle) && PacketConduitProbe.canCreatePacket(world, x, y, z)) { if(world.isRemote) { - EnderIO.packetPipeline.sendToServer(new PacketConduitProbe(x, y, z, side)); + PacketHandler.INSTANCE.sendToServer(new PacketConduitProbe(x, y, z, side)); } return true; } diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index 78c634ec..dd0aae82 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -16,6 +16,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler.PowerReceiver; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.TileConduitBundle; @@ -26,7 +27,6 @@ import crazypants.enderio.conduit.power.NetworkPowerManager; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.network.IMessage; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.PowerInterfaceBC; import crazypants.enderio.power.PowerInterfaceRF; @@ -90,7 +90,7 @@ public class PacketConduitProbe implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -99,7 +99,7 @@ public class PacketConduitProbe implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index da82664d..98d6c779 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -5,7 +5,6 @@ import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import crazypants.enderio.machine.tank.TileTank; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; @@ -23,13 +22,13 @@ public class PacketPowerInfo extends MessageTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { super.fromBytes(ctx, buf); nbtRoot = NetworkUtil.readNBTTagCompound(buf); } diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java index d29fbeef..2b7c7b2e 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.enderio.Log; -import crazypants.enderio.network.IMessage; public class PacketPowerMonitor implements IMessage { @@ -30,7 +30,7 @@ public class PacketPowerMonitor implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -41,7 +41,7 @@ public class PacketPowerMonitor implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 337fa6d0..4e8c0b87 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -15,6 +15,7 @@ import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.util.DyeColor; @@ -163,7 +164,7 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal } } if(update) { - EnderIO.packetPipeline.sendToAllAround(new PacketPowerInfo(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketPowerInfo(this), this); } return false; } diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 110e305b..f0984495 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -31,7 +31,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; -import crazypants.enderio.material.ItemFusedQuartz; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.Util; @@ -42,8 +42,8 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc public static int renderId = -1; public static BlockCapacitorBank create() { - EnderIO.packetPipeline.registerPacket(PacketClientState.class); - EnderIO.packetPipeline.registerPacket(PacketPowerStorage.class); + PacketHandler.INSTANCE.registerPacket(PacketClientState.class); + PacketHandler.INSTANCE.registerPacket(PacketPowerStorage.class); BlockCapacitorBank res = new BlockCapacitorBank(); res.init(); diff --git a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java index 670d48eb..8a7d1db2 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java @@ -7,10 +7,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.power.PowerHandlerUtil; public class BlockItemCapacitorBank extends ItemBlock { diff --git a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java index cf1c3cda..5c89ff0f 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java +++ b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 8dcb32fb..9ce30f8b 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; @@ -23,6 +22,7 @@ import crazypants.enderio.machine.GuiOverlayIoConfig; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; @@ -83,7 +83,7 @@ public class GuiCapacitorBank extends GuiContainerBase { @Override public void setRedstoneControlMode(RedstoneControlMode mode) { capBank.setInputControlMode(mode); - EnderIO.packetPipeline.sendToServer(new PacketClientState(capBank)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); } @Override @@ -99,7 +99,7 @@ public class GuiCapacitorBank extends GuiContainerBase { @Override public void setRedstoneControlMode(RedstoneControlMode mode) { capBank.setOutputControlMode(mode); - EnderIO.packetPipeline.sendToServer(new PacketClientState(capBank)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); } @Override @@ -215,7 +215,7 @@ public class GuiCapacitorBank extends GuiContainerBase { if(output != capBank.getMaxOutput()) { capBank.setMaxOutput(output); maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - EnderIO.packetPipeline.sendToServer(new PacketClientState(capBank)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); } } @@ -223,7 +223,7 @@ public class GuiCapacitorBank extends GuiContainerBase { if(input != capBank.getMaxInput()) { capBank.setMaxInput(input); maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - EnderIO.packetPipeline.sendToServer(new PacketClientState(capBank)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); } } diff --git a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java index f28d4f1d..0f9eb0db 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.network.IMessage; public class PacketClientState implements IMessage { @@ -33,7 +33,7 @@ public class PacketClientState implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf dos) { + public void toBytes(ByteBuf dos) { dos.writeInt(x); dos.writeInt(y); dos.writeInt(z); @@ -44,7 +44,7 @@ public class PacketClientState implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf data) { + public void fromBytes(ByteBuf data) { x = data.readInt(); y = data.readInt(); z = data.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java index c7e07c45..26b754f6 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java @@ -1,14 +1,14 @@ package crazypants.enderio.machine.power; -import java.util.List; - import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; + +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.network.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.util.BlockCoord; public class PacketPowerStorage implements IMessage { @@ -29,7 +29,7 @@ public class PacketPowerStorage implements IMessage { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -38,7 +38,7 @@ public class PacketPowerStorage implements IMessage { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 6ba0983c..722fd314 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -28,6 +28,7 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.IPowerInterface; @@ -251,7 +252,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe if(lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 10 == 0) { lastSyncPowerStored = storedEnergy; - EnderIO.packetPipeline.sendToAllAround(new PacketPowerStorage(this), this, 64); + PacketHandler.INSTANCE.sendToAllAround(new PacketPowerStorage(this), this, 64); } if(notifyNeighbours) { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java index d0878aa0..7a1c5568 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java @@ -2,6 +2,12 @@ package crazypants.enderio.machine.solar; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlockWithMetadata; +import net.minecraft.item.ItemStack; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; @@ -9,12 +15,6 @@ import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.util.Lang; -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlockWithMetadata; -import net.minecraft.item.ItemStack; public class BlockItemSolorPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider{ diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 37a00bb2..5c3b7131 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -2,8 +2,6 @@ package crazypants.enderio.machine.solar; import java.util.List; -import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -16,6 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.BlockEio; import crazypants.enderio.Config; import crazypants.enderio.ModObject; diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index d91136e6..24bd78c5 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -4,7 +4,6 @@ import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -13,15 +12,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.network.PacketHandler; import crazypants.render.VertexRotation; import crazypants.util.FluidUtil; import crazypants.util.Util; @@ -32,7 +30,7 @@ public class BlockVat extends AbstractMachineBlock { public static int renderId; public static BlockVat create() { - EnderIO.packetPipeline.registerPacket(PacketTanks.class); + PacketHandler.INSTANCE.registerPacket(PacketTanks.class); BlockVat res = new BlockVat(); res.init(); return res; diff --git a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java b/src/main/java/crazypants/enderio/machine/still/PacketTanks.java index 939d81b3..bd023205 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/still/PacketTanks.java @@ -31,13 +31,13 @@ public class PacketTanks extends MessageTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { super.fromBytes(ctx, buf); nbtRoot = NetworkUtil.readNBTTagCompound(buf); } diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index d5418b3c..e36f31d9 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.Config; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; @@ -174,7 +174,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler protected boolean processTasks(boolean redstoneChecksPassed) { boolean res = super.processTasks(redstoneChecksPassed); if(tanksDirty && worldObj.getWorldTime() % 10 == 0) { - EnderIO.packetPipeline.sendToAllAround(new PacketTanks(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketTanks(this), this); tanksDirty = false; } return res; diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java index 5baa25cb..8bb79805 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java @@ -6,14 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.enderio.power.PowerHandlerUtil; public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 9bab7f28..16bce74c 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -2,9 +2,6 @@ package crazypants.enderio.machine.tank; import java.util.List; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +17,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; @@ -28,10 +28,8 @@ import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.power.BlockItemCapacitorBank; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.util.FluidUtil; import crazypants.util.Lang; import crazypants.util.Util; @@ -39,7 +37,7 @@ import crazypants.util.Util; public class BlockTank extends AbstractMachineBlock implements IAdvancedTooltipProvider { public static BlockTank create() { - EnderIO.packetPipeline.registerPacket(PacketTank.class); + PacketHandler.INSTANCE.registerPacket(PacketTank.class); BlockTank res = new BlockTank(); res.init(); return res; diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index f145fa6f..ff50d4e0 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -1,21 +1,14 @@ package crazypants.enderio.machine.tank; -import java.awt.Color; import java.awt.Rectangle; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; -import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java index 9e3d797f..2f9e066e 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java @@ -5,7 +5,6 @@ import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; @@ -27,13 +26,13 @@ public class PacketTank extends MessageTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { super.fromBytes(ctx, buf); nbtRoot = NetworkUtil.readNBTTagCompound(buf); } diff --git a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java index 24e2ad1c..1004d28f 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java @@ -1,14 +1,15 @@ package crazypants.enderio.machine.tank; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; + import org.lwjgl.opengl.GL11; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; public class TankFluidRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java index ad71e8cd..51180ced 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java @@ -1,26 +1,17 @@ package crazypants.enderio.machine.tank; -import java.awt.Color; - import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.EnderIO; import crazypants.render.BoundingBox; -import crazypants.render.ColorUtil; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index c01728d3..d683e026 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.tank; -import buildcraft.api.power.PowerHandler.PowerReceiver; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -8,19 +7,16 @@ import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import crazypants.enderio.EnderIO; -import crazypants.enderio.TileEntityEio; +import buildcraft.api.power.PowerHandler.PowerReceiver; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; -import crazypants.util.Util; public class TileTank extends AbstractMachineEntity implements IFluidHandler { @@ -217,7 +213,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { return true; } if(tankDirty && worldObj.getWorldTime() % 10 == 0) { - EnderIO.packetPipeline.sendToAllAround(new PacketTank(this), this); + PacketHandler.INSTANCE.sendToAllAround(new PacketTank(this), this); tankDirty = false; } return res; diff --git a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java index ada8777a..263e9a38 100644 --- a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java @@ -1,11 +1,10 @@ package crazypants.enderio.material; +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.painter.BlockItemPaintedFence; -import net.minecraft.block.BlockPane; -import net.minecraft.block.material.Material; public class BlockDarkIronBars extends BlockPane { diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java index 2be522e8..65202989 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -2,14 +2,13 @@ package crazypants.enderio.material; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.util.Lang; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.util.Lang; public class BlockItemDarkIronBars extends ItemBlock { diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index ca503dd1..8e486700 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -2,17 +2,15 @@ package crazypants.enderio.material; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.util.Lang; diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 970d9fcf..56c46f6a 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -7,9 +7,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import crazypants.enderio.crafting.IEnderIoRecipe; diff --git a/src/main/java/crazypants/enderio/network/MessageTileEntity.java b/src/main/java/crazypants/enderio/network/MessageTileEntity.java index 69765931..c5901bff 100644 --- a/src/main/java/crazypants/enderio/network/MessageTileEntity.java +++ b/src/main/java/crazypants/enderio/network/MessageTileEntity.java @@ -5,7 +5,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; +import crazypants.enderio.conduit.IConduit; public abstract class MessageTileEntity implements IMessage { @@ -60,4 +62,8 @@ public abstract class MessageTileEntity implements IMessag return null; } + protected World getWorld(MessageContext ctx) + { + return ctx.getServerHandler().playerEntity.worldObj; + } } diff --git a/src/main/java/crazypants/enderio/network/NetworkUtil.java b/src/main/java/crazypants/enderio/network/NetworkUtil.java index 745ca504..53d4c922 100644 --- a/src/main/java/crazypants/enderio/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/network/NetworkUtil.java @@ -1,12 +1,13 @@ package crazypants.enderio.network; -import cpw.mods.fml.common.FMLCommonHandler; import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; import java.io.IOException; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.FMLCommonHandler; + /** * Created by CrazyPants on 27/02/14. */ diff --git a/src/main/java/crazypants/enderio/network/PacketHandler.java b/src/main/java/crazypants/enderio/network/PacketHandler.java index 0e01a0e9..b32c6ee4 100644 --- a/src/main/java/crazypants/enderio/network/PacketHandler.java +++ b/src/main/java/crazypants/enderio/network/PacketHandler.java @@ -1,7 +1,10 @@ package crazypants.enderio.network; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; public class PacketHandler { diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 51fc9b71..60d8b930 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -1,10 +1,10 @@ package crazypants.enderio.power; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.mj.IBatteryObject; +import buildcraft.api.mj.MjAPI; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PerditionCalculator; diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java b/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java index 1a432293..b934df0e 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java @@ -1,7 +1,7 @@ package crazypants.enderio.power; -import buildcraft.api.mj.IBatteryObject; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.mj.IBatteryObject; public class PowerInterfaceBC2 implements IPowerInterface { private final IBatteryObject battery; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 92ea854d..2717a744 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -10,7 +10,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; import crazypants.enderio.gui.CheckBoxEIO; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 3c381105..b34193a7 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -10,9 +10,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.PacketHandler; import crazypants.enderio.network.MessageTileNBT; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index e77b379f..db5fc5ff 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -12,7 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.ItemEnergyContainer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java index 65e452df..bf50336d 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java @@ -1,13 +1,8 @@ package crazypants.enderio.teleport; -import java.awt.Color; -import java.nio.FloatBuffer; - import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -18,9 +13,7 @@ import org.lwjgl.opengl.GL14; import crazypants.enderio.EnderIO; import crazypants.render.BoundingBox; -import crazypants.render.ColorUtil; import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/trigger/TriggerEnderIO.java b/src/main/java/crazypants/enderio/trigger/TriggerEnderIO.java index 4f7d29bb..d622e98a 100644 --- a/src/main/java/crazypants/enderio/trigger/TriggerEnderIO.java +++ b/src/main/java/crazypants/enderio/trigger/TriggerEnderIO.java @@ -1,17 +1,16 @@ package crazypants.enderio.trigger; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.power.TileCapacitorBank; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; -import thermalexpansion.api.item.IChargeableItem; public class TriggerEnderIO implements ITrigger { diff --git a/src/main/java/crazypants/enderio/trigger/TriggerProviderEIO.java b/src/main/java/crazypants/enderio/trigger/TriggerProviderEIO.java index 8599ef22..8fe70923 100644 --- a/src/main/java/crazypants/enderio/trigger/TriggerProviderEIO.java +++ b/src/main/java/crazypants/enderio/trigger/TriggerProviderEIO.java @@ -1,15 +1,15 @@ package crazypants.enderio.trigger; +import java.util.LinkedList; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; import buildcraft.api.gates.IOverrideDefaultTriggers; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerProvider; import buildcraft.api.transport.IPipeTile; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.power.TileCapacitorBank; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; - -import java.util.LinkedList; public class TriggerProviderEIO implements ITriggerProvider { diff --git a/src/main/java/crazypants/gui/ItemButton.java b/src/main/java/crazypants/gui/ItemButton.java index b2a236a1..13c41910 100644 --- a/src/main/java/crazypants/gui/ItemButton.java +++ b/src/main/java/crazypants/gui/ItemButton.java @@ -1,14 +1,16 @@ package crazypants.gui; -import crazypants.render.RenderUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; +import crazypants.render.RenderUtil; + public class ItemButton extends GuiButton { public static final RenderItem ITEM_RENDERER = new RenderItem(); diff --git a/src/main/java/crazypants/render/BoundingBox.java b/src/main/java/crazypants/render/BoundingBox.java index 73b8a8d3..5e666ee6 100644 --- a/src/main/java/crazypants/render/BoundingBox.java +++ b/src/main/java/crazypants/render/BoundingBox.java @@ -1,14 +1,14 @@ package crazypants.render; +import java.util.ArrayList; +import java.util.List; + +import net.minecraftforge.common.util.ForgeDirection; import crazypants.util.BlockCoord; import crazypants.vecmath.Vector2f; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; import crazypants.vecmath.Vertex; -import net.minecraftforge.common.util.ForgeDirection; - -import java.util.ArrayList; -import java.util.List; public final class BoundingBox { diff --git a/src/main/java/crazypants/util/ClientUtil.java b/src/main/java/crazypants/util/ClientUtil.java new file mode 100644 index 00000000..481c3211 --- /dev/null +++ b/src/main/java/crazypants/util/ClientUtil.java @@ -0,0 +1,30 @@ +package crazypants.util; + +import net.minecraft.client.Minecraft; +import net.minecraft.tileentity.TileEntity; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.TileConduitBundle; +import crazypants.enderio.conduit.liquid.ILiquidConduit; +import crazypants.enderio.conduit.liquid.PacketFluidLevel; + +/** + * To avoid integrated server crashes when calling client-only methods + * @author Garrett Spicer-Davis + */ +public class ClientUtil +{ + public static void doFluidLevelUpdate(int x, int y, int z, PacketFluidLevel pkt) + { + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + + if(pkt.tc == null || !(tile instanceof IConduitBundle)) { + return; + } + IConduitBundle bundle = (IConduitBundle) tile; + ILiquidConduit con = bundle.getConduit(ILiquidConduit.class); + if(con == null) { + return; + } + con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION); + } +}