Add support for placer ores, including config options for enable/disable and density. Increase orevein height to 9 layers. Give small ores a free 1 fortune boost to compensate for lower orevein densities.

4 files changed, 116 insertions, 18 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 06c5e77e1e..c4c014a78b 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -260,6 +260,8 @@ public class GT_Mod implements IGT_Mod {
         GT_Values.oreveinPercentage = tMainConfig.get(aTextGeneral, "oreveinPercentage_100",100).getInt(100);
         GT_Values.oreveinAttempts = tMainConfig.get(aTextGeneral, "oreveinAttempts_64",64).getInt(64);
         GT_Values.oreveinMaxPlacementAttempts = tMainConfig.get(aTextGeneral, "oreveinMaxPlacementAttempts_8",8).getInt(8);
+        GT_Values.oreveinPlacerOres = tMainConfig.get(aTextGeneral, "oreveinPlacerOres", true).getBoolean(true);
+        GT_Values.oreveinPlacerOresMultiplier = tMainConfig.get(aTextGeneral, "oreveinPlacerOresMultiplier",2).getInt(2);
         //GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64);
         GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30).getInt(30);
         GT_Values.cleanroomGlass= (float) tMainConfig.get("machines","ReinforcedGlassPercentageForCleanroom",5D).getDouble(5D);
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 8fefe5b719..c89d447d66 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -130,6 +130,14 @@ public class GT_Values {
      */
     public static int oreveinMaxPlacementAttempts;
     /**
+     * Whether or not to place small ores as placer ores for an orevein
+     */
+    public static boolean oreveinPlacerOres;
+    /** 
+     * Multiplier to control how many placer ores get generated.
+     */
+    public static int oreveinPlacerOresMultiplier;
+    /**
      * How wide to look for oreveins that affect a requested chunk. Trying to use oreveins larger than this will not work correctly. Increasing the size will cause additional worldgenerator lag.
      * Disabled for now, using 64 in Deep Dark, 32 elsewhere
      */
diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
index 748352e717..41bbd06f40 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.Random;

 

 import static gregtech.api.enums.GT_Values.debugOrevein;

+import static gregtech.api.enums.GT_Values.oreveinPlacerOres;

+import static gregtech.api.enums.GT_Values.oreveinPlacerOresMultiplier;

 

 public class GT_Worldgen_GT_Ore_Layer

         extends GT_Worldgen {

@@ -60,12 +62,12 @@ public class GT_Worldgen_GT_Ore_Layer
         //this.mAsteroid = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Asteroid", aAsteroid);

         this.mMinY = ((short) GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));

         short mMaxY = ((short) GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY));

-        if (mMaxY < (this.mMinY + 7))    {

+        if (mMaxY < (this.mMinY + 9))    {

             GT_Log.out.println(

                     "Oremix " + this.mWorldGenName +

                     " has invalid Min/Max heights!"

                 );

-            mMaxY = (short) (this.mMinY + 7);

+            mMaxY = (short) (this.mMinY + 9);

         }

         this.mMaxY = mMaxY;

         this.mWeight = ((short) GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));

@@ -183,6 +185,7 @@ public class GT_Worldgen_GT_Ore_Layer
 

          // To allow for early exit due to no ore placed in the bottom layer (probably because we are in the sky), unroll 1 pass through the loop

         // Now we do bottom-level-first oregen, and work our way upwards.

+        // Layer -1 Secondary and Sporadic

         int level = tMinY - 1; //Dunno why, but the first layer is actually played one below tMinY.  Go figure.

             for (int tX = wX; tX < eX; tX++) {

                 int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

@@ -193,7 +196,7 @@ public class GT_Worldgen_GT_Ore_Layer
                             placeCount[1]++;

                         }

                     }

-                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are only 1 per vertical column normally, reduce by 1/7 to compensate

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

                             placeCount[3]++;

                     }

@@ -205,7 +208,8 @@ public class GT_Worldgen_GT_Ore_Layer
             );

             return NO_ORE_IN_BOTTOM_LAYER;  // Exit early, didn't place anything in the bottom layer

         }

-        for (level = tMinY; level < (tMinY-1+3); level++) {

+        // Layers 0 & 1 Secondary and Sporadic

+        for (level = tMinY; level < (tMinY+2); level++) {

             for (int tX = wX; tX < eX; tX++) {

                 int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

                 for (int tZ = nZ; tZ < sZ; tZ++) {

@@ -215,71 +219,152 @@ public class GT_Worldgen_GT_Ore_Layer
                             placeCount[1]++;

                         }

                     }

-                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are only 1 per vertical column normally, reduce by 1/7 to compensate

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

                             placeCount[3]++;

                     }

                 }

             }

         }

-        // Low Middle layer is between + sporadic

-        // level should be = tMinY-1+3 from end of for loop

+        // Layer 2 is Secondary, in-between, and sporadic

             for (int tX = wX; tX < eX; tX++) {

                 int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

                 for (int tZ = nZ; tZ < sZ; tZ++) {

                     int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

-                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are only 1 per vertical column, reduce by 1/2 to compensate

+                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are reduce by 1/2 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {

                             placeCount[2]++;

                         }

                     }

-                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are only 1 per vertical column normally, reduce by 1/7 to compensate

+                    else if ( ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSecondaryMeta > 0) ) {

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) {

+                            placeCount[1]++;

+                        }

+                    }

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

+                            placeCount[3]++;

+                    }

+                }

+            }

+        level++; // Increment level to next layer

+        // Layer 3 is In-between, and sporadic

+            for (int tX = wX; tX < eX; tX++) {

+                int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

+                for (int tZ = nZ; tZ < sZ; tZ++) {

+                    int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

+                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are reduce by 1/2 to compensate

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {

+                            placeCount[2]++;

+                        }

+                    }

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

+                            placeCount[3]++;

+                    }

+                }

+            }

+        level++; // Increment level to next layer

+        // Layer 4 is In-between, Primary and sporadic

+            for (int tX = wX; tX < eX; tX++) {

+                int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

+                for (int tZ = nZ; tZ < sZ; tZ++) {

+                    int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

+                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are reduce by 1/2 to compensate

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {

+                            placeCount[2]++;

+                        }

+                    }

+                    else if ( ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0) ) {

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {

+                            placeCount[1]++;

+                        }

+                    }

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

                             placeCount[3]++;

                     }

                 }

             }

-        // High Middle layer is between + primary + sporadic

         level++; // Increment level to next layer

+        // Layer 5 is In-between, Primary and sporadic

             for (int tX = wX; tX < eX; tX++) {

                 int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

                 for (int tZ = nZ; tZ < sZ; tZ++) {

                     int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

-                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are only 1 per vertical column, reduce by 1/2 to compensate

+                    if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mBetweenMeta > 0) ) {  // Between are reduce by 1/2 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {

                             placeCount[2]++;

                         }

                     }

                     else if ( ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0) ) {

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {

-                            placeCount[0]++;

+                            placeCount[1]++;

+                        }

+                    }

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

+                            placeCount[3]++;

+                    }

+                }

+            }

+        level++; // Increment level to next layer

+        // Layer 6 is Primary and sporadic

+            for (int tX = wX; tX < eX; tX++) {

+                int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

+                for (int tZ = nZ; tZ < sZ; tZ++) {

+                    int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

+                    if ( ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0) ) {

+                        if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {

+                            placeCount[1]++;

                         }

                     }

-                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are only 1 per vertical column normally, reduce by 1/7 to compensate

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

                             placeCount[3]++;

                     }

                 }

             }

-        // Top two layers are primary + sporadic

         level++; // Increment level to next layer

-        for( ; level < (tMinY + 6); level++){ // should do two layers

+        // Layer 7 is Primary and sporadic

             for (int tX = wX; tX < eX; tX++) {

                 int placeX = Math.max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX))/localDensity);

                 for (int tZ = nZ; tZ < sZ; tZ++) {

                     int placeZ = Math.max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ))/localDensity);

                     if ( ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0) ) {

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {

-                            placeCount[0]++;

+                            placeCount[1]++;

                         }

                     }

-                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are only 1 per vertical column normally, reduce by 1/7 to compensate

+                    else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0) ) {  // Sporadics are reduce by 1/7 to compensate

                         if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))

                             placeCount[3]++;

                     }

                 }

             }

-        }    

+        //Place small ores for the vein

+        if( oreveinPlacerOres ) {

+            int nSmallOres = (eX-wX)*(sZ-nZ)*this.mDensity/10 * oreveinPlacerOresMultiplier;

+            //Small ores are placed in the whole chunk in which the vein appears.

+            for( int nSmallOresCount = 0; nSmallOresCount < nSmallOres; nSmallOresCount++) {

+                int tX = aRandom.nextInt(16) + aChunkX + 2;

+                int tZ = aRandom.nextInt(16) + aChunkZ + 2;

+                int tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.

+                if (this.mPrimaryMeta > 0 ) GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mPrimaryMeta, true, isUnderdark);

+                tX = aRandom.nextInt(16) + aChunkX + 2;

+                tZ = aRandom.nextInt(16) + aChunkZ + 2;

+                tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.

+                if (this.mSecondaryMeta > 0 ) GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mSecondaryMeta, true, isUnderdark);

+                tX = aRandom.nextInt(16) + aChunkX + 2;

+                tZ = aRandom.nextInt(16) + aChunkZ + 2;

+                tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.

+                if (this.mBetweenMeta > 0 ) GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mBetweenMeta, true, isUnderdark);

+                tX = aRandom.nextInt(16) + aChunkX + 2;

+                tZ = aRandom.nextInt(16) + aChunkZ + 2;

+                tY = aRandom.nextInt(190) + 10; // Y height can vary from 10 to 200 for small ores.

+                if (this.mSporadicMeta > 0 ) GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mSporadicMeta, true, isUnderdark);

+            }

+        }

         if (debugOrevein) {

             GT_Log.out.println(

                             " wXVein" + wXVein +

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 a76120150c..7b9067270f 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -200,6 +200,9 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
             return rList;
         }
         Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
+
+        // Everyone gets a free small fortune boost
+        aFortune += 1;
         if (!this.mNatural) {
             aFortune = 0;
         }