+ Added the Waste Collector.

+ Added new constructor to BlockPos.java.
+ Added some time handling functions to Utils.java.
- Logging.

8 files changed, 486 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index 8c940baba3..9ab0f2eefb 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -6,6 +6,7 @@ import java.util.Set;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -48,6 +49,10 @@ public class BlockPos implements Serializable{
 	public BlockPos(IGregTechTileEntity b) {
 		this (b.getXCoord(), b.getYCoord(), b.getZCoord(), b.getWorld());
 	}
+	
+	public BlockPos(TileEntity b) {
+		this (b.xCoord, b.yCoord, b.zCoord, b.getWorldObj());
+	}
 
 	public String getLocationString() {
 		return "[X: "+this.xPos+"][Y: "+this.yPos+"][Z: "+this.zPos+"][Dim: "+this.dim+"]";
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
new file mode 100644
index 0000000000..a5f466b19f
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
@@ -0,0 +1,111 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
+public class ThreadPooCollector extends Thread {
+
+	public boolean canRun = true;   
+    public boolean isRunning = false;
+    
+    private static final long INIT_TIME;
+    private static long internalTickCounter = 0;
+
+	private static final ThreadPooCollector mThread;
+    private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors = new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>();
+    
+	
+	static {
+		mThread = new ThreadPooCollector();
+		INIT_TIME = (System.currentTimeMillis());
+	}
+	
+	public ThreadPooCollector() {
+        setName("gtpp.handler.poop");
+        run();
+	}
+	
+	public static ThreadPooCollector getInstance() {
+		return mThread;
+	}
+	
+	public static void addTask(TileEntityPooCollector aTile) {
+		BlockPos aTempPos = new BlockPos(aTile);
+		mPooCollectors.put(aTempPos.getUniqueIdentifier(), new Pair<BlockPos, TileEntityPooCollector>(aTempPos, aTile));
+	}
+	
+	public static void stopThread() {
+		mThread.canRun = false;
+	}
+	
+	
+	@Override
+	public void run() {
+		
+		if (!isRunning) {
+			isRunning = true;
+		}
+		else {
+			return;
+		}
+
+		while (canRun) {			
+			if (mPooCollectors.isEmpty() || GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED) {
+				continue;
+			} else {
+				internalTickCounter = Utils.getTicksFromSeconds(
+						Utils.getSecondsFromMillis(Utils.getMillisSince(INIT_TIME, System.currentTimeMillis())));
+				if (internalTickCounter % 100 == 0) {
+					for (Pair<BlockPos, TileEntityPooCollector> pair : mPooCollectors.values()) {
+						if (pair != null) {
+							BlockPos p = pair.getKey();
+							if (p != null) {
+								if (p.world != null) {
+									World w = p.world;									
+									if (w == null) {
+										continue;
+									}									
+									Chunk c = w.getChunkFromBlockCoords(p.xPos, p.zPos);
+									if (c != null) {
+										if (c.isChunkLoaded) {
+											int startX = p.xPos - 2;
+											int startY = p.yPos;
+											int startZ = p.zPos - 2;
+											int endX = p.xPos + 3;
+											int endY = p.yPos + 5;
+											int endZ = p.zPos + 3;
+											AxisAlignedBB box = AxisAlignedBB.getBoundingBox(startX, startY, startZ,
+													endX, endY, endZ);
+											if (box != null) {
+												@SuppressWarnings("unchecked")
+												List<EntityAnimal> animals = w.getEntitiesWithinAABB(EntityAnimal.class, box);
+												if (animals != null && !animals.isEmpty()) {
+													pair.getValue().onPostTick(animals);
+												}
+											} else {
+												continue;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}		
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index f95f8814a9..2b04356f52 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,23 +1,32 @@
 package gtPlusPlus.core.block;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockJukebox;
-import net.minecraft.block.material.Material;
-
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
-import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.block.general.*;
+import gtPlusPlus.core.block.general.BlockCompressedObsidian;
+import gtPlusPlus.core.block.general.BlockNet;
+import gtPlusPlus.core.block.general.BlockTankXpConverter;
+import gtPlusPlus.core.block.general.FirePit;
+import gtPlusPlus.core.block.general.FluidTankInfinite;
+import gtPlusPlus.core.block.general.HellFire;
+import gtPlusPlus.core.block.general.LightGlass;
+import gtPlusPlus.core.block.general.MiningExplosives;
+import gtPlusPlus.core.block.general.PlayerDoors;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
-import gtPlusPlus.core.block.machine.*;
+import gtPlusPlus.core.block.machine.CircuitProgrammer;
+import gtPlusPlus.core.block.machine.DecayablesChest;
+import gtPlusPlus.core.block.machine.FishTrap;
+import gtPlusPlus.core.block.machine.HeliumGenerator;
+import gtPlusPlus.core.block.machine.Machine_ModularityTable;
+import gtPlusPlus.core.block.machine.Machine_PooCollector;
+import gtPlusPlus.core.block.machine.Machine_ProjectTable;
+import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
+import gtPlusPlus.core.block.machine.Machine_TradeTable;
+import gtPlusPlus.core.block.machine.Machine_Workbench;
+import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced;
 import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake;
 import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
 
 public final class ModBlocks {
@@ -78,6 +87,8 @@ public final class ModBlocks {
 	public static Block blockCustomMobSpawner;
 	public static Block blockCustomSuperLight;
 	public static Block blockCustomJukebox;
+	
+	public static Block blockPooCollector;
 
 	public static void init() {
 		Logger.INFO("Initializing Blocks.");
@@ -127,6 +138,8 @@ public final class ModBlocks {
 		
 		//blockCustomSuperLight = new BlockSuperLight();
 		blockCustomJukebox = new Machine_SuperJukebox();
+		
+		blockPooCollector = new Machine_PooCollector();
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
new file mode 100644
index 0000000000..6aa3800b51
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -0,0 +1,127 @@
+package gtPlusPlus.core.block.machine;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
+import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+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.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.ItemFluidContainer;
+
+public class Machine_PooCollector extends BlockContainer {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureSide;
+
+	public Machine_PooCollector() {
+		super(Material.iron);
+		this.setBlockName("blockPooCollector");
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, "blockPooCollector");
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
+		return p_149691_1_ == 1 ? this.textureTop : this.blockIcon;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister p_149651_1_) {
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_top");
+		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_sides");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+			final int side, final float lx, final float ly, final float lz) {
+		if (world.isRemote) {
+			return true;
+		} else {
+			TileEntityInfiniteFluid tank = (TileEntityInfiniteFluid) world.getTileEntity(x, y, z);
+			if (tank != null) {
+				Item handItem;
+				try {
+					handItem = player.getHeldItem().getItem();
+				} catch (Throwable t) {
+					handItem = null;
+				}
+				if (handItem != null
+						&& (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
+								|| FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
+					if (tank.tank.getFluid() == null) {
+						try {
+							if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) {
+								ItemStack handItemStack = player.getHeldItem();
+								IFluidContainerItem container = (IFluidContainerItem) handItem;
+								FluidStack containerFluid = container.getFluid(handItemStack);
+								container.drain(handItemStack, container.getFluid(handItemStack).amount, true);
+								tank.tank.setFluid(containerFluid);
+							} else {
+								ItemStack handItemStack = player.getHeldItem();
+								FluidContainerRegistry.drainFluidContainer(handItemStack);
+								FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack);
+								ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack);
+								player.setItemInUse(emptyContainer, 0);
+
+								tank.tank.setFluid(containerFluid);
+							}
+						} catch (Throwable t) {
+							t.printStackTrace();
+						}
+					}
+
+				}
+				if (tank.tank.getFluid() != null) {
+					PlayerUtils.messagePlayer(player, "This tank contains " + tank.tank.getFluidAmount() + "L of "
+							+ tank.tank.getFluid().getLocalizedName());
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public int getRenderBlockPass() {
+		return 1;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityPooCollector();
+	}
+
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index da018675f3..8b6aa7c208 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -14,7 +14,7 @@ public class ModTileEntities {
 
 	public static void init() {
 		Logger.INFO("Registering Tile Entities.");
-		GameRegistry.registerTileEntity(TileEntityHeliumGenerator.class, "HeliumGenerator");
+		GameRegistry.registerTileEntity(TileEntityPooCollector.class, "TileEntityPooCollector");
 		GameRegistry.registerTileEntity(TileEntityWorkbench.class, "TileWorkbench");
 		GameRegistry.registerTileEntity(TileEntityWorkbenchAdvanced.class, "TileWorkbenchAdvanced");
 		GameRegistry.registerTileEntity(TileEntityFishTrap.class, "TileFishTrap");
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
new file mode 100644
index 0000000000..d5325d912f
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -0,0 +1,203 @@
+package gtPlusPlus.core.tileentities.machines;
+
+import java.util.List;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import net.minecraft.entity.passive.EntityAnimal;
+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 net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class TileEntityPooCollector extends TileEntity implements IFluidHandler {
+
+	public FluidTank tank = new FluidTank(Integer.MAX_VALUE);
+	private boolean needsUpdate = false;
+	private int updateTimer = 0;
+	private boolean hasRegistered = false;
+	private long internalTickCounter = 0;
+	private BlockPos internalBlockLocation;
+	
+	public TileEntityPooCollector() {	
+		super();
+	}
+
+	@Override
+	public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
+		needsUpdate = true;
+		return this.tank.fill(resource, doFill);
+	}
+
+	@Override
+	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
+		needsUpdate = true;
+		return this.tank.drain(resource.amount, doDrain);
+	}
+
+	@Override
+	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
+		needsUpdate = true;
+		FluidStack fluid = this.tank.getFluid();
+		// return this.tank.drain(maxDrain, doDrain);
+		if (fluid == null) {
+			return null;
+		}
+
+		int drained = maxDrain;
+		if (fluid.amount < drained) {
+			drained = fluid.amount;
+		}
+
+		FluidStack stack = new FluidStack(fluid, drained);
+		if (doDrain) {
+			fluid.amount -= drained;
+			if (fluid.amount <= 0) {
+				fluid = null;
+			}
+
+			if (this != null) {
+				FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluid, this.getWorldObj(), this.xCoord,
+						this.yCoord, this.zCoord, this.tank, 0));
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public boolean canFill(ForgeDirection from, Fluid fluid) {
+		return false;
+	}
+
+	@Override
+	public boolean canDrain(ForgeDirection from, Fluid fluid) {
+		return true;
+	}
+
+	@Override
+	public FluidTankInfo[] getTankInfo(ForgeDirection from) {
+		return new FluidTankInfo[] { this.tank.getInfo() };
+	}
+
+	@Override
+	public void updateEntity() {			
+		onPreTick();
+		onTick();		
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound tag) {
+		tank.readFromNBT(tag);
+		super.readFromNBT(tag);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound tag) {
+		tank.writeToNBT(tag);
+		super.writeToNBT(tag);
+	}
+
+	@Override
+	public Packet getDescriptionPacket() {
+		NBTTagCompound tag = new NBTTagCompound();
+		writeToNBT(tag);
+		return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, this.blockMetadata, tag);
+	}
+
+	@Override
+	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
+		NBTTagCompound tag = pkt.func_148857_g();
+		readFromNBT(tag);
+	}
+	
+	public void onPreTick() {
+		if (needsUpdate) {			
+			if (updateTimer == 0) {
+				updateTimer = 10; // every 10 ticks it will send an update
+			} else {
+				--updateTimer;
+				if (updateTimer == 0) {
+					worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+					needsUpdate = false;
+				}
+			}
+		}
+		if (!hasRegistered) {
+			//Register to the Handler.
+			/*if (!this.worldObj.isRemote) {
+				ThreadPooCollector.addTask(this);
+				if (!ThreadPooCollector.getInstance().isRunning) {
+					ThreadPooCollector.getInstance().run();
+				}
+			}*/
+		}
+	}
+	
+	public void onTick() {
+
+		if (this.worldObj == null || this.worldObj.isRemote) {
+			return;
+		}
+		if (internalTickCounter % 100 == 0) {
+			if (internalBlockLocation == null) {
+				internalBlockLocation = new BlockPos(this);
+			}
+			BlockPos p = internalBlockLocation;
+			if (p != null) {
+				if (p.world != null) {
+					World w = this.worldObj;
+					if (w == null) {
+						return;
+					}
+					Chunk c = w.getChunkFromBlockCoords(p.xPos, p.zPos);
+					if (c != null) {
+						if (c.isChunkLoaded) {
+							int startX = p.xPos - 2;
+							int startY = p.yPos;
+							int startZ = p.zPos - 2;
+							int endX = p.xPos + 3;
+							int endY = p.yPos + 5;
+							int endZ = p.zPos + 3;
+							AxisAlignedBB box = AxisAlignedBB.getBoundingBox(startX, startY, startZ, endX, endY, endZ);
+							if (box != null) {
+								@SuppressWarnings("unchecked")
+								List<EntityAnimal> animals = w.getEntitiesWithinAABB(EntityAnimal.class, box);
+								if (animals != null && !animals.isEmpty()) {
+									onPostTick(animals);
+								}
+							} else {
+								return;
+							}
+						}
+					}
+				}
+			}
+
+		}
+
+		internalTickCounter++;
+	}
+
+	public void onPostTick(List<EntityAnimal> animals) {
+		for (EntityAnimal aPooMaker : animals) {
+			Logger.INFO("Sewer found "+aPooMaker.getCommandSenderName());
+		}
+		
+	}
+	
+	public boolean addDrop(EntityAnimal aAnimal) {
+		return false;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 7d1d42abf0..d032384638 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -948,4 +948,16 @@ public class Utils {
 		return aOther;
 	}
 
+	public static long getMillisSince(long aStartTime, long aCurrentTime) {		
+		return (aCurrentTime - aStartTime);
+	}
+	
+	public static long getSecondsFromMillis(long aMillis) {
+		return (aMillis/1000);
+	}
+	
+	public static long getTicksFromSeconds(long aSeconds) {
+		return (aSeconds*20);
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java
index e86d1e4a12..f71615b7c1 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java
@@ -121,7 +121,7 @@ public class ClassTransformer_GT_BlockMachines_MetaPipeEntity {
 	 * 15 = BaseCustomTileEntity, Wrench lvl 3 to dismantle
 	 */
 	public static TileEntity createTileEntity(World aWorld, int aMeta) {
-		Logger.INFO("Creating Tile Entity with Meta of "+aMeta);
+		//Logger.INFO("Creating Tile Entity with Meta of "+aMeta);
 		if (aMeta < 4) {
 			return GregTech_API.constructBaseMetaTileEntity();
 		} else if (aMeta < 12) {