% Localized the Plasma Death Message.

$ Fixed electrolyzer recipes for ore dust.
$ Fixed bug with material generation system.
+ Added a custom renderer for the ore blocks.
$ Fixed renderer issue where the background texture was incorrect.

1 files changed, 49 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index bc0c12fd2f..cb0961eb66 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -1,17 +1,22 @@
 package gtPlusPlus.core.block.base;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.math.MathUtils;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.block.Block;
 import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-public class BlockBaseOre extends BlockBaseModular{
+public class BlockBaseOre extends BlockBaseModular implements ITexturedTileEntity {
 
 	@SuppressWarnings("unused")
 	private IIcon base;
@@ -24,7 +29,7 @@ public class BlockBaseOre extends BlockBaseModular{
 	}*/
 
 	protected Material blockMaterial;
-	
+
 	protected int blockColour;
 	protected BlockTypes thisBlock;
 	protected String thisBlockMaterial;
@@ -32,8 +37,9 @@ public class BlockBaseOre extends BlockBaseModular{
 
 	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);
@@ -64,16 +70,16 @@ public class BlockBaseOre extends BlockBaseModular{
 	    return true;
     }*/
 
-	@Override
+	/*@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(final IIconRegister iIcon)
 	{
 		this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
 		//this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone");
 		//this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay");
-	}
+	}*/
 
-	@Override
+	/*@Override
 	public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){
 		if (this.blockColour == 0){
 			return MathUtils.generateSingularRandomHexValue();
@@ -87,13 +93,43 @@ public class BlockBaseOre extends BlockBaseModular{
 			return MathUtils.generateSingularRandomHexValue();
 		}
 		return this.blockColour;
-	}
+	}*/
 
 	@Override
 	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
 		return false;
 	}
 
+	@Override
+	public int getRenderType() {
+		return CustomOreBlockRenderer.INSTANCE.mRenderID;
+	}
+
+	@Override
+	public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
+		return Blocks.stone.getIcon(0, 0);
+	}
+
+	@Override
+	public IIcon getIcon(int aSide, int aMeta) {
+		return Blocks.stone.getIcon(0, 0);
+	}	
+
+	/**
+	 * GT Texture Handler
+	 */
+
+	@Override
+	public ITexture[] getTexture(Block block, byte side) {
+		if (this.blockMaterial != null){
+			GT_RenderedTexture aIconSet = new GT_RenderedTexture(Materials.Iron.mIconSet.mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA());
+			if (aIconSet != null){
+				//Logger.INFO("[Render] Good Overlay.");
+				return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};				
+			}
+		}
+		return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.STONES[0], new short[]{240, 240, 240, 0})};			
+	}