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

1 files changed, 53 insertions, 52 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index 2612797511..556307778d 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -26,15 +26,13 @@ import java.util.ArrayList;
 import java.util.Random;
 
 public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntity {
-    public static final 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)};
+    public static final 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_RenderedTexture(Textures.BlockIcons.MARBLE_STONE), new GT_RenderedTexture(Textures.BlockIcons.BASALT_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)};
     public static final ITexture[] mStoneTexturesUb1 = {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)};
     public static final ITexture[] mStoneTexturesUb2 = {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)};
     public static final ITexture[] mStoneTexturesUb3 = {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(UndergroundBiomes.sedimentaryStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 7), 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(UndergroundBiomes.sedimentaryStone, 0, 4), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 5), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 6), new GT_CopiedBlockTexture(UndergroundBiomes.sedimentaryStone, 0, 7)};
     public short mMetaData = 0;
     public boolean mNatural = false;
     public boolean mBlocked = true;
-    public static String mOreBlock = ""; //TODO remove static
-    //public static Block mOreBlock = GregTech_API.sBlockOres1;
 
     public static byte getHarvestData(short aMetaData) {
         Materials aMaterial = GregTech_API.sGeneratedMaterials[(aMetaData % 1000)];
@@ -45,12 +43,8 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
         return tByte;
     }
 
-    public static byte getOreMeta(short aMetaData, Block tBlock) {
-        return (byte) (aMetaData % 16000 / 1000);
-    }
-
     public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean smallOre) {
-        return setOreBlock(aWorld, aX, aY, aZ, aMetaData, false, false);
+        return setOreBlock(aWorld, aX, aY, aZ, aMetaData, smallOre, false);
     }
 
     public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean smallOre, boolean air) {
@@ -60,6 +54,7 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
         Block tBlock = aWorld.getBlock(aX, aY, aZ);
         Block tOreBlock = GregTech_API.sBlockOres1;
         int BlockMeta = aWorld.getBlockMetadata(aX, aY, aZ);
+        aMetaData += smallOre ? 16000 : 0;
         if ((aMetaData > 0) && ((tBlock != Blocks.air) || air)) {
             if (tBlock instanceof BlockMetadataBase) { //UBC Handling
                 if (tBlock == UndergroundBiomes.igneousStone) {
@@ -69,7 +64,7 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
                 } else if(tBlock == UndergroundBiomes.sedimentaryStone) {
                     tOreBlock = GregTech_API.sBlockOresUb3;
                 }
-                aMetaData += smallOre ? 8000 + (BlockMeta * 1000) : (BlockMeta * 1000);
+                aMetaData += (BlockMeta * 1000);
             } else { //Default Handling
                 if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) {
                     aMetaData += 1000;
@@ -85,9 +80,9 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
                     } else {
                         aMetaData += 3000;
                     }
-                } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) && smallOre) {
+                } /*else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) && smallOre) {
                     aMetaData  += 16000;
-                } else if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) {
+                }*/ else if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) {
                     return false;
                 }
             }
@@ -96,8 +91,6 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
             if ((tTileEntity instanceof GT_TileEntity_Ores)) {
                 ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) aMetaData);
                 ((GT_TileEntity_Ores) tTileEntity).mNatural = true;
-                ((GT_TileEntity_Ores) tTileEntity).mOreBlock = tOreBlock.getUnlocalizedName();
-                //System.out.println(mOreBlock);
             }
             return true;
         }
@@ -108,14 +101,12 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
         super.readFromNBT(aNBT);
         this.mMetaData = aNBT.getShort("m");
         this.mNatural = aNBT.getBoolean("n");
-        this.mOreBlock = aNBT.getString("o");
     }
 
     public void writeToNBT(NBTTagCompound aNBT) {
         super.writeToNBT(aNBT);
         aNBT.setShort("m", this.mMetaData);
         aNBT.setBoolean("n", this.mNatural);
-        aNBT.setString("o", this.mOreBlock);
     }
 
     public void onUpdated() {
@@ -135,29 +126,45 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
     }
 
     public void overrideOreBlockMaterial(Block aOverridingStoneBlock, byte aOverridingStoneMeta) {
-        this.mMetaData = ((short) (int) (this.mMetaData % 1000L + this.mMetaData / 16000L * 16000L));
-        if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.netherrack)) {
-            this.mMetaData = ((short) (this.mMetaData + 1000));
-        } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.end_stone)) {
-            this.mMetaData = ((short) (this.mMetaData + 2000));
-        } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, GregTech_API.sBlockGranites)) {
-            if (aOverridingStoneBlock == GregTech_API.sBlockGranites) {
-                if (aOverridingStoneMeta < 8) {
-                    this.mMetaData = ((short) (this.mMetaData + 3000));
+        //if(this.mMetaData < 3000) { //Fix issue where a black granite vein could override the meta of ores in an existing red granite vein.
+            //System.out.println("Data before: " + this.mMetaData);
+            this.mMetaData = ((short) (int) (this.mMetaData % 1000L + this.mMetaData / 16000L * 16000L));
+            //System.out.println("Data after: " + this.mMetaData);
+            if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.netherrack)) {
+                this.mMetaData = ((short) (this.mMetaData + 1000));
+            } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.end_stone)) {
+                this.mMetaData = ((short) (this.mMetaData + 2000));
+            } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, GregTech_API.sBlockGranites)) {
+                if (aOverridingStoneBlock == GregTech_API.sBlockGranites) {
+                    if (aOverridingStoneMeta < 8) {
+                        this.mMetaData = ((short) (this.mMetaData + 3000));
+                    } else {
+                        this.mMetaData = ((short) (this.mMetaData + 4000));
+                    }
                 } else {
-                    this.mMetaData = ((short) (this.mMetaData + 4000));
+                    this.mMetaData = ((short) (this.mMetaData + 3000));
                 }
-            } else {
-                this.mMetaData = ((short) (this.mMetaData + 3000));
-            }
-        } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, GregTech_API.sBlockStones)) {
-            if (aOverridingStoneBlock == GregTech_API.sBlockStones) {
-                if (aOverridingStoneMeta == 0) {
-                    this.mMetaData = ((short) (this.mMetaData + 5000));
+            } else if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, GregTech_API.sBlockStones)) {
+                if (aOverridingStoneBlock == GregTech_API.sBlockStones) {
+                    if (aOverridingStoneMeta < 8) {
+                        this.mMetaData = ((short) (this.mMetaData + 5000));
+                    } else {
+                        this.mMetaData = ((short) (this.mMetaData + 6000));
+                    }
                 }
             }
+            this.worldObj.setBlockMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, getHarvestData(this.mMetaData), 0);
+        //}
+    }
+
+    public TileEntity convertOreBlock(World aWorld, GT_TileEntity_Ores aTileEntityOres, int aX, int aY, int aZ) {
+        aWorld.setBlock(aX, aY, aZ, GregTech_API.sBlockOres1);
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if(tTileEntity instanceof GT_TileEntity_Ores) {
+            short aMeta = aTileEntityOres.mMetaData;
+            ((GT_TileEntity_Ores) tTileEntity).mMetaData = aMeta >= 16000 ? (short) ((aMeta % 1000) + 16000) : (short) (aMeta % 1000);
         }
-        this.worldObj.setBlockMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, getHarvestData(this.mMetaData), 0);
+        return tTileEntity;
     }
 
     public short getMetaData() {
@@ -168,14 +175,14 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
         return false;
     }
 
-    public ArrayList<ItemStack> getDrops(int aFortune) {
+    public ArrayList<ItemStack> getDrops(Block aDroppedOre, int aFortune) {
         ArrayList<ItemStack> rList = new ArrayList();
         if (this.mMetaData <= 0) {
             rList.add(new ItemStack(Blocks.cobblestone, 1, 0));
             return rList;
         }
         if (this.mMetaData < 16000) {
-            rList.add(new ItemStack(GregTech_API.sBlockOres1, 1, this.mMetaData));
+            rList.add(new ItemStack(aDroppedOre, 1, this.mMetaData));
             return rList;
         }
         Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
@@ -257,24 +264,18 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
         return rList;
     }
 
-    public ITexture[] getTexture(byte aSide) {
-        if(this.mMetaData % 1000 >=0) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
-            if ((aMaterial != null) && (this.mMetaData < 16000)) {
-                //return ((GT_Block_Ores_Abstract) mOreBlock).getStoneTexture(aSide, this.mMetaData, aMaterial);
-                //System.out.println(this.mOreBlock + " -- " + this.mMetaData);
-                if (this.mOreBlock.equalsIgnoreCase("gt.blockores")) {
-                    return new ITexture[]{mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
-                } else if (this.mOreBlock.equalsIgnoreCase("gt.blockores.ub1")) {
-                    return new ITexture[]{mStoneTexturesUb1[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData < 8000 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
-                } else if (this.mOreBlock.equalsIgnoreCase("gt.blockores.ub2")) {
-                    return new ITexture[]{mStoneTexturesUb2[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData < 8000 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
-                } else if (this.mOreBlock.equalsIgnoreCase("gt.blockores.ub3")) {
-                    return new ITexture[]{mStoneTexturesUb3[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData < 8000 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
-                }
+    public ITexture[] getTexture(Block aBlock, byte aSide) {
+        Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
+        if ((aMaterial != null) && (this.mMetaData < 32000)) {
+            if (aBlock instanceof GT_Block_Ores) {
+                return new ITexture[]{mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+            } else if (aBlock instanceof GT_Block_Ores_UB1) {
+                return new ITexture[]{mStoneTexturesUb1[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+            } else if (aBlock instanceof GT_Block_Ores_UB2) {
+                return new ITexture[]{mStoneTexturesUb2[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
+            } else if (aBlock instanceof GT_Block_Ores_UB3) {
+                return new ITexture[]{mStoneTexturesUb3[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex : OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa)};
             }
-        } else {
-            System.out.println(this.mMetaData + "######################## ERROR ########################");
         }
         return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_RenderedTexture(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex])};
     }