diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch index 78134195d8..7c5f6b7d4b 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java.patch @@ -8,7 +8,7 @@ + do { + block = par1World.func_147439_a(par3, par4, par5); -+ if (block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5)) ++ if (!(block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5))) + { + break; + } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch index 734d6e3d0b..8df9cd5e4f 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java.patch @@ -8,7 +8,7 @@ + do { + block = par1World.func_147439_a(par3, par4, par5); -+ if (block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5)) ++ if (!(block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5))) + { + break; + } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch index e55b84bf8c..76c681a859 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch @@ -17,7 +17,7 @@ Block block = par1World.func_147439_a(j1, i1, k1); - if (block.func_149688_o() != Material.field_151579_a && block.func_149688_o() != Material.field_151584_j) -+ if (block.isAir(par1World, j1, i1, k1) || block.isLeaves(par1World, j1, i1, k1)) ++ if (!(block.isAir(par1World, j1, i1, k1) || block.isLeaves(par1World, j1, i1, k1))) { if (block != Blocks.water && block != Blocks.flowing_water) { @@ -87,7 +87,7 @@ --par3; - if (par1World.func_147439_a(par2, par3, par4).func_149688_o() != Material.field_151579_a || i1 <= 0) -+ if (par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4) || i1 <= 0) ++ if (!(par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) { return; } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch index 9854950fc1..87659cd64d 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch @@ -8,7 +8,7 @@ + do { + block = par1World.func_147439_a(par3, par4, par5); -+ if (block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5)) ++ if (!(block.isLeaves(par1World, par3, par4, par5) || block.isAir(par1World, par3, par4, par5))) + { + break; + } diff --git a/src/main/java/net/minecraftforge/common/ForgeModContainer.java b/src/main/java/net/minecraftforge/common/ForgeModContainer.java index d54730a0c9..962e21cb2a 100644 --- a/src/main/java/net/minecraftforge/common/ForgeModContainer.java +++ b/src/main/java/net/minecraftforge/common/ForgeModContainer.java @@ -52,7 +52,7 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC public static boolean forceDuplicateFluidBlockCrash = true; public static boolean fullBoundingBoxLadders = false; public static double zombieSummonBaseChance = 0.1; - public static int[] blendRanges = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32 }; + public static int[] blendRanges = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }; public static float zombieBabyChance = 0.05f; public static boolean shouldSortRecipies = true; public static boolean disableVersionCheck = false; @@ -144,7 +144,7 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC FMLLog.warning("Disabling forced crashes on duplicate Fluid Blocks - USE AT YOUR OWN RISK"); } - prop = config.get(Configuration.CATEGORY_GENERAL, "biomeSkyBlendRange", new int[] { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32 }); + prop = config.get(Configuration.CATEGORY_GENERAL, "biomeSkyBlendRange", new int[] { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }); prop.comment = "Control the range of sky blending for colored skies in biomes."; blendRanges = prop.getIntList();