- Removed recipe for crafting XP Convertor.

$ More small fixes & general QoL improvements for the Biocomposite Collector & it's simpler counterpart.

9 files changed, 123 insertions, 31 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
index 86beb71719..23fdfe9733 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -12,7 +12,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector;
 import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector;
 import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.BlockContainer;
@@ -169,12 +168,7 @@ public class Machine_PooCollector extends BlockContainer {
 
 	@Override
 	public int getRenderColor(int aMeta) {
-		if (aMeta <= 7) {
-			return super.getRenderColor(aMeta);			
-		}
-		else {
-			return Utils.rgbtoHexValue(128, 45, 45);		
-		}
+		return super.getRenderColor(aMeta);	
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 6d09f65f3f..3acc3b6bcf 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -3,12 +3,14 @@ package gtPlusPlus.core.handler.events;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -28,6 +30,9 @@ public class GeneralTooltipEventHandler {
 		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED) {
 			return;
 		}
+		if (event.itemStack == null) {
+			return;
+		}
 		
 		if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) {
 			if (BlockEventHandler.blockLimestone != null && !BlockEventHandler.blockLimestone.isEmpty()) {
@@ -50,6 +55,24 @@ public class GeneralTooltipEventHandler {
 			}
 		}
 
+		//Material Collector Tooltips
+		if (event.itemStack.getItem() == Item.getItemFromBlock(ModBlocks.blockPooCollector)) {			
+			//Normal
+			if (event.itemStack.getItemDamage() == 0) {
+				event.toolTip.add("Used to collect animal waste");
+				event.toolTip.add("Collects in a 5x4x5 area starting at Y+1");
+				event.toolTip.add("Use Hoppers/Pipes to empty");
+			}
+			//Advanced
+			else {
+				event.toolTip.add("Used to collect waste (Works on more than animals)");
+				event.toolTip.add("Significantly faster than the simple version");
+				event.toolTip.add("Collects in a 5x4x5 area starting at Y+1");
+				event.toolTip.add("Use Hoppers/Pipes to empty");
+			}
+		}
+		
+		
 
 		if (CORE.ConfigSwitches.enableAnimatedTurbines) {
 			boolean shift = false;					
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index d55ee6b707..c271ab39d0 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -1,8 +1,14 @@
 package gtPlusPlus.core.item.base.itemblock;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.data.AutoMap;
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -10,13 +16,36 @@ import net.minecraft.util.IIcon;
 public class ItemBlockMeta extends ItemBlockWithMetadata
 {
 	private final Block mBlock;
+	private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<Integer, AutoMap<String>>();
 
-	public ItemBlockMeta(final Block p_i45326_1_)
+	public ItemBlockMeta(final Block aBlock)
 	{
-		super(p_i45326_1_, p_i45326_1_);
-		this.mBlock = p_i45326_1_;
+		super(aBlock, aBlock);
+		this.mBlock = aBlock;
 		this.setMaxDamage(15);
 		this.setHasSubtypes(true);
+		if (aBlock instanceof ITileTooltip) {
+			ITileTooltip aTooltip = (ITileTooltip) aBlock;
+			//aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap());
+		}
+	}
+	
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		Block aThis = Block.getBlockFromItem(stack.getItem());
+		if (aThis != null) {
+			if (!aTooltips.isEmpty()) {
+				AutoMap<String> h = aTooltips.get(stack.getItemDamage());
+				if (h != null && !h.isEmpty()) {
+					for (String s : h) {
+						list.add(s);
+					}
+				}
+			}
+		}		
+		super.addInformation(stack, aPlayer, list, bool);		
 	}
 
 	/**
@@ -42,4 +71,44 @@ public class ItemBlockMeta extends ItemBlockWithMetadata
 	public String getUnlocalizedName(final ItemStack stack) {
 		return this.getUnlocalizedName() + "." + stack.getItemDamage();
 	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 1c0f3f8a28..6ed5c71bcc 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -235,14 +235,14 @@ public class RECIPES_General {
 			Logger.INFO("Added a recipe for Wither Cages.");
 		}
 
-		Logger.RECIPE("[Inspection] Xp Converter");
+		/*Logger.RECIPE("[Inspection] Xp Converter");
 		if (RecipeUtils.recipeBuilder(
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){
 			Logger.INFO("Added a recipe for XP Converter.");
-		}
+		}*/
 
 
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index a8b1d01115..092214a714 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -381,7 +381,7 @@ public class RECIPES_Machines {
 							CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16)
 					}, 
 					CI.getAlternativeTieredFluid(5, 144 * 9), 
-					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 1, 8),
+					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
 					20 * 60 * 5, 
 					500);
 
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 35de9263c3..ba592bcb65 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -436,8 +436,11 @@ public class CI {
 		else if (tier == 8){
 			return machineHull_UV;
 		}
+		else if (tier == 9){
+			return machineHull_MAX;
+		}
 		else {
-			return machineHull_MAX;			
+			return GregtechItemList.Casing_Multi_Use.get(1);			
 		}
 	}
 
@@ -469,8 +472,11 @@ public class CI {
 		else if (tier == 8){
 			return machineCasing_UV;
 		}
+		else if (tier == 9){
+			return machineCasing_MAX;
+		}
 		else {
-			return machineCasing_MAX;			
+			return GregtechItemList.Casing_Multi_Use.get(1);			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
index 4f40dcecfa..bdf899e22d 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -120,7 +120,7 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
 					}					
 				}				
 				aPooAmount = Math.max(Math.min(this.tank.getCapacity()-this.tank.getFluidAmount(), aPooAmount), 1);				
-				return aPooAmount * 4;
+				return aPooAmount * MathUtils.getRandomFromArray(new int[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 4});
 			}
 			else {
 				return 0;
@@ -148,6 +148,10 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
 		return aItem;
 	}
 	
+	public int getBaseTickRate() {
+		return MathUtils.randInt(50, 200);
+	}
+	
 	
 	
 
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
index 0435c0a591..2438d57355 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.tileentities.machines;
 
 import java.util.List;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -10,7 +11,6 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -141,6 +141,10 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 		readFromNBT(tag);
 	}
 	
+	public int getBaseTickRate() {
+		return MathUtils.randInt(200, 300);
+	}
+	
 	public abstract AutoMap<Class> aThingsToLookFor();
 	
 	public abstract void onPreLogicTick();
@@ -150,7 +154,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 		if (this.worldObj == null || this.worldObj.isRemote) {
 			return;
 		}
-		if (internalTickCounter % MathUtils.randInt(200, 300) == 0) {
+		if (internalTickCounter % getBaseTickRate() == 0) {
 			if (internalBlockLocation == null) {
 				internalBlockLocation = new BlockPos(this);
 			}
@@ -173,6 +177,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 							AxisAlignedBB box = AxisAlignedBB.getBoundingBox(startX, startY, startZ, endX, endY, endZ);
 							if (box != null) {								
 								for (Class c2 : aThingsToLookFor()) {
+									Logger.INFO("Looking for "+c2.getName());
 									tickEntityType(w, box, c2);										
 								}														
 							} else {
@@ -190,9 +195,10 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 	
 	@SuppressWarnings("unchecked")
 	public final void tickEntityType(World w, AxisAlignedBB box, Class aClassToFind) {
-		List<EntityAnimal> entities = w.getEntitiesWithinAABB(aClassToFind, box);	
+		List<?> entities = w.getEntitiesWithinAABB(aClassToFind, box);	
 		if (entities != null && !entities.isEmpty()) {
-			onPostTick(entities);
+			Logger.INFO("Found some "+aClassToFind.getName());
+			interactWithEntities(entities);
 		}
 	}
 	
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
index b14e7d80b1..3667dd6a29 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -11,9 +11,7 @@ import net.minecraft.entity.passive.EntityCow;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityMooshroom;
 import net.minecraft.entity.passive.EntitySheep;
-import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.passive.IAnimals;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -78,8 +76,6 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
 		if (aEntityToDrain.isEmpty()) {
 			aEntityToDrain.add(EntityAnimal.class);
 			aEntityToDrain.add(IAnimals.class);
-			aEntityToDrain.add(EntityVillager.class);
-			aEntityToDrain.add(EntityPlayer.class);
 		}
 		return aEntityToDrain;
 	}
@@ -109,12 +105,6 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
 					if (aPooMaker instanceof EntityAnimal || aPooMaker instanceof IAnimals) {
 						aPooAmount = MathUtils.randInt(5, 35);						
 					}
-					else if (aPooMaker instanceof EntityVillager) {
-						aPooAmount = MathUtils.randInt(25, 30);
-					}
-					else if (aPooMaker instanceof EntityPlayer) {
-						aPooAmount = MathUtils.randInt(1, 3);
-					}
 					else {
 						aPooAmount = MathUtils.randInt(1, 10);
 					}