diff --git a/build.properties b/build.properties index 27a8406da..40adf927b 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -minecraft_version=1.9.4 -forge_version=12.17.0.1968 -mod_version=4.1.0 -mappings_version=snapshot_nodoc_20160519 +minecraft_version=1.10.2 +forge_version=12.18.1.2046 +mod_version=5.0.0 +mappings_version=snapshot_nodoc_20160808 diff --git a/src/main/java/biomesoplenty/api/generation/GeneratorStage.java b/src/main/java/biomesoplenty/api/generation/GeneratorStage.java index 2bc1ae827..aa2c51206 100644 --- a/src/main/java/biomesoplenty/api/generation/GeneratorStage.java +++ b/src/main/java/biomesoplenty/api/generation/GeneratorStage.java @@ -24,12 +24,18 @@ public enum GeneratorStage CLAY(Decorate.EventType.CLAY), @SerializedName("dead_bush") DEAD_BUSH(Decorate.EventType.DEAD_BUSH), + @SerializedName("desert_well") + DESERT_WELL(Decorate.EventType.DESERT_WELL), @SerializedName("lilypad") LILYPAD(Decorate.EventType.LILYPAD), @SerializedName("flowers") FLOWERS(Decorate.EventType.FLOWERS), + @SerializedName("fossil") + FOSSIL(Decorate.EventType.FOSSIL), @SerializedName("grass") GRASS(Decorate.EventType.GRASS), + @SerializedName("ice") + ICE(Decorate.EventType.ICE), @SerializedName("lake_water") LAKE_WATER(Decorate.EventType.LAKE_WATER), @SerializedName("lake_lava") @@ -38,6 +44,8 @@ public enum GeneratorStage PUMPKIN(Decorate.EventType.PUMPKIN), @SerializedName("reed") REED(Decorate.EventType.REED), + @SerializedName("rock") + ROCK(Decorate.EventType.ROCK), @SerializedName("sand") SAND(Decorate.EventType.SAND), @SerializedName("sand_pass_2") diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index 4e6c09104..18fa691a1 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -351,7 +351,7 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla if (walkOk && worldIn.isAirBlock(currPos)) { if (rand.nextInt(8)==0) { // with 1/8 probability, plant a flower - worldIn.getBiomeGenForCoords(currPos).plantFlower(worldIn, rand, currPos); + worldIn.getBiome(currPos).plantFlower(worldIn, rand, currPos); } else { diff --git a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java index 4feb21fdf..b89938b98 100644 --- a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java @@ -258,7 +258,7 @@ public class AchievementEventHandler private void updateBiomeRadarExplore(EntityPlayerMP player) { - Biome currentBiome = player.worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(player.posX), 0, MathHelper.floor_double(player.posZ))); + Biome currentBiome = player.worldObj.getBiome(new BlockPos(MathHelper.floor_double(player.posX), 0, MathHelper.floor_double(player.posZ))); //Search every item in the player's main inventory for a biome radar for (ItemStack stack : player.inventory.mainInventory) @@ -283,7 +283,7 @@ public class AchievementEventHandler private void updateBiomesExplored(EntityPlayerMP player) { - Biome currentBiome = player.worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(player.posX), 0, MathHelper.floor_double(player.posZ))); + Biome currentBiome = player.worldObj.getBiome(new BlockPos(MathHelper.floor_double(player.posX), 0, MathHelper.floor_double(player.posZ))); String biomeName = currentBiome.getBiomeName(); //Get a list of the current explored biomes JsonSerializableSet exploredBiomeNames = (JsonSerializableSet)player.getStatFile().getProgress(BOPAchievements.explore_all_biomes); diff --git a/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java b/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java index a5950b8b2..b577d6a46 100644 --- a/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java @@ -78,7 +78,7 @@ public class DecorateBiomeEventHandler private static boolean runGeneratorStage(World world, Random random, BlockPos pos, GeneratorStage stage) { - Biome biome = world.getBiomeGenForCoords(pos.add(16, 0, 16)); + Biome biome = world.getBiome(pos.add(16, 0, 16)); IExtendedBiome extendedBiome = BOPBiomes.REG_INSTANCE.getExtendedBiome(biome); if (extendedBiome != null) diff --git a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java index aff637d1f..30c4b5c31 100644 --- a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java +++ b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java @@ -98,7 +98,7 @@ public class BiomeUtils // chunkManager.genBiomes is the first layer returned from initializeAllBiomeGenerators() // chunkManager.biomeIndexLayer is the second layer returned from initializeAllBiomeGenerators(), it's zoomed twice from genBiomes (>> 2) this one is actual size // chunkManager.getBiomeGenAt uses biomeIndexLayer to get the biome - Biome[] biomesAtSample = chunkManager.getBiomeGenAt(null, (int)x, (int)z, 1, 1, false); + Biome[] biomesAtSample = chunkManager.getBiomes(null, (int)x, (int)z, 1, 1, false); if (biomesAtSample[0] == biomeToFind) { BiomesOPlenty.logger.info("Found "+biomeToFind.getBiomeName()+" after "+n+" samples, spaced "+sampleSpace+" blocks apart at ("+((int)x)+","+((int)z)+") distance "+((int)dist)); diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java index cf7fe5ae8..53383feb3 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java @@ -144,7 +144,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator this.setChunkAirStoneWater(chunkX, chunkZ, chunkprimer); // hand over to the biomes for them to set bedrock grass and dirt - Biome[] biomes = this.worldObj.getBiomeProvider().loadBlockGeneratorData(null, chunkX * 16, chunkZ * 16, 16, 16); + Biome[] biomes = this.worldObj.getBiomeProvider().getBiomes(null, chunkX * 16, chunkZ * 16, 16, 16); this.replaceBlocksForBiome(chunkX, chunkZ, chunkprimer, biomes); // add structures @@ -470,7 +470,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator BlockPos blockpos = new BlockPos(x, 0, z); - Biome Biome = this.worldObj.getBiomeGenForCoords(blockpos.add(16, 0, 16)); + Biome Biome = this.worldObj.getBiome(blockpos.add(16, 0, 16)); this.rand.setSeed(this.worldObj.getSeed()); long l0 = this.rand.nextLong() / 2L * 2L + 1L; @@ -550,7 +550,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator for (int j = 0; j < 16; ++j) { target = this.worldObj.getPrecipitationHeight(decorateStart.add(i, 0, j)); - Biome biome = this.worldObj.getBiomeGenForCoords(target); + Biome biome = this.worldObj.getBiome(target); // if it's cold enough for ice, and there's exposed water, then freeze it if (this.worldObj.canBlockFreezeWater(target.down())) { @@ -586,7 +586,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator @Override public List getPossibleCreatures(EnumCreatureType creatureType, BlockPos pos) { - Biome Biome = this.worldObj.getBiomeGenForCoords(pos); + Biome Biome = this.worldObj.getBiome(pos); if (this.mapFeaturesEnabled) { diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderHellBOP.java b/src/main/java/biomesoplenty/common/world/ChunkProviderHellBOP.java index a7532cc6c..6323d1fc3 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderHellBOP.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderHellBOP.java @@ -279,7 +279,7 @@ public class ChunkProviderHellBOP implements IChunkGenerator } Chunk chunk = new Chunk(this.world, chunkprimer, x, z); - Biome[] abiome = this.world.getBiomeProvider().loadBlockGeneratorData((Biome[])null, x * 16, z * 16, 16, 16); + Biome[] abiome = this.world.getBiomeProvider().getBiomes((Biome[])null, x * 16, z * 16, 16, 16); byte[] abyte = chunk.getBiomeArray(); for (int i = 0; i < abyte.length; ++i) @@ -466,7 +466,7 @@ public class ChunkProviderHellBOP implements IChunkGenerator } } - Biome biome = this.world.getBiomeGenForCoords(pos); + Biome biome = this.world.getBiome(pos); return biome.getSpawnableList(creatureType); }