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

Added armor texture hook.

Browse source
This commit is contained in:
Eloraam 2011-08-25 00:23:31 +00:00
parent b0efd106bd
commit 0457d8057f
2 changed files with 168 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java Normal file
View file

@ -0,0 +1,23 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
/**
* This interface has to be implemented by an instance of ItemArmor.
* It allows for the application of a custom texture file to the player skin
* when the armor is worn.
*/
public interface IArmorTextureProvider {
/**
* This interface has to return the path to a file that is the same
* format as iron_1.png (or any of the other armor files). It will be
* applied to the player skin when the armor is worn.
*/
public String getArmorTextureFile();
}

265
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-11 21:40:22.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-21 03:48:05.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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-11 22:00:30.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-21 03:48:05.000000000 -0400
@@ -230,23 +230,23 @@ @@ -230,23 +230,23 @@
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
{ {
@ -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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-11 22:01:46.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-21 03:48:05.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;
@ -172,8 +172,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-17 17:54:54.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -288,8 +288,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:59.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-21 03:48:05.000000000 -0400
@@ -63,6 +63,11 @@ @@ -63,6 +63,11 @@
return super.getSelectedBoundingBoxFromPool(world, i, j, k); return super.getSelectedBoundingBoxFromPool(world, i, j, k);
} }
@ -373,8 +373,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-11 22:12:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-21 03:48:05.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)
@ -494,8 +494,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:17:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-21 03:48:05.000000000 -0400
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -515,8 +515,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-17 17:10:13.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-21 03:48:05.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)
{ {
@ -571,8 +571,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:18:50.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-21 03:48:05.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)
@ -592,8 +592,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:29.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -623,8 +623,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-11 22:30:24.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-21 03:48:05.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)
@ -728,8 +728,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:38.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-21 03:48:05.000000000 -0400
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
{ {
j1--; j1--;
@ -757,8 +757,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-21 03:48:03.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -796,8 +796,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav
if(j1 != 0) if(j1 != 0)
{ {
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-21 03:48:05.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;
@ -941,8 +941,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-21 03:48:05.000000000 -0400
@@ -555,7 +555,9 @@ @@ -555,7 +555,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);
@ -955,8 +955,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-20 03:54:26.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-21 03:48:05.000000000 -0400
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
import java.util.*; import java.util.*;
@ -1045,8 +1045,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-20 06:25:56.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1081,10 +1081,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen
GL11.glEnable(3008 /*GL_ALPHA_TEST*/); GL11.glEnable(3008 /*GL_ALPHA_TEST*/);
} }
renderRainSnow(f); renderRainSnow(f);
Only in ../src_work/minecraft/net/minecraft/src: .EntityRenderer.java.swp
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1113,8 +1112,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:05.000000000 -0400
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; import java.util.Random;
@ -1139,8 +1138,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Item.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-12 17:59:17.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-21 03:48:05.000000000 -0400
@@ -75,6 +75,13 @@ @@ -75,6 +75,13 @@
return 1.0F; return 1.0F;
} }
@ -1156,8 +1155,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-21 03:48:05.000000000 -0400
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -1187,8 +1186,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-12 18:38:09.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -1214,8 +1213,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
{ {
itemstack.damageItem(2, entityliving1); itemstack.damageItem(2, entityliving1);
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:05.000000000 -0400
@@ -35,4 +35,7 @@ @@ -35,4 +35,7 @@
public int sideHit; public int sideHit;
public Vec3D hitVec; public Vec3D hitVec;
@ -1225,8 +1224,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj
+ public int subHit=0; + public int subHit=0;
} }
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-20 03:56:00.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1270,8 +1269,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/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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-12 00:47:04.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-21 03:48:05.000000000 -0400
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
{ {
Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer);
@ -1291,8 +1290,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
{ {
mc.sndManager.playSound(block.stepSound.func_1145_d(), (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.func_1145_d(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-12 19:08:13.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-21 03:48:05.000000000 -0400
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
int j1 = mc.theWorld.getBlockMetadata(i, j, k); int j1 = mc.theWorld.getBlockMetadata(i, j, k);
boolean flag = super.sendBlockRemoved(i, j, k, l); boolean flag = super.sendBlockRemoved(i, j, k, l);
@ -1321,8 +1320,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
{ {
mc.sndManager.playSound(block.stepSound.func_1145_d(), (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.func_1145_d(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-12 19:29:14.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-21 03:48:05.000000000 -0400
@@ -2171,7 +2171,7 @@ @@ -2171,7 +2171,7 @@
colorBlueTopRight *= f27; colorBlueTopRight *= f27;
int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); int i1 = block.getBlockTexture(blockAccess, i, j, k, 2);
@ -1396,8 +1395,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo
tessellator.setColorOpaque_F(f12 * f25 * f, f15 * f25 * f1, f18 * f25 * f2); tessellator.setColorOpaque_F(f12 * f25 * f, f15 * f25 * f1, f18 * f25 * 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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-11 23:20:23.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-21 03:48:05.000000000 -0400
@@ -126,6 +126,9 @@ @@ -126,6 +126,9 @@
} }
try try
@ -1409,8 +1408,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-20 18:22:41.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-21 03:48:05.000000000 -0400
@@ -1558,8 +1558,8 @@ @@ -1558,8 +1558,8 @@
} }
@ -1434,8 +1433,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-21 03:48:05.000000000 -0400
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
package net.minecraft.src; package net.minecraft.src;
@ -1496,9 +1495,36 @@ 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
--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-24 20:22:50.000000000 -0400
@@ -4,6 +4,7 @@
package net.minecraft.src;
+import net.minecraft.src.forge.IItemArmorPlayerTextureProvider;
import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
@@ -34,7 +35,14 @@
if(item instanceof ItemArmor)
{
ItemArmor itemarmor = (ItemArmor)item;
- loadTexture((new StringBuilder()).append("/armor/").append(armorFilenamePrefix[itemarmor.renderIndex]).append("_").append(i != 2 ? 1 : 2).append(".png").toString());
+ if ( item instanceof IArmorTextureProvider )
+ {
+ loadTexture( ((IArmorTextureProvider)item).getArmorTextureFile() );
+ }
+ else
+ {
+ loadTexture((new StringBuilder()).append("/armor/").append(armorFilenamePrefix[itemarmor.renderIndex]).append("_").append(i != 2 ? 1 : 2).append(".png").toString());
+ }
ModelBiped modelbiped = i != 2 ? modelArmorChestplate : modelArmor;
modelbiped.bipedHead.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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:26.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -1516,8 +1542,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 23:13:28.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-21 03:48:05.000000000 -0400
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
import java.io.PrintStream; import java.io.PrintStream;
@ -1702,8 +1728,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
} }
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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-12 19:32:56.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-21 03:48:05.000000000 -0400
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; package net.minecraft.src;
@ -1729,8 +1755,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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-17 17:56:22.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-21 03:48:05.000000000 -0400
@@ -313,7 +313,11 @@ @@ -313,7 +313,11 @@
public boolean isAirBlock(int i, int j, int k) public boolean isAirBlock(int i, int j, int k)
@ -1799,10 +1825,9 @@ 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-08-11 17:02:11.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-12 19:23:40.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-21 03:48:05.000000000 -0400
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
package net.minecraft.src; package net.minecraft.src;
@ -1885,8 +1910,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-11 21:44:46.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-21 03:48:05.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)
@ -2005,8 +2030,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-11 22:01:13.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-21 03:48:05.000000000 -0400
@@ -140,23 +140,23 @@ @@ -140,23 +140,23 @@
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
{ {
@ -2037,8 +2062,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/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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-11 22:02:01.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-21 03:48:05.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;
@ -2058,8 +2083,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-17 17:55:56.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2174,8 +2199,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:05.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-21 03:48:05.000000000 -0400
@@ -40,6 +40,11 @@ @@ -40,6 +40,11 @@
return super.getCollisionBoundingBoxFromPool(world, i, j, k); return super.getCollisionBoundingBoxFromPool(world, i, j, k);
} }
@ -2259,8 +2284,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-11 22:13:32.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-21 03:48:05.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)
@ -2380,8 +2405,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:18:08.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-21 03:48:05.000000000 -0400
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k) public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -2401,8 +2426,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-17 17:10:08.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-21 03:48:05.000000000 -0400
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
public static final boolean func_27029_g(World world, int i, int j, int k) public static final boolean func_27029_g(World world, int i, int j, int k)
{ {
@ -2457,8 +2482,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:19:02.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-21 03:48:05.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)
@ -2478,8 +2503,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:42.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2509,8 +2534,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/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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-11 22:31:30.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-21 03:48:05.000000000 -0400
@@ -36,24 +36,24 @@ @@ -36,24 +36,24 @@
private boolean func_31028_g(World world, int i, int j, int k) private boolean func_31028_g(World world, int i, int j, int k)
@ -2614,8 +2639,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:43.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-21 03:48:05.000000000 -0400
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
{ {
j1--; j1--;
@ -2643,8 +2668,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2682,8 +2707,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
if(j1 != 0) if(j1 != 0)
{ {
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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-11 20:47:14.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-21 03:48:05.000000000 -0400
@@ -532,7 +532,9 @@ @@ -532,7 +532,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);
@ -2696,8 +2721,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-20 03:53:18.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-21 03:48:05.000000000 -0400
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
import java.util.*; import java.util.*;
@ -2786,8 +2811,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2815,8 +2840,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/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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:05.000000000 -0400
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; import java.util.Random;
@ -2841,8 +2866,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{ {
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-20 03:56:01.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -2922,8 +2947,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-12 17:59:16.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-21 03:48:05.000000000 -0400
@@ -65,6 +65,13 @@ @@ -65,6 +65,13 @@
return 1.0F; return 1.0F;
} }
@ -2939,8 +2964,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/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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-12 18:38:14.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -2966,8 +2991,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{ {
itemstack.damageItem(2, entityliving1); itemstack.damageItem(2, entityliving1);
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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:05.000000000 -0400
@@ -35,4 +35,7 @@ @@ -35,4 +35,7 @@
public int sideHit; public int sideHit;
public Vec3D hitVec; public Vec3D hitVec;
@ -2977,8 +3002,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo
+ public int subHit=0; + public int subHit=0;
} }
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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-21 03:48:05.000000000 -0400
@@ -169,12 +169,11 @@ @@ -169,12 +169,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++)
@ -2996,8 +3021,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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:29.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-21 03:48:05.000000000 -0400
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // Decompiler options: packimports(3) braces deadcode
@ -3015,8 +3040,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/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-08-11 17:02:12.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-21 03:48:05.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-17 17:56:37.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-21 03:48:05.000000000 -0400
@@ -166,7 +166,11 @@ @@ -166,7 +166,11 @@
public boolean isAirBlock(int i, int j, int k) public boolean isAirBlock(int i, int j, int k)