Ore System Rewrite part 2

Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in

7 files changed, 222 insertions, 193 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
index 2955afcfd8..7c826dd4ce 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
@@ -3,19 +3,17 @@ package gregtech.common.blocks;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class GT_Block_Ores extends GT_Block_Ores_Abstract {
@@ -32,6 +30,7 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 3000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 4000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 5000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 6000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 16000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 17000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 18000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
@@ -45,12 +44,14 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreBlackgranite.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 3000));
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreRedgranite.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 4000));
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreMarble.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 5000));
+                    GT_OreDictUnificator.registerOre(OrePrefixes.oreBasalt.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 6000));
                     if (tHideOres) {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 1000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 2000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 3000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 4000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 5000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 6000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 16000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 17000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 18000));
@@ -68,9 +69,12 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
     }
 
     @Override
-    public ITexture[] getStoneTexture(byte aSide, int aMetaData, Materials aMaterial) {
-        ITexture[] mStoneTextures = {new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0), new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0)};
-        return new ITexture[]{mStoneTextures[(aMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[aMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
+            return ((GT_TileEntity_Ores) tTileEntity).getDrops(GregTech_API.sBlockOres1, aFortune);
+        }
+        return mTemporaryTileEntity.get() == null ? new ArrayList() : mTemporaryTileEntity.get().getDrops(GregTech_API.sBlockOres1, aFortune);
     }
 
     @Override
@@ -84,6 +88,7 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
                 aList.add(new ItemStack(aItem, 1, i + 3000));
                 aList.add(new ItemStack(aItem, 1, i + 4000));
                 aList.add(new ItemStack(aItem, 1, i + 5000));
+                aList.add(new ItemStack(aItem, 1, i + 6000));
                 aList.add(new ItemStack(aItem, 1, i + 16000));
                 aList.add(new ItemStack(aItem, 1, i + 17000));
                 aList.add(new ItemStack(aItem, 1, i + 18000));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 865993a93f..518a97e73f 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -7,7 +7,6 @@ import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.items.GT_Generic_Block;
 import gregtech.common.render.GT_Renderer_Block;
 import net.minecraft.block.Block;
@@ -189,13 +188,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         aWorld.removeTileEntity(aX, aY, aZ);
     }
 
-    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            return ((GT_TileEntity_Ores) tTileEntity).getDrops(aFortune);
-        }
-        return mTemporaryTileEntity.get() == null ? new ArrayList() : mTemporaryTileEntity.get().getDrops(aFortune);
-    }
+    public abstract ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune);
 
     public TileEntity createTileEntity(World aWorld, int aMeta) {
         return new GT_TileEntity_Ores();
@@ -203,6 +196,4 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     @SideOnly(Side.CLIENT)
     public abstract void getSubBlocks(Item aItem, CreativeTabs aTab, List aList);
-
-    public abstract ITexture[] getStoneTexture(byte aSide, int aMetaData, Materials aMaterial);
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
index 881043e601..4d570662b2 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
@@ -2,13 +2,8 @@ package gregtech.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import exterminatorJeff.undergroundBiomes.common.UndergroundBiomes;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -16,7 +11,10 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
@@ -35,14 +33,14 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 5000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 6000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 7000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 8000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 9000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 10000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 11000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 12000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 13000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 14000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 15000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 16000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 17000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 18000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 19000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 20000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 21000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 22000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 23000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 1000));
@@ -52,14 +50,14 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 5000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 6000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 7000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 8000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 9000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 10000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 11000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 12000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 13000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 14000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 15000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 16000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 17000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 18000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 19000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 20000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 21000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 22000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 23000));
                     if (tHideOres) {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 1000));
@@ -69,14 +67,14 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 5000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 6000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 7000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 8000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 9000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 10000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 11000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 12000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 13000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 14000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 15000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 16000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 17000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 18000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 19000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 20000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 21000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 22000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 23000));
                     }
                 }
             }
@@ -89,9 +87,12 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
     }
 
     @Override
-    public ITexture[] getStoneTexture(byte aSide, int aMetaData, Materials aMaterial) {
-        ITexture[] mStoneTextures = {new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 0), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 1), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 2), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 3), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 7), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 0), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 1), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 2), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 3), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.igneousStone, 0, 7)};
-        return new ITexture[]{mStoneTextures[(aMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[aMetaData < 8000 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
+            return ((GT_TileEntity_Ores) tTileEntity).getDrops(GregTech_API.sBlockOresUb1, aFortune);
+        }
+        return mTemporaryTileEntity.get() == null ? new ArrayList() : mTemporaryTileEntity.get().getDrops(GregTech_API.sBlockOresUb1, aFortune);
     }
 
     @SideOnly(Side.CLIENT)
@@ -107,14 +108,14 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
                 aList.add(new ItemStack(aItem, 1, i + 5000));
                 aList.add(new ItemStack(aItem, 1, i + 6000));
                 aList.add(new ItemStack(aItem, 1, i + 7000));
-                aList.add(new ItemStack(aItem, 1, i + 8000));
-                aList.add(new ItemStack(aItem, 1, i + 9000));
-                aList.add(new ItemStack(aItem, 1, i + 10000));
-                aList.add(new ItemStack(aItem, 1, i + 11000));
-                aList.add(new ItemStack(aItem, 1, i + 12000));
-                aList.add(new ItemStack(aItem, 1, i + 13000));
-                aList.add(new ItemStack(aItem, 1, i + 14000));
-                aList.add(new ItemStack(aItem, 1, i + 15000));
+                aList.add(new ItemStack(aItem, 1, i + 16000));
+                aList.add(new ItemStack(aItem, 1, i + 1700));
+                aList.add(new ItemStack(aItem, 1, i + 18000));
+                aList.add(new ItemStack(aItem, 1, i + 19000));
+                aList.add(new ItemStack(aItem, 1, i + 20000));
+                aList.add(new ItemStack(aItem, 1, i + 21000));
+                aList.add(new ItemStack(aItem, 1, i + 22000));
+                aList.add(new ItemStack(aItem, 1, i + 23000));
             }
         }
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
index 34cca42da1..617ffb3931 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
@@ -2,13 +2,8 @@ package gregtech.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import exterminatorJeff.undergroundBiomes.common.UndergroundBiomes;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -16,7 +11,10 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
@@ -35,14 +33,14 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 5000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 6000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 7000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 8000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 9000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 10000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 11000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 12000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 13000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 14000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 15000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 16000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 17000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 18000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 19000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 20000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 21000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 22000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 23000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 1000));
@@ -52,14 +50,14 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 5000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 6000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 7000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 8000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 9000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 10000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 11000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 12000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 13000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 14000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 15000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 16000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 1700));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 18000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 19000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 20000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 21000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 22000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 23000));
                     if (tHideOres) {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 1000));
@@ -69,14 +67,14 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 5000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 6000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 7000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 8000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 9000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 10000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 11000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 12000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 13000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 14000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 15000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 16000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 17000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 18000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 19000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 20000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 21000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 22000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 23000));
                     }
                 }
             }
@@ -89,9 +87,12 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
     }
 
     @Override
-    public ITexture[] getStoneTexture(byte aSide, int aMetaData, Materials aMaterial) {
-        ITexture[] mStoneTextures = {new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 0), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 1), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 2), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 3), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 7), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 0), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 1), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 2), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 3), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.metamorphicStone, 0, 7)};
-        return new ITexture[]{mStoneTextures[(aMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[aMetaData < 8000 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
+            return ((GT_TileEntity_Ores) tTileEntity).getDrops(GregTech_API.sBlockOresUb2, aFortune);
+        }
+        return mTemporaryTileEntity.get() == null ? new ArrayList() : mTemporaryTileEntity.get().getDrops(GregTech_API.sBlockOresUb2, aFortune);
     }
 
     @SideOnly(Side.CLIENT)
@@ -107,14 +108,14 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
                 aList.add(new ItemStack(aItem, 1, i + 5000));
                 aList.add(new ItemStack(aItem, 1, i + 6000));
                 aList.add(new ItemStack(aItem, 1, i + 7000));
-                aList.add(new ItemStack(aItem, 1, i + 8000));
-                aList.add(new ItemStack(aItem, 1, i + 9000));
-                aList.add(new ItemStack(aItem, 1, i + 10000));
-                aList.add(new ItemStack(aItem, 1, i + 11000));
-                aList.add(new ItemStack(aItem, 1, i + 12000));
-                aList.add(new ItemStack(aItem, 1, i + 13000));
-                aList.add(new ItemStack(aItem, 1, i + 14000));
-                aList.add(new ItemStack(aItem, 1, i + 15000));
+                aList.add(new ItemStack(aItem, 1, i + 16000));
+                aList.add(new ItemStack(aItem, 1, i + 17000));
+                aList.add(new ItemStack(aItem, 1, i + 18000));
+                aList.add(new ItemStack(aItem, 1, i + 19000));
+                aList.add(new ItemStack(aItem, 1, i + 20000));
+                aList.add(new ItemStack(aItem, 1, i + 21000));
+                aList.add(new ItemStack(aItem, 1, i + 22000));
+                aList.add(new ItemStack(aItem, 1, i + 23000));
             }
         }
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
index 9a79577df9..d29d5ca85c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
@@ -2,13 +2,8 @@ package gregtech.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import exterminatorJeff.undergroundBiomes.common.UndergroundBiomes;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -16,7 +11,10 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
@@ -35,14 +33,14 @@ public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 5000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 6000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 7000) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 8000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 9000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 10000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 11000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 12000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 13000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 14000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 15000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 16000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 17000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 18000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 19000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 20000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 21000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 22000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + 23000) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                 if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 1000));
@@ -52,14 +50,14 @@ public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 5000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 6000));
                     GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 7000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 8000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 9000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 10000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 11000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 12000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 13000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 14000));
-                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 15000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 16000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 17000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 18000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 19000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 20000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 21000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 22000));
+                    GT_OreDictUnificator.registerOre("ore", new ItemStack(this, 1, i + 23000));
                     if (tHideOres) {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 1000));
@@ -69,14 +67,14 @@ public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 5000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 6000));
                         codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 7000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 8000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 9000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 10000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 11000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 12000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 13000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 14000));
-                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 15000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 16000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 17000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 18000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 19000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 20000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 21000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 22000));
+                        codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 23000));
                     }
                 }
             }
@@ -89,9 +87,12 @@ public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
     }
 
     @Override
-    public ITexture[] getStoneTexture(byte aSide, int aMetaData, Materials aMaterial) {
-        ITexture[] mStoneTextures = {new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 0), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 1), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 2), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 3), new GT_CopiedBlockTexture