+ Added crafting recipe for Biocomposite Collector.

$ Minor fixes.

6 files changed, 46 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
index bdeef2dd40..86beb71719 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
 import java.util.List;
+import java.util.Random;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -30,7 +31,11 @@ public class Machine_PooCollector extends BlockContainer {
 	@SideOnly(Side.CLIENT)
 	private IIcon textureTop;
 	@SideOnly(Side.CLIENT)
+	private IIcon textureTop2;
+	@SideOnly(Side.CLIENT)
 	private IIcon textureSide;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureSide2;
 
 	public Machine_PooCollector() {
 		super(Material.iron);
@@ -44,15 +49,24 @@ public class Machine_PooCollector extends BlockContainer {
 	 */
 	@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;
+	public IIcon getIcon(final int aSide, final int aMeta) {
+		if (aMeta <= 7) {
+			blockIcon = textureSide;
+			return aSide <= 1 ? this.textureTop : this.textureSide;			
+		}
+		else {
+			blockIcon = textureSide2;
+			return aSide <= 1 ? this.textureTop2 : this.textureSide2;			
+		}	
 	}
 
 	@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");
+		this.textureTop2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_top");
+		this.textureSide = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_sides");
+		this.textureSide2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_sides");
 	}
 
 	/**
@@ -140,7 +154,17 @@ public class Machine_PooCollector extends BlockContainer {
 	@Override
 	public int getBlockColor() {
 		// TODO Auto-generated method stub
-		return super.getBlockColor();
+		return 0;
+	}
+
+	@Override
+	public int damageDropped(final int damage) {
+		return damage;
+	}
+
+	@Override
+	public Item getItemDropped(final int meta, final Random rand, final int fortune) {
+		return Item.getItemFromBlock(this);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index 1d48bbbbf9..d55ee6b707 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -15,7 +15,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata
 	{
 		super(p_i45326_1_, p_i45326_1_);
 		this.mBlock = p_i45326_1_;
-		this.setMaxDamage(0);
+		this.setMaxDamage(15);
 		this.setHasSubtypes(true);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index d9b5f5dad2..a8b1d01115 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -369,7 +369,21 @@ public class RECIPES_Machines {
 					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
 					20 * 60, 
 					30);
-			
+
+			//Adv. Poo Collector		
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getTieredMachineHull(-1),
+							ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
+							CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 8 : 4),
+							CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4),
+							CI.getElectricPump(5, GTNH ? 12 : 6),
+							CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16)
+					}, 
+					CI.getAlternativeTieredFluid(5, 144 * 9), 
+					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 1, 8),
+					20 * 60 * 5, 
+					500);
 
 
 			//Basic Steam Turbine
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
index 237ea54e4c..4f40dcecfa 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.tileentities.machines;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -23,6 +24,7 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
 	
 	public TileEntityAdvPooCollector() {	
 		super(18, 128000);
+		Logger.INFO("Created");
 	}
 
 
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png
new file mode 100644
index 0000000000..a8e497ec01
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png
new file mode 100644
index 0000000000..34d35b44e3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png