From 3a465518b3a77ab5aa77cd2ecea009cf0693c8de Mon Sep 17 00:00:00 2001 From: Pahimar Date: Fri, 10 Oct 2014 13:01:42 -0400 Subject: [PATCH 1/3] Update build.properties --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 3335e2a71..04e2b94a7 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1189 +forge_version=10.13.1.1224 mod_version=2.1.0 From 6b060dac89232b4fdc535e61388050e22c3eab2e Mon Sep 17 00:00:00 2001 From: Pahimar Date: Fri, 10 Oct 2014 13:02:43 -0400 Subject: [PATCH 2/3] Update GenLayerBiomeBOP.java --- .../common/world/layer/GenLayerBiomeBOP.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index c29c99b4f..eba461ee8 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -31,10 +31,25 @@ public class GenLayerBiomeBOP extends GenLayerBiome this.biomeLists[2].addAll(BOPBiomeManager.overworldBiomes[2]); this.biomeLists[3].addAll(BOPBiomeManager.overworldBiomes[3]); - this.biomeLists[0].addAll(BiomeManager.desertBiomes); - this.biomeLists[1].addAll(BiomeManager.warmBiomes); - this.biomeLists[2].addAll(BiomeManager.coolBiomes); - this.biomeLists[3].addAll(BiomeManager.icyBiomes); + if (BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT) != null) + { + this.biomeLists[0].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.WARM) != null) + { + this.biomeLists[1].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.WARM)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.COOL) != null) + { + this.biomeLists[2].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.COOL)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.ICY) != null) + { + this.biomeLists[3].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.ICY)); + } this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.desert, 30)); this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.savanna, 20)); From 947956639e7ecb220c2f73a0cc091bbd1e4d3d0c Mon Sep 17 00:00:00 2001 From: Pahimar Date: Fri, 10 Oct 2014 13:08:40 -0400 Subject: [PATCH 3/3] Update for Forge 1224 --- .../common/world/layer/GenLayerBiomeBOP.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index eba461ee8..af94d102d 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -1,9 +1,8 @@ package biomesoplenty.common.world.layer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; +import biomesoplenty.common.core.BOPBiomes; +import biomesoplenty.common.world.BOPBiomeManager; import net.minecraft.util.WeightedRandom; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; @@ -12,9 +11,9 @@ import net.minecraft.world.gen.layer.GenLayerBiome; import net.minecraft.world.gen.layer.IntCache; import net.minecraftforge.common.BiomeManager; import net.minecraftforge.common.BiomeManager.BiomeEntry; -import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; -import biomesoplenty.common.core.BOPBiomes; -import biomesoplenty.common.world.BOPBiomeManager; + +import java.util.ArrayList; +import java.util.List; public class GenLayerBiomeBOP extends GenLayerBiome { @@ -33,24 +32,24 @@ public class GenLayerBiomeBOP extends GenLayerBiome if (BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT) != null) { - this.biomeLists[0].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT)); - } - - if (BiomeManager.getBiomes(BiomeManager.BiomeType.WARM) != null) - { - this.biomeLists[1].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.WARM)); - } - - if (BiomeManager.getBiomes(BiomeManager.BiomeType.COOL) != null) - { - this.biomeLists[2].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.COOL)); - } - - if (BiomeManager.getBiomes(BiomeManager.BiomeType.ICY) != null) - { - this.biomeLists[3].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.ICY)); - } - + this.biomeLists[0].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.WARM) != null) + { + this.biomeLists[1].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.WARM)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.COOL) != null) + { + this.biomeLists[2].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.COOL)); + } + + if (BiomeManager.getBiomes(BiomeManager.BiomeType.ICY) != null) + { + this.biomeLists[3].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.ICY)); + } + this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.desert, 30)); this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.savanna, 20)); this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.plains, 10));