diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 4947f348..7f24186a 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -1,84 +1,27 @@ package crazypants.enderio; -import java.util.ArrayList; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; -import com.google.common.collect.Lists; +import com.enderio.core.common.BlockEnder; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.tool.ToolUtil; -public abstract class BlockEio extends Block { - - protected final Class teClass; - protected final String name; +public abstract class BlockEio extends BlockEnder { protected BlockEio(String name, Class teClass) { - this(name, teClass, new Material(MapColor.ironColor)); + super(name, teClass); } protected BlockEio(String name, Class teClass, Material mat) { - super(mat); - this.teClass = teClass; - this.name = name; - setHardness(0.5F); - setBlockName(name); - setStepSound(Block.soundTypeMetal); - setHarvestLevel("pickaxe", 0); - setCreativeTab(EnderIOTab.tabEnderIO); + super(name, teClass, mat); } - protected void init() { - GameRegistry.registerBlock(this, name); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); - } - } - - @Override - public boolean hasTileEntity(int metadata) { - return teClass != null; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - if(teClass != null) { - try { - TileEntityEio te = teClass.newInstance(); - te.init(); - return te; - } catch (Exception e) { - Log.error("Could not create tile entity for block " + name + " for class " + teClass); - } - } - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - blockIcon = iIconRegister.registerIcon("enderio:" + name); - } - - /* Subclass Helpers */ - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { @@ -96,89 +39,6 @@ public abstract class BlockEio extends Block { } } - if (te instanceof ITankAccess) { - if (FluidUtil.fillInternalTankFromPlayerHandItem(world, x, y, z, entityPlayer, (ITankAccess) te)) { - return true; - } - if (FluidUtil.fillPlayerHandItemFromInternalTank(world, x, y, z, entityPlayer, (ITankAccess) te)) { - return true; - } - } - - if(entityPlayer.isSneaking()) { - return false; - } - - return openGui(world, x, y, z, entityPlayer, side); + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); } - - protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return true; - } - - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return false; - } - - public boolean doNormalDrops(World world, int x, int y, int z) { - return true; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(willHarvest) { - return true; - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - - @Override - public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { - super.harvestBlock(world, player, x, y, z, meta); - world.setBlockToAir(x, y, z); - } - - @Override - public final ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - if(doNormalDrops(world, x, y, z)) { - return super.getDrops(world, x, y, z, metadata, fortune); - } - return Lists.newArrayList(getNBTDrop(world, x, y, z, (TileEntityEio) world.getTileEntity(x, y, z))); - } - - public ItemStack getNBTDrop(World world, int x, int y, int z, TileEntityEio te) { - int meta = damageDropped(te.getBlockMetadata()); - ItemStack itemStack = new ItemStack(this, 1, meta); - processDrop(world, x, y, z, te, itemStack); - return itemStack; - } - - protected void processDrop(World world, int x, int y, int z, @Nullable TileEntityEio te, ItemStack drop) { - } - - protected TileEntityEio getTileEntityEio(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (teClass.isInstance(te)) { - return (TileEntityEio)te; - } - return null; - } - - protected boolean shouldDoWorkThisTick(World world, int x, int y, int z, int interval) { - TileEntityEio te = getTileEntityEio(world, x, y, z); - if (te == null) { - return world.getTotalWorldTime() % interval == 0; - } else { - return te.shouldDoWorkThisTick(interval); - } - } - protected boolean shouldDoWorkThisTick(World world, int x, int y, int z, int interval, int offset) { - TileEntityEio te = getTileEntityEio(world, x, y, z); - if (te == null) { - return (world.getTotalWorldTime() + offset) % interval == 0; - } else { - return te.shouldDoWorkThisTick(interval, offset); - } - } - } diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8bfb13c0..a15056f9 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -15,6 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.enderio.core.common.network.MessageTileNBT; import com.enderio.core.common.util.EntityUtil; import com.google.common.collect.ImmutableList; @@ -147,7 +148,6 @@ import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; import crazypants.enderio.material.OreDictionaryPreferences; -import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.rail.BlockEnderRail; import crazypants.enderio.teleport.ItemTravelStaff; @@ -157,7 +157,6 @@ import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import crazypants.enderio.teleport.telepad.BlockTelePad; import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; - import static crazypants.enderio.EnderIO.*; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 0a7b1829..f02b05f0 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -1,154 +1,7 @@ package crazypants.enderio; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; +import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.IProgressTile; -import com.enderio.core.common.util.Util; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.PacketProgress; -import crazypants.enderio.network.PacketHandler; -import com.enderio.core.common.util.BlockCoord; - -public abstract class TileEntityEio extends TileEntity { - - private final int checkOffset = (int) (Math.random() * 20); - private final boolean isProgressTile; - - protected int lastProgressScaled = -1; - protected int ticksSinceLastProgressUpdate; - - public TileEntityEio() { - isProgressTile = this instanceof IProgressTile; - } - - @Override - public final boolean canUpdate() { - return shouldUpdate() || isProgressTile; - } - - protected boolean shouldUpdate() { - return true; - } - - private long lastUpdate = 0; - - @Override - public final void updateEntity() { - if (Config.allowExternalTickSpeedup || worldObj.getTotalWorldTime() != lastUpdate) { - lastUpdate = worldObj.getTotalWorldTime(); - doUpdate(); - if (isProgressTile && !worldObj.isRemote) { - int curScaled = getProgressScaled(16); - if (++ticksSinceLastProgressUpdate >= getProgressUpdateFreq() || curScaled != lastProgressScaled) { - sendTaskProgressPacket(); - lastProgressScaled = curScaled; - } - } - } - } - - public final int getProgressScaled(int scale) { - if(isProgressTile) { - return Util.getProgressScaled(scale, (IProgressTile) this); - } - return 0; - } - - protected void doUpdate() { - - } - - protected void sendTaskProgressPacket() { - if(isProgressTile) { - PacketHandler.sendToAllAround(new PacketProgress((IProgressTile) this), this); - } - ticksSinceLastProgressUpdate = 0; - } - - /** - * Controls how often progress updates. Has no effect if your TE is not - * {@link IProgressTile}. - */ - protected int getProgressUpdateFreq() { - return 20; - } - - @Override - public final void readFromNBT(NBTTagCompound root) { - super.readFromNBT(root); - readCustomNBT(root); - } - - @Override - public final void writeToNBT(NBTTagCompound root) { - super.writeToNBT(root); - writeCustomNBT(root); - } - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound tag = new NBTTagCompound(); - writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readCustomNBT(pkt.func_148857_g()); - } - - protected abstract void writeCustomNBT(NBTTagCompound root); - - protected abstract void readCustomNBT(NBTTagCompound root); - - protected void updateBlock() { - if(worldObj != null) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - } - - protected boolean isPoweredRedstone() { - return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; - } - - /** - * Called directly after the TE is constructed. This is the place to call - * non-final methods. - */ - public void init() { - } - - private BlockCoord cachedLocation = null; - - public BlockCoord getLocation() { - return cachedLocation == null || !cachedLocation.equals(xCoord, yCoord, zCoord) ? (cachedLocation = new BlockCoord(this)) : cachedLocation; - } - - /** - * Call this with an interval (in ticks) to find out if the current tick is - * the one you want to do some work. This is staggered so the work of - * different TEs is stretched out over time. - * - * @see #shouldDoWorkThisTick(int, int) If you need to offset work ticks - */ - protected boolean shouldDoWorkThisTick(int interval) { - return shouldDoWorkThisTick(interval, 0); - } - - /** - * Call this with an interval (in ticks) to find out if the current tick is - * the one you want to do some work. This is staggered so the work of - * different TEs is stretched out over time. - * - * If you have different work items in your TE, use this variant to stagger - * your work. - */ - protected boolean shouldDoWorkThisTick(int interval, int offset) { - return (worldObj.getTotalWorldTime() + checkOffset + offset) % interval == 0; - } +public abstract class TileEntityEio extends TileEntityEnder { + // Nothing yet ;D } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 3fb5e05d..511767f3 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -49,6 +49,7 @@ import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; + import com.enderio.core.common.util.BlockCoord; public class ConduitUtil { diff --git a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java index f2de0d85..4318e903 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java +++ b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.gas; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -7,7 +9,6 @@ import cpw.mods.fml.common.network.ByteBufUtils; 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 PacketGasLevel extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java index a5ac768b..751c236c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.gui; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -9,7 +11,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; -import crazypants.enderio.network.MessageTileEntity; public class PacketOpenConduitUI extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index e5a2e15f..36ffb48b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -13,9 +13,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.enderio.network.NetworkUtil; public class ExistingItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index 62e0f0a6..a5943b3b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -15,9 +15,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.enderio.network.NetworkUtil; public class ItemFilter implements IInventory, IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java index 8d600e29..22800316 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.enderio.network.NetworkUtil; public class ModItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index e0ad9cc2..e8d626b6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound; import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.enderio.network.NetworkUtil; /** * diff --git a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java index 53eb9b21..903e0e8f 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -7,7 +9,6 @@ import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.network.MessageTileEntity; import crazypants.util.ClientUtil; public class PacketFluidLevel extends MessageTileEntity implements IMessageHandler{ diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java index 198ef4ad..533a2dbd 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java @@ -1,7 +1,8 @@ package crazypants.enderio.conduit.packet; +import com.enderio.core.common.network.MessageTileEntity; + import net.minecraft.tileentity.TileEntity; -import crazypants.enderio.network.MessageTileEntity; public abstract class AbstractConduitBundlePacket extends MessageTileEntity { diff --git a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java index 3c2b4d3b..e92c9115 100644 --- a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java @@ -1,7 +1,7 @@ package crazypants.enderio.item.skull; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.TileEntityEio; +import net.minecraft.nbt.NBTTagCompound; public class TileEndermanSkull extends TileEntityEio { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index bbc94a3d..89d943ab 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -18,6 +18,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; +import com.enderio.core.common.network.PacketProgress; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -28,7 +30,6 @@ import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.waila.IWailaInfoProvider; @@ -197,7 +198,7 @@ public abstract class AbstractMachineBlock exte } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack stack) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack stack) { if(te != null) { ((AbstractMachineEntity) te).writeToItemStack(stack); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index cc674db3..c4550513 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.api.common.util.IProgressTile; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.power.IInternalPowerReceiver; diff --git a/src/main/java/crazypants/enderio/machine/PacketProgress.java b/src/main/java/crazypants/enderio/machine/PacketProgress.java deleted file mode 100644 index 0df18e9f..00000000 --- a/src/main/java/crazypants/enderio/machine/PacketProgress.java +++ /dev/null @@ -1,49 +0,0 @@ -package crazypants.enderio.machine; - -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; - -import com.enderio.core.common.util.IProgressTile; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; - -public class PacketProgress extends MessageTileEntity implements IMessageHandler { - - private float progress; - - public PacketProgress() { - } - - public PacketProgress(IProgressTile tile) { - super(tile.getTileEntity()); - progress = tile.getProgress(); - if (progress == 0) { - progress = -1; - } - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeFloat(progress); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - progress = buf.readFloat(); - } - - @Override - public IMessage onMessage(PacketProgress message, MessageContext ctx) { - TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); - if(tile instanceof IProgressTile) { - ((IProgressTile) tile).setProgress(message.progress); - } - return null; - } -} diff --git a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java index ed66f0e2..eccca6ce 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java +++ b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.buffer; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; 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; public class PacketBufferIO extends MessageTileEntity implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 456fb778..271ededc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; +import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -37,7 +38,6 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; @@ -443,7 +443,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { drop.stackTagCompound = new NBTTagCompound(); if(te != null) { ((TileCapBank) te).writeCommonNBT(drop.stackTagCompound); diff --git a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java index db242667..98a38314 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java @@ -1,12 +1,13 @@ package crazypants.enderio.machine.crafter; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; 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; public class PacketCrafter extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java index 92626d4a..9c55d232 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.farm; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; 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; public class PacketFarmLockedSlot extends MessageTileEntity implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java index b3c36434..d06b79ae 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java @@ -1,12 +1,13 @@ package crazypants.enderio.machine.farm; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketUpdateNotification extends MessageTileEntity implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java index 41bf4c64..3873a548 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java @@ -1,12 +1,13 @@ package crazypants.enderio.machine.generator.combustion; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; import crazypants.util.ClientUtil; public class PacketCombustionTank extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 70cef437..c3392aab 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -11,9 +11,9 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; import crazypants.enderio.ModObject; import crazypants.enderio.fluid.FluidFuelRegister; diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java index 32ee643c..04d67ff6 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.generator.stirling; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; 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 MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index 8a4798eb..570cf064 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -8,8 +8,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.IProgressTile; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java index 157b2a90..608065dc 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.generator.zombie; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -7,7 +9,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketNutrientTank extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index bcc7791f..c2c4b872 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -11,9 +11,9 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index c93f8e5c..38415efe 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -13,7 +13,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.util.Util; import crazypants.enderio.machine.AbstractMachineEntity; diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index cebe3220..2134c8aa 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -11,12 +11,12 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; +import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.IProgressTile; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector4f; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java index 4c63d8fb..21dfab7a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java @@ -7,6 +7,9 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -16,8 +19,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.machine.invpanel.server.ItemEntry; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketItemInfo extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java index 08f735b6..1b993f46 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java @@ -7,6 +7,9 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -14,8 +17,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; import crazypants.enderio.network.PacketHandler; public class PacketItemList extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java index c1f0ae0d..1d6ce684 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java @@ -7,6 +7,10 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import com.enderio.core.common.network.CompressedDataOutput; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -14,9 +18,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.machine.invpanel.server.ItemEntry; -import crazypants.enderio.network.CompressedDataOutput; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; import crazypants.enderio.network.PacketHandler; public class PacketRequestMissingItems extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index ab1d74bf..f83040db 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.ITankAccess; +import com.enderio.core.api.common.util.ITankAccess; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.TileConduitBundle; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java index 12188d3f..f267cdf8 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java @@ -1,11 +1,14 @@ package crazypants.enderio.machine.invpanel.client; import crazypants.enderio.machine.invpanel.InventoryDatabase; -import crazypants.enderio.network.CompressedDataInput; + import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; + +import com.enderio.core.common.network.CompressedDataInput; + import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java index 9c7c825e..20a558ba 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java @@ -6,9 +6,8 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.invpanel.InventoryDatabase; import crazypants.enderio.machine.invpanel.PacketDatabaseReset; import crazypants.enderio.machine.invpanel.TileInventoryPanel; -import crazypants.enderio.network.CompressedDataInput; -import crazypants.enderio.network.CompressedDataOutput; import crazypants.enderio.network.PacketHandler; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -16,6 +15,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; + +import com.enderio.core.common.network.CompressedDataInput; +import com.enderio.core.common.network.CompressedDataOutput; + import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; diff --git a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java index 095880e5..978b789d 100644 --- a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java +++ b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.killera; +import com.enderio.core.common.network.MessageTileEntity; + import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketSwing extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 99f839f2..10e46725 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -26,11 +26,11 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.util.ITankAccess; import com.enderio.core.common.vecmath.Vector3d; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index b32bf9b6..a47d938f 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -11,6 +11,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.vecmath.Vector3f; import cpw.mods.fml.common.registry.GameRegistry; @@ -181,7 +182,7 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { TileElectricLight light = (TileElectricLight) te; if(light == null) { return; diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index b61293da..8cb2ffbe 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.monitor; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -7,8 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketPowerInfo extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java index 41a9ce45..d3a78885 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.obelisk.weather; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketActivateWeather extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index c49a0dd8..3c8eda2b 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.WorldInfo; -import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.api.common.util.IProgressTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java index 9f6444f7..ed072a0c 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java @@ -9,8 +9,8 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index b8d93930..86e22cd2 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -23,6 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -32,7 +33,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; import crazypants.enderio.item.IRotatableFacade; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; @@ -217,7 +217,7 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; if(tef != null) { ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java index c9103b86..bbabfe4f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java @@ -1,10 +1,10 @@ package crazypants.enderio.machine.painter; +import crazypants.enderio.TileEntityEio; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import crazypants.enderio.TileEntityEio; public class TileEntityPaintedBlock extends TileEntityEio implements IPaintableTileEntity { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 41eb67b8..b12addce 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -13,14 +13,13 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ITankAccess; import com.enderio.core.common.vecmath.Vector3f; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; - import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; public class TileReservoir extends TileEntityEio implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 76042011..39676527 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -11,8 +11,8 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java index 50aa0f7c..3e33f073 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.tank; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -7,8 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketTank extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index bb1c028c..bc87d30d 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -14,10 +14,10 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.FluidUtil.FluidAndStackResult; -import com.enderio.core.common.util.ITankAccess; import com.enderio.core.common.util.ItemUtil; import crazypants.enderio.machine.AbstractMachineEntity; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java index e393ef26..c913f815 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java @@ -1,12 +1,13 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.network.NetworkUtil; + 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 cpw.mods.fml.relauncher.Side; -import crazypants.enderio.network.NetworkUtil; import crazypants.enderio.network.PacketHandler; public class PacketAddRemoveChannel implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java index a35c16db..6f3c36c9 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -5,12 +5,13 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; +import com.enderio.core.common.network.NetworkUtil; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; 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.NetworkUtil; public class PacketChannelList implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java index 68f5207f..ee1e0bab 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -7,8 +10,6 @@ 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.filter.ItemFilter; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketItemFilter extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java index 6041c79d..6d3d0932 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java @@ -1,13 +1,14 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; 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; public class PacketSendRecieveChannel extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java index e647adc9..8dc7dce2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java @@ -6,6 +6,9 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.List; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -13,8 +16,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketSendRecieveChannelList extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index d47f5ca5..e53d55df 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; @@ -17,7 +18,6 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.network.PacketHandler; @@ -70,7 +70,7 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { drop.stackTagCompound = new NBTTagCompound(); if(te != null) { ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java index 6f0fe12e..56cb114e 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java @@ -1,12 +1,13 @@ package crazypants.enderio.machine.vacuum; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; 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; public class PacketVaccumChest extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java index 2d85bdd0..a42ffff5 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.vat; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidTank; 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; public class PacketDumpTank extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java index 1cabb95a..fd86f389 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.vat; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -8,8 +11,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketTanks extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java index 8e2f500f..ddb7c520 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.vat; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -11,7 +13,6 @@ import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.PoweredTaskProgress; -import crazypants.enderio.network.MessageTileEntity; public class PacketVatProgress extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vat/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java index e2c0fa63..067103a6 100644 --- a/src/main/java/crazypants/enderio/machine/vat/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java @@ -10,9 +10,9 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ITankAccess; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 1b30dab8..63a85d34 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -10,12 +10,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; import crazypants.enderio.network.PacketHandler; public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */{ @@ -124,7 +124,7 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { drop.stackTagCompound = new NBTTagCompound(); if(te instanceof TileWirelessCharger) { ((TileWirelessCharger) te).writeCustomNBT(drop.stackTagCompound); diff --git a/src/main/java/crazypants/enderio/network/CompressedDataInput.java b/src/main/java/crazypants/enderio/network/CompressedDataInput.java deleted file mode 100644 index 2162605b..00000000 --- a/src/main/java/crazypants/enderio/network/CompressedDataInput.java +++ /dev/null @@ -1,30 +0,0 @@ -package crazypants.enderio.network; - -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.zip.InflaterInputStream; - -public class CompressedDataInput extends DataInputStream { - - public CompressedDataInput(byte[] compressed) { - this(new ByteArrayInputStream(compressed)); - } - - public CompressedDataInput(InputStream in) { - super(new BufferedInputStream(new InflaterInputStream(in))); - } - - public int readVariable() throws IOException { - int b, res = 0; - int shift = 0; - do { - b = readUnsignedByte(); - res |= (b & 0x7F) << shift; - shift += 7; - } while(b >= 0x80); - return res; - } -} diff --git a/src/main/java/crazypants/enderio/network/CompressedDataOutput.java b/src/main/java/crazypants/enderio/network/CompressedDataOutput.java deleted file mode 100644 index c77c266f..00000000 --- a/src/main/java/crazypants/enderio/network/CompressedDataOutput.java +++ /dev/null @@ -1,34 +0,0 @@ -package crazypants.enderio.network; - -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.zip.DeflaterOutputStream; - -public class CompressedDataOutput extends DataOutputStream { - - final ByteArrayOutputStream baos; - - public CompressedDataOutput() { - this(new ByteArrayOutputStream()); - } - - private CompressedDataOutput(ByteArrayOutputStream baos) { - super(new BufferedOutputStream(new DeflaterOutputStream(baos))); - this.baos = baos; - } - - public void writeVariable(int value) throws IOException { - while((value & ~0x7F) != 0) { - writeByte(value | 0x80); - value >>= 7; - } - writeByte(value); - } - - public byte[] getCompressed() throws IOException { - close(); - return baos.toByteArray(); - } -} diff --git a/src/main/java/crazypants/enderio/network/MessageTileEntity.java b/src/main/java/crazypants/enderio/network/MessageTileEntity.java deleted file mode 100644 index 9c6b2762..00000000 --- a/src/main/java/crazypants/enderio/network/MessageTileEntity.java +++ /dev/null @@ -1,67 +0,0 @@ -package crazypants.enderio.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.Log; - -public abstract class MessageTileEntity implements IMessage { - - protected int x; - protected int y; - protected int z; - - private Class tileClass; - - protected MessageTileEntity() { - } - - protected MessageTileEntity(T tile) { - tileClass = tile.getClass(); - x = tile.xCoord; - y = tile.yCoord; - z = tile.zCoord; - } - - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - ByteBufUtils.writeUTF8String(buf, tileClass.getName()); - - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - String str = ByteBufUtils.readUTF8String(buf); - try { - tileClass = (Class) Class.forName(str); - } catch (Exception e) { - Log.error("AbstractPacketTileEntity could not load tile entity class: " + str); - } - } - - protected T getTileEntity(World worldObj) { - if(worldObj == null) { - return null; - } - TileEntity te = worldObj.getTileEntity(x, y, z); - if(te == null) { - return null; - } - if(tileClass.isAssignableFrom(te.getClass())) { - return (T) te; - } - return null; - } - - protected World getWorld(MessageContext ctx) { - return ctx.getServerHandler().playerEntity.worldObj; - } -} diff --git a/src/main/java/crazypants/enderio/network/MessageTileNBT.java b/src/main/java/crazypants/enderio/network/MessageTileNBT.java deleted file mode 100644 index fe988e82..00000000 --- a/src/main/java/crazypants/enderio/network/MessageTileNBT.java +++ /dev/null @@ -1,77 +0,0 @@ -package crazypants.enderio.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.Log; - -/** - * Created by CrazyPants on 27/02/14. - */ -public class MessageTileNBT implements IMessage, IMessageHandler { - - TileEntity te; - - int x; - int y; - int z; - NBTTagCompound tags; - - boolean renderOnUpdate = false; - - public MessageTileNBT() { - - } - - public MessageTileNBT(TileEntity te) { - this.te = te; - x = te.xCoord; - y = te.yCoord; - z = te.zCoord; - tags = new NBTTagCompound(); - te.writeToNBT(tags); - } - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeInt(x); - buffer.writeInt(y); - buffer.writeInt(z); - NetworkUtil.writeNBTTagCompound(tags, buffer); - } - - @Override - public void fromBytes(ByteBuf dis) { - x = dis.readInt(); - y = dis.readInt(); - z = dis.readInt(); - tags = NetworkUtil.readNBTTagCompound(dis); - } - - @Override - public IMessage onMessage(MessageTileNBT msg, MessageContext ctx) { - te = handle(ctx.getServerHandler().playerEntity.worldObj); - if(te != null && renderOnUpdate) { - te.getWorldObj().markBlockForUpdate(x,y,z); - } - return null; - } - - private TileEntity handle(World world) { - if(world == null) { - Log.warn("PacketUtil.handleTileEntityPacket: TileEntity null world processing tile entity packet."); - return null; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te == null) { - Log.warn("PacketUtil.handleTileEntityPacket: TileEntity null when processing tile entity packet."); - return null; - } - te.readFromNBT(tags); - return te; - } -} diff --git a/src/main/java/crazypants/enderio/network/NetworkUtil.java b/src/main/java/crazypants/enderio/network/NetworkUtil.java deleted file mode 100644 index 6a3b167c..00000000 --- a/src/main/java/crazypants/enderio/network/NetworkUtil.java +++ /dev/null @@ -1,58 +0,0 @@ -package crazypants.enderio.network; - -import io.netty.buffer.ByteBuf; - -import java.io.IOException; - -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTSizeTracker; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.FMLCommonHandler; - -/** - * Created by CrazyPants on 27/02/14. - */ -public class NetworkUtil { - - public static NBTTagCompound readNBTTagCompound(ByteBuf dataIn) { - try { - short size = dataIn.readShort(); - if(size < 0) { - return null; - } else { - byte[] buffer = new byte[size]; - dataIn.readBytes(buffer); - return CompressedStreamTools.func_152457_a(buffer, NBTSizeTracker.field_152451_a); - } - } catch (IOException e) { - FMLCommonHandler.instance().raiseException(e, "Custom Packet", true); - return null; - } - } - - public static void writeNBTTagCompound(NBTTagCompound compound, ByteBuf dataout) { - try { - if(compound == null) { - dataout.writeShort(-1); - } else { - byte[] buf = CompressedStreamTools.compress(compound); - dataout.writeShort((short) buf.length); - dataout.writeBytes(buf); - } - } catch (IOException e) { - FMLCommonHandler.instance().raiseException(e, "PacketUtil.readTileEntityPacket.writeNBTTagCompound", true); - } - } - - public static byte[] readByteArray(ByteBuf buf) { - int size = buf.readMedium(); - byte[] res = new byte[size]; - buf.readBytes(res); - return res; - } - - public static void writeByteArray(ByteBuf buf, byte[] arr) { - buf.writeMedium(arr.length); - buf.writeBytes(arr); - } -} diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index ad77006c..717356f6 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -13,10 +13,10 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.network.MessageTileNBT; import com.enderio.core.common.util.Lang; import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; public class GuiTravelAuth extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 27ec12f6..2ca0d6cd 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.FMLCommonHandler; @@ -179,7 +180,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { TileTravelAnchor anchor = (TileTravelAnchor) te; if(anchor == null) { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java index 1c1359ab..222e3656 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java @@ -1,5 +1,7 @@ package crazypants.enderio.teleport.telepad; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -7,7 +9,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketOpenServerGui extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java index 9bee600f..4f4cf498 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java @@ -1,5 +1,7 @@ package crazypants.enderio.teleport.telepad; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; @@ -8,7 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketTeleport extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java index f22a8778..12d4c776 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java @@ -2,13 +2,13 @@ package crazypants.enderio.teleport.telepad; import io.netty.buffer.ByteBuf; +import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; public class PacketUpdateCoords extends MessageTileEntity implements IMessageHandler{ diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 4651c060..80d151c8 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -22,8 +22,8 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; +import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.IProgressTile; import com.enderio.core.common.util.Util; import com.google.common.collect.Lists; import com.google.common.collect.Queues; diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 0083f9b5..e774dcd2 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -46,7 +46,6 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; - import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { diff --git a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java index fa2c1b6b..632c7e69 100644 --- a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java @@ -1,5 +1,7 @@ package crazypants.enderio.xp; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -7,7 +9,6 @@ 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 cpw.mods.fml.relauncher.Side; -import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.PacketHandler; public class PacketDrainPlayerXP extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java index 0e054fff..caa214ab 100644 --- a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java +++ b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java @@ -1,5 +1,7 @@ package crazypants.enderio.xp; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -8,7 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.PacketHandler; public class PacketExperianceContainer extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java index 03219485..bc95285e 100644 --- a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java @@ -1,5 +1,7 @@ package crazypants.enderio.xp; +import com.enderio.core.common.network.MessageTileEntity; + import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -7,7 +9,6 @@ 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 cpw.mods.fml.relauncher.Side; -import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.PacketHandler; public class PacketGivePlayerXP extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/util/BuildcraftUtil.java b/src/main/java/crazypants/util/BuildcraftUtil.java index 53115c9a..e0b31860 100644 --- a/src/main/java/crazypants/util/BuildcraftUtil.java +++ b/src/main/java/crazypants/util/BuildcraftUtil.java @@ -6,9 +6,9 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; +import com.enderio.core.api.common.util.IFluidReceptor; +import com.enderio.core.api.common.util.IItemReceptor; import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.IFluidReceptor; -import com.enderio.core.common.util.IItemReceptor; import com.enderio.core.common.util.ItemUtil; public class BuildcraftUtil implements IItemReceptor, IFluidReceptor {