fix some issues - the issue reported by Morph about blocks from certain mods was much deeper and actually effected the entirety of the 'default' generator, albeit this only showed in certain conditions. Restore the original version alongside the version utilized by the Precision Generator.

dshadowwolf · dshadowwolf · commit 95042d71acfc · 2018-01-08T00:20:19.000-05:00
diff --git a/src/main/java/com/mcmoddev/orespawn/api/FeatureBase.java b/src/main/java/com/mcmoddev/orespawn/api/FeatureBase.java
@@ -108,7 +108,7 @@ private boolean spawnOrCache(World world, BlockPos coord, List<IBlockState> bloc
 			IBlockState targetBlock = world.getBlockState(coord);
 
 			if (canReplace(targetBlock, blockReplace)) {
-				world.setBlockState(coord, oreBlock, 22);
+				world.setBlockState(coord, oreBlock); // , 22);
 				return true;
 			} else {
 				return false;
@@ -229,33 +229,47 @@ protected int getPoint(int lowerBound, int upperBound, int median) {
 		return t - median;
 	}
 
-
-	protected void spawnMunge(FunctionParameterWrapper params, double radius, int count, boolean toPositive) {
-		int rSqr = (int)(radius * radius);
+	protected void spawnMungeSW(World world, BlockPos blockPos, int rSqr, double radius,
+			List<IBlockState> replaceBlock, int count, OreList possibleOres) {
+		Random prng = this.random;
 		int quantity = count;
-
-		OreList possible = params.getOres();
-		World world = params.getWorld();
-		BlockPos blockPos = params.getBlockPos();
-		List<IBlockState> replace = params.getReplacements();
-		BiomeLocation biomes = params.getBiomes();
-
-		for (int dy = (int)(-1 * radius); dy < radius; dy++) {
-			for (int dx = getStart(toPositive, radius); endCheck(toPositive, dx, radius); dx = countItem(dx, toPositive)) {
-				for (int dz = getStart(toPositive, radius); endCheck(toPositive, dz, radius); dz = countItem(dz, toPositive)) {
-					if (getABC(dx, dy, dz) <= rSqr) {
-						IBlockState oreBlock = possible.getRandomOre(this.random).getOre();
-						spawn(oreBlock, world, blockPos.add(dx, dy, dz), world.provider.getDimension(), true, replace, biomes);
-
-						if (--quantity <= 0) {
-							return;
-						}
+		for(int dy = (int)(-1 * radius); dy < radius; dy++){
+			for(int dx = (int)(radius); dx >= (int)(-1 * radius); dx--){
+				for(int dz = (int)(radius); dz >= (int)(-1 * radius); dz--){
+					if((dx*dx + dy*dy + dz*dz) <= rSqr){
+						IBlockState oreBlock = possibleOres.getRandomOre(prng).getOre();
+						spawnOrCache(world,blockPos.add(dx,dy,dz),replaceBlock, oreBlock, true, world.provider.getDimension());
+						quantity--;
+					}
+					if(quantity <= 0) {
+						return;
 					}
 				}
 			}
 		}
 	}
 
+
+	protected void spawnMungeNE(World world, BlockPos blockPos, int rSqr, double radius,
+			List<IBlockState> replaceBlock, int count, OreList possibleOres) {
+		Random prng = this.random;
+		int quantity = count;
+		for(int dy = (int)(-1 * radius); dy < radius; dy++){
+			for(int dz = (int)(-1 * radius); dz < radius; dz++){
+				for(int dx = (int)(-1 * radius); dx < radius; dx++){
+					if((dx*dx + dy*dy + dz*dz) <= rSqr){
+						IBlockState oreBlock = possibleOres.getRandomOre(prng).getOre();
+						spawnOrCache(world,blockPos.add(dx,dy,dz),replaceBlock, oreBlock, true, world.provider.getDimension());
+						quantity--;
+					}
+					if(quantity <= 0) {
+						return;
+					}
+				}
+			}
+		}
+	}
+	
 	protected int getABC(int dx, int dy, int dz) {
 		return (dx * dx + dy * dy + dz * dz);
 	}
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java
@@ -173,12 +173,13 @@ private void spawnChunk(FunctionParameterWrapper params, int quantity) {
 	}
 
 	private void doSpawnFill(boolean nextBoolean, int quantity, FunctionParameterWrapper params) {
-		double radius = Math.pow(quantity, 1.0 / 3.0) * (3.0 / 4.0 / Math.PI) + 2;
-
-		if (nextBoolean) {
-			spawnMunge(params, radius, quantity, false);
+		int count = quantity;
+		double radius = Math.pow(quantity, 1.0/3.0) * (3.0 / 4.0 / Math.PI) + 2;
+		int rSqr = (int)(radius * radius);
+		if( nextBoolean ) {
+			spawnMungeNE( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );
 		} else {
-			spawnMunge(params, radius, quantity, true);
+			spawnMungeSW( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );
 		}
 	}
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java
@@ -5,6 +5,7 @@
 import java.util.Random;
 
 import com.google.gson.JsonObject;
+import com.mcmoddev.orespawn.OreSpawn;
 import com.mcmoddev.orespawn.api.BiomeLocation;
 import com.mcmoddev.orespawn.api.FeatureBase;
 import com.mcmoddev.orespawn.api.GeneratorParameters;
@@ -112,7 +113,8 @@ private void spawnOre(FunctionParameterWrapper params, int quantity) {
 
 			while (count > 0) {
 				IBlockState oreBlock = params.getOres().getRandomOre(this.random).getOre();
-				spawn(oreBlock, params.getWorld(), params.getBlockPos().add(offs[scrambledLUT[--count]]),
+				BlockPos target = params.getBlockPos().add(offs[scrambledLUT[--count]]);
+				spawn(oreBlock, params.getWorld(), target,
 				    params.getWorld().provider.getDimension(), true, params.getReplacements(), params.getBiomes());
 			}
 
@@ -123,12 +125,13 @@ private void spawnOre(FunctionParameterWrapper params, int quantity) {
 	}
 
 	private void doSpawnFill(boolean nextBoolean, int quantity, FunctionParameterWrapper params) {
-		double radius = Math.pow(quantity, 1.0 / 3.0) * (3.0 / 4.0 / Math.PI) + 2;
-
-		if (nextBoolean) {
-			spawnMunge(params, radius, quantity, false);
+		int count = quantity;
+		double radius = Math.pow(quantity, 1.0/3.0) * (3.0 / 4.0 / Math.PI) + 2;
+		int rSqr = (int)(radius * radius);
+		if( nextBoolean ) {
+			spawnMungeNE( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );
 		} else {
-			spawnMunge(params, radius, quantity, true);
+			spawnMungeSW( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );
 		}
 	}
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/os3/OreBuilderImpl.java b/src/main/java/com/mcmoddev/orespawn/impl/os3/OreBuilderImpl.java
@@ -47,13 +47,13 @@ public OreBuilder setOre(String name, String serializedState) {
 	@SuppressWarnings("deprecation")
 	@Override
 	public OreBuilder setOre(String name, int metaData) {
-		this.setOre(name);
+		Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(name));
 
-		if (this.ore == null) {
+		if (block == null) {
 			return this;
 		}
 
-		this.ore = this.ore.getBlock().getStateFromMeta(metaData);
+		this.ore = block.getStateFromMeta(metaData);
 		return this;
 	}
 
diff --git a/src/main/java/com/mcmoddev/orespawn/json/OS3Writer.java b/src/main/java/com/mcmoddev/orespawn/json/OS3Writer.java
@@ -94,7 +94,7 @@ private void writeFile(File file, JsonObject wrapper) {
 		Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
 		try {
-			FileUtils.writeStringToFile(file, gson.toJson(wrapper), Charset.defaultCharset(), false);
+			FileUtils.writeStringToFile(file, gson.toJson(wrapper), "UTF8", false);
 		} catch (IOException e) {
 			CrashReport report = CrashReport.makeCrashReport(e, String.format("Failed in config %s", file.getName()));
 			report.getCategory().addCrashSection("OreSpawn Version", Constants.VERSION);
diff --git a/src/main/java/com/mcmoddev/orespawn/util/StateUtil.java b/src/main/java/com/mcmoddev/orespawn/util/StateUtil.java
@@ -1,5 +1,7 @@
 package com.mcmoddev.orespawn.util;
 
+import com.mcmoddev.orespawn.OreSpawn;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 
@@ -15,7 +17,8 @@ public static String serializeState(IBlockState state) {
 		if (string.equals(state.getBlock().getRegistryName().toString())) {
 			string = "normal";
 		}
-
+		
+		OreSpawn.LOGGER.fatal("State is %s (for block %s)", string, state.getBlock().getRegistryName());
 		return string;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,13 @@ private void spawnChunk(FunctionParameterWrapper params, int quantity) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private void doSpawnFill(boolean nextBoolean, int quantity, FunctionParameterWrapper params) {`
`176`		`- double radius = Math.pow(quantity, 1.0 / 3.0) * (3.0 / 4.0 / Math.PI) + 2;`
`177`		`-`
`178`		`- if (nextBoolean) {`
`179`		`- spawnMunge(params, radius, quantity, false);`
	`176`	`+ int count = quantity;`
	`177`	`+ double radius = Math.pow(quantity, 1.0/3.0) * (3.0 / 4.0 / Math.PI) + 2;`
	`178`	`+ int rSqr = (int)(radius * radius);`
	`179`	`+ if( nextBoolean ) {`
	`180`	`+ spawnMungeNE( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );`
`180`	`181`	`} else {`
`181`		`- spawnMunge(params, radius, quantity, true);`
	`182`	`+ spawnMungeSW( params.getWorld(), params.getBlockPos(), rSqr, radius, params.getReplacements(), count, params.getOres() );`
`182`	`183`	`}`
`183`	`184`	`}`
`184`	`185`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,13 @@ public OreBuilder setOre(String name, String serializedState) {`
`47`	`47`	`@SuppressWarnings("deprecation")`
`48`	`48`	`@Override`
`49`	`49`	`public OreBuilder setOre(String name, int metaData) {`
`50`		`- this.setOre(name);`
	`50`	`+ Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(name));`
`51`	`51`
`52`		`- if (this.ore == null) {`
	`52`	`+ if (block == null) {`
`53`	`53`	`return this;`
`54`	`54`	`}`
`55`	`55`
`56`		`- this.ore = this.ore.getBlock().getStateFromMeta(metaData);`
	`56`	`+ this.ore = block.getStateFromMeta(metaData);`
`57`	`57`	`return this;`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package com.mcmoddev.orespawn.util;`
`2`	`2`
	`3`	`+import com.mcmoddev.orespawn.OreSpawn;`
	`4`	`+`
`3`	`5`	`import net.minecraft.block.Block;`
`4`	`6`	`import net.minecraft.block.state.IBlockState;`
`5`	`7`
`@@ -15,7 +17,8 @@ public static String serializeState(IBlockState state) {`
`15`	`17`	`if (string.equals(state.getBlock().getRegistryName().toString())) {`
`16`	`18`	`string = "normal";`
`17`	`19`	`}`
`18`		`-`
	`20`	`+`
	`21`	`+ OreSpawn.LOGGER.fatal("State is %s (for block %s)", string, state.getBlock().getRegistryName());`
`19`	`22`	`return string;`
`20`	`23`	`}`
`21`	`24`