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

Fixed the MCP mappings.

This commit is contained in:
Eloraam 2011-10-02 18:42:15 +00:00
parent b763c73b74
commit 56438eb585
1 changed files with 215 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

381
forge/minecraft.patch
View File

@ -1,6 +1,6 @@
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButton.java ../src_work/minecraft/net/minecraft/src/BlockButton.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButton.java ../src_work/minecraft/net/minecraft/src/BlockButton.java
--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-10-02 14:29:22.000000000 -0400
@@ -41,36 +41,36 @@ @@ -41,36 +41,36 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -119,8 +119,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChest.java ../src_work/minecraft/net/minecraft/src/BlockChest.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChest.java ../src_work/minecraft/net/minecraft/src/BlockChest.java
--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-10-02 14:29:22.000000000 -0400
@@ -423,23 +423,23 @@ @@ -423,23 +423,23 @@
{ {
return true; return true;
@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes
return true; return true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockContainer.java ../src_work/minecraft/net/minecraft/src/BlockContainer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockContainer.java ../src_work/minecraft/net/minecraft/src/BlockContainer.java
--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 2011-10-02 14:29:22.000000000 -0400
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
public void onBlockAdded(World world, int i, int j, int k) public void onBlockAdded(World world, int i, int j, int k)
{ {
@ -176,8 +176,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCont
{ {
super.playBlock(world, i, j, k, l, i1); super.playBlock(world, i, j, k, l, i1);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCrops.java ../src_work/minecraft/net/minecraft/src/BlockCrops.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCrops.java ../src_work/minecraft/net/minecraft/src/BlockCrops.java
--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:32.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 2011-10-02 14:29:22.000000000 -0400
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -225,8 +225,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCrop
public int idDropped(int i, Random random) public int idDropped(int i, Random random)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java
--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-10-02 14:29:22.000000000 -0400
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
flag = true; flag = true;
@ -246,8 +246,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.java ../src_work/minecraft/net/minecraft/src/Block.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.java ../src_work/minecraft/net/minecraft/src/Block.java
--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-10-02 03:06:23.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -437,8 +437,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav
{ {
try try
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadder.java ../src_work/minecraft/net/minecraft/src/BlockLadder.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadder.java ../src_work/minecraft/net/minecraft/src/BlockLadder.java
--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-10-02 14:29:22.000000000 -0400
@@ -63,6 +63,11 @@ @@ -63,6 +63,11 @@
return super.getSelectedBoundingBoxFromPool(world, i, j, k); return super.getSelectedBoundingBoxFromPool(world, i, j, k);
} }
@ -522,8 +522,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLever.java ../src_work/minecraft/net/minecraft/src/BlockLever.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLever.java ../src_work/minecraft/net/minecraft/src/BlockLever.java
--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-10-02 14:29:22.000000000 -0400
@@ -40,44 +40,44 @@ @@ -40,44 +40,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -643,8 +643,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-10-02 14:29:22.000000000 -0400
@@ -46,7 +46,8 @@ @@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -666,8 +666,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail.java ../src_work/minecraft/net/minecraft/src/BlockRail.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail.java ../src_work/minecraft/net/minecraft/src/BlockRail.java
--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-10-02 14:29:22.000000000 -0400
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k) public static final boolean isRailBlockAt(World world, int i, int j, int k)
{ {
@ -722,8 +722,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-10-02 14:29:22.000000000 -0400
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -743,8 +743,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
return false; return false;
} else } else
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -774,8 +774,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
{ {
return true; return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java
--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:39.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,7 +4,10 @@ @@ -4,7 +4,10 @@
package net.minecraft.src; package net.minecraft.src;
@ -813,8 +813,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTall
public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorch.java ../src_work/minecraft/net/minecraft/src/BlockTorch.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorch.java ../src_work/minecraft/net/minecraft/src/BlockTorch.java
--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-10-02 14:29:22.000000000 -0400
@@ -41,24 +41,24 @@ @@ -41,24 +41,24 @@
private boolean func_31032_h(World world, int i, int j, int k) private boolean func_31032_h(World world, int i, int j, int k)
@ -918,8 +918,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-10-02 14:29:22.000000000 -0400
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
{ {
j1--; j1--;
@ -955,8 +955,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap
+ public static boolean disableValidation=false; + public static boolean disableValidation=false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-30 08:25:56.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1302,8 +1302,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav
for(l = -1; i1 > 0 && l == -1;) for(l = -1; i1 > 0 && l == -1;)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-10-02 14:29:22.000000000 -0400
@@ -7,6 +7,9 @@ @@ -7,6 +7,9 @@
import java.util.*; import java.util.*;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -1451,8 +1451,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
private Random rand; private Random rand;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiving.java ../src_work/minecraft/net/minecraft/src/EntityLiving.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiving.java ../src_work/minecraft/net/minecraft/src/EntityLiving.java
--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-10-02 14:29:22.000000000 -0400
@@ -624,7 +624,9 @@ @@ -624,7 +624,9 @@
int i = MathHelper.floor_double(posX); int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY); int j = MathHelper.floor_double(boundingBox.minY);
@ -1465,8 +1465,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv
public void writeEntityToNBT(NBTTagCompound nbttagcompound) public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,10 @@ @@ -4,6 +4,10 @@
package net.minecraft.src; package net.minecraft.src;
@ -1542,8 +1542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla
{ {
if(isPlayerSleeping() || !isEntityAlive()) if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRenderer.java ../src_work/minecraft/net/minecraft/src/EntityRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRenderer.java ../src_work/minecraft/net/minecraft/src/EntityRenderer.java
--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -1579,8 +1579,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen
} }
renderRainSnow(f); renderRainSnow(f);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-10-02 14:29:22.000000000 -0400
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -1609,8 +1609,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion
if(f1 > 0.0F) if(f1 > 0.0F)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java
--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-10-02 14:29:22.000000000 -0400
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
import java.util.HashMap; import java.util.HashMap;
@ -1668,8 +1668,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock.java ../src_work/minecraft/net/minecraft/src/ItemBlock.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock.java ../src_work/minecraft/net/minecraft/src/ItemBlock.java
--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:22.000000000 -0400
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
{ {
return false; return false;
@ -1680,8 +1680,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-10-02 14:29:22.000000000 -0400
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; import java.util.Random;
@ -1704,8 +1704,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
{ {
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.java ../src_work/minecraft/net/minecraft/src/ItemDye.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.java ../src_work/minecraft/net/minecraft/src/ItemDye.java
--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-10-02 01:36:25.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1750,8 +1750,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.j
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java
--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:22.000000000 -0400
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
{ {
i++; i++;
@ -1762,8 +1762,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.java ../src_work/minecraft/net/minecraft/src/ItemHoe.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.java ../src_work/minecraft/net/minecraft/src/ItemHoe.java
--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-10-02 14:29:22.000000000 -0400
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -1774,8 +1774,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.j
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Item.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-10-02 14:29:22.000000000 -0400
@@ -76,6 +76,13 @@ @@ -76,6 +76,13 @@
return 1.0F; return 1.0F;
} }
@ -1791,8 +1791,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java
{ {
return itemstack; return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedstone.java ../src_work/minecraft/net/minecraft/src/ItemRedstone.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedstone.java ../src_work/minecraft/net/minecraft/src/ItemRedstone.java
--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-10-02 14:29:22.000000000 -0400
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
return false; return false;
} }
@ -1803,8 +1803,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed.java ../src_work/minecraft/net/minecraft/src/ItemReed.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed.java ../src_work/minecraft/net/minecraft/src/ItemReed.java
--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-10-02 14:29:22.000000000 -0400
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
i++; i++;
} }
@ -1815,8 +1815,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed.
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-10-02 14:29:22.000000000 -0400
@@ -5,6 +5,10 @@ @@ -5,6 +5,10 @@
package net.minecraft.src; package net.minecraft.src;
@ -1858,8 +1858,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
int i = entityliving.getItemIcon(itemstack); int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds.java ../src_work/minecraft/net/minecraft/src/ItemSeeds.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds.java ../src_work/minecraft/net/minecraft/src/ItemSeeds.java
--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-10-02 14:29:22.000000000 -0400
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
{ {
return false; return false;
@ -1870,8 +1870,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -1907,8 +1907,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
protected EnumToolMaterial toolMaterial; protected EnumToolMaterial toolMaterial;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java
--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-10-02 14:29:22.000000000 -0400
@@ -35,4 +35,7 @@ @@ -35,4 +35,7 @@
public int sideHit; public int sideHit;
public Vec3D hitVec; public Vec3D hitVec;
@ -1918,8 +1918,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj
+ public int subHit=-1; + public int subHit=-1;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java
--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1937,8 +1937,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
return true; return true;
} else } else
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-10-02 14:31:02.000000000 -0400
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
package net.minecraft.src; package net.minecraft.src;
@ -1964,7 +1964,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
Block block = Block.blocksList[i1]; Block block = Block.blocksList[i1];
- curBlockDamageMP += block.blockStrength(mc.thePlayer); - curBlockDamageMP += block.blockStrength(mc.thePlayer);
+ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k);
if(field_9441_h % 4F == 0.0F && block != null) if(stepSoundTickCounter % 4F == 0.0F && block != null)
{ {
mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F); mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
@@ -204,6 +207,13 @@ @@ -204,6 +207,13 @@
@ -1994,9 +1994,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
} }
} }
Only in ../src_work/minecraft/net/minecraft/src: PlayerControllerMP.java.orig
Only in ../src_work/minecraft/net/minecraft/src: PlayerControllerMP.java.rej
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2060,8 +2062,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlocks.java ../src_work/minecraft/net/minecraft/src/RenderBlocks.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlocks.java ../src_work/minecraft/net/minecraft/src/RenderBlocks.java
--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-10-02 14:29:22.000000000 -0400
@@ -2980,7 +2980,7 @@ @@ -2980,7 +2980,7 @@
colorBlueTopRight *= f27; colorBlueTopRight *= f27;
int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); int j2 = block.getBlockTexture(blockAccess, i, j, k, 2);
@ -2135,8 +2137,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo
tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2);
renderSouthFace(block, i, j, k, 38); renderSouthFace(block, i, j, k, 38);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEngine.java ../src_work/minecraft/net/minecraft/src/RenderEngine.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEngine.java ../src_work/minecraft/net/minecraft/src/RenderEngine.java
--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-10-02 14:29:22.000000000 -0400
@@ -128,6 +128,9 @@ @@ -128,6 +128,9 @@
} }
try try
@ -2148,8 +2150,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng
GLAllocation.generateTextureNames(singleIntBuffer); GLAllocation.generateTextureNames(singleIntBuffer);
int i = singleIntBuffer.get(0); int i = singleIntBuffer.get(0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlobal.java ../src_work/minecraft/net/minecraft/src/RenderGlobal.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlobal.java ../src_work/minecraft/net/minecraft/src/RenderGlobal.java
--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-10-02 14:29:22.000000000 -0400
@@ -1635,8 +1635,8 @@ @@ -1635,8 +1635,8 @@
} }
@ -2173,8 +2175,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo
private boolean occlusionEnabled; private boolean occlusionEnabled;
private int cloudOffsetX; private int cloudOffsetX;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,10 @@ @@ -4,6 +4,10 @@
package net.minecraft.src; package net.minecraft.src;
@ -2288,8 +2290,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte
int k1 = Item.itemsList[i].getColorFromDamage(j); int k1 = Item.itemsList[i].getColorFromDamage(j);
float f = (float)(k1 >> 16 & 0xff) / 255F; float f = (float)(k1 >> 16 & 0xff) / 255F;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPlayer.java ../src_work/minecraft/net/minecraft/src/RenderPlayer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPlayer.java ../src_work/minecraft/net/minecraft/src/RenderPlayer.java
--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 04:49:13.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -2315,8 +2317,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla
modelbiped.bipedHead.showModel = i == 0; modelbiped.bipedHead.showModel = i == 0;
modelbiped.bipedHeadwear.showModel = i == 0; modelbiped.bipedHeadwear.showModel = i == 0;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCrafting.java ../src_work/minecraft/net/minecraft/src/SlotCrafting.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCrafting.java ../src_work/minecraft/net/minecraft/src/SlotCrafting.java
--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2334,8 +2336,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft
{ {
ItemStack itemstack1 = craftMatrix.getStackInSlot(i); ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java
--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-10-02 14:37:42.000000000 -0400
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -2365,7 +2367,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
- byteBuffer = GLAllocation.createDirectByteBuffer(i * 4); - byteBuffer = GLAllocation.createDirectByteBuffer(i * 4);
- intBuffer = byteBuffer.asIntBuffer(); - intBuffer = byteBuffer.asIntBuffer();
- floatBuffer = byteBuffer.asFloatBuffer(); - floatBuffer = byteBuffer.asFloatBuffer();
- field_35836_g = byteBuffer.asShortBuffer(); - shortBuffer = byteBuffer.asShortBuffer();
- rawBuffer = new int[i]; - rawBuffer = new int[i];
- useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; - useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object;
- if(useVBO) - if(useVBO)
@ -2463,7 +2465,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
- private ByteBuffer byteBuffer; - private ByteBuffer byteBuffer;
- private IntBuffer intBuffer; - private IntBuffer intBuffer;
- private FloatBuffer floatBuffer; - private FloatBuffer floatBuffer;
- private ShortBuffer field_35836_g; - private ShortBuffer shortBuffer;
+ private static boolean useVBO = false; + private static boolean useVBO = false;
private int rawBuffer[]; private int rawBuffer[];
private int vertexCount; private int vertexCount;
@ -2500,7 +2502,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
+ private static ByteBuffer byteBuffer; + private static ByteBuffer byteBuffer;
+ private static IntBuffer intBuffer; + private static IntBuffer intBuffer;
+ private static FloatBuffer floatBuffer; + private static FloatBuffer floatBuffer;
+ private static ShortBuffer field_35836_g; + private static ShortBuffer shortBuffer;
+ public static Tessellator instance; + public static Tessellator instance;
+ +
+ static { + static {
@ -2512,7 +2514,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
+ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); + byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4);
+ intBuffer = byteBuffer.asIntBuffer(); + intBuffer = byteBuffer.asIntBuffer();
+ floatBuffer = byteBuffer.asFloatBuffer(); + floatBuffer = byteBuffer.asFloatBuffer();
+ field_35836_g = byteBuffer.asShortBuffer(); + shortBuffer = byteBuffer.asShortBuffer();
+ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; + useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object;
+ vboCount = 10; + vboCount = 10;
+ if(useVBO) + if(useVBO)
@ -2522,9 +2524,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
+ } + }
+ } + }
} }
Only in ../src_work/minecraft/net/minecraft/src: Tessellator.java.orig
Only in ../src_work/minecraft/net/minecraft/src: Tessellator.java.rej
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java
--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:28:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -2611,8 +2615,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
if(itemstack == null) if(itemstack == null)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java
--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-10-02 14:29:22.000000000 -0400
@@ -61,6 +61,13 @@ @@ -61,6 +61,13 @@
{ {
} }
@ -2628,8 +2632,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
{ {
TileEntity tileentity = null; TileEntity tileentity = null;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java
--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -2655,8 +2659,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
} }
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java
--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-26 15:46:44.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/World.java 2011-10-02 14:29:20.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/World.java 2011-10-02 14:29:22.000000000 -0400
@@ -336,7 +336,10 @@ @@ -336,7 +336,10 @@
public boolean isAirBlock(int i, int j, int k) public boolean isAirBlock(int i, int j, int k)
@ -2823,7 +2827,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
public void saveWorldIndirectly(IProgressUpdate iprogressupdate) public void saveWorldIndirectly(IProgressUpdate iprogressupdate)
@@ -2308,7 +2304,7 @@ @@ -2308,7 +2304,7 @@
private int func_35458_d(int i, int j, int k, int l, int i1, int j1) private int computeBlockLightValue(int i, int j, int k, int l, int i1, int j1)
{ {
- int k1 = Block.lightValue[i1]; - int k1 = Block.lightValue[i1];
+ int k1=(i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); + int k1=(i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l);
@ -2839,7 +2843,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
} }
@@ -3193,7 +3190,7 @@ @@ -3193,7 +3190,7 @@
public int field_27172_i; public int lightningFlash;
public boolean editingBlocks; public boolean editingBlocks;
private long lockTimestamp; private long lockTimestamp;
- protected int autosavePeriod; - protected int autosavePeriod;
@ -2847,9 +2851,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
public int difficultySetting; public int difficultySetting;
public Random rand; public Random rand;
public boolean isNewWorld; public boolean isNewWorld;
Only in ../src_work/minecraft/net/minecraft/src: World.java.orig
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -2926,8 +2931,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
- } - }
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockButton.java ../src_work/minecraft_server/net/minecraft/src/BlockButton.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockButton.java ../src_work/minecraft_server/net/minecraft/src/BlockButton.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-10-02 14:29:22.000000000 -0400
@@ -41,36 +41,36 @@ @@ -41,36 +41,36 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -3046,8 +3051,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockChest.java ../src_work/minecraft_server/net/minecraft/src/BlockChest.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockChest.java ../src_work/minecraft_server/net/minecraft/src/BlockChest.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-10-02 14:29:22.000000000 -0400
@@ -328,23 +328,23 @@ @@ -328,23 +328,23 @@
{ {
return true; return true;
@ -3078,8 +3083,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
return true; return true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-10-02 14:29:22.000000000 -0400
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
public void onBlockAdded(World world, int i, int j, int k) public void onBlockAdded(World world, int i, int j, int k)
{ {
@ -3103,8 +3108,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{ {
super.playBlock(world, i, j, k, l, i1); super.playBlock(world, i, j, k, l, i1);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:30.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 2011-10-02 14:29:22.000000000 -0400
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -3152,8 +3157,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
public int idDropped(int i, Random random) public int idDropped(int i, Random random)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-10-02 14:29:22.000000000 -0400
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
flag = true; flag = true;
@ -3173,8 +3178,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Block.java ../src_work/minecraft_server/net/minecraft/src/Block.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Block.java ../src_work/minecraft_server/net/minecraft/src/Block.java
--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-10-02 03:06:26.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -3347,8 +3352,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{ {
try try
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-10-02 14:29:22.000000000 -0400
@@ -40,6 +40,11 @@ @@ -40,6 +40,11 @@
return super.getCollisionBoundingBoxFromPool(world, i, j, k); return super.getCollisionBoundingBoxFromPool(world, i, j, k);
} }
@ -3432,8 +3437,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLever.java ../src_work/minecraft_server/net/minecraft/src/BlockLever.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLever.java ../src_work/minecraft_server/net/minecraft/src/BlockLever.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-10-02 14:29:22.000000000 -0400
@@ -35,44 +35,44 @@ @@ -35,44 +35,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -3553,8 +3558,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-10-02 14:29:22.000000000 -0400
@@ -46,7 +46,8 @@ @@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -3576,8 +3581,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRail.java ../src_work/minecraft_server/net/minecraft/src/BlockRail.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRail.java ../src_work/minecraft_server/net/minecraft/src/BlockRail.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-10-02 14:29:22.000000000 -0400
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k) public static final boolean isRailBlockAt(World world, int i, int j, int k)
{ {
@ -3632,8 +3637,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-10-02 14:29:22.000000000 -0400
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -3653,8 +3658,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
return false; return false;
} else } else
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -3684,8 +3689,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{ {
return true; return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:35.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,7 +4,10 @@ @@ -4,7 +4,10 @@
package net.minecraft.src; package net.minecraft.src;
@ -3722,8 +3727,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-10-02 14:29:22.000000000 -0400
@@ -36,24 +36,24 @@ @@ -36,24 +36,24 @@
private boolean canPlaceTorchOn(World world, int i, int j, int k) private boolean canPlaceTorchOn(World world, int i, int j, int k)
@ -3827,8 +3832,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true; flag = true;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-10-02 14:29:22.000000000 -0400
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
{ {
j1--; j1--;
@ -3864,8 +3869,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
+ public static boolean disableValidation=false; + public static boolean disableValidation=false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java
--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-30 08:25:53.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -4160,8 +4165,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
for(l = -1; i1 > 0 && l == -1;) for(l = -1; i1 > 0 && l == -1;)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-10-02 14:29:22.000000000 -0400
@@ -600,7 +600,9 @@ @@ -600,7 +600,9 @@
int i = MathHelper.floor_double(posX); int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY); int j = MathHelper.floor_double(boundingBox.minY);
@ -4174,8 +4179,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
public void writeEntityToNBT(NBTTagCompound nbttagcompound) public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-10-02 14:29:22.000000000 -0400
@@ -6,6 +6,10 @@ @@ -6,6 +6,10 @@
import java.util.*; import java.util.*;
@ -4251,8 +4256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
{ {
if(isPlayerSleeping() || !isEntityAlive()) if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -4280,8 +4285,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex
if(f1 > 0.0F) if(f1 > 0.0F)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java
--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-10-02 14:29:22.000000000 -0400
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
import java.util.HashMap; import java.util.HashMap;
@ -4339,8 +4344,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:22.000000000 -0400
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
{ {
return false; return false;
@ -4351,8 +4356,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-10-02 14:29:22.000000000 -0400
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; import java.util.Random;
@ -4376,8 +4381,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{ {
return itemstack; return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemDye.java ../src_work/minecraft_server/net/minecraft/src/ItemDye.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemDye.java ../src_work/minecraft_server/net/minecraft/src/ItemDye.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-10-02 01:36:28.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -4422,8 +4427,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:22.000000000 -0400
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
{ {
i++; i++;
@ -4434,8 +4439,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-10-02 14:29:22.000000000 -0400
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -4446,8 +4451,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -4529,8 +4534,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Item.java ../src_work/minecraft_server/net/minecraft/src/Item.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Item.java ../src_work/minecraft_server/net/minecraft/src/Item.java
--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-10-02 14:29:22.000000000 -0400
@@ -66,6 +66,13 @@ @@ -66,6 +66,13 @@
return 1.0F; return 1.0F;
} }
@ -4546,8 +4551,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{ {
return itemstack; return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-10-02 14:29:22.000000000 -0400
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
return false; return false;
} }
@ -4558,8 +4563,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemReed.java ../src_work/minecraft_server/net/minecraft/src/ItemReed.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemReed.java ../src_work/minecraft_server/net/minecraft/src/ItemReed.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-10-02 14:29:22.000000000 -0400
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
i++; i++;
} }
@ -4570,8 +4575,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-10-02 14:29:22.000000000 -0400
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
{ {
return false; return false;
@ -4582,8 +4587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
return false; return false;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -4619,8 +4624,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
protected EnumToolMaterial toolMaterial; protected EnumToolMaterial toolMaterial;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java
--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-10-02 14:29:22.000000000 -0400
@@ -35,4 +35,7 @@ @@ -35,4 +35,7 @@
public int sideHit; public int sideHit;
public Vec3D hitVec; public Vec3D hitVec;
@ -4630,8 +4635,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo
+ public int subHit=-1; + public int subHit=-1;
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java
--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-10-02 14:29:22.000000000 -0400
@@ -168,12 +168,11 @@ @@ -168,12 +168,11 @@
sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
for(int k = 0; k < numBlocksToUpdate; k++) for(int k = 0; k < numBlocksToUpdate; k++)
@ -4649,8 +4654,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Pl
} }
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java
--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-10-02 14:29:22.000000000 -0400
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -4669,8 +4674,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl
{ {
ItemStack itemstack1 = craftMatrix.getStackInSlot(i); ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java
--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:22:11.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-10-02 14:29:22.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -4767,8 +4772,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti
if(itemstack == null) if(itemstack == null)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntity.java ../src_work/minecraft_server/net/minecraft/src/TileEntity.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntity.java ../src_work/minecraft_server/net/minecraft/src/TileEntity.java
--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-10-02 14:29:22.000000000 -0400
@@ -61,6 +61,13 @@ @@ -61,6 +61,13 @@
{ {
} }
@ -4784,8 +4789,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti
{ {
TileEntity tileentity = null; TileEntity tileentity = null;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-26 15:46:45.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-10-01 20:06:23.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-10-02 14:35:03.000000000 -0400
@@ -183,7 +183,11 @@ @@ -183,7 +183,11 @@
public boolean isAirBlock(int i, int j, int k) public boolean isAirBlock(int i, int j, int k)
@ -4825,19 +4830,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo
- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); - markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord);
} }
} while(true); } while(true);
field_34901_P.clear(); addedTileEntityList.clear();
@@ -1168,13 +1172,19 @@ @@ -1168,13 +1172,19 @@
public void addTileEntity(Collection collection) public void addTileEntity(Collection collection)
{ {
- if(scanningTileEntities) - if(scanningTileEntities)
- { - {
- field_34901_P.addAll(collection); - addedTileEntityList.addAll(collection);
- } else - } else
- { - {
- loadedTileEntityList.addAll(collection); - loadedTileEntityList.addAll(collection);
- } - }
+ List dest=scanningTileEntities ? field_34901_P : + List dest=scanningTileEntities ? addedTileEntityList :
+ loadedTileEntityList; + loadedTileEntityList;
+ for(Object ob : collection) { + for(Object ob : collection) {
+ TileEntity te=(TileEntity)ob; + TileEntity te=(TileEntity)ob;
@ -4847,7 +4852,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo
+ +
+ /* FORGE: Used as a bugfix */ + /* FORGE: Used as a bugfix */
+ public void addTileEntity(TileEntity te) { + public void addTileEntity(TileEntity te) {
+ List dest=scanningTileEntities ? field_34901_P : + List dest=scanningTileEntities ? addedTileEntityList :
+ loadedTileEntityList; + loadedTileEntityList;
+ if(te.canUpdate()) dest.add(te); + if(te.canUpdate()) dest.add(te);
} }
@ -4874,7 +4879,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo
- tileentity.xCoord = i; - tileentity.xCoord = i;
- tileentity.yCoord = j; - tileentity.yCoord = j;
- tileentity.zCoord = k; - tileentity.zCoord = k;
- field_34901_P.add(tileentity); - addedTileEntityList.add(tileentity);
- } else - } else
- { - {
- loadedTileEntityList.add(tileentity); - loadedTileEntityList.add(tileentity);
@ -4887,7 +4892,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo
- } - }
+ if(tileentity==null || tileentity.isInvalid()) + if(tileentity==null || tileentity.isInvalid())
+ return; + return;
+ List dest=scanningTileEntities ? field_34901_P : + List dest=scanningTileEntities ? addedTileEntityList :
+ loadedTileEntityList; + loadedTileEntityList;
+ if(tileentity.canUpdate()) dest.add(tileentity); + if(tileentity.canUpdate()) dest.add(tileentity);
+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); + Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4);
@ -4973,9 +4978,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo
public int difficultySetting; public int difficultySetting;
public Random rand; public Random rand;
public boolean isNewWorld; public boolean isNewWorld;
Only in ../src_work/minecraft_server/net/minecraft/src: World.java.orig
Only in ../src_work/minecraft_server/net/minecraft/src: World.java.rej
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/WorldServer.java ../src_work/minecraft_server/net/minecraft/src/WorldServer.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/WorldServer.java ../src_work/minecraft_server/net/minecraft/src/WorldServer.java
--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-26 15:46:46.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-30 08:24:14.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-10-02 14:29:22.000000000 -0400
@@ -54,15 +54,20 @@ @@ -54,15 +54,20 @@
public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) public List getTileEntityList(int i, int j, int k, int l, int i1, int j1)
{ {