+ Added dehydrator recipes for denser ore types.

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

2 files changed, 94 insertions, 43 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index c0847c798d..abcccd1005 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -12,9 +12,9 @@ import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
@@ -27,64 +27,43 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-public class BlockBaseOre extends BlockBaseModular implements ITexturedTileEntity {
+public class BlockBaseOre extends BasicBlock implements ITexturedTileEntity {
 
-	@SuppressWarnings("unused")
-	private IIcon base;
-	@SuppressWarnings("unused")
-	private IIcon overlay;
-
-	protected Material blockMaterial;
-
-	protected int blockColour;
-	protected BlockTypes thisBlock;
+	private final Material blockMaterial;
 
 	public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) {
-		this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron, blockType, colour, 3);
-		blockMaterial = material;
-	}
-
-	public BlockBaseOre(final String unlocalizedName, final String blockMaterial,  final BlockTypes blockType, final int colour) {
-		this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2);
-	}
+		super(Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock);
+		this.blockMaterial = material;
+		this.setHardness(2.0f);
+		this.setResistance(6.0F);
+		this.setLightLevel(0.0F);
+		this.setHarvestLevel("pickaxe", 3);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setStepSound(soundTypeStone);		
+		this.setBlockName(Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName())));
 
-	public BlockBaseOre(final String unlocalizedName, final String blockMaterial, final net.minecraft.block.material.Material vanillaMaterial,  final BlockTypes blockType, final int colour, final int miningLevel) {
-		super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel);
-		try {
-		if (blockMaterial == null){
-			Logger.DEBUG_MATERIALS("Failed to generate "+unlocalizedName+" due to invalid material variable.");
-		}
 		
-		this.blockColour = colour;
-		this.thisBlock = blockType;
-		
-		if (this == null || this.blockMaterial == null){
-			Logger.DEBUG_MATERIALS("Issue during Ore construction, Material or Block is null.");
-		}
+		//this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
+		//this.setBlockName(this.blockMaterial.getLocalizedName()+" Ore");
 		
-		GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName())));
+		try {			
+		GameRegistry.registerBlock(this, ItemBlockOre.class, Utils.sanitizeString("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName())));
 		GT_OreDictUnificator.registerOre("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName()), ItemUtils.getSimpleStack(this));
-		LanguageRegistry.addName(this, blockMaterial+ " Ore");
+		LanguageRegistry.addName(this, blockMaterial.getLocalizedName()+ " Ore");
 		}
 		catch (Throwable t){
 			t.printStackTrace();
 		}
 	}
 
-	/**
-	 * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
-	 */
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderBlockPass(){
-		return 0;
-	}
-
 	@Override
 	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
 		return false;
 	}
+	
+	public Material getMaterialEx(){
+		return this.blockMaterial;
+	}
 
 	@Override
 	public int getRenderType() {
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);
+		}
+	}
+
+}