+ Added dehydrator recipes for denser ore types.

$ Fixed Ore Blocks not generating as intended.
% Improved Ore Generator.

1 files changed, 72 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
new file mode 100644
index 0000000000..cb3455f0c5
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -0,0 +1,72 @@
+package gtPlusPlus.core.item.base.itemblock;
+
+import java.util.List;
+
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.entity.EntityUtils;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class ItemBlockOre extends ItemBlock{
+
+	private final BlockBaseOre mThisOre;
+	private final Material mThisMaterial;
+	private final int mThisRadiation;
+	private final int mThisColour;
+
+	public ItemBlockOre(final Block block) {
+		super(block);
+		if (block instanceof BlockBaseOre){
+			this.mThisOre = (BlockBaseOre) block;
+			this.mThisMaterial = this.mThisOre.getMaterialEx();
+			this.mThisRadiation = this.mThisMaterial.vRadiationLevel;
+			this.mThisColour = this.mThisMaterial.getRgbAsHex();
+		}
+		else {
+			this.mThisOre = null;
+			this.mThisMaterial = null;
+			this.mThisRadiation = 0;
+			this.mThisColour = Utils.rgbtoHexValue(255, 255, 255);
+		}	
+	}
+
+	public int getRenderColor(final int aMeta) {
+		return this.mThisColour;
+	}
+
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		//Radioactive?
+		if (this.mThisRadiation > 0){
+			list.add(CORE.GT_Tooltip_Radioactive);
+		}
+
+		/**
+		 * Tooltip Handler for Ores
+		 */		
+		if (this.mThisMaterial == FLUORIDES.FLUORITE){
+			list.add("Mined from Sandstone and Limestone.");			
+		}	
+		else if (this.mThisMaterial != FLUORIDES.FLUORITE){
+			list.add("Mined from the Dark Dimension.");			
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
+		if (this.mThisRadiation > 0){
+			EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.mThisRadiation, world, entityHolding);
+		}
+	}
+
+}