diff --git a/.gitignore b/.gitignore index 085ecc22..3c1420e4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /eclipse /eclipseBin /.classpath +/run 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 e565252b..78d2851a 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -22,6 +22,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.conduit.BlockConduitBundle; import crazypants.enderio.conduit.ConduitRecipes; import crazypants.enderio.conduit.facade.BlockConduitFacade; @@ -86,8 +87,8 @@ import crazypants.enderio.material.ItemMachinePart; import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; -import crazypants.enderio.network.PacketPipeline; -import crazypants.enderio.network.PacketTileEntityNbt; +import crazypants.enderio.network.MessageTileNBT; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.BlockTravelAnchor; import crazypants.enderio.teleport.ItemTravelStaff; import crazypants.enderio.teleport.TeleportRecipes; @@ -101,7 +102,7 @@ public class EnderIO { @SidedProxy(clientSide = "crazypants.enderio.ClientProxy", serverSide = "crazypants.enderio.CommonProxy") public static CommonProxy proxy; - public static final PacketPipeline packetPipeline = new PacketPipeline(); + public static final PacketHandler packetPipeline = new PacketHandler(); public static GuiHandler guiHandler = new GuiHandler(); @@ -204,7 +205,7 @@ public class EnderIO { public void preInit(FMLPreInitializationEvent event) { Config.load(event); - + ConduitGeometryUtil.setupBounds((float) Config.conduitScale); blockEnderIo = BlockEnderIO.create(); @@ -326,9 +327,8 @@ public class EnderIO { instance = this; - packetPipeline.initalise(); - packetPipeline.registerPacket(PacketTileEntityNbt.class); - packetPipeline.registerPacket(PacketRedstoneMode.class); + PacketHandler.INSTANCE.registerMessage(MessageTileNBT.class, MessageTileNBT.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER); NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler); MinecraftForge.EVENT_BUS.register(this); @@ -391,7 +391,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 5fc87195..96eabcdb 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 01ccf1ba..4789e000 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; @@ -97,12 +97,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/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java index a2559729..a53fac24 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java @@ -14,6 +14,7 @@ import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -140,7 +141,7 @@ public class BasicItemFilterGui { private void sendFilterChange() { updateButtons(); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } public void deactivate() { 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 983a77d8..e91f9a4b 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; @@ -22,6 +22,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; @@ -99,7 +100,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)); } } @@ -310,19 +311,19 @@ public class ItemSettings extends BaseSettingsPanel { updateGuiVisibility(); } 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) { DyeColor col = DyeColor.values()[channelB.getColorIndex()]; @@ -335,7 +336,7 @@ public class ItemSettings extends BaseSettingsPanel { itemConduit.setOutputColor(gui.dir, DyeColor.values()[channelB.getColorIndex()]); input = false; } - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } if(filterGui != null) { 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 a23c65b9..ac3f2657 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.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; -public class PacketOpenConduitUI extends AbstractPacketTileEntity { +public class PacketOpenConduitUI extends MessageTileEntity implements IMessageHandler{ private ForgeDirection dir; @@ -23,20 +24,20 @@ public class PacketOpenConduitUI extends AbstractPacketTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { buf.writeShort(dir.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(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 = message.getWorld(ctx).getTileEntity(x, y, z); + player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + message.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 701f6db0..7250263b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -1,10 +1,10 @@ package crazypants.enderio.conduit.item; -import cofh.api.transport.IItemDuct; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; 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 c69d702d..b9865b3a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -19,7 +19,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/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 64fa4698..0b2f2551 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -5,17 +5,16 @@ import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.monitor.ItemConduitProbe; import crazypants.enderio.machine.monitor.PacketConduitProbe; +import crazypants.enderio.network.PacketHandler; public class ItemExtractSpeedUpgrade extends Item { public static ItemExtractSpeedUpgrade create() { - EnderIO.packetPipeline.registerPacket(PacketConduitProbe.class); + PacketHandler.INSTANCE.registerMessage(PacketConduitProbe.class, PacketConduitProbe.class, PacketHandler.nextID(), Side.SERVER); ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade(); result.init(); 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 7e70b25c..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 crazypants.enderio.network.AbstractPacketTileEntity; +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 AbstractPacketTileEntity { +public class PacketFluidLevel extends MessageTileEntity implements IMessageHandler{ - NBTTagCompound tc; + public NBTTagCompound tc; public PacketFluidLevel() { } @@ -25,28 +24,20 @@ public class PacketFluidLevel extends AbstractPacketTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { ByteBufUtils.writeTag(buf, tc); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(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 a0b2cd40..198ef4ad 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java @@ -1,12 +1,9 @@ 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.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; -public abstract class AbstractConduitBundlePacket extends AbstractPacketTileEntity { +public abstract class AbstractConduitBundlePacket extends MessageTileEntity { public AbstractConduitBundlePacket() { } @@ -14,32 +11,4 @@ public abstract class AbstractConduitBundlePacket extends AbstractPacketTileEnti public AbstractConduitBundlePacket(TileEntity tile) { super(tile); } - - @Override - protected void handleClientSide(EntityPlayer player, World worldObj, TileEntity tile) { - if(!(tile instanceof IConduitBundle)) { - return; - } - handleClientSide(player, worldObj, (IConduitBundle) tile); - } - - protected void handleClientSide(EntityPlayer player, World worldObj, IConduitBundle tile) { - handle(player, worldObj, tile); - } - - @Override - protected void handleServerSide(EntityPlayer player, World worldObj, TileEntity tile) { - if(!(tile instanceof IConduitBundle)) { - return; - } - handleServerSide(player, worldObj, (IConduitBundle) tile); - } - - protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile) { - handle(player, worldObj, tile); - } - - protected void handle(EntityPlayer player, World worldObj, IConduitBundle tile) { - } - } diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java index 50b5d6dd..bfc95881 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java @@ -1,66 +1,29 @@ package crazypants.enderio.conduit.packet; -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 cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; public class AbstractConduitPacket 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.encode(ctx, buf); - buf.writeShort(conType.ordinal()); + + protected Class getConType() + { + return conType.getBaseType(); } - - @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(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..04641893 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) { + message.getTileCasted(ctx).setConnectionMode(message.dir, message.mode); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.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..266cac4c 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) { + message.getTileCasted(ctx).setExtractionRedstoneMode(message.mode, message.dir); + message.getTileCasted(ctx).setExtractionSignalColor(message.dir, message.color); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.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 dc0b51d7..4df2bb6c 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -1,21 +1,16 @@ package crazypants.enderio.conduit.packet; 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 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.FilterRegister; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.IItemFilter; -import crazypants.enderio.conduit.item.ItemFilter; -import crazypants.enderio.network.NetworkUtil; import crazypants.util.DyeColor; -import crazypants.util.ItemUtil; -public class PacketItemConduitFilter extends AbstractConduitPacket { +public class PacketItemConduitFilter extends AbstractConduitPacket implements IMessageHandler { private ForgeDirection dir; private boolean loopMode; @@ -44,8 +39,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); @@ -57,8 +51,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(); @@ -70,19 +63,21 @@ public class PacketItemConduitFilter extends AbstractConduitPacket } @Override - protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile, IItemConduit conduit) { - conduit.setSelfFeedEnabled(dir, loopMode); - conduit.setRoundRobinEnabled(dir, roundRobin); - conduit.setInputColor(dir, colIn); - conduit.setOutputColor(dir, colOut); - conduit.setOutputPriority(dir, priority); - applyFilter(conduit, inputFilter, true); - applyFilter(conduit, outputFilter, false); + public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) { + IItemConduit conduit = message.getTileCasted(ctx); + conduit.setSelfFeedEnabled(message.dir, message.loopMode); + conduit.setRoundRobinEnabled(message.dir, message.roundRobin); + conduit.setInputColor(message.dir, message.colIn); + conduit.setOutputColor(message.dir, message.colOut); + conduit.setOutputPriority(message.dir, message.priority); + applyFilter(message.dir, conduit, message.inputFilter, true); + applyFilter(message.dir, conduit, message.outputFilter, false); - worldObj.markBlockForUpdate(x, y, z); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; } - private void applyFilter(IItemConduit conduit, IItemFilter filter, boolean isInput) { + private void applyFilter(ForgeDirection dir, IItemConduit conduit, IItemFilter filter, boolean isInput) { // if(filter == null) { if(isInput) { conduit.setInputFilter(dir, filter); diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java index 6965f1d7..90a239ad 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,30 +41,24 @@ public class PacketOpenRemoteUi implements IPacketEio { } @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); + PlayerProxy pp = new PlayerProxy(player, message.x, message.y, message.z); EntityPlayerMP proxy = createPlayerProxy(player, pp); proxy.playerNetServerHandler = player.playerNetServerHandler; proxy.inventory = player.inventory; @@ -81,7 +76,7 @@ public class PacketOpenRemoteUi implements IPacketEio { 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 4fd10fc4..3f7b1580 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 2f12f602..ed391182 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.IPacketEio; -public class YetaWrenchPacketProcessor implements IPacketEio { +public class YetaWrenchPacketProcessor implements IMessage, IMessageHandler { private int slot; private ConduitDisplayMode mode; @@ -21,32 +21,26 @@ public class YetaWrenchPacketProcessor implements IPacketEio { } @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); + if(message.slot > -1 && message.slot < 9) { + stack = ctx.getServerHandler().playerEntity.inventory.getStackInSlot(slot); } - if(stack == null) { - return; + if(stack != null) { + ConduitDisplayMode.setDisplayMode(stack, message.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 86f262c9..1f687754 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.IPacketEio; +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 IPacketEio { +public class PacketDarkSteelPowerPacket implements IMessage, IMessageHandler { private int powerUse; private short armorType; @@ -19,25 +19,21 @@ public class PacketDarkSteelPowerPacket implements IPacketEio { } @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), message.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 c89c688f..f2ca4282 100644 --- a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java +++ b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java @@ -1,15 +1,13 @@ 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.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; -public class PacketCurrentTask extends AbstractPacketTileEntity { +public class PacketCurrentTask extends MessageTileEntity { private NBTTagCompound nbtRoot; @@ -27,14 +25,14 @@ public class PacketCurrentTask extends AbstractPacketTileEntity { private int x; private int y; @@ -31,7 +32,7 @@ public class PacketRedstoneMode implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -39,7 +40,7 @@ public class PacketRedstoneMode implements IPacketEio { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); @@ -48,13 +49,10 @@ public class PacketRedstoneMode implements IPacketEio { } @Override - public void handleClientSide(EntityPlayer player) { - handle(player); - } - - @Override - public void handleServerSide(EntityPlayer player) { - handle(player); + public IMessage onMessage(PacketRedstoneMode message, MessageContext ctx) + { + handle(ctx.getServerHandler().playerEntity); + return null; } private void handle(EntityPlayer player) { diff --git a/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java index e64a8abd..7658041d 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java @@ -5,16 +5,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import crazypants.enderio.EnderIO; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.network.PacketHandler; public class BlockAlloySmelter extends AbstractMachineBlock { public static BlockAlloySmelter create() { - EnderIO.packetPipeline.registerPacket(PacketClientState.class); + PacketHandler.INSTANCE.registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); BlockAlloySmelter ppainter = new BlockAlloySmelter(); ppainter.init(); diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index caea1322..0fd663f0 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -11,6 +11,7 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.alloy.TileAlloySmelter.Mode; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.gui.IconButton; import crazypants.render.RenderUtil; @@ -80,7 +81,7 @@ public class GuiAlloySmelter extends GuiMachineBase { if(par1GuiButton.id == SMELT_MODE_BUTTON_ID) { tileEntity.setMode(tileEntity.getMode().next()); vanillaFurnaceButton.setIcon(getIconForMode()); - EnderIO.packetPipeline.sendToServer(new PacketClientState(tileEntity)); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(tileEntity)); } else { super.actionPerformed(par1GuiButton); } diff --git a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java index fb27ac41..e03db4ab 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java @@ -1,12 +1,13 @@ 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 crazypants.enderio.network.IPacketEio; +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 PacketClientState implements IPacketEio { +public class PacketClientState implements IMessage, IMessageHandler { private int x; private int y; @@ -26,7 +27,7 @@ public class PacketClientState implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -34,7 +35,7 @@ public class PacketClientState implements IPacketEio { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); @@ -43,23 +44,13 @@ public class PacketClientState implements IPacketEio { } - @Override - public void handleClientSide(EntityPlayer player) { - handle(player); - } - - @Override - public void handleServerSide(EntityPlayer player) { - handle(player); - } - - private void handle(EntityPlayer player) { - TileEntity te = player.worldObj.getTileEntity(x, y, z); + public IMessage onMessage(PacketClientState message, MessageContext ctx) { + TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z); if(te instanceof TileAlloySmelter) { TileAlloySmelter me = (TileAlloySmelter) te; - me.setMode(mode); - player.worldObj.markBlockForUpdate(x, y, z); + me.setMode(message.mode); + ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(message.x, message.y, message.z); } + return null; } - } 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..09215f2c 100644 --- a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -2,21 +2,22 @@ package crazypants.enderio.machine.farm; import java.util.Random; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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.registerMessage(PacketFarmAction.class, PacketFarmAction.class, PacketHandler.nextID(), Side.CLIENT); 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 2db9f53b..88debebb 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -8,10 +8,13 @@ import java.util.List; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import crazypants.enderio.network.IPacketEio; +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.util.BlockCoord; +import crazypants.util.ClientUtil; -public class PacketFarmAction implements IPacketEio { +public class PacketFarmAction implements IMessage, IMessageHandler { private static Random rand = new Random(); @@ -25,7 +28,7 @@ public class PacketFarmAction implements IPacketEio { } @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 +40,7 @@ public class PacketFarmAction implements IPacketEio { } @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++) { @@ -46,21 +49,12 @@ public class PacketFarmAction implements IPacketEio { } @Override - public void handleClientSide(EntityPlayer player) { - for (BlockCoord bc : coords) { + public IMessage onMessage(PacketFarmAction message, MessageContext ctx) { + for (BlockCoord bc : message.coords) { for (int i = 0; i < 15; i++) { - double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; - double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2; - double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; - player.worldObj.spawnParticle("portal", bc.x + xOff, bc.y + yOff, bc.z + zOff, - (rand.nextDouble() - 0.5) * 1.5, -rand.nextDouble(), (rand.nextDouble() - 0.5) * 1.5); + ClientUtil.spawnFarmParcticles(rand, bc); } } - + return null; } - - @Override - public void handleServerSide(EntityPlayer player) { - } - } 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 e43d9ddd..64f03815 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -1,32 +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; @@ -36,13 +22,12 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; 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*/ { @@ -253,7 +238,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt if(harvest != null) { if(harvest.getDrops() != null) { PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); - EnderIO.packetPipeline.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + PacketHandler.INSTANCE.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); for (EntityItem ei : harvest.getDrops()) { if(ei != null) { insertHarvestDrop(ei); @@ -262,7 +247,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt } } } - } } } 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..a9ec941e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -2,21 +2,19 @@ package crazypants.enderio.machine.generator.combustion; import java.util.Random; +import cpw.mods.fml.relauncher.Side; 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 +23,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock 0) { + if(gen.getCoolantTank().getFluidAmount() > 0) { x = guiLeft + 114; //right tank - RenderUtil.renderGuiTank(gen.coolantTank.getFluid(), 4000, gen.coolantTank.getFluidAmount() - 1000, x, y, zLevel, 15, 47); + RenderUtil.renderGuiTank(gen.getCoolantTank().getFluid(), 4000, gen.getCoolantTank().getFluidAmount() - 1000, x, y, zLevel, 15, 47); if(gen.isActive()) { txt = gen.getNumTicksPerMbCoolant() + " t/MB"; @@ -114,19 +112,19 @@ public class GuiCombustionGenerator extends GuiMachineBase { x = guiLeft + 72; y = guiTop + 14; //center coolant chamber - RenderUtil.renderGuiTank(gen.coolantTank.getFluid(), 1000, Math.min(gen.coolantTank.getFluidAmount(), 1000), x, y, zLevel, 33, 33); + RenderUtil.renderGuiTank(gen.getCoolantTank().getFluid(), 1000, Math.min(gen.getCoolantTank().getFluidAmount(), 1000), x, y, zLevel, 33, 33); //draw some gui over the top again to make the center shape RenderUtil.bindTexture("enderio:textures/gui/combustionGen.png"); drawTexturedModalRect(x, y + 14, 0, 223, 33, 33); y += 7; } - if(gen.fuelTank.getFluidAmount() > 0) { + if(gen.getFuelTank().getFluidAmount() > 0) { //left tank x = guiLeft + 48; //RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), 4000, gen.fuelTank.getFluidAmount() - 1000, x, y, zLevel, 15, 47); - RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), 4000, gen.fuelTank.getFluidAmount() - 1000, x, y, zLevel, 15, 47); + RenderUtil.renderGuiTank(gen.getFuelTank().getFluid(), 4000, gen.getFuelTank().getFluidAmount() - 1000, x, y, zLevel, 15, 47); if(gen.isActive()) { txt = gen.getNumTicksPerMbFuel() + " t/MB"; @@ -136,7 +134,7 @@ public class GuiCombustionGenerator extends GuiMachineBase { //center tank //RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), 1000, Math.min(gen.fuelTank.getFluidAmount(), 1000), guiLeft + 81, guiTop + 5, zLevel, 14, 14); - RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), 1000, Math.min(gen.fuelTank.getFluidAmount(), 1000), guiLeft + 81, guiTop + 5, zLevel, 14, 14); + RenderUtil.renderGuiTank(gen.getFuelTank().getFluid(), 1000, Math.min(gen.getFuelTank().getFluidAmount(), 1000), guiLeft + 81, guiTop + 5, zLevel, 14, 14); } RenderUtil.bindTexture("enderio:textures/gui/combustionGen.png"); diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java new file mode 100644 index 00000000..baa747bb --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java @@ -0,0 +1,49 @@ +package crazypants.enderio.machine.generator.combustion; + +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; +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.enderio.network.NetworkUtil; +import crazypants.util.ClientUtil; + +public class PacketCombustionTank extends MessageTileEntity implements IMessageHandler { + + public NBTTagCompound nbtRoot; + + public PacketCombustionTank() { + } + + public PacketCombustionTank(TileCombustionGenerator tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + if(tile.getCoolantTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.getCoolantTank().writeToNBT(tankRoot); + nbtRoot.setTag("coolantTank", tankRoot); + } + if(tile.getFuelTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.getFuelTank().writeToNBT(tankRoot); + nbtRoot.setTag("fuelTank", tankRoot); + } + } + + @Override + public void toBytes(ByteBuf buf) { + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + nbtRoot = NetworkUtil.readNBTTagCompound(buf); + } + @Override + public IMessage onMessage(PacketCombustionTank message, MessageContext ctx) { + ClientUtil.setTankNBT(message, message.x, message.y, message.z); + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketTanks.java b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketTanks.java deleted file mode 100644 index 62b948c8..00000000 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketTanks.java +++ /dev/null @@ -1,61 +0,0 @@ -package crazypants.enderio.machine.generator.combustion; - -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.network.AbstractPacketTileEntity; -import crazypants.enderio.network.NetworkUtil; - -public class PacketTanks extends AbstractPacketTileEntity { - - private NBTTagCompound nbtRoot; - - public PacketTanks() { - } - - public PacketTanks(TileCombustionGenerator tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.coolantTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.coolantTank.writeToNBT(tankRoot); - nbtRoot.setTag("coolantTank", tankRoot); - } - if(tile.fuelTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.fuelTank.writeToNBT(tankRoot); - nbtRoot.setTag("fuelTank", tankRoot); - } - } - - @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - protected void handleClientSide(EntityPlayer player, World worldObj, TileCombustionGenerator tile) { - if(nbtRoot.hasKey("coolantTank")) { - NBTTagCompound tankRoot = nbtRoot.getCompoundTag("coolantTank"); - tile.coolantTank.readFromNBT(tankRoot); - } else { - tile.coolantTank.setFluid(null); - } - if(nbtRoot.hasKey("fuelTank")) { - NBTTagCompound tankRoot = nbtRoot.getCompoundTag("fuelTank"); - tile.fuelTank.readFromNBT(tankRoot); - } else { - tile.fuelTank.setFluid(null); - } - } - -} 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..547559d6 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -15,20 +15,19 @@ 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; public class TileCombustionGenerator extends AbstractMachineEntity implements IPowerEmitter, IFluidHandler { - final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); - final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); + private final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); + private final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); private boolean tanksDirty; private int ticksRemaingFuel; @@ -118,10 +117,10 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } tanksDirty = true; if(IronEngineCoolant.isCoolant(resource.getFluid())) { - return coolantTank.fill(resource, doFill); + return getCoolantTank().fill(resource, doFill); } if(IronEngineFuel.getFuelForFluid(resource.getFluid()) != null) { - return fuelTank.fill(resource, doFill); + return getFuelTank().fill(resource, doFill); } return 0; } @@ -170,7 +169,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } if(tanksDirty) { - EnderIO.packetPipeline.sendToAllAround(new PacketTanks(this), this); + PacketHandler.sendToAllAround(new PacketCombustionTank(this), this); tanksDirty = false; } @@ -198,12 +197,12 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP generated = 0; - Fuel fuel = fuelTank.getFluid() == null ? null : IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); + Fuel fuel = getFuelTank().getFluid() == null ? null : IronEngineFuel.getFuelForFluid(getFuelTank().getFluid().getFluid()); if(fuel == null) { return false; } - if(coolantTank.getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored()) { + if(getCoolantTank().getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored()) { return false; } @@ -214,7 +213,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } inPause = false; - Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); + Coolant coolant = IronEngineCoolant.getCoolant(getCoolantTank().getFluid()); if(coolant == null) { return false; } @@ -222,14 +221,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP boolean res = false; ticksRemaingFuel--; if(ticksRemaingFuel <= 0) { - fuelTank.drain(1, true); + getFuelTank().drain(1, true); ticksRemaingFuel = getNumTicksPerMbFuel(fuel); res = true; tanksDirty = true; } ticksRemaingCoolant--; if(ticksRemaingCoolant <= 0) { - coolantTank.drain(1, true); + getCoolantTank().drain(1, true); ticksRemaingCoolant = getNumTicksPerMbCoolant(coolant, fuel); res = true; tanksDirty = true; @@ -240,22 +239,22 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP generated = fuel.powerPerCycle; storedEnergy = Math.min(storedEnergy, capacitorType.capacitor.getMaxEnergyStored()); - return fuelTank.getFluidAmount() > 0 && coolantTank.getFluidAmount() > 0; + return getFuelTank().getFluidAmount() > 0 && getCoolantTank().getFluidAmount() > 0; } public int getNumTicksPerMbFuel() { - if(fuelTank.getFluidAmount() <= 0) { + if(getFuelTank().getFluidAmount() <= 0) { return 0; } - return getNumTicksPerMbFuel(IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid())); + return getNumTicksPerMbFuel(IronEngineFuel.getFuelForFluid(getFuelTank().getFluid().getFluid())); } public int getNumTicksPerMbCoolant() { - if(fuelTank.getFluidAmount() <= 0) { + if(getFuelTank().getFluidAmount() <= 0) { return 0; } - Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); - Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); + Fuel fuel = IronEngineFuel.getFuelForFluid(getFuelTank().getFluid().getFluid()); + Coolant coolant = IronEngineCoolant.getCoolant(getCoolantTank().getFluid()); return getNumTicksPerMbCoolant(coolant, fuel); } @@ -306,7 +305,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP if(isSideDisabled(from.ordinal())) { return new FluidTankInfo[0]; } - return new FluidTankInfo[] { coolantTank.getInfo(), fuelTank.getInfo() }; + return new FluidTankInfo[] { getCoolantTank().getInfo(), getFuelTank().getInfo() }; } @Override @@ -322,23 +321,23 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP if(nbtRoot.hasKey("coolantTank")) { NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("coolantTank"); if(tankRoot != null) { - coolantTank.readFromNBT(tankRoot); + getCoolantTank().readFromNBT(tankRoot); } else { - coolantTank.setFluid(null); + getCoolantTank().setFluid(null); } } else { - coolantTank.setFluid(null); + getCoolantTank().setFluid(null); } if(nbtRoot.hasKey("fuelTank")) { NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); if(tankRoot != null) { - fuelTank.readFromNBT(tankRoot); + getFuelTank().readFromNBT(tankRoot); } else { - fuelTank.setFluid(null); + getFuelTank().setFluid(null); } } else { - fuelTank.setFluid(null); + getFuelTank().setFluid(null); } ticksRemaingFuel = nbtRoot.getInteger("ticksRemaingFuel"); @@ -348,14 +347,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); - if(coolantTank.getFluidAmount() > 0) { + if(getCoolantTank().getFluidAmount() > 0) { NBTTagCompound tankRoot = new NBTTagCompound(); - coolantTank.writeToNBT(tankRoot); + getCoolantTank().writeToNBT(tankRoot); nbtRoot.setTag("coolantTank", tankRoot); } - if(fuelTank.getFluidAmount() > 0) { + if(getFuelTank().getFluidAmount() > 0) { NBTTagCompound tankRoot = new NBTTagCompound(); - fuelTank.writeToNBT(tankRoot); + getFuelTank().writeToNBT(tankRoot); nbtRoot.setTag("fuelTank", tankRoot); } nbtRoot.setInteger("ticksRemaingFuel", ticksRemaingFuel); @@ -378,14 +377,22 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP @Override public float getPowerUsePerTick() { - if(fuelTank.getFluidAmount() <= 0) { + if(getFuelTank().getFluidAmount() <= 0) { return 0; } - Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); + Fuel fuel = IronEngineFuel.getFuelForFluid(getFuelTank().getFluid().getFluid()); if(fuel == null) { return 0; } return fuel.powerPerCycle; } + public FluidTank getCoolantTank() { + return coolantTank; + } + + public FluidTank getFuelTank() { + return fuelTank; + } + } 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..90c11458 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,17 @@ package crazypants.enderio.machine.generator.stirling; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import crazypants.enderio.EnderIO; +import cpw.mods.fml.relauncher.Side; 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.registerMessage(PacketBurnTime.class, PacketBurnTime.class, PacketHandler.nextID(), Side.CLIENT); 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 e630808a..05478750 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java @@ -1,16 +1,16 @@ 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.AbstractPacketTileEntity; -import crazypants.enderio.network.PacketTileEntityNbt; +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 PacketBurnTime extends AbstractPacketTileEntity { +public class PacketBurnTime extends MessageTileEntity implements IMessageHandler { - private int burnTime; - private int totalBurnTime; + public int burnTime; + public int totalBurnTime; public PacketBurnTime() { } @@ -22,23 +22,20 @@ public class PacketBurnTime extends AbstractPacketTileEntity { +public class PacketZombieTank extends MessageTileEntity { private NBTTagCompound nbtRoot; - public PacketTank() { + public PacketZombieTank() { } - public PacketTank(TileZombieGenerator tile) { + public PacketZombieTank(TileZombieGenerator tile) { super(tile); nbtRoot = new NBTTagCompound(); if(tile.fuelTank.getFluidAmount() > 0) { @@ -27,17 +26,16 @@ public class PacketTank extends AbstractPacketTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, buf); + public void fromBytes(ByteBuf buf) { nbtRoot = NetworkUtil.readNBTTagCompound(buf); } + @Override protected void handleClientSide(EntityPlayer player, World worldObj, TileZombieGenerator tile) { if(nbtRoot.hasKey("tank")) { 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..6a62f0b2 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 PacketZombieTank(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 95b0e976..c0a8108a 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -4,10 +4,10 @@ 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.IPacketEio; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import crazypants.enderio.network.PacketHandler; -public class PacketAddRemoveChannel implements IPacketEio { +public class PacketAddRemoveChannel implements IMessage { private boolean isAdd; private Channel channel; @@ -21,7 +21,7 @@ public class PacketAddRemoveChannel implements IPacketEio { } @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 IPacketEio { } @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 IPacketEio { } 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 f02d6dd3..f6d5779d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -8,9 +8,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.ByteBufUtils; -import crazypants.enderio.network.IPacketEio; +import cpw.mods.fml.common.network.simpleimpl.IMessage; -public class PacketChannelList implements IPacketEio { +public class PacketChannelList implements IMessage { private boolean isPrivate; private List channels; @@ -45,7 +45,7 @@ public class PacketChannelList implements IPacketEio { } @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 IPacketEio { } @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 b9c091d5..3f39feb0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -9,11 +9,11 @@ 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.IPacketEio; -public class PacketClientState implements IPacketEio { +public class PacketClientState implements IMessage { private int x; private int y; @@ -36,7 +36,7 @@ public class PacketClientState implements IPacketEio { } @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 IPacketEio { } @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 67b342e2..4bb7baa8 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.monitor; import static crazypants.enderio.power.PowerInterfaceBC.fromRF; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.List; @@ -16,6 +15,9 @@ 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 cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.TileConduitBundle; @@ -26,13 +28,12 @@ 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.IPacketEio; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.PowerInterfaceBC; import crazypants.enderio.power.PowerInterfaceRF; import crazypants.util.Lang; -public class PacketConduitProbe implements IPacketEio { +public class PacketConduitProbe implements IMessage, IMessageHandler { private static final String OF = " " + Lang.localize("gui.powerMonitor.of") + " "; private static final String CON_STORAGE = " " + Lang.localize("gui.powerMonitor.monHeading1") + ": "; @@ -90,7 +91,7 @@ public class PacketConduitProbe implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -99,7 +100,7 @@ public class PacketConduitProbe implements IPacketEio { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); @@ -107,23 +108,19 @@ public class PacketConduitProbe implements IPacketEio { } @Override - public void handleClientSide(EntityPlayer player) { - - } - - @Override - public void handleServerSide(EntityPlayer player) { + public IMessage onMessage(PacketConduitProbe message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; World world = player.worldObj; if(world == null) { Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); - return; + return null; } - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(message.x, message.y, message.z); if(block == null) { - return; + return null; } - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(message.x, message.y, message.z); if(te instanceof TileConduitBundle) { sendInfoMessage(player, (TileConduitBundle) te); @@ -144,7 +141,7 @@ public class PacketConduitProbe implements IPacketEio { } else if(te instanceof IPowerReceptor) { IPowerReceptor pr = (IPowerReceptor) te; - PowerReceiver rec = pr.getPowerReceiver(side); + PowerReceiver rec = pr.getPowerReceiver(message.side); if(rec == null) { player.addChatComponentMessage(new ChatComponentTranslation(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); } else { @@ -154,6 +151,7 @@ public class PacketConduitProbe implements IPacketEio { } } + return null; } public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index 21cfae26..98d6c779 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -5,11 +5,10 @@ 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.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; -public class PacketPowerInfo extends AbstractPacketTileEntity { +public class PacketPowerInfo extends MessageTileEntity { private NBTTagCompound nbtRoot; @@ -23,14 +22,14 @@ public class PacketPowerInfo extends AbstractPacketTileEntity } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { + super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, 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 9d22ebb0..2b7c7b2e 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -4,10 +4,10 @@ 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.IPacketEio; -public class PacketPowerMonitor implements IPacketEio { +public class PacketPowerMonitor implements IMessage { int x; int y; @@ -30,7 +30,7 @@ public class PacketPowerMonitor implements IPacketEio { } @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 IPacketEio { } @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 5c6fb03d..0f9eb0db 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java @@ -4,10 +4,10 @@ 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.IPacketEio; -public class PacketClientState implements IPacketEio { +public class PacketClientState implements IMessage { private int x; private int y; @@ -33,7 +33,7 @@ public class PacketClientState implements IPacketEio { } @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 IPacketEio { } @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 9e9baefa..26b754f6 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java @@ -1,17 +1,17 @@ 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.IPacketEio; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import crazypants.util.BlockCoord; -public class PacketPowerStorage implements IPacketEio { +public class PacketPowerStorage implements IMessage { private int x; private int y; @@ -29,7 +29,7 @@ public class PacketPowerStorage implements IPacketEio { } @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 IPacketEio { } @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 5adc69cf..bd023205 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/still/PacketTanks.java @@ -5,10 +5,10 @@ import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import crazypants.enderio.network.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; -public class PacketTanks extends AbstractPacketTileEntity { +public class PacketTanks extends MessageTileEntity { private NBTTagCompound nbtRoot; @@ -31,14 +31,14 @@ public class PacketTanks extends AbstractPacketTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { + super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, 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 416cafe3..2f9e066e 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java @@ -5,11 +5,10 @@ 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.AbstractPacketTileEntity; +import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; -public class PacketTank extends AbstractPacketTileEntity { +public class PacketTank extends MessageTileEntity { private NBTTagCompound nbtRoot; @@ -27,14 +26,14 @@ public class PacketTank extends AbstractPacketTileEntity { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { - super.encode(ctx, buf); + public void toBytes(ByteBuf buf) { + super.toBytes(ctx, buf); NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { - super.decode(ctx, 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/IPacketEio.java b/src/main/java/crazypants/enderio/network/IPacketEio.java deleted file mode 100644 index 600c9f27..00000000 --- a/src/main/java/crazypants/enderio/network/IPacketEio.java +++ /dev/null @@ -1,21 +0,0 @@ -package crazypants.enderio.network; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; - -/** - * - */ -public interface IPacketEio { - - void encode(ChannelHandlerContext ctx, ByteBuf buffer); - - - void decode(ChannelHandlerContext ctx, ByteBuf buffer); - - void handleClientSide(EntityPlayer player); - - void handleServerSide(EntityPlayer player); - -} diff --git a/src/main/java/crazypants/enderio/network/AbstractPacketTileEntity.java b/src/main/java/crazypants/enderio/network/MessageTileEntity.java similarity index 51% rename from src/main/java/crazypants/enderio/network/AbstractPacketTileEntity.java rename to src/main/java/crazypants/enderio/network/MessageTileEntity.java index 305d4da4..c5901bff 100644 --- a/src/main/java/crazypants/enderio/network/AbstractPacketTileEntity.java +++ b/src/main/java/crazypants/enderio/network/MessageTileEntity.java @@ -1,14 +1,15 @@ package crazypants.enderio.network; 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 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 class AbstractPacketTileEntity implements IPacketEio { +public abstract class MessageTileEntity implements IMessage { protected int x; protected int y; @@ -16,18 +17,17 @@ public class AbstractPacketTileEntity implements IPacketEi private Class tileClass; - protected AbstractPacketTileEntity() { + protected MessageTileEntity() { } - protected AbstractPacketTileEntity(T tile) { + protected MessageTileEntity(T tile) { tileClass = tile.getClass(); x = tile.xCoord; y = tile.yCoord; z = tile.zCoord; } - @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); @@ -36,7 +36,7 @@ public class AbstractPacketTileEntity implements IPacketEi } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); @@ -48,34 +48,6 @@ public class AbstractPacketTileEntity implements IPacketEi } } - @Override - public void handleClientSide(EntityPlayer player) { - T tile = getTileEntity(player.worldObj); - if(tile != null) { - handleClientSide(player, player.worldObj, tile); - } - } - - protected void handleClientSide(EntityPlayer player, World worldObj, T tile) { - handle(player, worldObj, tile); - } - - @Override - public void handleServerSide(EntityPlayer player) { - T tile = getTileEntity(player.worldObj); - if(tile != null) { - handleServerSide(player, player.worldObj, tile); - } - } - - protected void handleServerSide(EntityPlayer player, World worldObj, T tile) { - handle(player, worldObj, tile); - } - - protected void handle(EntityPlayer player, World worldObj, T tile) { - - } - protected T getTileEntity(World worldObj) { if(worldObj == null) { return null; @@ -90,4 +62,8 @@ public class AbstractPacketTileEntity implements IPacketEi return null; } + protected World getWorld(MessageContext ctx) + { + return ctx.getServerHandler().playerEntity.worldObj; + } } diff --git a/src/main/java/crazypants/enderio/network/PacketTileEntityNbt.java b/src/main/java/crazypants/enderio/network/MessageTileNBT.java similarity index 66% rename from src/main/java/crazypants/enderio/network/PacketTileEntityNbt.java rename to src/main/java/crazypants/enderio/network/MessageTileNBT.java index 630e29da..adce8ac6 100644 --- a/src/main/java/crazypants/enderio/network/PacketTileEntityNbt.java +++ b/src/main/java/crazypants/enderio/network/MessageTileNBT.java @@ -1,17 +1,18 @@ package crazypants.enderio.network; -import crazypants.enderio.Log; 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.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.Log; /** * Created by CrazyPants on 27/02/14. */ -public class PacketTileEntityNbt implements IPacketEio { +public class MessageTileNBT implements IMessage, IMessageHandler { TileEntity te; @@ -22,11 +23,11 @@ public class PacketTileEntityNbt implements IPacketEio { boolean renderOnUpdate = false; - public PacketTileEntityNbt() { + public MessageTileNBT() { } - public PacketTileEntityNbt(TileEntity te) { + public MessageTileNBT(TileEntity te) { this.te = te; x = te.xCoord; y = te.yCoord; @@ -36,7 +37,7 @@ public class PacketTileEntityNbt implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void toBytes(ByteBuf buffer) { buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); @@ -44,7 +45,7 @@ public class PacketTileEntityNbt implements IPacketEio { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf dis) { + public void fromBytes(ByteBuf dis) { x = dis.readInt(); y = dis.readInt(); z = dis.readInt(); @@ -52,20 +53,13 @@ public class PacketTileEntityNbt implements IPacketEio { } @Override - public void handleClientSide(EntityPlayer player) { - te = handle(player.getEntityWorld()); + public IMessage onMessage(MessageTileNBT msg, MessageContext ctx) + { + te = handle(ctx.getServerHandler().playerEntity.worldObj); if(te != null && renderOnUpdate) { te.getWorldObj().markBlockForUpdate(x,y,z); } - } - - @Override - public void handleServerSide(EntityPlayer player) { - System.out.println("crazypants.enderio.network.PacketTileEntity.handleServerSide"); - te = handle(player.getEntityWorld()); - if(te != null) { - te.getWorldObj().markBlockForUpdate(x,y,z); - } + return null; } private TileEntity handle(World world) { 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 new file mode 100644 index 00000000..872db4fc --- /dev/null +++ b/src/main/java/crazypants/enderio/network/PacketHandler.java @@ -0,0 +1,30 @@ +package crazypants.enderio.network; + +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; + +public class PacketHandler +{ + + public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("smt"); + + private static int ID = 0; + + public static int nextID() + { + return ID++; + } + + public static void sendToAllAround(IMessage message, TileEntity te, int range) + { + INSTANCE.sendToAllAround(message, new TargetPoint(te.getWorldObj().provider.dimensionId, te.xCoord, te.yCoord, te.zCoord, range)); + } + + public static void sendToAllAround(IMessage message, TileEntity te) + { + sendToAllAround(message, te, 16); + } +} diff --git a/src/main/java/crazypants/enderio/network/PacketPipeline.java b/src/main/java/crazypants/enderio/network/PacketPipeline.java deleted file mode 100644 index 901e5b11..00000000 --- a/src/main/java/crazypants/enderio/network/PacketPipeline.java +++ /dev/null @@ -1,254 +0,0 @@ -package crazypants.enderio.network; - -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageCodec; - -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.INetHandler; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * Packet pipeline class. Directs all registered packet data to be handled by - * the packets themselves. - * - * @author sirgingalot some code from: cpw - */ -@ChannelHandler.Sharable -public class PacketPipeline extends MessageToMessageCodec { - - private EnumMap channels; - private LinkedList> packets = new LinkedList>(); - private boolean isPostInitialised = false; - - /** - * Register your packet with the pipeline. Discriminators are automatically - * set. - * - * @param clazz - * the class to register - * - * @return whether registration was successful. Failure may occur if 256 - * packets have been registered or if the registry already contains - * this packet - */ - public boolean registerPacket(Class clazz) { - if(this.packets.size() > 256) { - // You should log here!! - return false; - } - - if(this.packets.contains(clazz)) { - // You should log here!! - return false; - } - - if(this.isPostInitialised) { - // You should log here!! - return false; - } - - this.packets.add(clazz); - return true; - } - - // In line encoding of the packet, including discriminator setting - @Override - protected void encode(ChannelHandlerContext ctx, IPacketEio msg, List out) throws Exception { - ByteBuf buffer = Unpooled.buffer(); - Class clazz = msg.getClass(); - if(!this.packets.contains(msg.getClass())) { - throw new NullPointerException("No Packet Registered for: " + msg.getClass().getCanonicalName()); - } - - byte discriminator = (byte) this.packets.indexOf(clazz); - buffer.writeByte(discriminator); - msg.encode(ctx, buffer); - FMLProxyPacket proxyPacket = new FMLProxyPacket(buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); - out.add(proxyPacket); - } - - // In line decoding and handling of the packet - @Override - protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List out) throws Exception { - ByteBuf payload = msg.payload(); - byte discriminator = payload.readByte(); - Class clazz = this.packets.get(discriminator); - if(clazz == null) { - throw new NullPointerException("No packet registered for discriminator: " + discriminator); - } - - IPacketEio pkt = clazz.newInstance(); - pkt.decode(ctx, payload.slice()); - - EntityPlayer player; - switch (FMLCommonHandler.instance().getEffectiveSide()) { - case CLIENT: - player = this.getClientPlayer(); - pkt.handleClientSide(player); - break; - - case SERVER: - INetHandler netHandler = ctx.channel().attr(NetworkRegistry.NET_HANDLER).get(); - player = ((NetHandlerPlayServer) netHandler).playerEntity; - pkt.handleServerSide(player); - break; - - default: - } - - out.add(pkt); - } - - // Method to call from FMLInitializationEvent - public void initalise() { - this.channels = NetworkRegistry.INSTANCE.newChannel("EnderIO", this); - registerPackets(); - } - - public void registerPackets() { - - } - - // Method to call from FMLPostInitializationEvent - // Ensures that packet discriminators are common between server and client by using logical sorting - public void postInitialise() { - if(this.isPostInitialised) { - return; - } - - this.isPostInitialised = true; - Collections.sort(this.packets, new Comparator>() { - - @Override - public int compare(Class clazz1, Class clazz2) { - int com = String.CASE_INSENSITIVE_ORDER.compare(clazz1.getCanonicalName(), clazz2.getCanonicalName()); - if(com == 0) { - com = clazz1.getCanonicalName().compareTo(clazz2.getCanonicalName()); - } - - return com; - } - }); - } - - @SideOnly(Side.CLIENT) - private EntityPlayer getClientPlayer() { - return Minecraft.getMinecraft().thePlayer; - } - - /** - * Send this message to everyone. - *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * - * @param message - * The message to send - */ - public void sendToAll(IPacketEio message) { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); - this.channels.get(Side.SERVER).writeAndFlush(message); - } - - /** - * Send this message to the specified player. - *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * - * @param message - * The message to send - * @param player - * The player to send it to - */ - public void sendTo(IPacketEio message, EntityPlayerMP player) { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); - this.channels.get(Side.SERVER).writeAndFlush(message); - } - - public void sendTo(Object message, EntityPlayerMP player) { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); - this.channels.get(Side.SERVER).writeAndFlush(message); - } - - /** - * Send this message to everyone within a certain range of a point. - *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * - * @param message - * The message to send - * @param point - * The - * {@link cpw.mods.fml.common.network.NetworkRegistry.TargetPoint} - * around which to send - */ - public void sendToAllAround(IPacketEio message, NetworkRegistry.TargetPoint point) { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point); - this.channels.get(Side.SERVER).writeAndFlush(message); - } - - public void sendToAllAround(IPacketEio message, TileEntity te, int range) { - sendToAllAround(message, new TargetPoint(te.getWorldObj().provider.dimensionId, te.xCoord, te.yCoord, te.zCoord, range)); - } - - public void sendToAllAround(IPacketEio message, TileEntity te) { - sendToAllAround(message, te, 16); - } - - /** - * Send this message to everyone within the supplied dimension. - *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * - * @param message - * The message to send - * @param dimensionId - * The dimension id to target - */ - public void sendToDimension(IPacketEio message, int dimensionId) { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.DIMENSION); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(dimensionId); - this.channels.get(Side.SERVER).writeAndFlush(message); - } - - /** - * Send this message to the server. - *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * - * @param message - * The message to send - */ - public void sendToServer(IPacketEio message) { - this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); - this.channels.get(Side.CLIENT).writeAndFlush(message); - } - -} 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/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 0a132df3..6c8d46de 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -12,12 +12,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.BlockEio; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketConfigSync; import crazypants.enderio.teleport.packet.PacketDrainStaff; @@ -29,11 +31,11 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt public static BlockTravelAnchor create() { - EnderIO.packetPipeline.registerPacket(PacketAccessMode.class); - EnderIO.packetPipeline.registerPacket(PacketTravelEvent.class); - EnderIO.packetPipeline.registerPacket(PacketDrainStaff.class); - EnderIO.packetPipeline.registerPacket(PacketOpenAuthGui.class); - EnderIO.packetPipeline.registerPacket(PacketConfigSync.class); + PacketHandler.INSTANCE.registerMessage(PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); ConnectionHandler ch = new ConnectionHandler(); FMLCommonHandler.instance().bus().register(ch); diff --git a/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java b/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java index 93a73f56..cf19413f 100644 --- a/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java +++ b/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java @@ -3,14 +3,14 @@ package crazypants.enderio.teleport; import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketConfigSync; public class ConnectionHandler { @SubscribeEvent public void onPlayerLoggon(PlayerLoggedInEvent evt) { - EnderIO.packetPipeline.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); + PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); } } diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index ee666362..2717a744 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -10,8 +10,8 @@ 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; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.gui.GuiContainerBase; @@ -86,7 +86,7 @@ public class GuiTravelAccessable extends GuiContainerBase { BlockCoord bc = te.getLocation(); PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode); - EnderIO.packetPipeline.sendToServer(p); + PacketHandler.INSTANCE.sendToServer(p); } @Override diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 938db9bc..b34193a7 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -10,8 +10,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.PacketTileEntityNbt; +import crazypants.enderio.network.MessageTileNBT; +import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; @@ -50,7 +50,7 @@ public class GuiTravelAuth extends GuiContainerBase { ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots; if(ta.authoriseUser(player, poo.enteredPassword)) { TileEntity te = ((TileEntity) ta); - EnderIO.packetPipeline.sendToServer(new PacketTileEntityNbt(te)); + PacketHandler.INSTANCE.sendToServer(new MessageTileNBT(te)); this.mc.displayGuiScreen((GuiScreen) null); this.mc.setIngameFocus(); diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index 06c5eab6..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; @@ -24,6 +23,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.power.PowerDisplayUtil.PowerType; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.util.BlockCoord; import crazypants.util.Util; @@ -158,7 +158,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IResourceToo ITravelAccessable ta = (ITravelAccessable) te; if(ta.getRequiresPassword(player)) { PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); - EnderIO.packetPipeline.sendToServer(p); + PacketHandler.INSTANCE.sendToServer(p); return equipped; } } diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 316f2751..9427609b 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -26,6 +26,7 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketDrainStaff; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; @@ -146,7 +147,7 @@ public class TravelController { ITravelAccessable ta = (ITravelAccessable) te; if(ta.getRequiresPassword(player)) { PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); - EnderIO.packetPipeline.sendToServer(p); + PacketHandler.INSTANCE.sendToServer(p); return; } } @@ -180,7 +181,7 @@ public class TravelController { if(requiredPower <= 0 || requiredPower <= EnderIO.itemTravelStaff.getEnergyStored(equipped)) { if(requiredPower > 0) { PacketDrainStaff p = new PacketDrainStaff(requiredPower); - EnderIO.packetPipeline.sendToServer(p); + PacketHandler.INSTANCE.sendToServer(p); } player.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, target.x, TravelController.instance.selectedCoord.y, TravelController.instance.selectedCoord.z); @@ -441,7 +442,7 @@ public class TravelController { private void sendTravelEvent(BlockCoord bc, TravelSource source, int powerUse) { PacketTravelEvent p = new PacketTravelEvent(bc.x, bc.y, bc.z, powerUse, source.getConserveMomentum()); - EnderIO.packetPipeline.sendToServer(p); + PacketHandler.INSTANCE.sendToServer(p); } private BlockCoord getActiveTravelBlock(EntityClientPlayerMP player) { 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/teleport/packet/PacketAccessMode.java b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java index 457dfbbe..90f8b78d 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java @@ -1,17 +1,17 @@ package crazypants.enderio.teleport.packet; -import crazypants.enderio.network.IPacketEio; -import crazypants.enderio.teleport.TileTravelAnchor; -import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; 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 cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.teleport.TileTravelAnchor; /** * Created by CrazyPants on 27/02/14. */ -public class PacketAccessMode implements IPacketEio { +public class PacketAccessMode implements IMessage, IMessageHandler { int x; int y; @@ -29,32 +29,29 @@ public class PacketAccessMode implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf dos) { - dos.writeInt(x); - dos.writeInt(y); - dos.writeInt(z); - dos.writeShort(mode.ordinal()); + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort(mode.ordinal()); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf data) { - x = data.readInt(); - y = data.readInt(); - z = data.readInt(); - mode = TileTravelAnchor.AccessMode.values()[data.readShort()]; + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + mode = TileTravelAnchor.AccessMode.values()[buf.readShort()]; } - @Override - public void handleClientSide(EntityPlayer player) { - } - - @Override - public void handleServerSide(EntityPlayer player) { - TileEntity te = player.worldObj.getTileEntity(x, y, z); + public IMessage onMessage(PacketAccessMode message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); if(te instanceof TileTravelAnchor) { - ((TileTravelAnchor) te).setAccessMode(mode); - player.worldObj.markBlockForUpdate(x, y, z); - player.worldObj.markTileEntityChunkModified(x,y,z,te); + ((TileTravelAnchor) te).setAccessMode(message.mode); + player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te); } + return null; } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java b/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java index e1886b64..0b7265fe 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java @@ -1,29 +1,29 @@ package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; +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.Config; -import crazypants.enderio.network.IPacketEio; -public class PacketConfigSync implements IPacketEio { +public class PacketConfigSync implements IMessage, IMessageHandler { @Override - public void encode(ChannelHandlerContext ctx, ByteBuf dos) { - dos.writeBoolean(Config.travelAnchorEnabled); - dos.writeInt(Config.travelAnchorMaxDistance); - dos.writeBoolean(Config.travelStaffEnabled); - dos.writeBoolean(Config.travelStaffBlinkEnabled); - dos.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled); - dos.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled); - dos.writeInt(Config.travelStaffBlinkPauseTicks); - dos.writeInt(Config.travelStaffMaxDistance); - dos.writeInt(Config.travelStaffMaxBlinkDistance); - dos.writeFloat(Config.travelStaffPowerPerBlockRF); + public void toBytes(ByteBuf buf) { + buf.writeBoolean(Config.travelAnchorEnabled); + buf.writeInt(Config.travelAnchorMaxDistance); + buf.writeBoolean(Config.travelStaffEnabled); + buf.writeBoolean(Config.travelStaffBlinkEnabled); + buf.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled); + buf.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled); + buf.writeInt(Config.travelStaffBlinkPauseTicks); + buf.writeInt(Config.travelStaffMaxDistance); + buf.writeInt(Config.travelStaffMaxBlinkDistance); + buf.writeFloat(Config.travelStaffPowerPerBlockRF); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf data) { + public void fromBytes(ByteBuf data) { Config.travelAnchorEnabled = data.readBoolean(); Config.travelAnchorMaxDistance = data.readInt(); Config.travelStaffEnabled = data.readBoolean(); @@ -37,13 +37,8 @@ public class PacketConfigSync implements IPacketEio { } @Override - public void handleClientSide(EntityPlayer player) { - + public IMessage onMessage(PacketConfigSync message, MessageContext ctx) + { + return null; } - - @Override - public void handleServerSide(EntityPlayer player) { - - } - } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java index 1933ccca..d3217875 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java @@ -1,13 +1,14 @@ package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; +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.network.IPacketEio; import crazypants.enderio.teleport.ItemTravelStaff; -public class PacketDrainStaff implements IPacketEio { +public class PacketDrainStaff implements IMessage, IMessageHandler { int powerUse; @@ -19,24 +20,23 @@ public class PacketDrainStaff implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { - buffer.writeInt(powerUse); + public void toBytes(ByteBuf buf) { + buf.writeInt(powerUse); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + public void fromBytes(ByteBuf buffer) { powerUse = buffer.readInt(); } @Override - public void handleClientSide(EntityPlayer player) { - } - - @Override - public void handleServerSide(EntityPlayer ep) { + public IMessage onMessage(PacketDrainStaff message, MessageContext ctx) { + EntityPlayer ep = ctx.getServerHandler().playerEntity; + if(ItemTravelStaff.isEquipped(ep)) { - EnderIO.itemTravelStaff.extractInternal(ep.getCurrentEquippedItem(), powerUse); + EnderIO.itemTravelStaff.extractInternal(ep.getCurrentEquippedItem(), message.powerUse); } + return null; } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java index 17c21957..f5a4aa29 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java @@ -1,13 +1,12 @@ package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; -import crazypants.enderio.network.IPacketEio; -public class PacketOpenAuthGui implements IPacketEio { +public class PacketOpenAuthGui implements IMessage, IMessageHandler { int x; int y; @@ -24,27 +23,21 @@ public class PacketOpenAuthGui implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { - buffer.writeInt(x); - buffer.writeInt(y); - buffer.writeInt(z); + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.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) { - + public IMessage onMessage(PacketOpenAuthGui message, cpw.mods.fml.common.network.simpleimpl.MessageContext ctx) { + ctx.getServerHandler().playerEntity.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ctx.getServerHandler().playerEntity.worldObj, message.x, message.y, message.z); + return null; } - - @Override - public void handleServerSide(EntityPlayer ep) { - ep.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ep.worldObj, x, y, z); - } - } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index 3e3c2a11..94edb45d 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -1,17 +1,17 @@ package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S12PacketEntityVelocity; +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.network.IPacketEio; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class PacketTravelEvent implements IPacketEio { +public class PacketTravelEvent implements IMessage, IMessageHandler { int x; int y; @@ -31,54 +31,51 @@ public class PacketTravelEvent implements IPacketEio { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { - buffer.writeInt(x); - buffer.writeInt(y); - buffer.writeInt(z); - buffer.writeInt(powerUse); - buffer.writeBoolean(conserveMotion); + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(powerUse); + buf.writeBoolean(conserveMotion); } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { - x = buffer.readInt(); - y = buffer.readInt(); - z = buffer.readInt(); - powerUse = buffer.readInt(); - conserveMotion = buffer.readBoolean(); + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + powerUse = buf.readInt(); + conserveMotion = buf.readBoolean(); } - + @Override - public void handleClientSide(EntityPlayer player) { - - } - - @Override - public void handleServerSide(EntityPlayer ep) { + public IMessage onMessage(PacketTravelEvent message, MessageContext ctx) { + + EntityPlayer ep = ctx.getServerHandler().playerEntity; ep.worldObj.playSoundEffect(ep.posX, ep.posY, ep.posZ, "mob.endermen.portal", 1.0F, 1.0F); ep.playSound("mob.endermen.portal", 1.0F, 1.0F); - ep.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5); + ep.setPositionAndUpdate(message.x + 0.5, message.y + 1.1, message.z + 0.5); - ep.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); + ep.worldObj.playSoundEffect(message.x, message.y, message.z, "mob.endermen.portal", 1.0F, 1.0F); ep.fallDistance = 0; - if(conserveMotion) { + if(message.conserveMotion) { Vector3d velocityVex = Util.getLookVecEio(ep); S12PacketEntityVelocity p = new S12PacketEntityVelocity(ep.getEntityId(), velocityVex.x, velocityVex.y, velocityVex.z); - EnderIO.packetPipeline.sendTo(p, (EntityPlayerMP) ep); - + ctx.getServerHandler().sendPacket(p); } - if(powerUse > 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().getItem() == EnderIO.itemTravelStaff) { + if(message.powerUse > 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().getItem() == EnderIO.itemTravelStaff) { ItemStack item = ep.getCurrentEquippedItem().copy(); - EnderIO.itemTravelStaff.extractInternal(item, powerUse); + EnderIO.itemTravelStaff.extractInternal(item, message.powerUse); ep.setCurrentItemOrArmor(0, item); } + return null; } } 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..3e38992c --- /dev/null +++ b/src/main/java/crazypants/util/ClientUtil.java @@ -0,0 +1,74 @@ +package crazypants.util; + +import java.util.Random; + +import net.minecraft.client.Minecraft; +import net.minecraft.nbt.NBTTagCompound; +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; +import crazypants.enderio.machine.generator.combustion.PacketCombustionTank; +import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator; +import crazypants.enderio.machine.generator.stirling.PacketBurnTime; +import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; + +/** + * 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); + } + + public static void spawnFarmParcticles(Random rand, BlockCoord bc) + { + double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2; + double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + Minecraft.getMinecraft().theWorld.spawnParticle("portal", bc.x + xOff, bc.y + yOff, bc.z + zOff, (rand.nextDouble() - 0.5) * 1.5, -rand.nextDouble(), (rand.nextDouble() - 0.5) * 1.5); + } + + public static void setTankNBT(PacketCombustionTank message, int x, int y, int z) + { + TileCombustionGenerator tile = (TileCombustionGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + + if (message.nbtRoot.hasKey("coolantTank")) + { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("coolantTank"); + tile.getCoolantTank().readFromNBT(tankRoot); + } + else + { + tile.getCoolantTank().setFluid(null); + } + if (message.nbtRoot.hasKey("fuelTank")) + { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("fuelTank"); + tile.getFuelTank().readFromNBT(tankRoot); + } + else + { + tile.getFuelTank().setFluid(null); + } + } + + public static void setStirlingBurnTime(PacketBurnTime message, int x, int y, int z) + { + TileEntityStirlingGenerator tile = (TileEntityStirlingGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + + tile.burnTime = message.burnTime; + tile.totalBurnTime = message.totalBurnTime; + } +}