From 94b24d92e0b533e0631c70748c32a0b5719bfb68 Mon Sep 17 00:00:00 2001
From: Richard Hendricks <richardhendricks@pobox.com>
Date: Mon, 2 Oct 2017 20:04:20 -0500
Subject: Add variable to configure number of attempts before giving up,
 default to 64. Set default orevein fill rate to 75%

---
 .../java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java  |  8 +++++---
 src/main/java/gregtech/common/GT_Worldgenerator.java    | 17 +++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/main/java/gregtech/common')

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 8008510b2b..7c89ea443f 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
@@ -15,7 +15,7 @@ import net.minecraft.world.chunk.IChunkProvider;
 import java.util.ArrayList;
 import java.util.Random;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GT_Values.debugOrevein;
 
 public class GT_Worldgen_GT_Ore_Layer
         extends GT_Worldgen {
@@ -123,7 +123,8 @@ public class GT_Worldgen_GT_Ore_Layer
                 }
             }
         }
-        if (D1) {
+        if (debugOrevein) {
+			String tDimensionName = aWorld.provider.getDimensionName();
             GT_Log.out.println(
                             "Generated Orevein:" + this.mWorldGenName +
                             " chunkX="+aChunkX+
@@ -132,7 +133,8 @@ public class GT_Worldgen_GT_Ore_Layer
                             " Secondary="+placeCount[1]+" "+new ItemStack(GregTech_API.sBlockOres1,1,mSecondaryMeta).getDisplayName()+
                             " Between="+placeCount[2]+" "+new ItemStack(GregTech_API.sBlockOres1,1,mBetweenMeta).getDisplayName()+
                             " Primary="+placeCount[0]+" "+new ItemStack(GregTech_API.sBlockOres1,1,mPrimaryMeta).getDisplayName()+
-                            " Sporadic="+placeCount[3]+" "+new ItemStack(GregTech_API.sBlockOres1,1,mSporadicMeta).getDisplayName()
+                            " Sporadic="+placeCount[3]+" "+new ItemStack(GregTech_API.sBlockOres1,1,mSporadicMeta).getDisplayName() +
+                            " Dimension=" + tDimensionName
             );
         }
 		// Didn't place anything, return false
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index a99da09916..47990cae64 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -18,6 +18,8 @@ import net.minecraft.world.gen.ChunkProviderHell;
 import static gregtech.api.enums.GT_Values.D1;
 import static gregtech.api.enums.GT_Values.oreveinPercentage;
 import static gregtech.api.enums.GT_Values.debugWorldGen;
+import static gregtech.api.enums.GT_Values.debugOrevein;
+import static gregtech.api.enums.GT_Values.oreveinAttempts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -120,7 +122,7 @@ public class GT_Worldgenerator
 
                     int tRandomWeight;
 					int i;
-                    for (i = 0; (i < 256) && (temp); i++) {
+                    for (i = 0; (i < oreveinAttempts) && (temp); i++) {
                         tRandomWeight = this.mRandom.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight);
                         for (GT_Worldgen tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) {
                             tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight;
@@ -136,15 +138,15 @@ public class GT_Worldgenerator
                             }
                         }
                     }
-					if (D1 & temp) {
+					if (debugOrevein & temp) {
 						GT_Log.out.println(
 										"No orevein selected!" +
-										" @ dim="+ this.mDimensionType+
 										" chunkX="+ this.mX +
 										" chunkZ="+ this.mZ + 
+										" oreveinAttemps=" + oreveinAttempts +
 										" dimensionName=" + tDimensionName
 						);
-					} else if (D1)
+					} else if (debugOrevein)
 					{
 						GT_Log.out.println(
 										"Orevein took " + i + 
@@ -155,11 +157,10 @@ public class GT_Worldgenerator
 						
                 }else
                 {
-                	if((oreveinRNG >= oreveinPercentage) && (D1))
+                	if((oreveinRNG >= oreveinPercentage) && (debugOrevein))
                 	{
 						GT_Log.out.println(
 										"Skipped orevein in this 3x3 chunk!" +
-										" @ dim="+ this.mDimensionType+
 										" chunkX="+ this.mX +
 										" chunkZ="+ this.mZ +
 										" RNG=" + oreveinRNG +
@@ -191,7 +192,7 @@ public class GT_Worldgenerator
             }
 			else
 			{
-				if (D1) {
+				if (debugOrevein) {
 					GT_Log.out.println(
 									"Skipped chunk, not 3x3 center" +
 									" @ dim="+this.mDimensionType+
@@ -214,7 +215,7 @@ public class GT_Worldgenerator
                 if ((GT_Worldgen_GT_Ore_Layer.sWeight > 0) && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) {
                     boolean temp = true;
                     int tRandomWeight;
-                    for (int i = 0; (i < 256) && (temp); i++) {
+                    for (int i = 0; (i < oreveinAttempts) && (temp); i++) {
                         tRandomWeight = aRandom.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight);
                         for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) {
                             tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight;
-- 
cgit