From b6144885161f7b507191cede5e65f2138cd5b9c3 Mon Sep 17 00:00:00 2001
From: Morlok8k <otis.spankmeyer@gmail.com>
Date: Tue, 11 Sep 2012 03:04:58 -0700
Subject: [PATCH] 1.7.1 region file filling

---
 src/morlok8k/MinecraftLandGenerator/Main.java | 26 +++++++++++--------
 src/morlok8k/MinecraftLandGenerator/var.java  |  3 ++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/morlok8k/MinecraftLandGenerator/Main.java b/src/morlok8k/MinecraftLandGenerator/Main.java
index c4602dd..ab2d5b6 100644
--- a/src/morlok8k/MinecraftLandGenerator/Main.java
+++ b/src/morlok8k/MinecraftLandGenerator/Main.java
@@ -456,9 +456,16 @@ public class Main {
 				return;
 			}
 
-			xRange = (int) (Math.ceil(((double) xRange) / ((double) 16))) * 16;			//say xRange was entered as 1000.  this changes it to be 1008, a multiple of 16. (the size of a chunk)
-			zRange = (int) (Math.ceil(((double) zRange) / ((double) 16))) * 16;			//say zRange was entered as 2000.  there is no change, as it already is a multiple of 16.
+			boolean useChunks = false;
 
+			if (useChunks) {		// use Chunks or Regions
+				xRange = (int) (Math.ceil(((double) xRange) / ((double) 16))) * 16;			//say xRange was entered as 1000.  this changes it to be 1008, a multiple of 16. (the size of a chunk)
+				zRange = (int) (Math.ceil(((double) zRange) / ((double) 16))) * 16;			//say zRange was entered as 2000.  there is no change, as it already is a multiple of 16.
+			} else {
+				xRange = (int) (Math.ceil(((double) xRange) / ((double) 512))) * 512;			//say xRange was entered as 1000.  this changes it to be 1024, a multiple of 512. (the size of a region)
+				zRange = (int) (Math.ceil(((double) zRange) / ((double) 512))) * 512;			//say zRange was entered as 2048.  there is no change, as it already is a multiple of 512.
+
+			}
 			FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator
 					+ "MinecraftLandGenerator.log",
 					"# " + var.PROG_NAME + " " + var.VERSION + " - " + SelfAware.JVMinfo()
@@ -517,13 +524,11 @@ public class Main {
 			xLoops = ((double) xRange / (double) var.increment);		//How many loops do we need?
 			xLoops = Math.ceil(xLoops);								//round up to find out!
 			xRangeAdj = (int) (xLoops * var.increment);
-			xLoops = xLoops + 1;
 
 			// Z
 			zLoops = ((double) zRange / (double) var.increment);		//How many loops do we need?
 			zLoops = Math.ceil(zLoops);								//round up to find out!
 			zRangeAdj = (int) (zLoops * var.increment);
-			zLoops = zLoops + 1;
 
 			Out.out("Calculating Spawn Points...");
 
@@ -539,9 +544,9 @@ public class Main {
 			for (int currentX = 0; currentX <= (xRangeAdj / 2); currentX += var.increment) {
 				curXloops++;
 				if (curXloops == 1) {
-					currentX = (((0 - xRange) / 2) + (var.increment / 2) + 16);
-				} else if (curXloops == xLoops) {
-					currentX = (xRange / 2) - (var.increment / 2);
+					currentX = (((0 - xRange) / 2) + (var.incrementFull / 2));  	// West Edge of map
+				} else if (curXloops == ((int) xLoops)) {
+					currentX = ((xRange / 2) - (var.incrementFull / 2));			// East Edge of map
 				}
 
 				for (int currentZ = 0; currentZ <= (zRangeAdj / 2); currentZ += var.increment) {
@@ -549,9 +554,9 @@ public class Main {
 
 					curZloops++;
 					if (curZloops == 1) {
-						currentZ = (((0 - zRange) / 2) + (var.increment / 2) + 16);
-					} else if (curZloops == zLoops) {
-						currentZ = (zRange / 2) - (var.increment / 2);
+						currentZ = (((0 - zRange) / 2) + (var.incrementFull / 2));	// North Edge of map
+					} else if (curZloops == ((int) zLoops)) {
+						currentZ = ((zRange / 2) - (var.incrementFull / 2));		// South Edge of map
 					}
 
 					{
@@ -690,5 +695,4 @@ public class Main {
 			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, ex.getMessage(), ex);
 		}
 	}
-
 }
diff --git a/src/morlok8k/MinecraftLandGenerator/var.java b/src/morlok8k/MinecraftLandGenerator/var.java
index 3c87b6a..09f019c 100644
--- a/src/morlok8k/MinecraftLandGenerator/var.java
+++ b/src/morlok8k/MinecraftLandGenerator/var.java
@@ -115,7 +115,8 @@ public class var {
 	public static boolean dontWait = false;
 	public static boolean alternate = false;
 	public static int MinecraftServerChunkPlayerCache = 625;	//You see this number when you first launch the server in GUI mode, after the world is loaded, but before anyone has connected.
-	public static int increment = (int) (Math.sqrt(MinecraftServerChunkPlayerCache) * 16) - 20;			//private int increment = 380;
+	public static int incrementFull = (int) (Math.sqrt(MinecraftServerChunkPlayerCache) * 16);			// 400, the length of a fresh (no players have ever logged in) server map.
+	public static int increment = incrementFull - 16;		//public static int increment = 384;			// 384, what we use to iterate between sections of the map.  Allows for some overlap to prevent "stripes" 
 	public static boolean assertsEnabled = false;				//debugging use...  use java -ea -jar MinecraftlandGenerator.jar...
 	public static long startTime = 0L;
 	public static Boolean recheckFlag = false;