keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed some inverted logic causing tress to not gen correctly.

This commit is contained in:
LexManos 2012-06-03 11:40:12 -07:00
parent 2d3cd792c9
commit fc5132b583
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch
View File

@ -18,7 +18,7 @@
- if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)]) - if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)])
+ Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)];
+ +
+ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block != null && block.canBeReplacedByLeaves(par1World, var13, var11, var14))) + if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block == null || block.canBeReplacedByLeaves(par1World, var13, var11, var14)))
{ {
this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15); this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15);
} }
@ -29,7 +29,7 @@
- if (!Block.opaqueCubeLookup[var12]) - if (!Block.opaqueCubeLookup[var12])
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (block != null && block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) + if (block == null || block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5))
{ {
this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10); this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10);
} }

6
forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch
View File

@ -7,7 +7,7 @@
- if (var12 != 0 && var12 != Block.leaves.blockID) - if (var12 != 0 && var12 != Block.leaves.blockID)
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (var12 != 0 && (block != null && block.isLeaves(par1World, var10, var8, var11))) + if (var12 != 0 && (block != null && !block.isLeaves(par1World, var10, var8, var11)))
{ {
var7 = false; var7 = false;
} }
@ -19,7 +19,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)];
+ +
+ if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) + (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14)))
{ {
this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2); this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2);
} }
@ -30,7 +30,7 @@
- if (var10 == 0 || var10 == Block.leaves.blockID) - if (var10 == 0 || var10 == Block.leaves.blockID)
+ Block block = Block.blocksList[var10]; + Block block = Block.blocksList[var10];
+ +
+ if (var10 == 0 || (block != null && block.isLeaves(par1World, par3, par4 + var16, par5))) + if (var10 == 0 || block == null || block.isLeaves(par1World, par3, par4 + var16, par5))
{ {
this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2); this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2);
} }

2
forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch
View File

@ -27,7 +27,7 @@
- if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)]) - if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)])
+ block = Block.blocksList[par1World.getBlockId(var11, var8, var13)]; + block = Block.blocksList[par1World.getBlockId(var11, var8, var13)];
+ +
+ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block != null && block.canBeReplacedByLeaves(par1World, var11, var8, var13))) + if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block == null || block.canBeReplacedByLeaves(par1World, var11, var8, var13)))
{ {
this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48197_a); this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48197_a);
} }

4
forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch
View File

@ -5,7 +5,7 @@
var12 = par1World.getBlockId(var10, var8, var11); var12 = par1World.getBlockId(var10, var8, var11);
- if (var12 != 0 && var12 != Block.leaves.blockID) - if (var12 != 0 && var12 != Block.leaves.blockID)
+ if (var12 != 0 && (Block.blocksList[var12] != null && Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) + if (var12 != 0 && (Block.blocksList[var12] != null && !Block.blocksList[var12].isLeaves(par1World, var10, var8, var11)))
{ {
if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID) if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID)
{ {
@ -17,7 +17,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)];
+ +
+ if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) + (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14)))
{ {
this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID); this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID);
} }

2
forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch
View File

@ -19,7 +19,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)]; + Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)];
+ +
+ if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) && + if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var14, var13, var16))) + (block == null || block.canBeReplacedByLeaves(par1World, var14, var13, var16)))
{ {
this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1); this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1);
} }

4
forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch
View File

@ -8,10 +8,10 @@
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (var12 != 0 && + if (var12 != 0 &&
+ (block == null || !block.isLeaves(par1World, var10, var8, var11)) && + !block.isLeaves(par1World, var10, var8, var11) &&
+ var12 != Block.grass.blockID && + var12 != Block.grass.blockID &&
+ var12 != Block.dirt.blockID && + var12 != Block.dirt.blockID &&
+ (block == null || !block.isWood(par1World, var10, var8, var11))) + !block.isWood(par1World, var10, var8, var11))
{ {
var7 = false; var7 = false;
} }

4
forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch
View File

@ -18,7 +18,7 @@
- if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)]) - if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)])
+ Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)];
+ +
+ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block != null && block.canBeReplacedByLeaves(par1World, var13, var11, var14))) + if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block == null || block.canBeReplacedByLeaves(par1World, var13, var11, var14)))
{ {
this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15); this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15);
} }
@ -29,7 +29,7 @@
- if (!Block.opaqueCubeLookup[var12]) - if (!Block.opaqueCubeLookup[var12])
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (block != null && block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) + if (block == null || block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5))
{ {
this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10); this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10);
} }

6
forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch
View File

@ -7,7 +7,7 @@
- if (var12 != 0 && var12 != Block.leaves.blockID) - if (var12 != 0 && var12 != Block.leaves.blockID)
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (var12 != 0 && (block != null && block.isLeaves(par1World, var10, var8, var11))) + if (var12 != 0 && (block != null && !block.isLeaves(par1World, var10, var8, var11)))
{ {
var7 = false; var7 = false;
} }
@ -19,7 +19,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)];
+ +
+ if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) + (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14)))
{ {
this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2); this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2);
} }
@ -30,7 +30,7 @@
- if (var10 == 0 || var10 == Block.leaves.blockID) - if (var10 == 0 || var10 == Block.leaves.blockID)
+ Block block = Block.blocksList[var10]; + Block block = Block.blocksList[var10];
+ +
+ if (var10 == 0 || (block != null && block.isLeaves(par1World, par3, par4 + var16, par5))) + if (var10 == 0 || block == null || block.isLeaves(par1World, par3, par4 + var16, par5))
{ {
this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2); this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2);
} }

2
forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch
View File

@ -27,7 +27,7 @@
- if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)]) - if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)])
+ block = Block.blocksList[par1World.getBlockId(var11, var8, var13)]; + block = Block.blocksList[par1World.getBlockId(var11, var8, var13)];
+ +
+ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block != null && block.canBeReplacedByLeaves(par1World, var11, var8, var13))) + if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block == null || block.canBeReplacedByLeaves(par1World, var11, var8, var13)))
{ {
this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48408_a); this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48408_a);
} }

4
forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch
View File

@ -5,7 +5,7 @@
var12 = par1World.getBlockId(var10, var8, var11); var12 = par1World.getBlockId(var10, var8, var11);
- if (var12 != 0 && var12 != Block.leaves.blockID) - if (var12 != 0 && var12 != Block.leaves.blockID)
+ if (var12 != 0 && (Block.blocksList[var12] != null && Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) + if (var12 != 0 && (Block.blocksList[var12] != null && !Block.blocksList[var12].isLeaves(par1World, var10, var8, var11)))
{ {
if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID) if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID)
{ {
@ -17,7 +17,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)];
+ +
+ if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) + (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14)))
{ {
this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID); this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID);
} }

2
forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch
View File

@ -19,7 +19,7 @@
+ Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)]; + Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)];
+ +
+ if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) && + if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) &&
+ (block != null && block.canBeReplacedByLeaves(par1World, var14, var13, var16))) + (block == null || block.canBeReplacedByLeaves(par1World, var14, var13, var16)))
{ {
this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1); this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1);
} }

4
forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch
View File

@ -8,10 +8,10 @@
+ Block block = Block.blocksList[var12]; + Block block = Block.blocksList[var12];
+ +
+ if (var12 != 0 && + if (var12 != 0 &&
+ (block == null || !block.isLeaves(par1World, var10, var8, var11)) && + !block.isLeaves(par1World, var10, var8, var11) &&
+ var12 != Block.grass.blockID && + var12 != Block.grass.blockID &&
+ var12 != Block.dirt.blockID && + var12 != Block.dirt.blockID &&
+ (block == null || !block.isWood(par1World, var10, var8, var11))) + !block.isWood(par1World, var10, var8, var11))
{ {
var7 = false; var7 = false;
} }