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

Fixed faces for BlockFire

This commit is contained in:
LexManos 2012-01-01 09:30:42 +00:00
parent e26f1ab671
commit f3e56e0273
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch
View File

@ -74,8 +74,8 @@
- tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l); - tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l);
+ tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4); + tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4);
+ tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5); + tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5);
+ tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0); + tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 1);
+ tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1); + tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 0);
+ tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3); + tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3);
+ tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2); + tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2);
for(int i1 = i - 1; i1 <= i + 1; i1++) for(int i1 = i - 1; i1 <= i + 1; i1++)
@ -121,12 +121,12 @@
return true; return true;
} }
- if(canBlockCatchFire(world, i, j - 1, k)) - if(canBlockCatchFire(world, i, j - 1, k))
+ if(canBlockCatchFire(world, i, j - 1, k, 0)) + if(canBlockCatchFire(world, i, j - 1, k, 1))
{ {
return true; return true;
} }
- if(canBlockCatchFire(world, i, j + 1, k)) - if(canBlockCatchFire(world, i, j + 1, k))
+ if(canBlockCatchFire(world, i, j + 1, k, 1)) + if(canBlockCatchFire(world, i, j + 1, k, 0))
{ {
return true; return true;
} }
@ -150,10 +150,10 @@
- l = getChanceToEncourageFire(world, i, j + 1, k, l); - l = getChanceToEncourageFire(world, i, j + 1, k, l);
- l = getChanceToEncourageFire(world, i, j, k - 1, l); - l = getChanceToEncourageFire(world, i, j, k - 1, l);
- l = getChanceToEncourageFire(world, i, j, k + 1, l); - l = getChanceToEncourageFire(world, i, j, k + 1, l);
+ l = getChanceToEncourageFire(world, i + 1, j, k, l, 5); + l = getChanceToEncourageFire(world, i + 1, j, k, l, 4);
+ l = getChanceToEncourageFire(world, i - 1, j, k, l, 4); + l = getChanceToEncourageFire(world, i - 1, j, k, l, 5);
+ l = getChanceToEncourageFire(world, i, j - 1, k, l, 0); + l = getChanceToEncourageFire(world, i, j - 1, k, l, 1);
+ l = getChanceToEncourageFire(world, i, j + 1, k, l, 1); + l = getChanceToEncourageFire(world, i, j + 1, k, l, 0);
+ l = getChanceToEncourageFire(world, i, j, k - 1, l, 3); + l = getChanceToEncourageFire(world, i, j, k - 1, l, 3);
+ l = getChanceToEncourageFire(world, i, j, k + 1, l, 2); + l = getChanceToEncourageFire(world, i, j, k + 1, l, 2);
return l; return l;
@ -211,13 +211,13 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
{ {
- return world.isBlockNormalCube(i, j - 1, k) || func_263_h(world, i, j, k); - return world.isBlockNormalCube(i, j - 1, k) || func_263_h(world, i, j, k);
+ return world.isBlockSolidOnSide(i, j - 1, k, 0) || func_263_h(world, i, j, k); + return world.isBlockSolidOnSide(i, j - 1, k, 1) || func_263_h(world, i, j, k);
} }
public void onNeighborBlockChange(World world, int i, int j, int k, int l) public void onNeighborBlockChange(World world, int i, int j, int k, int l)
{ {
- if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k)) - if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k))
+ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k)) + if(!world.isBlockSolidOnSide(i, j - 1, k, 1) && !func_263_h(world, i, j, k))
{ {
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
return; return;
@ -235,7 +235,7 @@
world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F); world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
} }
- if(world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k)) - if(world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k))
+ if(world.isBlockSolidOnSide(i, j - 1, k, 0) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 0)) + if(world.isBlockSolidOnSide(i, j - 1, k, 1) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 1))
{ {
for(int l = 0; l < 3; l++) for(int l = 0; l < 3; l++)
{ {
@ -244,7 +244,7 @@
} else } else
{ {
- if(Block.fire.canBlockCatchFire(world, i - 1, j, k)) - if(Block.fire.canBlockCatchFire(world, i - 1, j, k))
+ if(Block.fire.canBlockCatchFire(world, i - 1, j, k, 4)) + if(Block.fire.canBlockCatchFire(world, i - 1, j, k, 5))
{ {
for(int i1 = 0; i1 < 2; i1++) for(int i1 = 0; i1 < 2; i1++)
{ {
@ -253,7 +253,7 @@
} }
- if(Block.fire.canBlockCatchFire(world, i + 1, j, k)) - if(Block.fire.canBlockCatchFire(world, i + 1, j, k))
+ if(Block.fire.canBlockCatchFire(world, i + 1, j, k, 5)) + if(Block.fire.canBlockCatchFire(world, i + 1, j, k, 4))
{ {
for(int j1 = 0; j1 < 2; j1++) for(int j1 = 0; j1 < 2; j1++)
{ {
@ -280,7 +280,7 @@
} }
- if(Block.fire.canBlockCatchFire(world, i, j + 1, k)) - if(Block.fire.canBlockCatchFire(world, i, j + 1, k))
+ if(Block.fire.canBlockCatchFire(world, i, j + 1, k, 1)) + if(Block.fire.canBlockCatchFire(world, i, j + 1, k, 0))
{ {
for(int i2 = 0; i2 < 2; i2++) for(int i2 = 0; i2 < 2; i2++)
{ {

8
forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
View File

@ -5,7 +5,7 @@
double d3 = ((float)j1 + 15.99F) / 256F; double d3 = ((float)j1 + 15.99F) / 256F;
float f = 1.4F; float f = 1.4F;
- if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k)) - if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k))
+ if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k, 0)) + if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k, 1))
{ {
float f1 = 0.2F; float f1 = 0.2F;
float f2 = 0.0625F; float f2 = 0.0625F;
@ -14,7 +14,7 @@
d = d4; d = d4;
} }
- if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k)) - if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k))
+ if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k, 4)) + if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k, 5))
{ {
tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2); tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2);
tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3); tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3);
@ -23,7 +23,7 @@
tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2); tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2);
} }
- if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k)) - if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k))
+ if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k, 5)) + if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k, 4))
{ {
tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2); tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2);
tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3); tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3);
@ -50,7 +50,7 @@
tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2); tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2);
} }
- if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k)) - if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k))
+ if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k, 1)) + if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k, 0))
{ {
double d5 = (double)i + 0.5D + 0.5D; double d5 = (double)i + 0.5D + 0.5D;
double d7 = ((double)i + 0.5D) - 0.5D; double d7 = ((double)i + 0.5D) - 0.5D;

12
forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
View File

@ -74,8 +74,8 @@
- tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l); - tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l);
+ tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4); + tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4);
+ tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5); + tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5);
+ tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0); + tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 1);
+ tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1); + tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 0);
+ tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3); + tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3);
+ tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2); + tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2);
for(int i1 = i - 1; i1 <= i + 1; i1++) for(int i1 = i - 1; i1 <= i + 1; i1++)
@ -123,12 +123,12 @@
return true; return true;
} }
- if(canBlockCatchFire(world, i, j - 1, k)) - if(canBlockCatchFire(world, i, j - 1, k))
+ if(canBlockCatchFire(world, i, j - 1, k, 0)) + if(canBlockCatchFire(world, i, j - 1, k, 1))
{ {
return true; return true;
} }
- if(canBlockCatchFire(world, i, j + 1, k)) - if(canBlockCatchFire(world, i, j + 1, k))
+ if(canBlockCatchFire(world, i, j + 1, k, 1)) + if(canBlockCatchFire(world, i, j + 1, k, 0))
{ {
return true; return true;
} }
@ -154,8 +154,8 @@
- l = getChanceToEncourageFire(world, i, j, k + 1, l); - l = getChanceToEncourageFire(world, i, j, k + 1, l);
+ l = getChanceToEncourageFire(world, i + 1, j, k, l, 5); + l = getChanceToEncourageFire(world, i + 1, j, k, l, 5);
+ l = getChanceToEncourageFire(world, i - 1, j, k, l, 4); + l = getChanceToEncourageFire(world, i - 1, j, k, l, 4);
+ l = getChanceToEncourageFire(world, i, j - 1, k, l, 0); + l = getChanceToEncourageFire(world, i, j - 1, k, l, 1);
+ l = getChanceToEncourageFire(world, i, j + 1, k, l, 1); + l = getChanceToEncourageFire(world, i, j + 1, k, l, 0);
+ l = getChanceToEncourageFire(world, i, j, k - 1, l, 3); + l = getChanceToEncourageFire(world, i, j, k - 1, l, 3);
+ l = getChanceToEncourageFire(world, i, j, k + 1, l, 2); + l = getChanceToEncourageFire(world, i, j, k + 1, l, 2);
return l; return l;