This commit is contained in:
CrazyPants committed 2014-06-05 14:55:21 +08:00
commit e159f6e4e5
146 files changed
+827 -1293

No files matched your search

@@ -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;
@@ -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();
@@ -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 {
@@ -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();
@@ -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));
}
}
@@ -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() {
@@ -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);
}
@@ -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) {
@@ -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));
}
}
@@ -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<TileEntity> {
public class PacketOpenConduitUI extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketOpenConduitUI, IMessage>{
private ForgeDirection dir;
@@ -23,20 +24,20 @@ public class PacketOpenConduitUI extends AbstractPacketTileEntity<TileEntity> {
}
@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;
}
}
@@ -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));
}
}
@@ -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));
}
}
@@ -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;
@@ -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;
@@ -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();
@@ -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();
}
}
@@ -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<TileEntity> {
public class PacketFluidLevel extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketFluidLevel, IMessage>{
NBTTagCompound tc;
public NBTTagCompound tc;
public PacketFluidLevel() {
}
@@ -25,28 +24,20 @@ public class PacketFluidLevel extends AbstractPacketTileEntity<TileEntity> {
}
@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;
}
}
@@ -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<TileEntity> {
public abstract class AbstractConduitBundlePacket extends MessageTileEntity<TileEntity> {
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) {
}
}
@@ -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<T extends IConduit> 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<? extends IConduit> 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) {
}
}
@@ -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<IConduit> {
public class PacketConnectionMode extends AbstractConduitPacket<IConduit> implements IMessageHandler<PacketConnectionMode, IMessage>{
private ForgeDirection dir;
private ConnectionMode mode;
@@ -24,24 +23,23 @@ public class PacketConnectionMode extends AbstractConduitPacket<IConduit> {
}
@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;
}
}
@@ -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<IExtractor> {
public class PacketExtractMode extends AbstractConduitPacket<IExtractor> implements IMessageHandler<PacketExtractMode, IMessage> {
private ForgeDirection dir;
private RedstoneControlMode mode;
@@ -27,26 +26,25 @@ public class PacketExtractMode extends AbstractConduitPacket<IExtractor> {
}
@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;
}
}
@@ -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<IItemConduit> {
public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit> implements IMessageHandler<PacketItemConduitFilter, IMessage> {
private ForgeDirection dir;
private boolean loopMode;
@@ -44,8 +39,7 @@ public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit>
}
@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<IItemConduit>
}
@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<IItemConduit>
}
@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);
@@ -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<IInsulatedRedstoneConduit> {
public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IInsulatedRedstoneConduit> implements IMessageHandler<PacketRedstoneConduitSignalColor, IMessage> {
private ForgeDirection dir;
private DyeColor col;
@@ -24,23 +23,22 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IIns
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
public void toBytes(ByteBuf buf) {
buf.writeShort(dir.ordinal());
buf.writeShort(col.ordinal());
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
public void fromBytes(ByteBuf buf) {
dir = ForgeDirection.values()[buf.readShort()];
col = DyeColor.values()[buf.readShort()];
}
@Override
protected void handleServerSide(EntityPlayer player, World worldObj, IConduitBundle tile, IInsulatedRedstoneConduit conduit) {
conduit.setSignalColor(dir, col);
worldObj.markBlockForUpdate(x, y, z);
public IMessage onMessage(PacketRedstoneConduitSignalColor message, MessageContext ctx) {
message.getTileCasted(ctx).setSignalColor(message.dir, message.col);
message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
return null;
}
}
@@ -1,7 +1,7 @@
package crazypants.enderio.conduit.redstone;
import crazypants.util.DyeColor;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.util.DyeColor;
public class Signal {
@@ -20,6 +20,7 @@ import crazypants.enderio.Log;
import crazypants.enderio.ModObject;
import crazypants.enderio.enderface.te.MeProxy;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.ITravelAccessable;
import crazypants.util.Lang;
@@ -46,7 +47,7 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider {
});
EnderIO.packetPipeline.registerPacket(PacketOpenRemoteUi.class);
PacketHandler.INSTANCE.registerMessage(PacketOpenRemoteUi.class, PacketOpenRemoteUi.class, PacketHandler.nextID(), Side.SERVER);
BlockEnderIO result = new BlockEnderIO();
result.init();
@@ -30,6 +30,7 @@ import org.lwjgl.opengl.GL12;
import crazypants.enderio.Config;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.TravelController;
import crazypants.render.RenderUtil;
import crazypants.util.BlockCoord;
@@ -555,7 +556,7 @@ public class GuiEnderface extends GuiScreen {
void openInterface(int x, int y, int z) {
PacketOpenRemoteUi p = new PacketOpenRemoteUi(x, y, z);
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
}
static class ViewableBlocks {
@@ -1,16 +1,16 @@
package crazypants.enderio.enderface;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import net.minecraft.client.renderer.texture.IIconRegister;
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 cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
public class ItemEnderface extends Item implements IGuiHandler {
@@ -1,7 +1,6 @@
package crazypants.enderio.enderface;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import java.lang.reflect.Method;
import java.util.HashSet;
@@ -22,9 +21,11 @@ import net.sf.cglib.proxy.MethodProxy;
import com.mojang.authlib.GameProfile;
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 PacketOpenRemoteUi implements IPacketEio {
public class PacketOpenRemoteUi implements IMessage, IMessageHandler<PacketOpenRemoteUi, IMessage> {
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> T createPlayerProxy(EntityPlayerMP player, PlayerProxy proxy) {
@@ -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 {
@@ -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 {
@@ -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;
@@ -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));
}
}
@@ -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;
@@ -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 {
@@ -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();
@@ -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 {
@@ -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<YetaWrenchPacketProcessor, IMessage> {
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;
}
}
@@ -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;
@@ -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));
}
}
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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<PacketDarkSteelPowerPacket, IMessage> {
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;
}
}
@@ -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<T extends AbstractMachineEntity> extends BlockContainer implements IGuiHandler, IResourceTooltipProvider {
@@ -53,9 +54,9 @@ public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> exte
protected final Class<T> 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<T> teClass, Material mat) {
@@ -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) {
@@ -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) {
@@ -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;
@@ -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<AbstractPoweredTaskEntity> {
public class PacketCurrentTask extends MessageTileEntity<AbstractPoweredTaskEntity> {
private NBTTagCompound nbtRoot;
@@ -27,14 +25,14 @@ public class PacketCurrentTask extends AbstractPacketTileEntity<AbstractPoweredT
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.network.IPacketEio;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
public class PacketIoMode implements IPacketEio {
public class PacketIoMode implements IMessage {
private int x;
private int y;
@@ -27,7 +27,7 @@ public class PacketIoMode implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
@@ -37,7 +37,7 @@ public class PacketIoMode implements IPacketEio {
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
@@ -4,10 +4,9 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.network.IPacketEio;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
public class PacketPowerStorage implements IPacketEio {
public class PacketPowerStorage implements IMessage {
private int x;
private int y;
@@ -25,7 +24,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);
@@ -34,7 +33,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();
@@ -1,12 +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.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 PacketRedstoneMode implements IPacketEio {
public class PacketRedstoneMode implements IMessage, IMessageHandler<PacketRedstoneMode, IMessage> {
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) {
@@ -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<TileAlloySmelter> {
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();
@@ -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);
}
@@ -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<PacketClientState, IMessage> {
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;
}
}
@@ -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<TileCrafter> {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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<TileFarmStation> {
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;
@@ -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;
@@ -1,6 +1,5 @@
package crazypants.enderio.machine.farm;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
@@ -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<PacketFarmAction, IMessage> {
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<BlockCoord>(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) {
}
}
@@ -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 {
@@ -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
}
}
}
}
}
}
@@ -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<TileCombustio
public static int renderId = -1;
public static BlockCombustionGenerator create() {
EnderIO.packetPipeline.registerPacket(PacketTanks.class);
PacketHandler.INSTANCE.registerMessage(PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT);
BlockCombustionGenerator gen = new BlockCombustionGenerator();
gen.init();
@@ -1,11 +1,5 @@
package crazypants.enderio.machine.generator.combustion;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import crazypants.enderio.EnderIO;
import crazypants.render.RenderUtil;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -14,10 +8,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
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 org.lwjgl.opengl.GL11;
import crazypants.render.RenderUtil;
public class CombustionGeneratorModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private static final String TEXTURE = "enderio:models/combustionGenerator.png";
@@ -122,7 +122,7 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple
public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float var8) {
TileCombustionGenerator gen = (TileCombustionGenerator) tileentity;
if(gen.coolantTank.getFluidAmount() <= 0 && gen.fuelTank.getFluidAmount() <= 0) {
if(gen.getCoolantTank().getFluidAmount() <= 0 && gen.getFuelTank().getFluidAmount() <= 0) {
return;
}
@@ -143,8 +143,8 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple
tes.startDrawingQuads();
BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.96, 0.96, 0.96);
renderTank(gen, bb, gen.coolantTank, true);
renderTank(gen, bb, gen.fuelTank, false);
renderTank(gen, bb, gen.getCoolantTank(), true);
renderTank(gen, bb, gen.getFuelTank(), false);
tes.draw();
tes.setTranslation(0, 0, 0);
@@ -4,9 +4,7 @@ import java.awt.Color;
import java.awt.Rectangle;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import org.lwjgl.opengl.GL11;
@@ -33,11 +31,11 @@ public class GuiCombustionGenerator extends GuiMachineBase {
protected void updateText() {
text.clear();
String heading = Lang.localize("combustionGenerator.coolantTank");
if(gen.coolantTank.getFluid() != null) {
heading += ": " + gen.coolantTank.getFluid().getFluid().getLocalizedName();
if(gen.getCoolantTank().getFluid() != null) {
heading += ": " + gen.getCoolantTank().getFluid().getFluid().getLocalizedName();
}
text.add(heading);
text.add(Fluids.toCapactityString(gen.coolantTank));
text.add(Fluids.toCapactityString(gen.getCoolantTank()));
}
});
@@ -48,11 +46,11 @@ public class GuiCombustionGenerator extends GuiMachineBase {
protected void updateText() {
text.clear();
String heading = Lang.localize("combustionGenerator.fuelTank");
if(gen.fuelTank.getFluid() != null) {
heading += ": " + gen.fuelTank.getFluid().getFluid().getLocalizedName();
if(gen.getFuelTank().getFluid() != null) {
heading += ": " + gen.getFuelTank().getFluid().getFluid().getLocalizedName();
}
text.add(heading);
text.add(Fluids.toCapactityString(gen.fuelTank));
text.add(Fluids.toCapactityString(gen.getFuelTank()));
}
});
@@ -100,10 +98,10 @@ public class GuiCombustionGenerator extends GuiMachineBase {
int x = guiLeft + 48;
int y = guiTop + 21;
if(gen.coolantTank.getFluidAmount() > 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");
@@ -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<TileCombustionGenerator> implements IMessageHandler<PacketCombustionTank, IMessage> {
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;
}
}
@@ -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<TileCombustionGenerator> {
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);
}
}
}
@@ -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;
}
}
@@ -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<TileEntityStirlingGenerator> {
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();
@@ -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<TileEntityStirlingGenerator> {
public class PacketBurnTime extends MessageTileEntity<TileEntityStirlingGenerator> implements IMessageHandler<PacketBurnTime, IMessage> {
private int burnTime;
private int totalBurnTime;
public int burnTime;
public int totalBurnTime;
public PacketBurnTime() {
}
@@ -22,23 +22,20 @@ public class PacketBurnTime extends AbstractPacketTileEntity<TileEntityStirlingG
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
public void toBytes(ByteBuf buf) {
buf.writeInt(burnTime);
buf.writeInt(totalBurnTime);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
public void fromBytes(ByteBuf buf) {
burnTime = buf.readInt();
totalBurnTime = buf.readInt();
}
@Override
protected void handleClientSide(EntityPlayer player, World worldObj, TileEntityStirlingGenerator tile) {
tile.burnTime = burnTime;
tile.totalBurnTime = totalBurnTime;
public IMessage onMessage(PacketBurnTime message, MessageContext ctx) {
ClientUtil.setStirlingBurnTime(message, message.x, message.y, message.z);
return null;
}
}
@@ -8,12 +8,12 @@ import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.power.IPowerEmitter;
import buildcraft.api.power.PowerHandler.Type;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineEntity;
import crazypants.enderio.machine.IoMode;
import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.machine.generator.PowerDistributor;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.power.Capacitors;
import crazypants.util.BlockCoord;
@@ -22,8 +22,8 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
public static final float ENERGY_PER_TICK = 2;
/** How many ticks left until the item is burnt. */
int burnTime = 0;
int totalBurnTime;
public int burnTime = 0;
public int totalBurnTime;
private PowerDistributor powerDis;
@@ -172,7 +172,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
}
}
if(!needsUpdate && sendBurnTimePacket) {
EnderIO.packetPipeline.sendToAllAround(new PacketBurnTime(this), this);
PacketHandler.sendToAllAround(new PacketBurnTime(this), this);
}
return needsUpdate;
@@ -10,10 +10,10 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.network.PacketHandler;
import crazypants.util.FluidUtil;
import crazypants.util.Util;
@@ -21,7 +21,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock<TileZombieGenerat
public static BlockZombieGenerator create() {
EnderIO.packetPipeline.registerPacket(PacketTank.class);
PacketHandler.INSTANCE.registerPacket(PacketZombieTank.class);
BlockZombieGenerator gen = new BlockZombieGenerator();
gen.init();
@@ -1,8 +1,8 @@
package crazypants.enderio.machine.generator.zombie;
import net.minecraft.entity.player.InventoryPlayer;
import crazypants.enderio.machine.AbstractMachineContainer;
import crazypants.enderio.machine.AbstractMachineEntity;
import net.minecraft.entity.player.InventoryPlayer;
public class ContainerZombieGenerator extends AbstractMachineContainer {
@@ -3,20 +3,19 @@ package crazypants.enderio.machine.generator.zombie;
import java.awt.Color;
import java.awt.Rectangle;
import net.minecraft.client.gui.FontRenderer;
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.IoMode;
import crazypants.enderio.machine.generator.combustion.ContainerCombustionEngine;
import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.gui.GuiToolTip;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
import crazypants.util.Lang;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.player.InventoryPlayer;
public class GuiZombieGenerator extends GuiMachineBase {
@@ -1,8 +1,8 @@
package crazypants.enderio.machine.generator.zombie;
import crazypants.enderio.EnderIO;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import crazypants.enderio.EnderIO;
public class NutrientTank extends FluidTank {
@@ -5,18 +5,17 @@ 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<TileZombieGenerator> {
public class PacketZombieTank extends MessageTileEntity<TileZombieGenerator> {
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<TileZombieGenerator> {
}
@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")) {
@@ -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;
}
@@ -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";
@@ -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();
@@ -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
@@ -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
@@ -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));
}
}
@@ -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<Channel> 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);
@@ -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();
@@ -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;
@@ -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<TilePowerMonitor> 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();
@@ -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));
}
}
@@ -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;
}
@@ -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<PacketConduitProbe, IMessage> {
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) {
@@ -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<TilePowerMonitor> {
public class PacketPowerInfo extends MessageTileEntity<TilePowerMonitor> {
private NBTTagCompound nbtRoot;
@@ -23,14 +22,14 @@ public class PacketPowerInfo extends AbstractPacketTileEntity<TilePowerMonitor>
}
@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);
}
@@ -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();
@@ -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;
}
@@ -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();
@@ -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 {
@@ -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;
Loaded 100 of 146 files, more files were not shown because too many files have changed in this diff. Show more