From 8c867332c01b823293006ea5fa9f91fe79d55008 Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Sat, 16 Sep 2017 13:15:51 -0500 Subject: Missed a execCount. Modified output to print dimension name instead of dimension number, since TF and others reuse dim 0. --- .../java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 2 -- src/main/java/gregtech/common/GT_Worldgenerator.java | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 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 17f35c2e54..8008510b2b 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 @@ -108,7 +108,6 @@ public class GT_Worldgen_GT_Ore_Layer if ((this.mBetweenMeta > 0) && ((aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0) || (aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0))) { if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false)) placeCount[2]++; - execCount[2]++; } if (this.mPrimaryMeta > 0) { for (int i = tMinY + 3; i < tMinY + 6; i++) { @@ -127,7 +126,6 @@ public class GT_Worldgen_GT_Ore_Layer if (D1) { GT_Log.out.println( "Generated Orevein:" + this.mWorldGenName + - " @ dim="+aDimensionType+ " chunkX="+aChunkX+ " chunkZ="+aChunkZ+ " chunkY="+tMinY+ diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index d69cf5c9c7..a99da09916 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -112,10 +112,12 @@ public class GT_Worldgenerator } public void run() { + String tDimensionName = this.mWorld.provider.getDimensionName(); if ((Math.abs(this.mX / 16) % 3 == 1) && (Math.abs(this.mZ / 16) % 3 == 1)) { int oreveinRNG = this.mRandom.nextInt(100); if (( oreveinRNG < oreveinPercentage) && (GT_Worldgen_GT_Ore_Layer.sWeight > 0) && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) { boolean temp = true; + int tRandomWeight; int i; for (i = 0; (i < 256) && (temp); i++) { @@ -139,12 +141,15 @@ public class GT_Worldgenerator "No orevein selected!" + " @ dim="+ this.mDimensionType+ " chunkX="+ this.mX + - " chunkZ="+ this.mZ + " chunkZ="+ this.mZ + + " dimensionName=" + tDimensionName ); } else if (D1) { GT_Log.out.println( - "Orevein took " + i + " attempts to find" + "Orevein took " + i + + " attempts to find" + + " dimensionName=" + tDimensionName ); } @@ -158,7 +163,8 @@ public class GT_Worldgenerator " chunkX="+ this.mX + " chunkZ="+ this.mZ + " RNG=" + oreveinRNG + - " %=" + oreveinPercentage + " %=" + oreveinPercentage+ + " dimensionName=" + tDimensionName ); } } @@ -190,7 +196,8 @@ public class GT_Worldgenerator "Skipped chunk, not 3x3 center" + " @ dim="+this.mDimensionType+ " chunkX="+this.mX+ - " chunkZ="+this.mZ + " chunkZ="+this.mZ+ + " dimensionName=" + tDimensionName ); } } -- cgit