and now make this work for 1.10.2

dshadowwolf · dshadowwolf · commit cf5ca7005450 · 2017-11-27T01:16:30.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ javadoc {
 
 description = 'OreSpawn'
 def mod_file = getModFile()
-def mc_version = "1.11.2"
+def mc_version = "1.10.2"
 def short_version = getVersion("VERSION", mod_file)
 version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
@@ -69,9 +69,9 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = '1.11.2-13.20.1.2386'
+    version = '1.10.2-12.18.3.2185'
     runDir = 'run'
-    mappings = 'stable_32'
+    mappings = 'stable_29'
     //    coreMod = ""
     makeObfSourceJar = false
 }
diff --git a/src/main/java/com/mcmoddev/orespawn/EventHandlers.java b/src/main/java/com/mcmoddev/orespawn/EventHandlers.java
@@ -92,7 +92,7 @@ public void onChunkSave(ChunkDataEvent.Save ev) {
 		.map(feat -> new NBTTagString(feat.getFeatureName()))
 		.forEach(features::appendTag);
 
-		ChunkPos chunkCoords = new ChunkPos(ev.getChunk().x, ev.getChunk().z);
+		ChunkPos chunkCoords = new ChunkPos(ev.getChunk().xPosition, ev.getChunk().zPosition);
 
 		if (!Config.getBoolean(Constants.RETROGEN_KEY) || chunks.contains(chunkCoords)) {
 			dataTag.setTag(Constants.ORE_TAG, ores);
@@ -105,7 +105,7 @@ public void onChunkSave(ChunkDataEvent.Save ev) {
 	@SubscribeEvent
 	public void onChunkLoad(ChunkDataEvent.Load ev) {
 		World world = ev.getWorld();
-		ChunkPos chunkCoords = new ChunkPos(ev.getChunk().x, ev.getChunk().z);
+		ChunkPos chunkCoords = new ChunkPos(ev.getChunk().xPosition, ev.getChunk().zPosition);
 
 		doBedrockRetrogen(chunkCoords);
 
@@ -187,15 +187,15 @@ public void worldTick(WorldTickEvent ev) {
 				ChunkPos p = chunks.pop();
 				Random random = new Random(world.getSeed());
 				// re-seed with something totally new :P
-				random.setSeed((((random.nextLong() >> 4 + 1) + p.x) + ((random.nextLong() >> 2 + 1) + p.z)) ^ world.getSeed());
+				random.setSeed((((random.nextLong() >> 4 + 1) + p.chunkXPos) + ((random.nextLong() >> 2 + 1) + p.chunkZPos)) ^ world.getSeed());
 				ChunkProviderServer chunkProvider = (ChunkProviderServer) world.getChunkProvider();
 				IChunkGenerator chunkGenerator = ObfuscationReflectionHelper.getPrivateValue(ChunkProviderServer.class, chunkProvider, "field_186029_c", "chunkGenerator");
-				OreSpawn.API.getGenerator().generate(random, p.x, p.z, world, chunkGenerator, chunkProvider);
+				OreSpawn.API.getGenerator().generate(random, p.chunkXPos, p.chunkZPos, world, chunkGenerator, chunkProvider);
 			}
 
 			for (int c = 0; c < 5 && !retroChunks.isEmpty(); c++) {
 				ChunkPos p = retroChunks.pop();
-				OreSpawn.flatBedrock.retrogen(world, p.x, p.z);
+				OreSpawn.flatBedrock.retrogen(world, p.chunkXPos, p.chunkZPos);
 			}
 		}
 	}
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.11.2,)")
+    acceptedMinecraftVersions = "[1.10.2,)")
 
 public class OreSpawn {
 	@Instance
diff --git a/src/main/java/com/mcmoddev/orespawn/api/GeneratorParameters.java b/src/main/java/com/mcmoddev/orespawn/api/GeneratorParameters.java
@@ -26,7 +26,7 @@ public GeneratorParameters(ChunkPos chunkPos, OreList oreList, List<IBlockState>
 			this.parameters.add(stringJsonElementEntry.getKey(), stringJsonElementEntry.getValue());
 		}
 
-		this.chunk = new ChunkPos(chunkPos.x, chunkPos.z);
+		this.chunk = new ChunkPos(chunkPos.chunkXPos, chunkPos.chunkZPos);
 		this.ores = oreList;
 		this.replacements = ImmutableList.copyOf(replacementBlocks);
 		this.biomes = biomes;
diff --git a/src/main/java/com/mcmoddev/orespawn/commands/AddOreCommand.java b/src/main/java/com/mcmoddev/orespawn/commands/AddOreCommand.java
@@ -100,7 +100,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
 		this.putFile(file, ore, dimension);
 
-		player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"), true);
+		player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"));
 	}
 
 	private void setProperties(JsonObject oreArgs, JsonObject newOreArgs) {
diff --git a/src/main/java/com/mcmoddev/orespawn/commands/ClearChunkCommand.java b/src/main/java/com/mcmoddev/orespawn/commands/ClearChunkCommand.java
@@ -48,7 +48,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
 		EntityPlayer player = (EntityPlayer) sender;
 		Chunk chunk = player.getEntityWorld().getChunkFromBlockCoords(player.getPosition());
-		ChunkPos chunkPos = chunk.getPos();
+		ChunkPos chunkPos = chunk.getChunkCoordIntPair();
 		List<Block> blocks;
 
 		boolean flagClassic = args.length > 0 ? args[0].toLowerCase().equalsIgnoreCase("classic") : false;
@@ -64,7 +64,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
 		clearBlocks(chunkPos, blocks, overburden, flagClassic, player);
 
-		player.sendStatusMessage(new TextComponentString("chunk " + chunkPos.toString() + " cleared"), true);
+		player.sendStatusMessage(new TextComponentString("chunk " + chunkPos.toString() + " cleared"));
 	}
 
 	private void clearBlocks(ChunkPos chunkPos, List<Block> blocks, List<Block> overburden, boolean flagClassic, EntityPlayer player) {
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/ClusterGenerator.java
@@ -41,8 +41,8 @@ public void generate(World world, IChunkGenerator chunkGenerator, IChunkProvider
 		BiomeLocation biomes = parameters.getBiomes();
 
 		// First, load cached blocks for neighboring chunk ore spawns
-		int chunkX = pos.x;
-		int chunkZ = pos.z;
+		int chunkX = pos.chunkXPos;
+		int chunkZ = pos.chunkZPos;
 
 		mergeDefaults(params, getDefaultParameters());
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java
@@ -38,8 +38,8 @@ public void generate(World world, IChunkGenerator chunkGenerator, IChunkProvider
 		BiomeLocation biomes = parameters.getBiomes();
 
 		// First, load cached blocks for neighboring chunk ore spawns
-		int chunkX = pos.x;
-		int chunkZ = pos.z;
+		int chunkX = pos.chunkXPos;
+		int chunkZ = pos.chunkZPos;
 
 		mergeDefaults(params, getDefaultParameters());
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/NormalCloudGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/NormalCloudGenerator.java
@@ -40,8 +40,8 @@ public void generate(World world, IChunkGenerator chunkGenerator, IChunkProvider
 		OreList ores = parameters.getOres();
 		BiomeLocation biomes = parameters.getBiomes();
 		// First, load cached blocks for neighboring chunk ore spawns
-		int chunkX = pos.x;
-		int chunkZ = pos.z;
+		int chunkX = pos.chunkXPos;
+		int chunkZ = pos.chunkZPos;
 
 		mergeDefaults(params, getDefaultParameters());
 
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/PrecisionGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/PrecisionGenerator.java
@@ -44,8 +44,8 @@ public void generate(World world, IChunkGenerator chunkGenerator, IChunkProvider
 		BiomeLocation biomes = parameters.getBiomes();
 
 		// First, load cached blocks for neighboring chunk ore spawns
-		int chunkX = pos.x;
-		int chunkZ = pos.z;
+		int chunkX = pos.chunkXPos;
+		int chunkZ = pos.chunkZPos;
 
 		mergeDefaults(params, getDefaultParameters());
 
@@ -150,7 +150,7 @@ private int spawnOreNode(FunctionParameterWrapper params, int nodeSize, HeightRa
 
 	private BlockPos fixMungeOffset(Vec3i offset, BlockPos spot, HeightRange heightRange, ChunkPos pos) {
 		BlockPos p = spot.add(offset);
-		ChunkPos x1z1 = new ChunkPos(pos.x + 1, pos.z + 1);
+		ChunkPos x1z1 = new ChunkPos(pos.chunkXPos + 1, pos.chunkZPos + 1);
 		int xMax = x1z1.getXEnd();
 		int zMax = x1z1.getZEnd();
 		int xMin = pos.getXStart();
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/features/VeinGenerator.java b/src/main/java/com/mcmoddev/orespawn/impl/features/VeinGenerator.java
@@ -41,8 +41,8 @@ public void generate(World world, IChunkGenerator chunkGenerator, IChunkProvider
 		BiomeLocation biomes = parameters.getBiomes();
 
 		// First, load cached blocks for neighboring chunk ore spawns
-		int chunkX = pos.x;
-		int chunkZ = pos.z;
+		int chunkX = pos.chunkXPos;
+		int chunkZ = pos.chunkZPos;
 
 		runCache(chunkX, chunkZ, world, blockReplace);
 		mergeDefaults(params, getDefaultParameters());
diff --git a/src/main/java/com/mcmoddev/orespawn/impl/location/BiomeLocationDictionary.java b/src/main/java/com/mcmoddev/orespawn/impl/location/BiomeLocationDictionary.java
@@ -17,7 +17,7 @@ public BiomeLocationDictionary(BiomeDictionary.Type type) {
 
 	@Override
 	public boolean matches(Biome biome) {
-		return BiomeDictionary.hasType(biome, this.type);
+		return BiomeDictionary.isBiomeOfType(biome, this.type);
 	}
 
 	@Override
@@ -36,6 +36,6 @@ public BiomeDictionary.Type getType() {
 
 	@Override
 	public ImmutableList<Biome> getBiomes() {
-		return ImmutableList.copyOf(BiomeDictionary.getBiomes(this.type));
+		return ImmutableList.copyOf(BiomeDictionary.getBiomesForType(this.type));
 	}
 }
diff --git a/src/main/java/com/mcmoddev/orespawn/json/OS3Reader.java b/src/main/java/com/mcmoddev/orespawn/json/OS3Reader.java
@@ -27,7 +27,6 @@
 
 import net.minecraft.crash.CrashReport;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.oredict.OreDictionary;
@@ -207,7 +206,7 @@ private static List<IBlockState> getReplacements(String configField, int dimensi
 		if (work.equals(ConfigNames.DEFAULT)) {
 			return ReplacementsRegistry.getDimensionDefault(dimension);
 		} else if (work.startsWith("ore:")) {
-			NonNullList<ItemStack> ores = OreDictionary.getOres(work.substring(4));
+			List<ItemStack> ores = OreDictionary.getOres(work.substring(4));
 			List<IBlockState> reps = new ArrayList<>();
 			ores.forEach(ore -> reps.add(Block.getBlockFromItem(ore.getItem()).getDefaultState()));
 			return reps;
diff --git a/src/main/java/com/mcmoddev/orespawn/json/os3/readers/Helpers.java b/src/main/java/com/mcmoddev/orespawn/json/os3/readers/Helpers.java
@@ -18,7 +18,6 @@
 import com.mcmoddev.orespawn.impl.location.BiomeLocationSingle;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -119,7 +118,7 @@ private static List<OreBuilder> loadOreDict(JsonObject oreObj, SpawnBuilder spaw
 		int chance = oreObj.has(ConfigNames.CHANCE) ? oreObj.get(ConfigNames.CHANCE).getAsInt() : 100;
 		List<OreBuilder> retval = new ArrayList<>();
 
-		NonNullList<ItemStack> ores = OreDictionary.getOres(oreName);
+		List<ItemStack> ores = OreDictionary.getOres(oreName);
 
 		for (ItemStack ore : ores) {
 			OreBuilder thisOre = spawn.newOreBuilder();
diff --git a/src/main/java/com/mcmoddev/orespawn/worldgen/FlatBedrock.java b/src/main/java/com/mcmoddev/orespawn/worldgen/FlatBedrock.java
@@ -48,7 +48,7 @@ private void genBottomPlate(World world, ChunkPos chunkPos, Block repBlock) {
 		for (int xP = 0; xP < 16; xP++) {
 			for (int zP = 0; zP < 16; zP++) {
 				for (int yP = 5; yP > 0; yP--) {
-					BlockPos target = new BlockPos(chunkPos.x * 16 + xP, yP, chunkPos.z * 16 + zP);
+					BlockPos target = new BlockPos(chunkPos.chunkXPos * 16 + xP, yP, chunkPos.chunkZPos * 16 + zP);
 
 					if (yP < plateThickness && !world.getBlockState(target).getBlock().equals(Blocks.BEDROCK)) {
 						world.setBlockState(target, Blocks.BEDROCK.getDefaultState(), 26);
@@ -67,7 +67,7 @@ private void genTopPlate(World world, ChunkPos chunkPos, Block repBlock) {
 		for (int xP = 0; xP < 16; xP++) {
 			for (int zP = 0; zP < 16; zP++) {
 				for (int yP = 126; yP > 121; yP--) {
-					BlockPos target = new BlockPos(chunkPos.x * 16 + xP, yP, chunkPos.z * 16 + zP);
+					BlockPos target = new BlockPos(chunkPos.chunkXPos * 16 + xP, yP, chunkPos.chunkZPos * 16 + zP);
 
 					if (yP > thickness && !world.getBlockState(target).getBlock().equals(Blocks.BEDROCK)) {
 						world.setBlockState(target, Blocks.BEDROCK.getDefaultState(), 26);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public GeneratorParameters(ChunkPos chunkPos, OreList oreList, List<IBlockState>`
`26`	`26`	`this.parameters.add(stringJsonElementEntry.getKey(), stringJsonElementEntry.getValue());`
`27`	`27`	`}`
`28`	`28`
`29`		`- this.chunk = new ChunkPos(chunkPos.x, chunkPos.z);`
	`29`	`+ this.chunk = new ChunkPos(chunkPos.chunkXPos, chunkPos.chunkZPos);`
`30`	`30`	`this.ores = oreList;`
`31`	`31`	`this.replacements = ImmutableList.copyOf(replacementBlocks);`
`32`	`32`	`this.biomes = biomes;`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args`
`100`	`100`
`101`	`101`	`this.putFile(file, ore, dimension);`
`102`	`102`
`103`		`- player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"), true);`
	`103`	`+ player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private void setProperties(JsonObject oreArgs, JsonObject newOreArgs) {`