works in 1.11.2

dshadowwolf · dshadowwolf · commit 9e97684fe7b3 · 2017-11-27T00:42:43.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
         classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.0.9'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5'
     }
@@ -34,7 +34,7 @@ javadoc {
 
 description = 'OreSpawn'
 def mod_file = getModFile()
-def mc_version = "1.12"
+def mc_version = "1.11.2"
 def short_version = getVersion("VERSION", mod_file)
 version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
@@ -69,10 +69,10 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = "1.12.1-14.22.1.2485"
-    runDir = "run"
-    mappings = "snapshot_20170925"
-//    coreMod = ""
+    version = '1.11.2-13.20.1.2386'
+    runDir = 'run'
+    mappings = 'stable_32'
+    //    coreMod = ""
     makeObfSourceJar = false
 }
 
diff --git a/src/main/java/com/mcmoddev/orespawn/EventHandlers.java b/src/main/java/com/mcmoddev/orespawn/EventHandlers.java
@@ -22,7 +22,7 @@
 import net.minecraft.nbt.NBTTagString;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.gen.ChunkProviderServer;
 import net.minecraftforge.event.terraingen.OreGenEvent;
 import net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType;
diff --git a/src/main/java/com/mcmoddev/orespawn/OreSpawn.java b/src/main/java/com/mcmoddev/orespawn/OreSpawn.java
@@ -42,7 +42,7 @@
 @Mod(modid = Constants.MODID,
     name = Constants.NAME,
     version = Constants.VERSION,
-    acceptedMinecraftVersions = "[1.12,)")
+    acceptedMinecraftVersions = "[1.11.2,)")
 
 public class OreSpawn {
 	@Instance
diff --git a/src/main/java/com/mcmoddev/orespawn/api/IFeature.java b/src/main/java/com/mcmoddev/orespawn/api/IFeature.java
@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 
 import net.minecraft.world.World;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 
 public interface IFeature {
diff --git a/src/main/java/com/mcmoddev/orespawn/data/Config.java b/src/main/java/com/mcmoddev/orespawn/data/Config.java
@@ -15,6 +15,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonParser;
 import com.mcmoddev.orespawn.OreSpawn;
+import com.google.gson.JsonPrimitive;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -132,7 +133,8 @@ private static void saveKnownConfigs() {
 		File in = p.toFile();
 
 		JsonArray data = new JsonArray();
-		extractedConfigs.forEach(data::add);
+		
+		extractedConfigs.forEach( val -> data.add( new JsonPrimitive(val) ) );
 
 		try {
 			FileUtils.writeStringToFile(in, gson.toJson(data), Charset.defaultCharset());
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java
@@ -14,7 +14,7 @@
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java
@@ -17,7 +17,7 @@
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/NormalCloudGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/NormalCloudGenerator.java
@@ -18,7 +18,7 @@
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 
 public class NormalCloudGenerator extends FeatureBase implements IFeature {
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/PrecisionGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/PrecisionGenerator.java
@@ -20,7 +20,7 @@
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 
 public class PrecisionGenerator extends FeatureBase implements IFeature {
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/VeinGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/VeinGenerator.java
@@ -18,7 +18,7 @@
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 
 public class VeinGenerator extends FeatureBase implements IFeature {
 
diff --git a/src/main/java/com/mcmoddev/orespawn/json/os3/readers/OS3V2Reader.java b/src/main/java/com/mcmoddev/orespawn/json/os3/readers/OS3V2Reader.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.mcmoddev.orespawn.OreSpawn;
 import com.mcmoddev.orespawn.data.Constants.ConfigNames;
 import com.mcmoddev.orespawn.json.os3.IOS3Reader;
@@ -70,7 +71,7 @@ private JsonObject setHandleDimensions(JsonObject spawnEntry) {
 		if (lw.get(ConfigNames.DIMENSIONS).isJsonArray()) {
 			if (lw.getAsJsonArray(ConfigNames.DIMENSIONS).size() < 1) {
 				JsonArray temp = lw.getAsJsonArray(ConfigNames.DIMENSIONS);
-				temp.add(OreSpawn.API.dimensionWildcard());
+				temp.add(new JsonPrimitive(OreSpawn.API.dimensionWildcard()));
 				lw.remove(ConfigNames.DIMENSIONS);
 				lw.add(ConfigNames.DIMENSIONS, temp);
 			}
@@ -79,7 +80,7 @@ private JsonObject setHandleDimensions(JsonObject spawnEntry) {
 			lw.add(ConfigNames.DIMENSION, dimSet);
 			lw.remove(ConfigNames.DIMENSIONS);
 			JsonArray temp = new JsonArray();
-			temp.add(OreSpawn.API.dimensionWildcard());
+			temp.add(new JsonPrimitive(OreSpawn.API.dimensionWildcard()));
 			lw.add(ConfigNames.DIMENSIONS, temp);
 		}
 
diff --git a/src/main/java/com/mcmoddev/orespawn/worldgen/FlatBedrock.java b/src/main/java/com/mcmoddev/orespawn/worldgen/FlatBedrock.java
@@ -12,7 +12,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraftforge.fml.common.IWorldGenerator;
 
 public class FlatBedrock implements IWorldGenerator {
diff --git a/src/main/java/com/mcmoddev/orespawn/worldgen/OreSpawnWorldGen.java b/src/main/java/com/mcmoddev/orespawn/worldgen/OreSpawnWorldGen.java
@@ -18,7 +18,7 @@
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.IChunkGenerator;
+import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.fml.common.IWorldGenerator;
 import net.minecraftforge.oredict.OreDictionary;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ buildscript {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`dependencies {`
`20`		`- classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'`
	`20`	`+ classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'`
`21`	`21`	`classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.0.9'`
`22`	`22`	`classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5'`
`23`	`23`	`}`
`@@ -34,7 +34,7 @@ javadoc {`
`34`	`34`
`35`	`35`	`description = 'OreSpawn'`
`36`	`36`	`def mod_file = getModFile()`
`37`		`-def mc_version = "1.12"`
	`37`	`+def mc_version = "1.11.2"`
`38`	`38`	`def short_version = getVersion("VERSION", mod_file)`
`39`	`39`	`version = mc_version + "-" + short_version`
`40`	`40`	`if (System.getenv().BUILD_NUMBER) {`
`@@ -69,10 +69,10 @@ if (secretFile.exists()) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`minecraft {`
`72`		`- version = "1.12.1-14.22.1.2485"`
`73`		`- runDir = "run"`
`74`		`- mappings = "snapshot_20170925"`
`75`		`-// coreMod = ""`
	`72`	`+ version = '1.11.2-13.20.1.2386'`
	`73`	`+ runDir = 'run'`
	`74`	`+ mappings = 'stable_32'`
	`75`	`+ // coreMod = ""`
`76`	`76`	`makeObfSourceJar = false`
`77`	`77`	`}`
`78`	`78`