From 999ef3817a7ddfd21043a69f8af5dcf2c028b945 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 12 Jul 2011 21:02:20 +0000 Subject: [PATCH 001/169] added base directories From f0c6f089b449b0d34915dc8fd701336a06e934ef Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 12 Jul 2011 21:02:53 +0000 Subject: [PATCH 002/169] added main source directory From b8582051454385651a754a562723d839b0de9970 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 12 Jul 2011 21:03:55 +0000 Subject: [PATCH 003/169] added main project directories From 859a0d1dee655cceca4e6eba985e3b4b76195e27 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 14 Jul 2011 11:10:21 +0000 Subject: [PATCH 004/169] made initial setup, implemented custom bucket, for #1 --- forge/forge_client/.classpath | 12 ++ forge/forge_client/.project | 29 +++++ .../minecraft/src/forge/IBucketHandler.java | 10 ++ .../minecraft/src/forge/MinecraftForge.java | 28 +++++ forge/forge_server/.classpath | 12 ++ forge/forge_server/.project | 29 +++++ forge/minecraft.patch | 111 ++++++++++++++++++ forge/setup.sh | 7 ++ forge/update_patch.sh | 5 + 9 files changed, 243 insertions(+) create mode 100755 forge/forge_client/.classpath create mode 100755 forge/forge_client/.project create mode 100755 forge/forge_common/net/minecraft/src/forge/IBucketHandler.java create mode 100755 forge/forge_common/net/minecraft/src/forge/MinecraftForge.java create mode 100755 forge/forge_server/.classpath create mode 100755 forge/forge_server/.project create mode 100644 forge/minecraft.patch create mode 100755 forge/setup.sh create mode 100755 forge/update_patch.sh diff --git a/forge/forge_client/.classpath b/forge/forge_client/.classpath new file mode 100755 index 0000000000..fae6017a3b --- /dev/null +++ b/forge/forge_client/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/forge/forge_client/.project b/forge/forge_client/.project new file mode 100755 index 0000000000..12d4bdba87 --- /dev/null +++ b/forge/forge_client/.project @@ -0,0 +1,29 @@ + + + forge_client + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + + + forge_common + 2 + PARENT-1-PROJECT_LOC/forge_common + + + minecraft + 2 + PARENT-1-WORKSPACE_LOC/src_work/minecraft + + + diff --git a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java new file mode 100755 index 0000000000..96dd415344 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java @@ -0,0 +1,10 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.ItemStack; +import net.minecraft.src.World; + +public interface IBucketHandler { + + public ItemStack fillCustomBucket (World w, int i, int j, int k); + +} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java new file mode 100755 index 0000000000..2327e2723b --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -0,0 +1,28 @@ +package net.minecraft.src.forge; + +import java.util.LinkedList; + +import net.minecraft.src.ItemStack; +import net.minecraft.src.World; + +public class MinecraftForge { + + private static LinkedList bucketHandlers = new LinkedList(); + + public static ItemStack fillCustomBucket (World w, int i, int j, int k) { + for (IBucketHandler handler : bucketHandlers) { + ItemStack stack = handler.fillCustomBucket(w, i, j, k); + + if (stack != null) { + return stack; + } + } + + return null; + } + + public static void registerCustomBucketHander (IBucketHandler handler) { + bucketHandlers.add(handler); + } + +} diff --git a/forge/forge_server/.classpath b/forge/forge_server/.classpath new file mode 100755 index 0000000000..cce36288cd --- /dev/null +++ b/forge/forge_server/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/forge/forge_server/.project b/forge/forge_server/.project new file mode 100755 index 0000000000..90891bc878 --- /dev/null +++ b/forge/forge_server/.project @@ -0,0 +1,29 @@ + + + forge_server + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + + + forge_common + 2 + PARENT-1-PROJECT_LOC/forge_common + + + minecraft_server + 2 + PARENT-1-WORKSPACE_LOC/src_work/minecraft_server + + + diff --git a/forge/minecraft.patch b/forge/minecraft.patch new file mode 100644 index 0000000000..5d1e29efea --- /dev/null +++ b/forge/minecraft.patch @@ -0,0 +1,111 @@ +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-07-11 21:58:45.174682000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:34.748396700 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // Item, EntityPlayer, Vec3D, MathHelper, + // World, MovingObjectPosition, EnumMovingObjectType, Material, +@@ -55,6 +57,13 @@ + } + if(isFull == 0) + { ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); ++ ++ if (customBucket != null) { ++ return customBucket; ++ } ++ + if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) + { + world.setBlockWithNotify(i, j, k, 0); +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java +--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 21:58:45.468698800 +0200 ++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 22:00:55.619143000 +0200 +@@ -333,41 +333,22 @@ + } + finally + { +- System.exit(0); ++ try ++ { ++ stopServer(); ++ serverStopped = true; ++ } ++ catch(Throwable throwable2) ++ { ++ throwable2.printStackTrace(); ++ } ++ finally ++ { ++ System.exit(0); ++ } + } +- break MISSING_BLOCK_LABEL_350; +- } +- try +- { +- stopServer(); +- serverStopped = true; +- } +- catch(Throwable throwable) +- { +- throwable.printStackTrace(); +- } +- finally +- { +- System.exit(0); +- } +- break MISSING_BLOCK_LABEL_350; +- Exception exception2; +- exception2; +- try +- { +- stopServer(); +- serverStopped = true; +- } +- catch(Throwable throwable3) +- { +- throwable3.printStackTrace(); +- } +- finally +- { +- System.exit(0); +- } +- throw exception2; + } ++} + + private void doTick() + { +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-07-11 21:58:45.765715800 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:49.701251900 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // Item, EntityPlayer, Vec3D, MathHelper, + // World, MovingObjectPosition, EnumMovingObjectType, Material, +@@ -55,6 +57,13 @@ + } + if(isFull == 0) + { ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); ++ ++ if (customBucket != null) { ++ return customBucket; ++ } ++ + if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) + { + world.setBlockWithNotify(i, j, k, 0); diff --git a/forge/setup.sh b/forge/setup.sh new file mode 100755 index 0000000000..1ad87c465c --- /dev/null +++ b/forge/setup.sh @@ -0,0 +1,7 @@ +if [ ! -f ../src_base ]; then + cp -r ../src ../src_base + #patch -p0 < minecraft.patch + cp -r ../src ../src_work +else + echo "patch already applied - remove src and src_base and decompile again" +fi diff --git a/forge/update_patch.sh b/forge/update_patch.sh new file mode 100755 index 0000000000..9e9edfbb90 --- /dev/null +++ b/forge/update_patch.sh @@ -0,0 +1,5 @@ +rm minecraft.patch +touch minecraft.patch + +diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \ + >> minecraft.patch From f9e5cdc9abdc4c523fdca7eda36a10398554ff5c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 14 Jul 2011 11:15:07 +0000 Subject: [PATCH 005/169] added missing patch step --- forge/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/setup.sh b/forge/setup.sh index 1ad87c465c..76afab80e2 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -1,6 +1,6 @@ if [ ! -f ../src_base ]; then cp -r ../src ../src_base - #patch -p0 < minecraft.patch + patch -p0 < minecraft.patch cp -r ../src ../src_work else echo "patch already applied - remove src and src_base and decompile again" From 7385d80298d3c285bbb7cfbc07ba758cfbb19884 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 14 Jul 2011 11:18:25 +0000 Subject: [PATCH 006/169] added basic build script for windows --- forge/build.bat | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 forge/build.bat diff --git a/forge/build.bat b/forge/build.bat new file mode 100755 index 0000000000..244e5bf009 --- /dev/null +++ b/forge/build.bat @@ -0,0 +1,7 @@ +cd .. + +rmdir /S /Q src +mkdir src +xcopy /Y /E src_work\* src\ + +cmd /C recompile.bat From 987ad5acd25dd08002ea82bbda0cdf072029d425 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 14 Jul 2011 11:19:22 +0000 Subject: [PATCH 007/169] fixed previous checkin --- forge/build.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge/build.bat b/forge/build.bat index 244e5bf009..f6d55a0a2f 100755 --- a/forge/build.bat +++ b/forge/build.bat @@ -4,4 +4,7 @@ rmdir /S /Q src mkdir src xcopy /Y /E src_work\* src\ +xcopy /Y /E forge\forge_common\net\* src\minecraft\net +xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net + cmd /C recompile.bat From 86612c1450d1a246218f6c4d7d6f8cb4bad6c69e Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 18:26:33 +0000 Subject: [PATCH 008/169] initial revision of the license --- forge/licence.txt | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100755 forge/licence.txt diff --git a/forge/licence.txt b/forge/licence.txt new file mode 100755 index 0000000000..f84d1e5679 --- /dev/null +++ b/forge/licence.txt @@ -0,0 +1,65 @@ +Minecraft Forge Public Licence +============================== + +Version 1.0 + +0. Definitions +-------------- + +Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB + +User: Anybody that interract with the software in one of the following ways: + - play + - decompile + - recompile or compile + - modify + +Minecraft Forge: The Minecraft Forge code, in source form, class file form, as +obtained in a standalone fashion or as part of a wider distribution. + +Dependency: Code required to have Minecraft Forge working properly. That can +include dependencies required to compile the code as well as modifications in +the Minecraft sources that are required to have Minecraft Forge working. + +1. Scope +-------- + +The present license is granted to any user of Minecraft Forge. As a +prerequisite, a user of Minecraft Forge must own a legally aquired copy of +Minecraft + +2. Play rights +-------------- + +The user of Minecraft Forge is allowed to install the software on a client or +a server and to play it without restriction. + +3. Modification rights +---------------------- + +The user has the right to decompile the source code, look at either the +decompiled version or the original source code, and to modify it. + +4. Derivation rights +-------------------- + +The user has the rights to derive code from Minecraft Forge, that is to say to +write code that either extends Minecraft Forge class and interfaces, +instantiate the objects declared or calls the functions. This code is known as +"derived" code, and can be licensed with conditions different from Minecraft +Forge. + + +5. Distribution rights +---------------------- + +The user of Minecraft Forge is allowed to redistribute Minecraft Forge in +partially, in totallity, or included in a distribution. When distributing +binaries or class files, the user must provide means to obtain the sources of +the distributed version of Minecraft Forge at no costs. This includes the +files as well as any dependency that the code may rely on, including patches to +minecraft original sources. + +Modification of Minecraft Forge as well as dependencies, including patches to +minecraft original sources, has to remain under the terms of the present +license. From 955a056015e83e9d6d777082b14f4cfebfb474e3 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 21:17:33 +0000 Subject: [PATCH 009/169] fixed style, added biome population support, for #2 --- .../minecraft/src/forge/IBiomePopulator.java | 10 ++++ .../minecraft/src/forge/IBucketHandler.java | 4 +- .../minecraft/src/forge/MinecraftForge.java | 49 +++++++++------ forge/minecraft.patch | 60 ++++++++++++++++--- 4 files changed, 94 insertions(+), 29 deletions(-) create mode 100755 forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java diff --git a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java new file mode 100755 index 0000000000..48efee9290 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java @@ -0,0 +1,10 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.BiomeGenBase; +import net.minecraft.src.World; + +public interface IBiomePopulator { + + public void populate(World world, BiomeGenBase biomegenbase, int x, int z); + +} diff --git a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java index 96dd415344..5c812153a7 100755 --- a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java @@ -5,6 +5,6 @@ import net.minecraft.src.World; public interface IBucketHandler { - public ItemStack fillCustomBucket (World w, int i, int j, int k); - + public ItemStack fillCustomBucket(World w, int i, int j, int k); + } diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 2327e2723b..a863330fa6 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -2,27 +2,40 @@ package net.minecraft.src.forge; import java.util.LinkedList; +import net.minecraft.src.BiomeGenBase; import net.minecraft.src.ItemStack; import net.minecraft.src.World; public class MinecraftForge { - private static LinkedList bucketHandlers = new LinkedList(); - - public static ItemStack fillCustomBucket (World w, int i, int j, int k) { - for (IBucketHandler handler : bucketHandlers) { - ItemStack stack = handler.fillCustomBucket(w, i, j, k); - - if (stack != null) { - return stack; - } - } - - return null; - } - - public static void registerCustomBucketHander (IBucketHandler handler) { - bucketHandlers.add(handler); - } - + private static LinkedList bucketHandlers = new LinkedList(); + private static LinkedList biomePopulators = new LinkedList(); + + public static void registerCustomBucketHander(IBucketHandler handler) { + bucketHandlers.add(handler); + } + + public static void registerBiomePopulate(IBiomePopulator populator) { + biomePopulators.add(populator); + } + + public static ItemStack fillCustomBucket(World w, int i, int j, int k) { + for (IBucketHandler handler : bucketHandlers) { + ItemStack stack = handler.fillCustomBucket(w, i, j, k); + + if (stack != null) { + return stack; + } + } + + return null; + } + + public static void populateBiome(World world, BiomeGenBase biomegenbase, + int x, int z) { + for (IBiomePopulator populator : biomePopulators) { + populator.populate(world, biomegenbase, x, z); + } + } + } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 5d1e29efea..c4d9650e75 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,27 @@ +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.029673700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 21:55:40.634969900 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, + // BiomeGenBase, Chunk, World, WorldChunkManager, +@@ -632,6 +634,8 @@ + int i25 = l + rand.nextInt(16) + 8; + (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); + } ++ ++ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); + + generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); + for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-11 21:58:45.174682000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:34.748396700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-15 23:13:30.143050500 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -14,12 +35,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke } if(isFull == 0) { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); + -+ if (customBucket != null) { -+ return customBucket; -+ } ++ if (customBucket != null) { ++ return customBucket; ++ } + if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { @@ -83,9 +104,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server private void doTick() { +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.652709400 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 23:09:16.449540100 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, + // BiomeGenBase, Chunk, World, WorldChunkManager, +@@ -632,6 +634,8 @@ + int i25 = l + rand.nextInt(16) + 8; + (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); + } ++ ++ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); + + generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); + for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-11 21:58:45.765715800 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:49.701251900 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-15 23:15:07.301607700 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -99,8 +141,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } if(isFull == 0) { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); + + if (customBucket != null) { + return customBucket; From c7fb93c4f90af9042cba2ef92fe88b93f3e34ea6 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 22:40:53 +0000 Subject: [PATCH 010/169] implement infinite terrain sprites, for #3 --- .../minecraft/src/forge/ITextureProvider.java | 19 +++++++ forge/minecraft.patch | 54 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100755 forge/forge_common/net/minecraft/src/forge/ITextureProvider.java diff --git a/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java b/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java new file mode 100755 index 0000000000..36228efdc4 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java @@ -0,0 +1,19 @@ +package net.minecraft.src.forge; + +/** + * This interface has to be implemented by a Block, and provide custom texture + * capabilities. + */ +public interface ITextureProvider { + + /** + * This interface has to return the path to a file that is the same size as + * terrain.png, but not named terrain.png. If the block implements + * getRenderType() by returning any of the following: + * BuildCraftCore.customTextureModel BuildCraftCore.pipeModel it will use + * that terrain file to render texture instead of the default terrain.png + * one. + */ + public String getTextureFile(); + +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index c4d9650e75..0d9d840714 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -45,6 +45,60 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { world.setBlockWithNotify(i, j, k, 0); +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-07-11 21:58:45.359692600 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-16 00:35:25.293181000 +0200 +@@ -5,6 +5,8 @@ + package net.minecraft.src; + + import net.minecraft.client.Minecraft; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.opengl.GL11; + + // Referenced classes of package net.minecraft.src: +@@ -3485,6 +3487,7 @@ + + public void renderBlockOnInventory(Block block, int i, float f) + { ++ MinecraftForgeClient.beforeBlockRenderInventory(block); + Tessellator tessellator = Tessellator.instance; + if(field_31088_b) + { +@@ -3685,6 +3688,8 @@ + { + ModLoader.RenderInvBlock(this, block, i, k); + } ++ ++ MinecraftForgeClient.afterBlockRenderInventory(block); + } + + public static boolean renderItemIn3d(int i) +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-07-11 21:58:45.464698600 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-16 00:27:38.378475000 +0200 +@@ -5,6 +5,9 @@ + package net.minecraft.src; + + import java.util.*; ++ ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.opengl.GL11; + + // Referenced classes of package net.minecraft.src: +@@ -144,8 +147,10 @@ + continue; + } + if(j3 == i2) +- { ++ { ++ MinecraftForgeClient.beforeBlockRender(block, renderblocks); + flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); ++ MinecraftForgeClient.afterBlockRender(block, renderblocks); + } + } + diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java --- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 21:58:45.468698800 +0200 +++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 22:00:55.619143000 +0200 From 69a16fad9c374c98a8daa5ddfb072d577799a28c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 23:04:10 +0000 Subject: [PATCH 011/169] added support for infinite sprites, for #4 --- .../src/forge/MinecraftForgeClient.java | 50 ++++++++ forge/minecraft.patch | 111 +++++++++++++++--- 2 files changed, 144 insertions(+), 17 deletions(-) create mode 100755 forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java new file mode 100755 index 0000000000..08bf0ec9ce --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -0,0 +1,50 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.ModLoader; +import net.minecraft.src.RenderBlocks; +import net.minecraft.src.Tessellator; +import org.lwjgl.opengl.GL11; + +public class MinecraftForgeClient { + + public static void beforeBlockRender(Block block, RenderBlocks renderblocks) { + if (block instanceof ITextureProvider + && renderblocks.overrideBlockTexture == -1) { + Tessellator tessellator = Tessellator.instance; + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture(((ITextureProvider) (block)).getTextureFile())); + + } + } + + public static void afterBlockRender(Block block, RenderBlocks renderblocks) { + if (block instanceof ITextureProvider + && renderblocks.overrideBlockTexture == -1) { + Tessellator tessellator = Tessellator.instance; + tessellator.draw(); + tessellator.startDrawingQuads(); + + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture("/terrain.png")); + } + } + + public static void overrideTexture (Object o) { + if (o instanceof ITextureProvider) { + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture(((ITextureProvider) (o)) + .getTextureFile())); + } + } + + + +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 0d9d840714..d388c0db1c 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -45,9 +45,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { world.setBlockWithNotify(i, j, k, 0); -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-07-11 21:58:45.359692600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-16 00:35:25.293181000 +0200 +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-07-11 21:58:45.189682900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-16 01:00:00.046532100 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -57,23 +57,100 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -3485,6 +3487,7 @@ - - public void renderBlockOnInventory(Block block, int i, float f) - { -+ MinecraftForgeClient.beforeBlockRenderInventory(block); - Tessellator tessellator = Tessellator.instance; - if(field_31088_b) +@@ -34,15 +36,18 @@ + if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { -@@ -3685,6 +3688,8 @@ + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]); + renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + } else { - ModLoader.RenderInvBlock(this, block, i, k); - } -+ -+ MinecraftForgeClient.afterBlockRenderInventory(block); - } + if(itemstack.itemID < 256) + { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]); + } else + { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); ++ MinecraftForgeClient.overrideTexture (Item.itemsList[itemstack.itemID]); + } + Tessellator tessellator = Tessellator.instance; + int i = entityliving.getItemIcon(itemstack); +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-07-11 21:58:45.359692600 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-16 00:51:36.820749200 +0200 +@@ -5,6 +5,8 @@ + package net.minecraft.src; - public static boolean renderItemIn3d(int i) + import net.minecraft.client.Minecraft; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.opengl.GL11; + + // Referenced classes of package net.minecraft.src: +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-07-11 21:58:45.370693200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-16 01:01:10.494561500 +0200 +@@ -5,6 +5,9 @@ + package net.minecraft.src; + + import java.util.Random; ++ ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.opengl.GL11; + + // Referenced classes of package net.minecraft.src: +@@ -51,6 +54,7 @@ + { + GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); + loadTexture("/terrain.png"); ++ MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]); + float f4 = 0.25F; + if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16) + { +@@ -78,10 +82,12 @@ + if(itemstack.itemID < 256) + { + loadTexture("/terrain.png"); ++ MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]); + } else + { + loadTexture("/gui/items.png"); +- } ++ MinecraftForgeClient.overrideTexture(Item.itemsList[itemstack.itemID]); ++ } + Tessellator tessellator = Tessellator.instance; + float f6 = (float)((i % 16) * 16 + 0) / 256F; + float f8 = (float)((i % 16) * 16 + 16) / 256F; +@@ -92,6 +98,7 @@ + float f14 = 0.25F; + if(field_27004_a) + { ++ + int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage()); + float f15 = (float)(k >> 16 & 0xff) / 255F; + float f17 = (float)(k >> 8 & 0xff) / 255F; +@@ -131,6 +138,7 @@ + { + int j1 = i; + renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ MinecraftForgeClient.overrideTexture (Block.blocksList[i]); + Block block = Block.blocksList[j1]; + GL11.glPushMatrix(); + GL11.glTranslatef(l - 2, i1 + 3, -3F); +@@ -159,9 +167,11 @@ + if(i < 256) + { + renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ MinecraftForgeClient.overrideTexture (Block.blocksList[i]); + } else + { + renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); ++ MinecraftForgeClient.overrideTexture(Item.itemsList[i]); + } + int k1 = Item.itemsList[i].getColorFromDamage(j); + float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-11 21:58:45.464698600 +0200 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-16 00:27:38.378475000 +0200 From cd9d101e0668fa270b04e2ee0d3375531e04a800 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 23:13:09 +0000 Subject: [PATCH 012/169] added headers --- .../src/forge/MinecraftForgeClient.java | 5 +++++ .../net/minecraft/src/forge/IBiomePopulator.java | 8 ++++++++ .../net/minecraft/src/forge/IBucketHandler.java | 5 +++++ .../minecraft/src/forge/ITextureProvider.java | 16 +++++++++------- .../net/minecraft/src/forge/MinecraftForge.java | 5 +++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 08bf0ec9ce..bdc47b24b6 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -1,3 +1,8 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; import net.minecraft.src.Block; diff --git a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java index 48efee9290..3b9e60d048 100755 --- a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java +++ b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java @@ -1,3 +1,8 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; import net.minecraft.src.BiomeGenBase; @@ -5,6 +10,9 @@ import net.minecraft.src.World; public interface IBiomePopulator { + /** + * This is called for + */ public void populate(World world, BiomeGenBase biomegenbase, int x, int z); } diff --git a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java index 5c812153a7..616b4bc449 100755 --- a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java @@ -1,3 +1,8 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; import net.minecraft.src.ItemStack; diff --git a/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java b/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java index 36228efdc4..00ca569e62 100755 --- a/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java +++ b/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java @@ -1,18 +1,20 @@ +/** + * 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 a Block, and provide custom texture - * capabilities. + * This interface has to be implemented either by an instance of Block or Item. + * It allow to use texture files different from terrain.png or items.png. */ public interface ITextureProvider { /** * This interface has to return the path to a file that is the same size as - * terrain.png, but not named terrain.png. If the block implements - * getRenderType() by returning any of the following: - * BuildCraftCore.customTextureModel BuildCraftCore.pipeModel it will use - * that terrain file to render texture instead of the default terrain.png - * one. + * terrain.png, but not named terrain.png. It will be used instead of the + * regular terrain file to render blocks and items. */ public String getTextureFile(); diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index a863330fa6..de7a621748 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -1,3 +1,8 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; import java.util.LinkedList; From 1b7e8b61798de930b617772138db2a5eed492022 Mon Sep 17 00:00:00 2001 From: FlowerChild Date: Sat, 16 Jul 2011 16:37:37 +0000 Subject: [PATCH 013/169] Added OnGameStart hook, added custom effect render to fulfill infinite sprite support. Render needs to be changed a little to cover items also, though. --- .../src/forge/MinecraftForgeClient.java | 8 +- .../forge/MinecraftForgeEffectRenderer.java | 314 ++++++++++++++++++ forge/minecraft.patch | 12 + 3 files changed, 331 insertions(+), 3 deletions(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index bdc47b24b6..9934a22811 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -49,7 +49,9 @@ public class MinecraftForgeClient { .getTextureFile())); } } - - - + + public static void onGameStart() { + System.out.println("OnGameHook"); + ModLoader.getMinecraftInstance().effectRenderer = new MinecraftForgeEffectRenderer(ModLoader.getMinecraftInstance().theWorld, ModLoader.getMinecraftInstance().renderEngine); + } } diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java new file mode 100644 index 0000000000..9b5c2b7f5d --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java @@ -0,0 +1,314 @@ +package net.minecraft.src.forge; + +import java.util.*; +import org.lwjgl.opengl.GL11; + +import net.minecraft.src.EntityFX; +import net.minecraft.src.Entity; +import net.minecraft.src.MathHelper; +import net.minecraft.src.RenderEngine; +import net.minecraft.src.Tessellator; +import net.minecraft.src.Block; +import net.minecraft.src.EntityDiggingFX; +import net.minecraft.src.World; +import net.minecraft.src.EffectRenderer; + +public class MinecraftForgeEffectRenderer extends EffectRenderer +{ + class BlockTextureParticles { + public String texture; + public List effects; + + public BlockTextureParticles(){ + effects = new ArrayList(); + } + } + + //protected World worldObj; + private List fxLayers[]; + private RenderEngine renderer; + private Random rand; + + private List effectList; + + public MinecraftForgeEffectRenderer(World world, RenderEngine renderengine) + { + super(world, renderengine); + + System.out.println("Init"); + + effectList = new ArrayList(); + + fxLayers = new List[4]; + rand = new Random(); + if(world != null) + { + worldObj = world; + } + renderer = renderengine; + for(int i = 0; i < 4; i++) + { + fxLayers[i] = new ArrayList(); + } + + } + + @Override + public void addEffect(EntityFX entityfx) + { + int i = entityfx.getFXLayer(); + if(fxLayers[i].size() >= 4000) + { + fxLayers[i].remove(0); + } + fxLayers[i].add(entityfx); + } + + @Override + public void updateEffects() + { + for(int i = 0; i < 4; i++) + { + for(int j = 0; j < fxLayers[i].size(); j++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(j); + entityfx.onUpdate(); + if(entityfx.isDead) + { + fxLayers[i].remove(j--); + } + } + + } + + for(int x = 0; x < effectList.size(); x++) + { + BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); + for(int y =0; y < entry.effects.size(); y++) + { + EntityFX entityfx = (EntityFX)entry.effects.get(y); + if(entityfx.isDead) + { + entry.effects.remove(y--); + } + } + if(effectList.size() == 0) effectList.remove(x--); + } + + } + + @Override + public void renderParticles(Entity entity, float f) + { + float f1 = MathHelper.cos((entity.rotationYaw * 3.141593F) / 180F); + float f2 = MathHelper.sin((entity.rotationYaw * 3.141593F) / 180F); + float f3 = -f2 * MathHelper.sin((entity.rotationPitch * 3.141593F) / 180F); + float f4 = f1 * MathHelper.sin((entity.rotationPitch * 3.141593F) / 180F); + float f5 = MathHelper.cos((entity.rotationPitch * 3.141593F) / 180F); + EntityFX.interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)f; + EntityFX.interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)f; + EntityFX.interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)f; + for(int i = 0; i < 3; i++) + { + if(fxLayers[i].size() == 0) + { + continue; + } + int j = 0; + if(i == 0) + { + j = renderer.getTexture("/particles.png"); + } + if(i == 1) + { + j = renderer.getTexture("/terrain.png"); + } + if(i == 2) + { + j = renderer.getTexture("/gui/items.png"); + } + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, j); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + for(int k = 0; k < fxLayers[i].size(); k++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(k); + if(entityfx instanceof EntityDiggingFX) continue; + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + tessellator.draw(); + } + + Tessellator tessellator = Tessellator.instance; + + for(int x = 0; x < effectList.size(); x++) + { + BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, renderer.getTexture(entry.texture)); + tessellator.startDrawingQuads(); + for(int y =0; y < entry.effects.size(); y++) + { + EntityFX entityfx = (EntityFX)entry.effects.get(y); + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + tessellator.draw(); + } + + } + + @Override + public void func_1187_b(Entity entity, float f) + { + byte byte0 = 3; + if(fxLayers[byte0].size() == 0) + { + return; + } + Tessellator tessellator = Tessellator.instance; + for(int i = 0; i < fxLayers[byte0].size(); i++) + { + EntityFX entityfx = (EntityFX)fxLayers[byte0].get(i); + entityfx.renderParticle(tessellator, f, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); + } + + } + + @Override + public String getStatistics() + { + return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); + } + + @Override + public void clearEffects(World world) + { + worldObj = world; + for(int i = 0; i < 4; i++) + { + fxLayers[i].clear(); + } + + for(int x = 0; x < effectList.size(); x++) + { + BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); + entry.effects.clear(); + } + effectList.clear(); + + } + + @Override + public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) + { + if(l == 0) + { + return; + } + Block block = Block.blocksList[l]; + int j1 = 4; + for(int k1 = 0; k1 < j1; k1++) + { + for(int l1 = 0; l1 < j1; l1++) + { + for(int i2 = 0; i2 < j1; i2++) + { + double d = (double)i + ((double)k1 + 0.5D) / (double)j1; + double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; + double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; + int j2 = rand.nextInt(6); + + EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, + d - (double)i - 0.5D, + d1 - (double)j - 0.5D, + d2 - (double)k - 0.5D, + block, j2, i1); + dig_effect.func_4041_a(i, j, k); + + addDigParticleEffect(dig_effect, block); + } + + } + + } + + } + + @Override + public void addBlockHitEffects(int i, int j, int k, int l) + { + int i1 = worldObj.getBlockId(i, j, k); + if(i1 == 0) + { + return; + } + Block block = Block.blocksList[i1]; + float f = 0.1F; + double d = (double)i + rand.nextDouble() * (block.maxX - block.minX - (double)(f * 2.0F)) + (double)f + block.minX; + double d1 = (double)j + rand.nextDouble() * (block.maxY - block.minY - (double)(f * 2.0F)) + (double)f + block.minY; + double d2 = (double)k + rand.nextDouble() * (block.maxZ - block.minZ - (double)(f * 2.0F)) + (double)f + block.minZ; + if(l == 0) + { + d1 = ((double)j + block.minY) - (double)f; + } + if(l == 1) + { + d1 = (double)j + block.maxY + (double)f; + } + if(l == 2) + { + d2 = ((double)k + block.minZ) - (double)f; + } + if(l == 3) + { + d2 = (double)k + block.maxZ + (double)f; + } + if(l == 4) + { + d = ((double)i + block.minX) - (double)f; + } + if(l == 5) + { + d = (double)i + block.maxX + (double)f; + } + + EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); + dig_effect.func_4041_a(i, j, k); + dig_effect.func_407_b(0.2F); + dig_effect.func_405_d(0.6F); + + addDigParticleEffect(dig_effect, block); + } + + public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) + { + boolean added = false; + String comp; + + if(block instanceof ITextureProvider) + { + comp = ((ITextureProvider)block).getTextureFile(); + } + else + { + comp = "/terrain.png"; + } + for(int x = 0; x < effectList.size(); x++) + { + BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); + if(entry.texture.equals(comp)) + { + entry.effects.add(dig_effect); + added = true; + } + } + if(!added) + { + BlockTextureParticles entry = new BlockTextureParticles(); + entry.texture = comp; + entry.effects.add(dig_effect); + effectList.add(entry); + } + addEffect(dig_effect); + } + +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index d388c0db1c..1b54a0e406 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -176,6 +176,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } } +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java +--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-11 21:58:45.464698600 +0200 ++++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-16 00:27:38.378475000 +0200 +@@ -177,6 +177,7 @@ + renderGlobal = new RenderGlobal(this, renderEngine); + GL11.glViewport(0, 0, displayWidth, displayHeight); + effectRenderer = new EffectRenderer(theWorld, renderEngine); ++ MinecraftForgeClient.onGameStart(); + try + { + downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); + diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java --- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 21:58:45.468698800 +0200 +++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 22:00:55.619143000 +0200 From eba740b4ce3f18f1168abf39799d291786b64f60 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 16 Jul 2011 22:32:57 +0000 Subject: [PATCH 014/169] fixed patch script and added release scripts --- forge/build.bat | 1 + forge/minecraft.patch | 68 ++++++++++++++++++++++++------------------- forge/package.sh | 44 ++++++++++++++++++++++++++++ forge/release.bat | 13 +++++++++ forge/setup.sh | 15 ++++++---- 5 files changed, 105 insertions(+), 36 deletions(-) create mode 100755 forge/package.sh create mode 100755 forge/release.bat diff --git a/forge/build.bat b/forge/build.bat index f6d55a0a2f..68e257b97e 100755 --- a/forge/build.bat +++ b/forge/build.bat @@ -4,6 +4,7 @@ rmdir /S /Q src mkdir src xcopy /Y /E src_work\* src\ +xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net xcopy /Y /E forge\forge_common\net\* src\minecraft\net xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 1b54a0e406..8121b72221 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,26 @@ +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java +--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:07.253743200 +0200 ++++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:32.530189000 +0200 +@@ -8,6 +8,8 @@ + import java.io.File; + import java.io.PrintStream; + import net.minecraft.src.*; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.LWJGLException; + import org.lwjgl.input.*; + import org.lwjgl.opengl.*; +@@ -177,6 +179,7 @@ + renderGlobal = new RenderGlobal(this, renderEngine); + GL11.glViewport(0, 0, displayWidth, displayHeight); + effectRenderer = new EffectRenderer(theWorld, renderEngine); ++ MinecraftForgeClient.onGameStart(); + try + { + downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.029673700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 21:55:40.634969900 +0200 +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.334747900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.467869900 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -20,8 +40,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-11 21:58:45.174682000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-15 23:13:30.143050500 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:07.460755100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.470870000 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -46,8 +66,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); 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-07-11 21:58:45.189682900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-16 01:00:00.046532100 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-17 00:28:07.476756000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-17 00:28:09.472870200 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -77,8 +97,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; int i = entityliving.getItemIcon(itemstack); 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-07-11 21:58:45.359692600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-16 00:51:36.820749200 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-17 00:28:07.646765700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-17 00:28:09.476870400 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -89,8 +109,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo // Referenced classes of package net.minecraft.src: 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-07-11 21:58:45.370693200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-16 01:01:10.494561500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-17 00:28:07.657766300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-17 00:28:09.478870500 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -152,8 +172,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-11 21:58:45.464698600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-16 00:27:38.378475000 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:07.751771700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:09.481870700 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -176,21 +196,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } } -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java ---- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-11 21:58:45.464698600 +0200 -+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-16 00:27:38.378475000 +0200 -@@ -177,6 +177,7 @@ - renderGlobal = new RenderGlobal(this, renderEngine); - GL11.glViewport(0, 0, displayWidth, displayHeight); - effectRenderer = new EffectRenderer(theWorld, renderEngine); -+ MinecraftForgeClient.onGameStart(); - try - { - downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); - diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java ---- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 21:58:45.468698800 +0200 -+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 22:00:55.619143000 +0200 +--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:07.755771900 +0200 ++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:09.485870900 +0200 @@ -333,41 +333,22 @@ } finally @@ -248,8 +256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server private void doTick() { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.652709400 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 23:09:16.449540100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.853777600 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.488871100 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -269,8 +277,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-11 21:58:45.765715800 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-15 23:15:07.301607700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:08.089791100 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.490871200 +0200 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/package.sh b/forge/package.sh new file mode 100755 index 0000000000..ea6a69a12b --- /dev/null +++ b/forge/package.sh @@ -0,0 +1,44 @@ +version=$1 +dir=`pwd`/../forge-$version + +function remove_svn () { + ( + cd $1 + + if [ -d .svn ]; then + rm -rf .svn + fi + + for j in `ls` + do + if [ -d $j ]; then + remove_svn $j + fi + done + ) +} + +function package_all () { + qual=$1 + + zip -r $dir/minecraftforge$qual-$version.zip \ + *.class \ + net/minecraft/src/forge +} + +cd ../reobf + +remove_svn . + +rm -rf $dir +mkdir $dir + +cd minecraft +package_all "-client" + +cd ../minecraft_server +package_all "-server" + +cd ../.. + +#rm -rf reobf diff --git a/forge/release.bat b/forge/release.bat new file mode 100755 index 0000000000..ac83b738a4 --- /dev/null +++ b/forge/release.bat @@ -0,0 +1,13 @@ +cmd /C build.bat + +cd .. + +cmd /C reobfuscate.bat + +set PATH=E:\cygwin\bin;%PATH% + +cd forge + +sh package.sh 1.0 + +pause diff --git a/forge/setup.sh b/forge/setup.sh index 76afab80e2..e76644ba68 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -1,7 +1,10 @@ -if [ ! -f ../src_base ]; then - cp -r ../src ../src_base - patch -p0 < minecraft.patch - cp -r ../src ../src_work -else - echo "patch already applied - remove src and src_base and decompile again" +if [ ! -d ../src ]; then + move ../src_base src + rm -rf src_work fi + +cp -r ../src ../src_base +cp -r ../src ../src_work +dir=`pwd` +cd ../src_work +patch -u -p2 < $dir/minecraft.patch From 5477f767b3ce9e0ddfa404449904b4f425e858d4 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 16 Jul 2011 22:39:55 +0000 Subject: [PATCH 015/169] fixed packaging script --- forge/package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/package.sh b/forge/package.sh index ea6a69a12b..ab14e67c09 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -23,7 +23,7 @@ function package_all () { zip -r $dir/minecraftforge$qual-$version.zip \ *.class \ - net/minecraft/src/forge + forge } cd ../reobf @@ -41,4 +41,4 @@ package_all "-server" cd ../.. -#rm -rf reobf +rm -rf reobf From 11c81cc91f3a87f2b29b4f635fbdd4cac852f29f Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 17 Jul 2011 12:16:26 +0000 Subject: [PATCH 016/169] fixed setup script for windows and patch --- forge/minecraft.patch | 59 ----------------------------------------- forge/modLoaderMP.patch | 59 +++++++++++++++++++++++++++++++++++++++++ forge/setup.bat | 24 +++++++++++++++++ 3 files changed, 83 insertions(+), 59 deletions(-) create mode 100755 forge/modLoaderMP.patch create mode 100755 forge/setup.bat diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 8121b72221..28fb877595 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -196,65 +196,6 @@ 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/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java ---- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:07.755771900 +0200 -+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:09.485870900 +0200 -@@ -333,41 +333,22 @@ - } - finally - { -- System.exit(0); -+ try -+ { -+ stopServer(); -+ serverStopped = true; -+ } -+ catch(Throwable throwable2) -+ { -+ throwable2.printStackTrace(); -+ } -+ finally -+ { -+ System.exit(0); -+ } - } -- break MISSING_BLOCK_LABEL_350; -- } -- try -- { -- stopServer(); -- serverStopped = true; -- } -- catch(Throwable throwable) -- { -- throwable.printStackTrace(); -- } -- finally -- { -- System.exit(0); -- } -- break MISSING_BLOCK_LABEL_350; -- Exception exception2; -- exception2; -- try -- { -- stopServer(); -- serverStopped = true; -- } -- catch(Throwable throwable3) -- { -- throwable3.printStackTrace(); -- } -- finally -- { -- System.exit(0); -- } -- throw exception2; - } -+} - - private void doTick() - { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java --- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.853777600 +0200 +++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.488871100 +0200 diff --git a/forge/modLoaderMP.patch b/forge/modLoaderMP.patch new file mode 100755 index 0000000000..babf5b9a11 --- /dev/null +++ b/forge/modLoaderMP.patch @@ -0,0 +1,59 @@ +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java +--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:07.755771900 +0200 ++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:09.485870900 +0200 +@@ -333,41 +333,22 @@ + } + finally + { +- System.exit(0); ++ try ++ { ++ stopServer(); ++ serverStopped = true; ++ } ++ catch(Throwable throwable2) ++ { ++ throwable2.printStackTrace(); ++ } ++ finally ++ { ++ System.exit(0); ++ } + } +- break MISSING_BLOCK_LABEL_350; +- } +- try +- { +- stopServer(); +- serverStopped = true; +- } +- catch(Throwable throwable) +- { +- throwable.printStackTrace(); +- } +- finally +- { +- System.exit(0); +- } +- break MISSING_BLOCK_LABEL_350; +- Exception exception2; +- exception2; +- try +- { +- stopServer(); +- serverStopped = true; +- } +- catch(Throwable throwable3) +- { +- throwable3.printStackTrace(); +- } +- finally +- { +- System.exit(0); +- } +- throw exception2; + } ++} + + private void doTick() + { diff --git a/forge/setup.bat b/forge/setup.bat new file mode 100755 index 0000000000..540d01547e --- /dev/null +++ b/forge/setup.bat @@ -0,0 +1,24 @@ +set CYWIN=E:\cygwin\bin + +cd .. + +rmdir /S /Q src + +IF EXIST src_base ( +move src_base src; +rmdir /S /Q src_work +) ELSE ( +cmd /C decompile.bat +cd src +%CYGWIN%\patch -u -p2 < ..\forge\modLoaderMP.patch +cd .. +cmd /C recompile.bat +cmd /C updatemd5.bat +) + +mkdir src_base +mkdir src_work +xcopy /Y /E src\* src_base +xcopy /Y /E src\* src_work +cd src_work +%CYGWIN%\patch -u -p2 < ..\forge\minecraft.patch From 9584d7d2adee2cc9b782ea8ac3fc97bf4b66b6c9 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Mon, 18 Jul 2011 06:18:14 +0000 Subject: [PATCH 017/169] removed OBE file --- forge/setup.sh | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 forge/setup.sh diff --git a/forge/setup.sh b/forge/setup.sh deleted file mode 100755 index e76644ba68..0000000000 --- a/forge/setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ ! -d ../src ]; then - move ../src_base src - rm -rf src_work -fi - -cp -r ../src ../src_base -cp -r ../src ../src_work -dir=`pwd` -cd ../src_work -patch -u -p2 < $dir/minecraft.patch From 1f78ce8b2525c805f5c018a367eb1c21269d5ad8 Mon Sep 17 00:00:00 2001 From: FlowerChild Date: Tue, 19 Jul 2011 11:24:36 +0000 Subject: [PATCH 018/169] Removed MCForgeEffectRenderer, patched MC EffectRenderer --- .../forge/MinecraftForgeEffectRenderer.java | 314 ------------------ forge/minecraft.patch | 161 +++++++++ 2 files changed, 161 insertions(+), 314 deletions(-) delete mode 100644 forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java deleted file mode 100644 index 9b5c2b7f5d..0000000000 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeEffectRenderer.java +++ /dev/null @@ -1,314 +0,0 @@ -package net.minecraft.src.forge; - -import java.util.*; -import org.lwjgl.opengl.GL11; - -import net.minecraft.src.EntityFX; -import net.minecraft.src.Entity; -import net.minecraft.src.MathHelper; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.Tessellator; -import net.minecraft.src.Block; -import net.minecraft.src.EntityDiggingFX; -import net.minecraft.src.World; -import net.minecraft.src.EffectRenderer; - -public class MinecraftForgeEffectRenderer extends EffectRenderer -{ - class BlockTextureParticles { - public String texture; - public List effects; - - public BlockTextureParticles(){ - effects = new ArrayList(); - } - } - - //protected World worldObj; - private List fxLayers[]; - private RenderEngine renderer; - private Random rand; - - private List effectList; - - public MinecraftForgeEffectRenderer(World world, RenderEngine renderengine) - { - super(world, renderengine); - - System.out.println("Init"); - - effectList = new ArrayList(); - - fxLayers = new List[4]; - rand = new Random(); - if(world != null) - { - worldObj = world; - } - renderer = renderengine; - for(int i = 0; i < 4; i++) - { - fxLayers[i] = new ArrayList(); - } - - } - - @Override - public void addEffect(EntityFX entityfx) - { - int i = entityfx.getFXLayer(); - if(fxLayers[i].size() >= 4000) - { - fxLayers[i].remove(0); - } - fxLayers[i].add(entityfx); - } - - @Override - public void updateEffects() - { - for(int i = 0; i < 4; i++) - { - for(int j = 0; j < fxLayers[i].size(); j++) - { - EntityFX entityfx = (EntityFX)fxLayers[i].get(j); - entityfx.onUpdate(); - if(entityfx.isDead) - { - fxLayers[i].remove(j--); - } - } - - } - - for(int x = 0; x < effectList.size(); x++) - { - BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); - for(int y =0; y < entry.effects.size(); y++) - { - EntityFX entityfx = (EntityFX)entry.effects.get(y); - if(entityfx.isDead) - { - entry.effects.remove(y--); - } - } - if(effectList.size() == 0) effectList.remove(x--); - } - - } - - @Override - public void renderParticles(Entity entity, float f) - { - float f1 = MathHelper.cos((entity.rotationYaw * 3.141593F) / 180F); - float f2 = MathHelper.sin((entity.rotationYaw * 3.141593F) / 180F); - float f3 = -f2 * MathHelper.sin((entity.rotationPitch * 3.141593F) / 180F); - float f4 = f1 * MathHelper.sin((entity.rotationPitch * 3.141593F) / 180F); - float f5 = MathHelper.cos((entity.rotationPitch * 3.141593F) / 180F); - EntityFX.interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)f; - EntityFX.interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)f; - EntityFX.interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)f; - for(int i = 0; i < 3; i++) - { - if(fxLayers[i].size() == 0) - { - continue; - } - int j = 0; - if(i == 0) - { - j = renderer.getTexture("/particles.png"); - } - if(i == 1) - { - j = renderer.getTexture("/terrain.png"); - } - if(i == 2) - { - j = renderer.getTexture("/gui/items.png"); - } - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, j); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - for(int k = 0; k < fxLayers[i].size(); k++) - { - EntityFX entityfx = (EntityFX)fxLayers[i].get(k); - if(entityfx instanceof EntityDiggingFX) continue; - entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); - } - tessellator.draw(); - } - - Tessellator tessellator = Tessellator.instance; - - for(int x = 0; x < effectList.size(); x++) - { - BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, renderer.getTexture(entry.texture)); - tessellator.startDrawingQuads(); - for(int y =0; y < entry.effects.size(); y++) - { - EntityFX entityfx = (EntityFX)entry.effects.get(y); - entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); - } - tessellator.draw(); - } - - } - - @Override - public void func_1187_b(Entity entity, float f) - { - byte byte0 = 3; - if(fxLayers[byte0].size() == 0) - { - return; - } - Tessellator tessellator = Tessellator.instance; - for(int i = 0; i < fxLayers[byte0].size(); i++) - { - EntityFX entityfx = (EntityFX)fxLayers[byte0].get(i); - entityfx.renderParticle(tessellator, f, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); - } - - } - - @Override - public String getStatistics() - { - return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); - } - - @Override - public void clearEffects(World world) - { - worldObj = world; - for(int i = 0; i < 4; i++) - { - fxLayers[i].clear(); - } - - for(int x = 0; x < effectList.size(); x++) - { - BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); - entry.effects.clear(); - } - effectList.clear(); - - } - - @Override - public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) - { - if(l == 0) - { - return; - } - Block block = Block.blocksList[l]; - int j1 = 4; - for(int k1 = 0; k1 < j1; k1++) - { - for(int l1 = 0; l1 < j1; l1++) - { - for(int i2 = 0; i2 < j1; i2++) - { - double d = (double)i + ((double)k1 + 0.5D) / (double)j1; - double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; - double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; - int j2 = rand.nextInt(6); - - EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, - d - (double)i - 0.5D, - d1 - (double)j - 0.5D, - d2 - (double)k - 0.5D, - block, j2, i1); - dig_effect.func_4041_a(i, j, k); - - addDigParticleEffect(dig_effect, block); - } - - } - - } - - } - - @Override - public void addBlockHitEffects(int i, int j, int k, int l) - { - int i1 = worldObj.getBlockId(i, j, k); - if(i1 == 0) - { - return; - } - Block block = Block.blocksList[i1]; - float f = 0.1F; - double d = (double)i + rand.nextDouble() * (block.maxX - block.minX - (double)(f * 2.0F)) + (double)f + block.minX; - double d1 = (double)j + rand.nextDouble() * (block.maxY - block.minY - (double)(f * 2.0F)) + (double)f + block.minY; - double d2 = (double)k + rand.nextDouble() * (block.maxZ - block.minZ - (double)(f * 2.0F)) + (double)f + block.minZ; - if(l == 0) - { - d1 = ((double)j + block.minY) - (double)f; - } - if(l == 1) - { - d1 = (double)j + block.maxY + (double)f; - } - if(l == 2) - { - d2 = ((double)k + block.minZ) - (double)f; - } - if(l == 3) - { - d2 = (double)k + block.maxZ + (double)f; - } - if(l == 4) - { - d = ((double)i + block.minX) - (double)f; - } - if(l == 5) - { - d = (double)i + block.maxX + (double)f; - } - - EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); - dig_effect.func_4041_a(i, j, k); - dig_effect.func_407_b(0.2F); - dig_effect.func_405_d(0.6F); - - addDigParticleEffect(dig_effect, block); - } - - public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) - { - boolean added = false; - String comp; - - if(block instanceof ITextureProvider) - { - comp = ((ITextureProvider)block).getTextureFile(); - } - else - { - comp = "/terrain.png"; - } - for(int x = 0; x < effectList.size(); x++) - { - BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); - if(entry.texture.equals(comp)) - { - entry.effects.add(dig_effect); - added = true; - } - } - if(!added) - { - BlockTextureParticles entry = new BlockTextureParticles(); - entry.texture = comp; - entry.effects.add(dig_effect); - effectList.add(entry); - } - addEffect(dig_effect); - } - -} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 28fb877595..069d189bf6 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -171,6 +171,167 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; + +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-07-17 00:28:07.657766300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-17 00:28:09.478870500 +0200 +@@ -6,6 +6,7 @@ + + import java.util.*; + import org.lwjgl.opengl.GL11; ++import net.minecraft.src.forge.ITextureProvider; + + // Referenced classes of package net.minecraft.src: + // EntityFX, Entity, MathHelper, RenderEngine, +@@ -13,9 +14,18 @@ + + public class EffectRenderer + { ++ class BlockTextureParticles { ++ public String texture; ++ public List effects; ++ ++ public BlockTextureParticles(){ ++ effects = new ArrayList(); ++ } ++ } + + public EffectRenderer(World world, RenderEngine renderengine) + { ++ effectList = new ArrayList(); + fxLayers = new List[4]; + rand = new Random(); + if(world != null) +@@ -55,6 +65,19 @@ + } + + } ++ for(int x = 0; x < effectList.size(); x++) ++ { ++ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); ++ for(int y =0; y < entry.effects.size(); y++) ++ { ++ EntityFX entityfx = (EntityFX)entry.effects.get(y); ++ if(entityfx.isDead) ++ { ++ entry.effects.remove(y--); ++ } ++ } ++ if(effectList.size() == 0) effectList.remove(x--); ++ } + + } + +@@ -93,11 +116,26 @@ + for(int k = 0; k < fxLayers[i].size(); k++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(k); ++ if(entityfx instanceof EntityDiggingFX) continue; + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + + tessellator.draw(); + } ++ Tessellator tessellator = Tessellator.instance; ++ ++ for(int x = 0; x < effectList.size(); x++) ++ { ++ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, renderer.getTexture(entry.texture)); ++ tessellator.startDrawingQuads(); ++ for(int y =0; y < entry.effects.size(); y++) ++ { ++ EntityFX entityfx = (EntityFX)entry.effects.get(y); ++ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); ++ } ++ tessellator.draw(); ++ } + + } + +@@ -124,6 +162,13 @@ + { + fxLayers[i].clear(); + } ++ ++ for(int x = 0; x < effectList.size(); x++) ++ { ++ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); ++ entry.effects.clear(); ++ } ++ effectList.clear(); + + } + +@@ -145,7 +190,9 @@ + double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; + double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; + int j2 = rand.nextInt(6); +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1); ++ dig_effect.func_4041_a(i, j, k); ++ addDigParticleEffect(dig_effect, block); + } + + } +@@ -190,16 +237,53 @@ + { + d = (double)i + block.maxX + (double)f; + } +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); ++ dig_effect.func_4041_a(i, j, k); ++ dig_effect.func_407_b(0.2F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, block); + } + + public String getStatistics() + { + return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); + } ++ ++ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) ++ { ++ boolean added = false; ++ String comp; ++ ++ if(block instanceof ITextureProvider) ++ { ++ comp = ((ITextureProvider)block).getTextureFile(); ++ } ++ else ++ { ++ comp = "/terrain.png"; ++ } ++ for(int x = 0; x < effectList.size(); x++) ++ { ++ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); ++ if(entry.texture.equals(comp)) ++ { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if(!added) ++ { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ addEffect(dig_effect); ++ } + + protected World worldObj; + private List fxLayers[]; ++ private List effectList; + private RenderEngine renderer; + private Random rand; + } + + + 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-07-17 00:28:07.751771700 +0200 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:09.481870700 +0200 From f15ff6b92558228b7ceba0090e0326c13f6c42da Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 19 Jul 2011 17:58:23 +0000 Subject: [PATCH 019/169] fixed setup file --- forge/setup.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge/setup.bat b/forge/setup.bat index 540d01547e..b22e394ce7 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -1,11 +1,11 @@ -set CYWIN=E:\cygwin\bin +set CYGWIN=E:\cygwin\bin cd .. rmdir /S /Q src IF EXIST src_base ( -move src_base src; +move src_base src rmdir /S /Q src_work ) ELSE ( cmd /C decompile.bat @@ -22,3 +22,4 @@ xcopy /Y /E src\* src_base xcopy /Y /E src\* src_work cd src_work %CYGWIN%\patch -u -p2 < ..\forge\minecraft.patch +pause From c9f7fc3475f2de767c5f1c1ac9feafa6f716bd9c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 19 Jul 2011 18:19:45 +0000 Subject: [PATCH 020/169] fixed compilation errors --- .../src/net/minecraft/src/forge/MinecraftForgeClient.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 9934a22811..f053ce8fe4 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -51,7 +51,6 @@ public class MinecraftForgeClient { } public static void onGameStart() { - System.out.println("OnGameHook"); - ModLoader.getMinecraftInstance().effectRenderer = new MinecraftForgeEffectRenderer(ModLoader.getMinecraftInstance().theWorld, ModLoader.getMinecraftInstance().renderEngine); + } } From b11e534f8820e2fda05702ece14e6a56d9075361 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 19 Jul 2011 18:41:51 +0000 Subject: [PATCH 021/169] improved previous patch, extracted internal class --- forge/minecraft.patch | 342 ++++++++++++++++++++---------------------- 1 file changed, 163 insertions(+), 179 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 069d189bf6..6403265493 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java ---- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:07.253743200 +0200 -+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:32.530189000 +0200 +--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 20:32:54.429858500 +0200 ++++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 20:33:40.515494400 +0200 @@ -8,6 +8,8 @@ import java.io.File; import java.io.PrintStream; @@ -19,8 +19,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecr { downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.334747900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.467869900 +0200 +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:32:54.820880000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:40.519494600 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -39,9 +39,154 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) +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-07-19 20:32:54.895885100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-19 20:40:47.501916600 +0200 +@@ -7,6 +7,9 @@ + import java.util.*; + import org.lwjgl.opengl.GL11; + ++import net.minecraft.src.forge.BlockTextureParticles; ++import net.minecraft.src.forge.ITextureProvider; ++ + // Referenced classes of package net.minecraft.src: + // EntityFX, Entity, MathHelper, RenderEngine, + // Tessellator, Block, EntityDiggingFX, World +@@ -16,6 +19,7 @@ + + public EffectRenderer(World world, RenderEngine renderengine) + { ++ effectList = new ArrayList(); + fxLayers = new List[4]; + rand = new Random(); + if(world != null) +@@ -55,6 +59,18 @@ + } + + } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ if (entityfx.isDead) { ++ entry.effects.remove(y--); ++ } ++ } ++ if (effectList.size() == 0) ++ effectList.remove(x--); ++ } + + } + +@@ -93,11 +109,26 @@ + for(int k = 0; k < fxLayers[i].size(); k++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(k); ++ if(entityfx instanceof EntityDiggingFX) continue; + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + + tessellator.draw(); + } ++ Tessellator tessellator = Tessellator.instance; ++ ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ++ renderer.getTexture(entry.texture)); ++ tessellator.startDrawingQuads(); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); ++ } ++ tessellator.draw(); ++ } + + } + +@@ -124,6 +155,13 @@ + { + fxLayers[i].clear(); + } ++ ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ entry.effects.clear(); ++ } ++ effectList.clear(); + + } + +@@ -145,7 +183,12 @@ + double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; + double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; + int j2 = rand.nextInt(6); +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, ++ d, d1, d2, d - (double) i - 0.5D, d1 - (double) j ++ - 0.5D, d2 - (double) k - 0.5D, block, j2, ++ i1); ++ dig_effect.func_4041_a(i, j, k); ++ addDigParticleEffect(dig_effect, block); + } + + } +@@ -190,16 +233,48 @@ + { + d = (double)i + block.maxX + (double)f; + } +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, ++ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); ++ dig_effect.func_4041_a(i, j, k); ++ dig_effect.func_407_b(0.2F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, block); + } + + public String getStatistics() + { + return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); + } ++ ++ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { ++ boolean added = false; ++ String comp; ++ ++ if (block instanceof ITextureProvider) { ++ comp = ((ITextureProvider) block).getTextureFile(); ++ } else { ++ comp = "/terrain.png"; ++ } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ if (entry.texture.equals(comp)) { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if (!added) { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ addEffect(dig_effect); ++ } + + protected World worldObj; + private List fxLayers[]; ++ private List effectList; + private RenderEngine renderer; + private Random rand; + } 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-07-17 00:28:07.460755100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.470870000 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 20:32:55.620926000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 20:33:40.524494900 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -66,8 +211,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); 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-07-17 00:28:07.476756000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-17 00:28:09.472870200 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 20:32:55.684930300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 20:33:40.528495200 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -97,8 +242,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; int i = entityliving.getItemIcon(itemstack); 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-07-17 00:28:07.646765700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-17 00:28:09.476870400 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 20:32:57.062009000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 20:33:40.533495400 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -109,8 +254,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo // Referenced classes of package net.minecraft.src: 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-07-17 00:28:07.657766300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-17 00:28:09.478870500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 20:32:57.183015900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 20:33:40.568497500 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -171,170 +316,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; - -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-07-17 00:28:07.657766300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-17 00:28:09.478870500 +0200 -@@ -6,6 +6,7 @@ - - import java.util.*; - import org.lwjgl.opengl.GL11; -+import net.minecraft.src.forge.ITextureProvider; - - // Referenced classes of package net.minecraft.src: - // EntityFX, Entity, MathHelper, RenderEngine, -@@ -13,9 +14,18 @@ - - public class EffectRenderer - { -+ class BlockTextureParticles { -+ public String texture; -+ public List effects; -+ -+ public BlockTextureParticles(){ -+ effects = new ArrayList(); -+ } -+ } - - public EffectRenderer(World world, RenderEngine renderengine) - { -+ effectList = new ArrayList(); - fxLayers = new List[4]; - rand = new Random(); - if(world != null) -@@ -55,6 +65,19 @@ - } - - } -+ for(int x = 0; x < effectList.size(); x++) -+ { -+ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); -+ for(int y =0; y < entry.effects.size(); y++) -+ { -+ EntityFX entityfx = (EntityFX)entry.effects.get(y); -+ if(entityfx.isDead) -+ { -+ entry.effects.remove(y--); -+ } -+ } -+ if(effectList.size() == 0) effectList.remove(x--); -+ } - - } - -@@ -93,11 +116,26 @@ - for(int k = 0; k < fxLayers[i].size(); k++) - { - EntityFX entityfx = (EntityFX)fxLayers[i].get(k); -+ if(entityfx instanceof EntityDiggingFX) continue; - entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); - } - - tessellator.draw(); - } -+ Tessellator tessellator = Tessellator.instance; -+ -+ for(int x = 0; x < effectList.size(); x++) -+ { -+ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); -+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, renderer.getTexture(entry.texture)); -+ tessellator.startDrawingQuads(); -+ for(int y =0; y < entry.effects.size(); y++) -+ { -+ EntityFX entityfx = (EntityFX)entry.effects.get(y); -+ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); -+ } -+ tessellator.draw(); -+ } - - } - -@@ -124,6 +162,13 @@ - { - fxLayers[i].clear(); - } -+ -+ for(int x = 0; x < effectList.size(); x++) -+ { -+ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); -+ entry.effects.clear(); -+ } -+ effectList.clear(); - - } - -@@ -145,7 +190,9 @@ - double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; - double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; - int j2 = rand.nextInt(6); -- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1); -+ dig_effect.func_4041_a(i, j, k); -+ addDigParticleEffect(dig_effect, block); - } - - } -@@ -190,16 +237,53 @@ - { - d = (double)i + block.maxX + (double)f; - } -- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); -+ dig_effect.func_4041_a(i, j, k); -+ dig_effect.func_407_b(0.2F); -+ dig_effect.func_405_d(0.6F); -+ addDigParticleEffect(dig_effect, block); - } - - public String getStatistics() - { - return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); - } -+ -+ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) -+ { -+ boolean added = false; -+ String comp; -+ -+ if(block instanceof ITextureProvider) -+ { -+ comp = ((ITextureProvider)block).getTextureFile(); -+ } -+ else -+ { -+ comp = "/terrain.png"; -+ } -+ for(int x = 0; x < effectList.size(); x++) -+ { -+ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); -+ if(entry.texture.equals(comp)) -+ { -+ entry.effects.add(dig_effect); -+ added = true; -+ } -+ } -+ if(!added) -+ { -+ BlockTextureParticles entry = new BlockTextureParticles(); -+ entry.texture = comp; -+ entry.effects.add(dig_effect); -+ effectList.add(entry); -+ } -+ addEffect(dig_effect); -+ } - - protected World worldObj; - private List fxLayers[]; -+ private List effectList; - private RenderEngine renderer; - private Random rand; - } - - - 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-07-17 00:28:07.751771700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:09.481870700 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 20:32:57.777049900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 20:33:40.579498100 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -358,8 +342,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/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.853777600 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.488871100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:10.318767000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:40.583498300 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -379,8 +363,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-17 00:28:08.089791100 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.490871200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 20:33:10.742791000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 20:33:40.617500300 +0200 @@ -6,6 +6,8 @@ import java.util.Random; From 5af89543d390b8bd242e50e0cc1ffe88b5873084 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Wed, 20 Jul 2011 19:58:59 +0000 Subject: [PATCH 022/169] added missing graphical features, added configuration management, for #5 --- .../src/forge/BlockTextureParticles.java | 13 + .../minecraft/src/forge/Configuration.java | 302 ++++++++++++++++++ 2 files changed, 315 insertions(+) create mode 100755 forge/forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java create mode 100755 forge/forge_common/net/minecraft/src/forge/Configuration.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java b/forge/forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java new file mode 100755 index 0000000000..f101913588 --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java @@ -0,0 +1,13 @@ +package net.minecraft.src.forge; + +import java.util.ArrayList; +import java.util.List; + +public class BlockTextureParticles { + public String texture; + public List effects; + + public BlockTextureParticles(){ + effects = new ArrayList(); + } +} diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java new file mode 100755 index 0000000000..afc7429c1a --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -0,0 +1,302 @@ +package net.minecraft.src.forge; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.text.DateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.TreeMap; + +import net.minecraft.src.Block; + +public class Configuration { + + private boolean configBlocks[] = null; + + public enum PropertyKind { + General, Block, Item + } + + File file; + + public static class Property { + public String name; + public String value; + public String comment; + } + + public TreeMap blockProperties = new TreeMap(); + public TreeMap itemProperties = new TreeMap(); + public TreeMap generalProperties = new TreeMap(); + + public Configuration(File file) { + this.file = file; + } + + public Property getOrCreateBlockIdProperty(String key, int defaultId) { + if (configBlocks == null) { + configBlocks = new boolean[Block.blocksList.length]; + + for (int i = 0; i < configBlocks.length; ++i) { + configBlocks[i] = false; + } + } + + if (blockProperties.containsKey(key)) { + Property property = getOrCreateIntProperty(key, PropertyKind.Block, + defaultId); + configBlocks[Integer.parseInt(property.value)] = true; + return property; + } else { + Property property = new Property(); + + blockProperties.put(key, property); + property.name = key; + + if (Block.blocksList[defaultId] == null + && !configBlocks[defaultId]) { + property.value = Integer.toString(defaultId); + configBlocks[defaultId] = true; + return property; + } else { + for (int j = Block.blocksList.length - 1; j >= 0; --j) { + if (Block.blocksList[j] == null && !configBlocks[j]) { + property.value = Integer.toString(j); + configBlocks[j] = true; + return property; + } + } + + throw new RuntimeException("No more block ids available for " + + key); + } + } + } + + public Property getOrCreateIntProperty(String key, PropertyKind kind, + int defaultValue) { + Property prop = getOrCreateProperty(key, kind, + Integer.toString(defaultValue)); + + try { + Integer.parseInt(prop.value); + + return prop; + } catch (NumberFormatException e) { + prop.value = Integer.toString(defaultValue); + return prop; + } + } + + public Property getOrCreateBooleanProperty(String key, PropertyKind kind, + boolean defaultValue) { + Property prop = getOrCreateProperty(key, kind, + Boolean.toString(defaultValue)); + + if ("true".equals(prop.value.toLowerCase()) + || "false".equals(prop.value.toLowerCase())) { + return prop; + } else { + prop.value = Boolean.toString(defaultValue); + return prop; + } + } + + public Property getOrCreateProperty(String key, PropertyKind kind, + String defaultValue) { + TreeMap source = null; + + switch (kind) { + case General: + source = generalProperties; + break; + case Block: + source = blockProperties; + break; + case Item: + source = itemProperties; + break; + } + + if (source.containsKey(key)) { + return source.get(key); + } else if (defaultValue != null) { + Property property = new Property(); + + source.put(key, property); + property.name = key; + + property.value = defaultValue; + return property; + } else { + return null; + } + } + + public void load() { + try { + if (file.getParentFile() != null) { + file.getParentFile().mkdirs(); + } + + if (!file.exists() && !file.createNewFile()) { + return; + } + + if (file.canRead()) { + FileInputStream fileinputstream = new FileInputStream(file); + + BufferedReader buffer = new BufferedReader( + new InputStreamReader(fileinputstream, "8859_1")); + + String line; + TreeMap currentMap = null; + + while (true) { + line = buffer.readLine(); + + if (line == null) { + break; + } + + int nameStart = -1, nameEnd = -1; + boolean skip = false; + + for (int i = 0; i < line.length() && !skip; ++i) { + if (Character.isLetterOrDigit(line.charAt(i)) + || line.charAt(i) == '.') { + if (nameStart == -1) { + nameStart = i; + } + + nameEnd = i; + } else if (Character.isWhitespace(line.charAt(i))) { + // ignore space charaters + } else { + switch (line.charAt(i)) { + case '#': + skip = true; + continue; + case '{': + String scopeName = line.substring(nameStart, + nameEnd + 1); + + if (scopeName.equals("general")) { + currentMap = generalProperties; + } else if (scopeName.equals("block")) { + currentMap = blockProperties; + } else if (scopeName.equals("item")) { + currentMap = itemProperties; + } else { + throw new RuntimeException( + "unknown section " + scopeName); + } + + break; + case '}': + currentMap = null; + break; + case '=': + String propertyName = line.substring(nameStart, + nameEnd + 1); + + if (currentMap == null) { + throw new RuntimeException("property " + + propertyName + " has no scope"); + } + + Property prop = new Property(); + prop.name = propertyName; + prop.value = line.substring(i + 1); + i = line.length(); + + currentMap.put(propertyName, prop); + + break; + default: + throw new RuntimeException("unknown character " + + line.charAt(i)); + } + } + } + } + + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void save() { + try { + if (file.getParentFile() != null) { + file.getParentFile().mkdirs(); + } + + if (!file.exists() && !file.createNewFile()) { + return; + } + + if (file.canWrite()) { + FileOutputStream fileoutputstream = new FileOutputStream(file); + + BufferedWriter buffer = new BufferedWriter( + new OutputStreamWriter(fileoutputstream, "8859_1")); + + buffer.write("# Configuration file\r\n"); + buffer.write("# Generated on " + + DateFormat.getInstance().format(new Date()) + "\r\n"); + buffer.write("\r\n"); + buffer.write("###########\r\n"); + buffer.write("# General #\r\n"); + buffer.write("###########\r\n\r\n"); + + buffer.write("general {\r\n"); + writeProperties(buffer, generalProperties.values()); + buffer.write("}\r\n\r\n"); + + buffer.write("#########\r\n"); + buffer.write("# Block #\r\n"); + buffer.write("#########\r\n\r\n"); + + buffer.write("block {\r\n"); + writeProperties(buffer, blockProperties.values()); + buffer.write("}\r\n\r\n"); + + buffer.write("########\r\n"); + buffer.write("# Item #\r\n"); + buffer.write("########\r\n\r\n"); + + buffer.write("item {\r\n"); + writeProperties(buffer, itemProperties.values()); + buffer.write("}\r\n\r\n"); + + buffer.close(); + fileoutputstream.close(); + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private void writeProperties(BufferedWriter buffer, + Collection props) throws IOException { + for (Property property : props) { + if (property.comment != null) { + buffer.write(" # " + property.comment + "\r\n"); + } + + buffer.write(" " + property.name + "=" + property.value); + buffer.write("\r\n"); + } + } + +} From 14b6dbe4f5f7ba26e31e149fffcf6a0ef443716e Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 29 Jul 2011 17:55:34 +0000 Subject: [PATCH 023/169] added mineable block configuration, for #6 --- .../minecraft/src/forge/MinecraftForge.java | 25 ++++ forge/minecraft.patch | 133 +++++++++++++++--- forge/release.bat | 2 +- 3 files changed, 139 insertions(+), 21 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index de7a621748..0974bd7125 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -8,13 +8,17 @@ package net.minecraft.src.forge; import java.util.LinkedList; import net.minecraft.src.BiomeGenBase; +import net.minecraft.src.Block; +import net.minecraft.src.Item; import net.minecraft.src.ItemStack; +import net.minecraft.src.ItemTool; import net.minecraft.src.World; public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); private static LinkedList biomePopulators = new LinkedList(); + private static LinkedList harvestHandlers = new LinkedList(); public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); @@ -23,6 +27,10 @@ public class MinecraftForge { public static void registerBiomePopulate(IBiomePopulator populator) { biomePopulators.add(populator); } + + public static void registerHarvestHandler(IHarvestHandler handler) { + harvestHandlers.add(handler); + } public static ItemStack fillCustomBucket(World w, int i, int j, int k) { for (IBucketHandler handler : bucketHandlers) { @@ -43,4 +51,21 @@ public class MinecraftForge { } } + public static boolean canHarvestBlock(ItemTool item, Block block) { + for (IHarvestHandler handler : harvestHandlers) { + if (handler.canHarvestBlock(item, block)) { + return true; + } + } + + return false; + } + + public void addPixaxeBlockEffectiveAgainst (Block block) { + ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); + ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block); + ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block); + ((ItemTool) Item.pickaxeGold).addBlockEffectiveAgainst(block); + ((ItemTool) Item.pickaxeDiamond).addBlockEffectiveAgainst(block); + } } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 6403265493..8e24e92df4 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java ---- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 20:32:54.429858500 +0200 -+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 20:33:40.515494400 +0200 +--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 22:35:38.532061000 +0200 ++++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 22:36:21.976545900 +0200 @@ -8,6 +8,8 @@ import java.io.File; import java.io.PrintStream; @@ -19,8 +19,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecr { downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:32:54.820880000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:40.519494600 +0200 +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:35:38.968086000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:36:21.998547200 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -40,8 +40,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-19 20:32:54.895885100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-19 20:40:47.501916600 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-19 22:35:39.064091500 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-19 22:36:22.004547500 +0200 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -185,8 +185,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-07-19 20:32:55.620926000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 20:33:40.524494900 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 22:35:39.911139000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 22:36:22.008547700 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -210,9 +210,31 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { world.setBlockWithNotify(i, j, k, 0); +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-19 22:35:39.959142000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 19:44:18.990445200 +0200 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.MinecraftForge; ++ + + // Referenced classes of package net.minecraft.src: + // ItemTool, Block, EnumToolMaterial, Material +@@ -42,6 +44,9 @@ + { + return toolMaterial.getHarvestLevel() >= 2; + } ++ if (MinecraftForge.canHarvestBlock(this, block)) { ++ return true; ++ } + if(block.blockMaterial == Material.rock) + { + return true; 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-07-19 20:32:55.684930300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 20:33:40.528495200 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 22:35:39.984144100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 22:36:22.013548000 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -241,9 +263,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende } Tessellator tessellator = Tessellator.instance; 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 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-19 22:35:40.017146000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 19:48:15.271959800 +0200 +@@ -4,6 +4,9 @@ + + package net.minecraft.src; + ++import java.util.Arrays; ++import java.util.concurrent.ArrayBlockingQueue; ++ + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, ItemStack, Block, +@@ -63,4 +66,11 @@ + private float efficiencyOnProperMaterial; + private int damageVsEntity; + protected EnumToolMaterial toolMaterial; ++ ++ public void addBlockEffectiveAgainst (Block block) { ++ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, ++ blocksEffectiveAgainst.length + 1); ++ ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; ++ } + } 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-07-19 20:32:57.062009000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 20:33:40.533495400 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 22:35:40.986201400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 22:36:22.019548400 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -254,8 +301,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo // Referenced classes of package net.minecraft.src: 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-07-19 20:32:57.183015900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 20:33:40.568497500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 22:35:41.100207900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 22:36:22.037549400 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -317,8 +364,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-19 20:32:57.777049900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 20:33:40.579498100 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 22:35:41.644239000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 22:36:22.041549600 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -342,8 +389,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/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:10.318767000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 20:33:40.583498300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:35:53.094893000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:36:22.046549900 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -363,8 +410,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-19 20:33:10.742791000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 20:33:40.617500300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 22:35:53.568921000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 22:36:22.050550100 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -388,3 +435,49 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { world.setBlockWithNotify(i, j, k, 0); +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-19 22:35:53.647925000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 19:52:41.066162300 +0200 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.MinecraftForge; ++ + + // Referenced classes of package net.minecraft.src: + // ItemTool, Block, EnumToolMaterial, Material +@@ -42,6 +44,9 @@ + { + return toolMaterial.getHarvestLevel() >= 2; + } ++ if (MinecraftForge.canHarvestBlock(this, block)) { ++ return true; ++ } + if(block.blockMaterial == Material.rock) + { + return true; +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-07-19 22:35:53.708929000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 19:51:37.558529900 +0200 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import java.util.Arrays; ++ + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, ItemStack, Block, +@@ -58,4 +60,11 @@ + private float efficiencyOnProperMaterial; + private int damageVsEntity; + protected EnumToolMaterial toolMaterial; ++ ++ public void addBlockEffectiveAgainst (Block block) { ++ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, ++ blocksEffectiveAgainst.length + 1); ++ ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; ++ } + } diff --git a/forge/release.bat b/forge/release.bat index ac83b738a4..3d36ebb89c 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0 +sh package.sh 1.0.0.200110729 pause From f2a1b244e8e47ea96e63f0f15a210906f20f7498 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 29 Jul 2011 20:58:31 +0000 Subject: [PATCH 024/169] added missing file --- .../net/minecraft/src/forge/IHarvestHandler.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java diff --git a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java new file mode 100755 index 0000000000..bbec013671 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java @@ -0,0 +1,13 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.ItemTool; + +public interface IHarvestHandler { + public boolean canHarvestBlock(ItemTool item, Block block); +} From 8c19143961c42fb0f4f41e4c0244ee3aa839d37c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 29 Jul 2011 20:59:01 +0000 Subject: [PATCH 025/169] added missing copyright header --- .../forge_common/net/minecraft/src/forge/Configuration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index afc7429c1a..61eb9ddd51 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -1,3 +1,8 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; import java.io.BufferedReader; From 7f0d588e629ead220810ba54990b4660e6c13f8e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 29 Jul 2011 21:15:21 +0000 Subject: [PATCH 026/169] Added the four new hooks from RedPower, and the TileEntity bugfix. --- forge/build.sh | 19 ++ forge/client | 1 + forge/common | 1 + .../src/forge/MinecraftForgeClient.java | 4 - .../minecraft/src/forge/IConnectRedstone.java | 6 + .../minecraft/src/forge/IMultipassRender.java | 6 + .../minecraft/src/forge/IOverrideReplace.java | 7 + .../minecraft/src/forge/IUseItemFirst.java | 8 + forge/minecraft.patch | 285 ++++++++++++++---- 9 files changed, 275 insertions(+), 62 deletions(-) create mode 100755 forge/build.sh create mode 120000 forge/client create mode 120000 forge/common create mode 100644 forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java create mode 100644 forge/forge_common/net/minecraft/src/forge/IMultipassRender.java create mode 100644 forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java create mode 100644 forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java diff --git a/forge/build.sh b/forge/build.sh new file mode 100755 index 0000000000..c527cc9fce --- /dev/null +++ b/forge/build.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +pushd .. + +rm -rf src +cp -a src_work src +rm -rf bin + +popd + +cp -a forge_client/src/net/* ../src/minecraft/net/ +cp -a forge_common/net/* ../src/minecraft/net/ +cp -a forge_common/net/* ../src/minecraft_server/net/ + +pushd .. + +./recompile.sh + + diff --git a/forge/client b/forge/client new file mode 120000 index 0000000000..9d34a1e7d4 --- /dev/null +++ b/forge/client @@ -0,0 +1 @@ +forge_client/src/net/minecraft/src/forge/ \ No newline at end of file diff --git a/forge/common b/forge/common new file mode 120000 index 0000000000..e2d97f8bba --- /dev/null +++ b/forge/common @@ -0,0 +1 @@ +forge_common/net/minecraft/src/forge \ No newline at end of file diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index f053ce8fe4..07497def9d 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -49,8 +49,4 @@ public class MinecraftForgeClient { .getTextureFile())); } } - - public static void onGameStart() { - - } } diff --git a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java new file mode 100644 index 0000000000..5211a45bb0 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java @@ -0,0 +1,6 @@ +package net.minecraft.src.forge; +import net.minecraft.src.*; + +public interface IConnectRedstone { + public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k, int dir); +} diff --git a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java new file mode 100644 index 0000000000..655f1bc02c --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java @@ -0,0 +1,6 @@ +package net.minecraft.src.forge; +import net.minecraft.src.*; + +public interface IMultipassRender { + public boolean canRenderInPass(int n); +} diff --git a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java new file mode 100644 index 0000000000..775274410b --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java @@ -0,0 +1,7 @@ +package net.minecraft.src.forge; +import net.minecraft.src.*; + +public interface IOverrideReplace { + public boolean canReplaceBlock(World world, int i, int j, int k, int bid); + public boolean getReplacedSuccess(); +} diff --git a/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java new file mode 100644 index 0000000000..3b71c5e2de --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java @@ -0,0 +1,8 @@ +package net.minecraft.src.forge; +import net.minecraft.src.*; + +public interface IUseItemFirst { + public boolean onItemUseFirst(ItemStack ist, + EntityPlayer player, World world, + int i, int j, int k, int l); +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 8e24e92df4..ab967bbf4c 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,26 +1,67 @@ -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java ---- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 22:35:38.532061000 +0200 -+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-19 22:36:21.976545900 +0200 -@@ -8,6 +8,8 @@ - import java.io.File; - import java.io.PrintStream; - import net.minecraft.src.*; -+import net.minecraft.src.forge.MinecraftForgeClient; -+ - import org.lwjgl.LWJGLException; - import org.lwjgl.input.*; - import org.lwjgl.opengl.*; -@@ -177,6 +179,7 @@ - renderGlobal = new RenderGlobal(this, renderEngine); - GL11.glViewport(0, 0, displayWidth, displayHeight); - effectRenderer = new EffectRenderer(theWorld, renderEngine); -+ MinecraftForgeClient.onGameStart(); - try +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-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -451,6 +452,10 @@ + { + return false; + } ++ if(Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess,i,j,k,l); ++ } + if(Block.blocksList[i1].canProvidePower()) + { + return true; +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-07-29 16:35:26.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.io.PrintStream; + import java.util.*; +@@ -249,6 +250,13 @@ + } + int l1 = xPosition * 16 + i; + int i2 = zPosition * 16 + k; ++ ++ if(Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1]; ++ if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(k1 != 0 && !worldObj.multiplayerWorld) + { +@@ -292,6 +300,13 @@ + } + int k1 = xPosition * 16 + i; + int l1 = zPosition * 16 + k; ++ ++ if(Block.blocksList[j1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1]; ++ if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(j1 != 0) { - downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:35:38.968086000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:36:21.998547200 +0200 +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:41:55.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -40,8 +81,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-19 22:35:39.064091500 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-19 22:36:22.004547500 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 16:41:55.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -185,8 +226,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-07-19 22:35:39.911139000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-19 22:36:22.008547700 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -211,8 +252,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-19 22:35:39.959142000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 19:44:18.990445200 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:26.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:41:55.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -233,8 +274,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-07-19 22:35:39.984144100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-19 22:36:22.013548000 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 16:41:55.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -264,19 +305,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-19 22:35:40.017146000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 19:48:15.271959800 +0200 -@@ -4,6 +4,9 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 17:06:13.000000000 -0400 +@@ -4,6 +4,7 @@ package net.minecraft.src; +import java.util.Arrays; -+import java.util.concurrent.ArrayBlockingQueue; -+ // Referenced classes of package net.minecraft.src: // Item, EnumToolMaterial, ItemStack, Block, -@@ -63,4 +66,11 @@ +@@ -63,4 +64,11 @@ private float efficiencyOnProperMaterial; private int damageVsEntity; protected EnumToolMaterial toolMaterial; @@ -288,21 +327,32 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; + } } -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-07-19 22:35:40.986201400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-19 22:36:22.019548400 +0200 -@@ -5,6 +5,8 @@ +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-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + package net.minecraft.src; ++import net.minecraft.src.forge.*; import net.minecraft.client.Minecraft; -+import net.minecraft.src.forge.MinecraftForgeClient; -+ - import org.lwjgl.opengl.GL11; - // Referenced classes of package net.minecraft.src: +@@ -98,6 +99,11 @@ + + public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + { ++ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); ++ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) ++ return true; ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { 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-07-19 22:35:41.100207900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-19 22:36:22.037549400 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-29 16:41:55.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -364,10 +414,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-19 22:35:41.644239000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-19 22:36:22.041549600 +0200 -@@ -5,6 +5,9 @@ +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 16:58:43.000000000 -0400 +@@ -3,8 +3,12 @@ + // Decompiler options: packimports(3) braces deadcode + package net.minecraft.src; ++import net.minecraft.src.forge.*; import java.util.*; + @@ -376,21 +429,95 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -144,8 +147,10 @@ +@@ -138,14 +142,23 @@ + } + Block block = Block.blocksList[i3]; + int j3 = block.getRenderBlockPass(); ++ ++ if(block instanceof IMultipassRender) { ++ if(j3 != i2) flag = true; ++ IMultipassRender impr=(IMultipassRender)block; ++ if(impr.canRenderInPass(i2)) j3=i2; ++ } ++ + if(j3 != i2) + { + flag = true; continue; } if(j3 == i2) - { + { -+ MinecraftForgeClient.beforeBlockRender(block, renderblocks); ++ MinecraftForgeClient.beforeBlockRender(block, renderblocks); flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); + MinecraftForgeClient.afterBlockRender(block, renderblocks); } } +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-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -413,6 +414,10 @@ + { + return false; + } ++ if(Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess,i,j,k,l); ++ } + if(Block.blocksList[i1].canProvidePower()) + { + return true; +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-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.io.PrintStream; + import java.util.*; +@@ -227,6 +228,13 @@ + } + int l1 = xPosition * 16 + i; + int i2 = zPosition * 16 + k; ++ ++ if(Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1]; ++ if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(k1 != 0 && !worldObj.singleplayerWorld) + { +@@ -270,6 +278,13 @@ + } + int k1 = xPosition * 16 + i; + int l1 = zPosition * 16 + k; ++ ++ if(Block.blocksList[j1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1]; ++ if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(j1 != 0) + { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:35:53.094893000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-19 22:36:22.046549900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:41:55.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -410,8 +537,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-19 22:35:53.568921000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-19 22:36:22.050550100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -435,9 +562,32 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:57:37.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + + // Referenced classes of package net.minecraft.src: +@@ -145,6 +146,11 @@ + + public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + { ++ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); ++ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) ++ return true; ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-19 22:35:53.647925000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 19:52:41.066162300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:41:55.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -458,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-07-19 22:35:53.708929000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 19:51:37.558529900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 16:41:55.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -481,3 +631,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; + } } +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-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 16:57:37.000000000 -0400 +@@ -169,12 +169,11 @@ + sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); + for(int k = 0; k < numBlocksToUpdate; k++) + { +- int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); +- int i2 = numBlocksToUpdate & 0xff; +- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); ++ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); ++ int i2 = blocksToUpdate[k] & 0xff; ++ int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); + if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) + { +- System.out.println("Sending!"); + updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); + } + } From 59e7645d6120ac9df34a92efdfee9908926128a1 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 29 Jul 2011 21:25:22 +0000 Subject: [PATCH 027/169] fixed addPixaxeBlockEffectiveAgainst --- forge/forge_common/net/minecraft/src/forge/MinecraftForge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 0974bd7125..7fc9a4a69e 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -61,7 +61,7 @@ public class MinecraftForge { return false; } - public void addPixaxeBlockEffectiveAgainst (Block block) { + public static void addPixaxeBlockEffectiveAgainst (Block block) { ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block); ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block); From 58f308407435377d9feaaf6a57d582e7d1986a94 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 29 Jul 2011 22:00:08 +0000 Subject: [PATCH 028/169] Added explosion resistance hook. --- .../src/forge/ISpecialResistance.java | 7 +++ forge/minecraft.patch | 58 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java b/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java new file mode 100644 index 0000000000..76777b79c9 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java @@ -0,0 +1,7 @@ +package net.minecraft.src.forge; +import net.minecraft.src.*; + +public interface ISpecialResistance { + public float getSpecialExplosionResistance(World world, int i, int j, int k, + double src_x, double src_y, double src_z, Entity exploder); +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index ab967bbf4c..d68525a19d 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -225,6 +225,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private RenderEngine renderer; private Random rand; } +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-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-29 17:56:22.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ISpecialResistance; + + import java.util.*; + +@@ -65,7 +66,16 @@ + int i5 = worldObj.getBlockId(j4, k4, l4); + if(i5 > 0) + { +- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ if(Block.blocksList[i5] instanceof ISpecialResistance) { ++ ISpecialResistance isr=(ISpecialResistance) ++ Block.blocksList[i5]; ++ f1-=(isr.getSpecialExplosionResistance( ++ worldObj,j4,k4,l4, ++ explosionX,explosionY,explosionZ, ++ exploder) + 0.3F) * f2; ++ } else { ++ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ } + } + 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 --- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 @@ -536,6 +565,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) +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-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-29 17:56:53.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ISpecialResistance; + + import java.util.*; + +@@ -65,7 +66,16 @@ + int i5 = worldObj.getBlockId(j4, k4, l4); + if(i5 > 0) + { +- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ if(Block.blocksList[i5] instanceof ISpecialResistance) { ++ ISpecialResistance isr=(ISpecialResistance) ++ Block.blocksList[i5]; ++ f1-=(isr.getSpecialExplosionResistance( ++ worldObj,j4,k4,l4, ++ explosionX,explosionY,explosionZ, ++ exploder) + 0.3F) * f2; ++ } else { ++ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ } + } + 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 From 5975944963c675e002c7fbea4d2fe649d305740b Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 06:42:15 +0000 Subject: [PATCH 029/169] first batch of documentation + minor reformatings --- .../minecraft/src/forge/Configuration.java | 1 - .../minecraft/src/forge/IBiomePopulator.java | 5 +- .../minecraft/src/forge/IBucketHandler.java | 8 + .../minecraft/src/forge/IConnectRedstone.java | 25 ++- .../minecraft/src/forge/IHarvestHandler.java | 10 ++ .../minecraft/src/forge/IMultipassRender.java | 6 +- .../minecraft/src/forge/IOverrideReplace.java | 27 ++- .../src/forge/ISpecialResistance.java | 23 ++- .../minecraft/src/forge/IUseItemFirst.java | 24 ++- forge/minecraft.patch | 164 +++++++++--------- 10 files changed, 202 insertions(+), 91 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index 61eb9ddd51..0352519ce0 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -287,7 +287,6 @@ public class Configuration { fileoutputstream.close(); } } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java index 3b9e60d048..bb12dd52ed 100755 --- a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java +++ b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java @@ -11,7 +11,10 @@ import net.minecraft.src.World; public interface IBiomePopulator { /** - * This is called for + * This is called for each chunk, after the rest of the generation, and + * allow contributers to add additional blocks in the world. + * + * @see MinecraftForge#registerBiomePopulate(IBiomePopulator) */ public void populate(World world, BiomeGenBase biomegenbase, int x, int z); diff --git a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java index 616b4bc449..200eeb3406 100755 --- a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java @@ -10,6 +10,14 @@ import net.minecraft.src.World; public interface IBucketHandler { + /** + * This is called before Minecraft tries to fill a bucket with water or + * lava. If it returns a non-null result, then the filling process will + * be stopped and the empty bucket will be changed to the result of this + * subprogram. + * + * @see MinecraftForge#registerCustomBucketHander(IBucketHandler) + */ public ItemStack fillCustomBucket(World w, int i, int j, int k); } diff --git a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java index 5211a45bb0..660b94c2df 100644 --- a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java +++ b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java @@ -1,6 +1,25 @@ -package net.minecraft.src.forge; -import net.minecraft.src.*; +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.IBlockAccess; + +/** + * This interface is to be implemented by Block classes. It will override + * standard algorithms controlling connection between two blocks by redstone + * + * @see Block + */ public interface IConnectRedstone { - public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k, int dir); + + /** + * When this returns false, the block at location i, j, k cannot provide + * redstone power to the direction given in parameter, otherwise it can. + */ + public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k, + int dir); } diff --git a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java index bbec013671..a122998367 100755 --- a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java @@ -9,5 +9,15 @@ import net.minecraft.src.Block; import net.minecraft.src.ItemTool; public interface IHarvestHandler { + + /** + * Return true if the tool in parameter is known to be able to harvest + * the given block, false if this handler does not know of any particular + * harvesting. Other rules may activate the harvesting outside of this + * handler. This is typically used to add e.g. blocks only extracted by + * diamond pixaxe + * + * @see MinecraftForge#registerHarvestHandler(IHarvestHandler) + */ public boolean canHarvestBlock(ItemTool item, Block block); } diff --git a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java index 655f1bc02c..7b8fcc3b22 100644 --- a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java +++ b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java @@ -1,5 +1,9 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + package net.minecraft.src.forge; -import net.minecraft.src.*; public interface IMultipassRender { public boolean canRenderInPass(int n); diff --git a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java index 775274410b..60fa993d13 100644 --- a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java +++ b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java @@ -1,7 +1,30 @@ -package net.minecraft.src.forge; -import net.minecraft.src.*; +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.World; + +/** + * This interface is to be implemented by block classes. It will allow a block + * to control how it can be replaced + * + * @see Block + */ public interface IOverrideReplace { + + /** + * Return true if this block has to take control over replacement, for + * the intended replacement given by the parameter bid. If true, then + * the actual replacement is supposed to have occured in the block. + */ public boolean canReplaceBlock(World world, int i, int j, int k, int bid); + + /** + * Return the status of the actual replacement. + */ public boolean getReplacedSuccess(); } diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java b/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java index 76777b79c9..971bacb47f 100644 --- a/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java +++ b/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java @@ -1,7 +1,26 @@ -package net.minecraft.src.forge; -import net.minecraft.src.*; +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.Entity; +import net.minecraft.src.World; + +/** + * This interface is to be implemented by block classes. It will allow a block + * to control how it resists to explosion + * + * @see Block + */ public interface ISpecialResistance { + + /** + * Return the explosion resistance of the block located at position i, j, + * k, from an exploder explosing on src_x, src_y, src_z. + */ public float getSpecialExplosionResistance(World world, int i, int j, int k, double src_x, double src_y, double src_z, Entity exploder); } diff --git a/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java index 3b71c5e2de..7d020aa28b 100644 --- a/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java +++ b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java @@ -1,7 +1,27 @@ -package net.minecraft.src.forge; -import net.minecraft.src.*; +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.Item; +import net.minecraft.src.ItemStack; +import net.minecraft.src.World; + +/** + * This interface is to be implemented by item classes. It will allow an item + * to perform a use before the block is activated. + * + * @see Item + */ public interface IUseItemFirst { + + /** + * This is called when the item is used, before the block is activated. + * Stop the computation when return true. + */ public boolean onItemUseFirst(ItemStack ist, EntityPlayer player, World world, int i, int j, int k, int l); diff --git a/forge/minecraft.patch b/forge/minecraft.patch index d68525a19d..4b21b2eb8e 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 23:21:33.781992000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:23:20.966701700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -13,16 +13,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return false; } -+ if(Block.blocksList[i1] instanceof IConnectRedstone) { -+ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; -+ return icr.canConnectRedstone(iblockaccess,i,j,k,l); -+ } ++ if (Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess, i, j, k, l); ++ } if(Block.blocksList[i1].canProvidePower()) { return true; 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-07-29 16:35:26.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-07-29 23:21:33.862997000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-30 08:28:53.466719600 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -36,11 +36,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; + -+ if(Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1]; -+ if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l)) -+ return iovr.getReplacedSuccess(); -+ } ++ if (Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; ++ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) ++ return iovr.getReplacedSuccess(); ++ } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(k1 != 0 && !worldObj.multiplayerWorld) @@ -50,18 +50,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int k1 = xPosition * 16 + i; int l1 = zPosition * 16 + k; + -+ if(Block.blocksList[j1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1]; -+ if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l)) -+ return iovr.getReplacedSuccess(); -+ } ++ if (Block.blocksList[j1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[j1]; ++ if (!iovr.canReplaceBlock(worldObj, k1, j, l1, l)) ++ return iovr.getReplacedSuccess(); ++ } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 23:21:33.906999000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.684144300 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -81,8 +81,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 23:21:33.988004400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-30 08:15:01.696145000 +0200 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -226,8 +226,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-29 17:56:22.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-07-29 23:21:34.371026000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-30 08:35:55.747872700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -236,27 +236,28 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion import java.util.*; -@@ -65,7 +66,16 @@ +@@ -65,7 +66,17 @@ int i5 = worldObj.getBlockId(j4, k4, l4); if(i5 > 0) { - f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ if(Block.blocksList[i5] instanceof ISpecialResistance) { -+ ISpecialResistance isr=(ISpecialResistance) -+ Block.blocksList[i5]; -+ f1-=(isr.getSpecialExplosionResistance( -+ worldObj,j4,k4,l4, -+ explosionX,explosionY,explosionZ, -+ exploder) + 0.3F) * f2; -+ } else { -+ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ } ++ if (Block.blocksList[i5] instanceof ISpecialResistance) { ++ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5]; ++ f1 -= (isr.getSpecialExplosionResistance( ++ worldObj, j4, k4, l4, explosionX, ++ explosionY, explosionZ, exploder) + 0.3F) ++ * f2; ++ } else { ++ f1 -= (Block.blocksList[i5] ++ .getExplosionResistance(exploder) + 0.3F) ++ * f2; ++ } } 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 23:21:34.649042000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.709145800 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -281,8 +282,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:26.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 23:21:34.696044000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.718146300 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -303,8 +304,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 23:21:34.720046300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-30 08:15:01.733147100 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -334,8 +335,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 17:06:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 23:21:34.752048000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.737147400 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -357,8 +358,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + } } 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-07-29 23:21:35.368083000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-30 08:41:23.244604400 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -367,21 +368,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon import net.minecraft.client.Minecraft; -@@ -98,6 +99,11 @@ +@@ -98,6 +99,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { -+ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); -+ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) -+ return true; -+ } ++ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); ++ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } ++ } int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-29 23:21:35.881112700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-30 08:15:01.745147800 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -443,8 +445,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 16:58:43.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 23:21:36.427143900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-30 08:28:15.329538300 +0200 @@ -3,8 +3,12 @@ // Decompiler options: packimports(3) braces deadcode @@ -458,16 +460,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -138,14 +142,23 @@ +@@ -138,14 +142,27 @@ } Block block = Block.blocksList[i3]; int j3 = block.getRenderBlockPass(); + -+ if(block instanceof IMultipassRender) { -+ if(j3 != i2) flag = true; -+ IMultipassRender impr=(IMultipassRender)block; -+ if(impr.canRenderInPass(i2)) j3=i2; -+ } ++ if (block instanceof IMultipassRender) { ++ if (j3 != i2) { ++ flag = true; ++ } ++ IMultipassRender impr = (IMultipassRender) block; ++ if (impr.canRenderInPass(i2)) { ++ j3 = i2; ++ } ++ } + if(j3 != i2) { @@ -484,8 +490,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/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 23:21:49.985919000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:15:01.754148300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -506,8 +512,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { return true; 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-07-29 23:21:50.050923000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-30 08:15:01.770149300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -545,8 +551,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch if(j1 != 0) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 23:21:50.088925000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.786150200 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -566,8 +572,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-29 17:56:53.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-07-29 23:21:50.402943000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-30 08:15:01.806151300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -595,8 +601,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 23:21:50.491948000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.811151600 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -621,8 +627,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 23:21:50.519949000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-30 08:15:01.830152700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -644,8 +650,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 23:21:50.541951000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.834152900 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -666,8 +672,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 16:41:55.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 23:21:50.581953000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.838153200 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -690,8 +696,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/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 16:57:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 23:21:51.077981000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-30 08:15:01.842153400 +0200 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) From 0490d22992d5edc2ad0f587a050e228fb72ee5b8 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 07:13:10 +0000 Subject: [PATCH 030/169] add custom armor, for #13 --- .../minecraft/src/forge/ISpecialArmor.java | 27 ++++++++ forge/minecraft.patch | 68 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100755 forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java new file mode 100755 index 0000000000..754883625e --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java @@ -0,0 +1,27 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.ItemArmor; + +/** + * This interface is to be implemented by ItemArmor classes. It will allow to + * modify computation of damage and health loss. Computation will be called + * before the actual armor computation, which can then be cancelled. + * + * @see ItemArmor + */ +public interface ISpecialArmor { + /** + * This interface will adjust the amount of damage received by the entity. + */ + public int adjustArmorDamage (int damage); + + /** + * When this return true, the regular armor computation will be cancelled + */ + public boolean allowRegularComputation (); +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 4b21b2eb8e..686037688f 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -225,6 +225,40 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private RenderEngine renderer; private Random rand; } +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-07-29 23:21:34.219017000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-30 09:10:04.107032100 +0200 +@@ -6,6 +6,8 @@ + + import java.util.*; + ++import net.minecraft.src.forge.ISpecialArmor; ++ + // Referenced classes of package net.minecraft.src: + // EntityLiving, InventoryPlayer, ContainerPlayer, World, + // ChunkCoordinates, DataWatcher, Container, StatList, +@@ -477,6 +479,21 @@ + + protected void damageEntity(int i) + { ++ boolean doRegularComputation = true; ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ i = armor.adjustArmorDamage(i); ++ doRegularComputation = doRegularComputation ++ && armor.allowRegularComputation(); ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(i); ++ } ++ + int j = 25 - inventory.getTotalArmorValue(); + int k = i * j + damageRemainder; + inventory.damageArmor(i); 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-07-29 23:21:34.371026000 +0200 +++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-30 08:35:55.747872700 +0200 @@ -571,6 +605,40 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); for(int j19 = k + 8; j19 < k + 8 + 16; j19++) +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-07-29 23:21:50.320938000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 09:10:42.295216400 +0200 +@@ -6,6 +6,8 @@ + + import java.util.*; + ++import net.minecraft.src.forge.ISpecialArmor; ++ + // Referenced classes of package net.minecraft.src: + // EntityLiving, InventoryPlayer, ContainerPlayer, World, + // ChunkCoordinates, DataWatcher, Container, StatList, +@@ -457,6 +459,21 @@ + + protected void damageEntity(int i) + { ++ boolean doRegularComputation = true; ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ i = armor.adjustArmorDamage(i); ++ doRegularComputation = doRegularComputation ++ && armor.allowRegularComputation(); ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(i); ++ } ++ + int j = 25 - inventory.getTotalArmorValue(); + int k = i * j + damageRemainder; + inventory.damageArmor(i); 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-07-29 23:21:50.402943000 +0200 +++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-30 08:15:01.806151300 +0200 From e6dff0bfc62676f50c334653bfff68b2b7485b0e Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 16:13:14 +0000 Subject: [PATCH 031/169] added sources packaging --- forge/package.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/forge/package.sh b/forge/package.sh index ab14e67c09..6cd6164913 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -1,4 +1,5 @@ version=$1 +build_dir=`pwd` dir=`pwd`/../forge-$version function remove_svn () { @@ -42,3 +43,18 @@ package_all "-server" cd ../.. rm -rf reobf + +cd $build_dir + +echo `pwd` +mkdir src +mkdir src/minecraft +mkdir src/minecraft_server +cp -r forge_client/src/* src/minecraft +cp -r forge_server/src/* src/minecraft_server +cp -r forge_common/* src/minecraft +cp -r forge_common/* src/minecraft_server +cp minecraft.patch src + +zip -r $dir/minecraftforge-src-$version.zip src +rm -rf src From 5717e3e9793b596824c25a4400cfee975813deae Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 16:13:31 +0000 Subject: [PATCH 032/169] fixed previous checkin --- forge/package.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/forge/package.sh b/forge/package.sh index 6cd6164913..cfe4767b67 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -46,7 +46,6 @@ rm -rf reobf cd $build_dir -echo `pwd` mkdir src mkdir src/minecraft mkdir src/minecraft_server From 18f822a8d2ef4534a8b21485aaee85025117f4eb Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 19:05:28 +0000 Subject: [PATCH 033/169] fixed exceptions in minecraft code --- forge/minecraft.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 686037688f..7805677d9c 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -227,7 +227,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } 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-07-29 23:21:34.219017000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-30 09:10:04.107032100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-30 21:03:33.693757400 +0200 @@ -6,6 +6,8 @@ import java.util.*; @@ -243,7 +243,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { + boolean doRegularComputation = true; + for (ItemStack stack : inventory.armorInventory) { -+ if (stack.getItem() instanceof ISpecialArmor) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { + ISpecialArmor armor = (ISpecialArmor) stack.getItem(); + + i = armor.adjustArmorDamage(i); @@ -370,7 +370,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende 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 --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 23:21:34.752048000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.737147400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-30 09:12:08.010119000 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -388,7 +388,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, + blocksEffectiveAgainst.length + 1); + -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length] = block; + } } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java @@ -607,7 +607,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-29 23:21:50.320938000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 09:10:42.295216400 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 21:04:21.430487800 +0200 @@ -6,6 +6,8 @@ import java.util.*; @@ -623,7 +623,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { + boolean doRegularComputation = true; + for (ItemStack stack : inventory.armorInventory) { -+ if (stack.getItem() instanceof ISpecialArmor) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { + ISpecialArmor armor = (ISpecialArmor) stack.getItem(); + + i = armor.adjustArmorDamage(i); From b892916d6f1c02558b07ccb76bf3b7e225354f9f Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 21:01:03 +0000 Subject: [PATCH 034/169] added comments --- .../net/minecraft/src/forge/Configuration.java | 9 +++++++++ .../net/minecraft/src/forge/MinecraftForge.java | 3 +++ 2 files changed, 12 insertions(+) diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index 0352519ce0..6e176a922f 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -40,10 +40,19 @@ public class Configuration { public TreeMap itemProperties = new TreeMap(); public TreeMap generalProperties = new TreeMap(); + /** + * Create a configuration file for the file given in parameter. + */ public Configuration(File file) { this.file = file; } + /** + * Gets or create a block id property. If the block id property key is + * already in the configuration, then it will be used. Otherwise, + * defaultId will be used, except if already taken, in which case this + * will try to determine a free default id. + */ public Property getOrCreateBlockIdProperty(String key, int defaultId) { if (configBlocks == null) { configBlocks = new boolean[Block.blocksList.length]; diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 7fc9a4a69e..118d007051 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -61,6 +61,9 @@ public class MinecraftForge { return false; } + /** + * Add a block to the list of blocks supposed to be + */ public static void addPixaxeBlockEffectiveAgainst (Block block) { ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block); From c35f8e5ddb2f1175d17a4387bcc7f7ab190c629f Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 21:10:42 +0000 Subject: [PATCH 035/169] additional comments --- .../minecraft/src/forge/Configuration.java | 4 ++++ .../minecraft/src/forge/MinecraftForge.java | 21 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index 6e176a922f..068b4fa8b1 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -20,6 +20,10 @@ import java.util.TreeMap; import net.minecraft.src.Block; +/** + * This class offers advanced configurations capabilities, allowing to provide + * various categories for configuration variables. + */ public class Configuration { private boolean configBlocks[] = null; diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 118d007051..22efad383b 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -20,18 +20,30 @@ public class MinecraftForge { private static LinkedList biomePopulators = new LinkedList(); private static LinkedList harvestHandlers = new LinkedList(); + /** + * Registers a new custom bucket handler. + */ public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); } + /** + * Registers a new biome contributer. + */ public static void registerBiomePopulate(IBiomePopulator populator) { biomePopulators.add(populator); } + /** + * Registers a new harvest handler. + */ public static void registerHarvestHandler(IHarvestHandler handler) { harvestHandlers.add(handler); } + /** + * This is not supposed to be called outside of Minecraft internals. + */ public static ItemStack fillCustomBucket(World w, int i, int j, int k) { for (IBucketHandler handler : bucketHandlers) { ItemStack stack = handler.fillCustomBucket(w, i, j, k); @@ -44,6 +56,9 @@ public class MinecraftForge { return null; } + /** + * This is not supposed to be called outside of Minecraft internals. + */ public static void populateBiome(World world, BiomeGenBase biomegenbase, int x, int z) { for (IBiomePopulator populator : biomePopulators) { @@ -51,6 +66,9 @@ public class MinecraftForge { } } + /** + * This is not supposed to be called outside of Minecraft internals. + */ public static boolean canHarvestBlock(ItemTool item, Block block) { for (IHarvestHandler handler : harvestHandlers) { if (handler.canHarvestBlock(item, block)) { @@ -62,7 +80,8 @@ public class MinecraftForge { } /** - * Add a block to the list of blocks supposed to be + * Add a block to the list of blocks to which the pixaxe is know to be + * effective. */ public static void addPixaxeBlockEffectiveAgainst (Block block) { ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); From c9685426b2c193152992be4055666dbc965708bc Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 30 Jul 2011 21:25:39 +0000 Subject: [PATCH 036/169] fixed files for release --- forge/licence.txt | 130 +++++++++++++++++++++++----------------------- forge/package.sh | 6 ++- forge/release.bat | 2 +- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/forge/licence.txt b/forge/licence.txt index f84d1e5679..74305b7d80 100755 --- a/forge/licence.txt +++ b/forge/licence.txt @@ -1,65 +1,65 @@ -Minecraft Forge Public Licence -============================== - -Version 1.0 - -0. Definitions --------------- - -Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB - -User: Anybody that interract with the software in one of the following ways: - - play - - decompile - - recompile or compile - - modify - -Minecraft Forge: The Minecraft Forge code, in source form, class file form, as -obtained in a standalone fashion or as part of a wider distribution. - -Dependency: Code required to have Minecraft Forge working properly. That can -include dependencies required to compile the code as well as modifications in -the Minecraft sources that are required to have Minecraft Forge working. - -1. Scope --------- - -The present license is granted to any user of Minecraft Forge. As a -prerequisite, a user of Minecraft Forge must own a legally aquired copy of -Minecraft - -2. Play rights --------------- - -The user of Minecraft Forge is allowed to install the software on a client or -a server and to play it without restriction. - -3. Modification rights ----------------------- - -The user has the right to decompile the source code, look at either the -decompiled version or the original source code, and to modify it. - -4. Derivation rights --------------------- - -The user has the rights to derive code from Minecraft Forge, that is to say to -write code that either extends Minecraft Forge class and interfaces, -instantiate the objects declared or calls the functions. This code is known as -"derived" code, and can be licensed with conditions different from Minecraft -Forge. - - -5. Distribution rights ----------------------- - -The user of Minecraft Forge is allowed to redistribute Minecraft Forge in -partially, in totallity, or included in a distribution. When distributing -binaries or class files, the user must provide means to obtain the sources of -the distributed version of Minecraft Forge at no costs. This includes the -files as well as any dependency that the code may rely on, including patches to -minecraft original sources. - -Modification of Minecraft Forge as well as dependencies, including patches to -minecraft original sources, has to remain under the terms of the present -license. +Minecraft Forge Public Licence +============================== + +Version 1.0 + +0. Definitions +-------------- + +Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB + +User: Anybody that interract with the software in one of the following ways: + - play + - decompile + - recompile or compile + - modify + +Minecraft Forge: The Minecraft Forge code, in source form, class file form, as +obtained in a standalone fashion or as part of a wider distribution. + +Dependency: Code required to have Minecraft Forge working properly. That can +include dependencies required to compile the code as well as modifications in +the Minecraft sources that are required to have Minecraft Forge working. + +1. Scope +-------- + +The present license is granted to any user of Minecraft Forge. As a +prerequisite, a user of Minecraft Forge must own a legally aquired copy of +Minecraft + +2. Play rights +-------------- + +The user of Minecraft Forge is allowed to install the software on a client or +a server and to play it without restriction. + +3. Modification rights +---------------------- + +The user has the right to decompile the source code, look at either the +decompiled version or the original source code, and to modify it. + +4. Derivation rights +-------------------- + +The user has the rights to derive code from Minecraft Forge, that is to say to +write code that either extends Minecraft Forge class and interfaces, +instantiate the objects declared or calls the functions. This code is known as +"derived" code, and can be licensed with conditions different from Minecraft +Forge. + + +5. Distribution rights +---------------------- + +The user of Minecraft Forge is allowed to redistribute Minecraft Forge in +partially, in totallity, or included in a distribution. When distributing +binaries or class files, the user must provide means to obtain the sources of +the distributed version of Minecraft Forge at no costs. This includes the +files as well as any dependency that the code may rely on, including patches to +minecraft original sources. + +Modification of Minecraft Forge as well as dependencies, including patches to +minecraft original sources, has to remain under the terms of the present +license. diff --git a/forge/package.sh b/forge/package.sh index cfe4767b67..8d2f52cfaa 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -55,5 +55,9 @@ cp -r forge_common/* src/minecraft cp -r forge_common/* src/minecraft_server cp minecraft.patch src -zip -r $dir/minecraftforge-src-$version.zip src +cd src +remove_svn . +cd .. + +zip -r $dir/minecraftforge-src-$version.zip src doc rm -rf src diff --git a/forge/release.bat b/forge/release.bat index 3d36ebb89c..4edfcd6b12 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.0.200110729 +sh package.sh 1.0.0 pause From e6cc73ce5529fe3a53b142debc4ce757010e185c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 31 Jul 2011 12:01:23 +0000 Subject: [PATCH 037/169] removed inner classes, remove redundant biome control --- .../minecraft/src/forge/Configuration.java | 30 ++++++------- .../minecraft/src/forge/IBiomePopulator.java | 21 ---------- .../minecraft/src/forge/MinecraftForge.java | 18 -------- .../net/minecraft/src/forge/Property.java | 12 ++++++ forge/minecraft.patch | 42 ------------------- 5 files changed, 24 insertions(+), 99 deletions(-) delete mode 100755 forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java create mode 100755 forge/forge_common/net/minecraft/src/forge/Property.java diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index 068b4fa8b1..e9f1707e99 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -28,18 +28,12 @@ public class Configuration { private boolean configBlocks[] = null; - public enum PropertyKind { - General, Block, Item - } - + public static final int GENERAL_PROPERTY = 0; + public static final int BLOCK_PROPERTY = 1; + public static final int ITEM_PROPERTY = 2; + File file; - public static class Property { - public String name; - public String value; - public String comment; - } - public TreeMap blockProperties = new TreeMap(); public TreeMap itemProperties = new TreeMap(); public TreeMap generalProperties = new TreeMap(); @@ -67,8 +61,8 @@ public class Configuration { } if (blockProperties.containsKey(key)) { - Property property = getOrCreateIntProperty(key, PropertyKind.Block, - defaultId); + Property property = getOrCreateIntProperty(key, + Configuration.BLOCK_PROPERTY, defaultId); configBlocks[Integer.parseInt(property.value)] = true; return property; } else { @@ -97,7 +91,7 @@ public class Configuration { } } - public Property getOrCreateIntProperty(String key, PropertyKind kind, + public Property getOrCreateIntProperty(String key, int kind, int defaultValue) { Property prop = getOrCreateProperty(key, kind, Integer.toString(defaultValue)); @@ -112,7 +106,7 @@ public class Configuration { } } - public Property getOrCreateBooleanProperty(String key, PropertyKind kind, + public Property getOrCreateBooleanProperty(String key, int kind, boolean defaultValue) { Property prop = getOrCreateProperty(key, kind, Boolean.toString(defaultValue)); @@ -126,18 +120,18 @@ public class Configuration { } } - public Property getOrCreateProperty(String key, PropertyKind kind, + public Property getOrCreateProperty(String key, int kind, String defaultValue) { TreeMap source = null; switch (kind) { - case General: + case GENERAL_PROPERTY: source = generalProperties; break; - case Block: + case BLOCK_PROPERTY: source = blockProperties; break; - case Item: + case ITEM_PROPERTY: source = itemProperties; break; } diff --git a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java deleted file mode 100755 index bb12dd52ed..0000000000 --- a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This software is provided under the terms of the Minecraft Forge Public - * License v1.0. - */ - -package net.minecraft.src.forge; - -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.World; - -public interface IBiomePopulator { - - /** - * This is called for each chunk, after the rest of the generation, and - * allow contributers to add additional blocks in the world. - * - * @see MinecraftForge#registerBiomePopulate(IBiomePopulator) - */ - public void populate(World world, BiomeGenBase biomegenbase, int x, int z); - -} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 22efad383b..79af311720 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -17,7 +17,6 @@ import net.minecraft.src.World; public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); - private static LinkedList biomePopulators = new LinkedList(); private static LinkedList harvestHandlers = new LinkedList(); /** @@ -26,13 +25,6 @@ public class MinecraftForge { public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); } - - /** - * Registers a new biome contributer. - */ - public static void registerBiomePopulate(IBiomePopulator populator) { - biomePopulators.add(populator); - } /** * Registers a new harvest handler. @@ -56,16 +48,6 @@ public class MinecraftForge { return null; } - /** - * This is not supposed to be called outside of Minecraft internals. - */ - public static void populateBiome(World world, BiomeGenBase biomegenbase, - int x, int z) { - for (IBiomePopulator populator : biomePopulators) { - populator.populate(world, biomegenbase, x, z); - } - } - /** * This is not supposed to be called outside of Minecraft internals. */ diff --git a/forge/forge_common/net/minecraft/src/forge/Property.java b/forge/forge_common/net/minecraft/src/forge/Property.java new file mode 100755 index 0000000000..08cc358daf --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/Property.java @@ -0,0 +1,12 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +public class Property { + public String name; + public String value; + public String comment; +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 7805677d9c..aca158a8e7 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -59,27 +59,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 23:21:33.906999000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.684144300 +0200 -@@ -6,6 +6,8 @@ - - import java.util.Random; - -+import net.minecraft.src.forge.MinecraftForge; -+ - // Referenced classes of package net.minecraft.src: - // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, - // BiomeGenBase, Chunk, World, WorldChunkManager, -@@ -632,6 +634,8 @@ - int i25 = l + rand.nextInt(16) + 8; - (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); - } -+ -+ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); - - generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); - for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-29 23:21:33.988004400 +0200 +++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-30 08:15:01.696145000 +0200 @@ -584,27 +563,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { -diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ---- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-29 23:21:50.088925000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.786150200 +0200 -@@ -6,6 +6,8 @@ - - import java.util.Random; - -+import net.minecraft.src.forge.MinecraftForge; -+ - // Referenced classes of package net.minecraft.src: - // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, - // BiomeGenBase, Chunk, World, WorldChunkManager, -@@ -632,6 +634,8 @@ - int i25 = l + rand.nextInt(16) + 8; - (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); - } -+ -+ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); - - generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); - for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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-07-29 23:21:50.320938000 +0200 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 21:04:21.430487800 +0200 From 73365fcbe410cc1d256c7cdb3d24f107016f4a63 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 31 Jul 2011 18:52:19 +0000 Subject: [PATCH 038/169] Improved some documentation. --- .../net/minecraft/src/forge/IConnectRedstone.java | 6 ++++-- .../net/minecraft/src/forge/IMultipassRender.java | 7 +++++++ .../net/minecraft/src/forge/IOverrideReplace.java | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java index 660b94c2df..57d56a9f3e 100644 --- a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java +++ b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java @@ -17,8 +17,10 @@ import net.minecraft.src.IBlockAccess; public interface IConnectRedstone { /** - * When this returns false, the block at location i, j, k cannot provide - * redstone power to the direction given in parameter, otherwise it can. + * When this returns false, the block at location i, j, k cannot make + * a redstone connection in the direction given in parameter, otherwise + * it can. Use to control which sides are inputs and outputs for redstone + * wires. */ public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k, int dir); diff --git a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java index 7b8fcc3b22..1f38104562 100644 --- a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java +++ b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java @@ -5,6 +5,13 @@ package net.minecraft.src.forge; +/** This interface is to be implemented by a Block class. Allows a block + * type to perform rendering in both render passes, in case some parts of the + * block are solid and others are transparent. + */ public interface IMultipassRender { + /** Returns true when the block has things to render in this render + * pass. + */ public boolean canRenderInPass(int n); } diff --git a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java index 60fa993d13..69b2820eb2 100644 --- a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java +++ b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java @@ -18,8 +18,8 @@ public interface IOverrideReplace { /** * Return true if this block has to take control over replacement, for - * the intended replacement given by the parameter bid. If true, then - * the actual replacement is supposed to have occured in the block. + * the intended replacement given by the parameter bid. If false, then + * the block replacement will be prevented. */ public boolean canReplaceBlock(World world, int i, int j, int k, int bid); From 197c847a5f07aba04917540665b896c4b979c65a Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 1 Aug 2011 02:06:00 +0000 Subject: [PATCH 039/169] Fixed bugs in the pickaxe code. --- .../minecraft/src/forge/IHarvestHandler.java | 2 +- .../minecraft/src/forge/MinecraftForge.java | 4 +- forge/minecraft.patch | 88 +++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java index a122998367..e697c7207e 100755 --- a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java @@ -15,7 +15,7 @@ public interface IHarvestHandler { * the given block, false if this handler does not know of any particular * harvesting. Other rules may activate the harvesting outside of this * handler. This is typically used to add e.g. blocks only extracted by - * diamond pixaxe + * diamond pickaxe * * @see MinecraftForge#registerHarvestHandler(IHarvestHandler) */ diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 79af311720..89b5ff85d9 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -62,10 +62,10 @@ public class MinecraftForge { } /** - * Add a block to the list of blocks to which the pixaxe is know to be + * Add a block to the list of blocks to which the pickaxe is know to be * effective. */ - public static void addPixaxeBlockEffectiveAgainst (Block block) { + public static void addPickaxeBlockEffectiveAgainst (Block block) { ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block); ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block); diff --git a/forge/minecraft.patch b/forge/minecraft.patch index aca158a8e7..fda4610c4b 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-07-29 23:21:33.781992000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:23:20.966701700 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -21,8 +21,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-07-29 23:21:33.862997000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-30 08:28:53.466719600 +0200 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-07-29 16:35:26.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -60,8 +60,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 23:21:33.988004400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-30 08:15:01.696145000 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-31 21:44:50.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -205,8 +205,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-07-29 23:21:34.219017000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-30 21:03:33.693757400 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-31 21:44:50.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -239,8 +239,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int k = i * j + damageRemainder; inventory.damageArmor(i); 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-07-29 23:21:34.371026000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-30 08:35:55.747872700 +0200 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -269,8 +269,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 23:21:34.649042000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.709145800 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-31 21:44:50.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -295,8 +295,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 23:21:34.696044000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.718146300 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:26.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-31 21:44:50.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -317,8 +317,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-07-29 23:21:34.720046300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-30 08:15:01.733147100 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-31 21:44:50.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -348,8 +348,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 23:21:34.752048000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-30 09:12:08.010119000 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-31 21:49:24.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -367,12 +367,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, + blocksEffectiveAgainst.length + 1); + -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length] = block; ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; + } } 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-07-29 23:21:35.368083000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-30 08:41:23.244604400 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -395,8 +395,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { 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-07-29 23:21:35.881112700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-30 08:15:01.745147800 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-31 21:44:50.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -458,8 +458,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-07-29 23:21:36.427143900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-30 08:28:15.329538300 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 16:35:27.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,8 +3,12 @@ // Decompiler options: packimports(3) braces deadcode @@ -503,8 +503,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/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 23:21:49.985919000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:15:01.754148300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -525,8 +525,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { return true; 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-07-29 23:21:50.050923000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-30 08:15:01.770149300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -564,8 +564,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch if(j1 != 0) { 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-07-29 23:21:50.320938000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 21:04:21.430487800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-31 21:44:50.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -598,8 +598,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int k = i * j + damageRemainder; inventory.damageArmor(i); 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-07-29 23:21:50.402943000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-30 08:15:01.806151300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -627,8 +627,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 23:21:50.491948000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.811151600 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-31 21:44:50.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -653,8 +653,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 23:21:50.519949000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-30 08:15:01.830152700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-31 21:44:50.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -676,8 +676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 23:21:50.541951000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.834152900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-31 21:44:50.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -698,8 +698,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-07-29 23:21:50.581953000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.838153200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-31 21:49:37.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -718,12 +718,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, + blocksEffectiveAgainst.length + 1); + -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block; ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; + } } 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-07-29 23:21:51.077981000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-30 08:15:01.842153400 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 16:35:28.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-31 21:44:50.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) From 98fbe565b395d19d6b26010801a92a4857e71f53 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 2 Aug 2011 03:54:59 +0000 Subject: [PATCH 040/169] Improved the setup scripts. --- forge/lfcr.py | 8 ++++++++ forge/setup.bat | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 forge/lfcr.py diff --git a/forge/lfcr.py b/forge/lfcr.py new file mode 100644 index 0000000000..d6ad3ee6c6 --- /dev/null +++ b/forge/lfcr.py @@ -0,0 +1,8 @@ +#! /usr/bin/env python + +import sys, re, os +data = open(sys.argv[1], "rb").read() +newdata = re.sub("\r?\n", "\r\n", data) +f = open(sys.argv[2], "wb") +f.write(newdata) +f.close() \ No newline at end of file diff --git a/forge/setup.bat b/forge/setup.bat index b22e394ce7..82cea28133 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -1,5 +1,3 @@ -set CYGWIN=E:\cygwin\bin - cd .. rmdir /S /Q src @@ -10,7 +8,8 @@ rmdir /S /Q src_work ) ELSE ( cmd /C decompile.bat cd src -%CYGWIN%\patch -u -p2 < ..\forge\modLoaderMP.patch +..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch +..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP.patch cd .. cmd /C recompile.bat cmd /C updatemd5.bat @@ -21,5 +20,6 @@ mkdir src_work xcopy /Y /E src\* src_base xcopy /Y /E src\* src_work cd src_work -%CYGWIN%\patch -u -p2 < ..\forge\minecraft.patch +..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch +..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch pause From ee1f04bd589c795d4416ec72a0701b2a7a17781a Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 2 Aug 2011 05:18:52 +0000 Subject: [PATCH 041/169] Fixed a little path bug. --- forge/setup.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/setup.bat b/forge/setup.bat index 82cea28133..8ad6e747c1 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -8,7 +8,7 @@ rmdir /S /Q src_work ) ELSE ( cmd /C decompile.bat cd src -..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch +..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP.patch cd .. cmd /C recompile.bat @@ -20,6 +20,6 @@ mkdir src_work xcopy /Y /E src\* src_base xcopy /Y /E src\* src_work cd src_work -..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch +..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch pause From d23812cb4c72d68cbbefb34eb1ff62faaad5c240 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 3 Aug 2011 05:15:31 +0000 Subject: [PATCH 042/169] Added secondary block properties patch. --- .../src/forge/IBlockSecondaryProperties.java | 52 ++++ forge/minecraft.patch | 266 +++++++++++++++--- 2 files changed, 276 insertions(+), 42 deletions(-) create mode 100644 forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java diff --git a/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java new file mode 100644 index 0000000000..cb6482b531 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java @@ -0,0 +1,52 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.World; + +/** + * This interface provides access to a number of secondary block properties through providing + * overrides to methods within world.class. + */ + +public interface IBlockSecondaryProperties +{ + /** + * Return true if this block should be treated as a normal cube by game logic + * (this is independant of rendering), false otherwise. This allows for things like secondary + * blocks (torches, rails, redstone dust, etc.) being attached to the surface of + * the block regardless of whether it is opaque, or posesses other rendering properties that + * would not normally make this possible. + */ + public boolean isBlockNormalCube( World world, int i, int j, int k ); + + /** + * Return true if this block can be replaced by another by the player, false otherwise. This provides + * a means of allowing blocks to not be considered when the player attempts to place another within + * their bounds, in the same way that water, lava, fire, and some other blocks behave within the game. + * Provides an override to the coresponding section in canBlockBePlacedAt() in world.class + */ + public boolean isBlockReplaceable( World world, int i, int j, int k ); + + /** + * Return true if this block should set fire and deal fire damage to entities coming into contact with + * it, false otherwise. Provides an override to the related test within isBoundingBoxBurning() within + * world.class + */ + public boolean isBlockBurning( World world, int i, int j, int k ); + + /** + * Return true if this block should be treated as an air block by the rest of the code, false + * otherwise. This method is primarily useful for creating pure logic-blocks that will be invisible + * to the player and otherwise interact as air would. + * Provides an override to isAirBlock() within world.class + */ + public boolean isAirBlock( World world, int i, int j, int k ); + +} + + diff --git a/forge/minecraft.patch b/forge/minecraft.patch index fda4610c4b..2b0d46c84e 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:07:39.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -21,8 +21,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-07-29 16:35:26.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-02 16:07:39.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -60,8 +60,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-02 16:07:40.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -205,8 +205,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-02 16:07:41.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -239,8 +239,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int k = i * j + damageRemainder; inventory.damageArmor(i); 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-02 16:07:42.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -269,8 +269,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-02 16:07:42.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -295,8 +295,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:26.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:07:42.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -317,8 +317,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-02 16:07:42.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -348,8 +348,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-31 21:49:24.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-02 16:07:42.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -371,8 +371,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + } } 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-02 16:07:42.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -395,8 +395,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-02 16:07:42.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -457,9 +457,100 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; +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-02 16:05:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-03 01:10:53.000000000 -0400 +@@ -7,6 +7,8 @@ + import java.io.PrintStream; + import java.util.*; + ++import net.minecraft.src.forge.IBlockSecondaryProperties; ++ + // Referenced classes of package net.minecraft.src: + // IBlockAccess, WorldProvider, WorldInfo, MapStorage, + // ISaveHandler, ChunkProvider, EntityPlayer, ChunkProviderLoadOrGenerate, +@@ -313,7 +315,25 @@ + + public boolean isAirBlock(int i, int j, int k) + { +- return getBlockId(i, j, k) == 0; ++ int iBlockID = getBlockId( i, j, k ); ++ ++ if ( iBlockID == 0 ) ++ { ++ return true; ++ } ++ else ++ { ++ Block block = Block.blocksList[iBlockID]; ++ ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k ); ++ } ++ else ++ { ++ return false; ++ } ++ } + } + + public boolean blockExists(int i, int j, int k) +@@ -1608,6 +1628,18 @@ + { + return true; + } ++ else ++ { ++ Block block = Block.blocksList[j2]; ++ ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) ) ++ { ++ return true; ++ } ++ } ++ } + } + + } +@@ -1900,7 +1932,14 @@ + return false; + } else + { +- return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock(); ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); ++ } ++ else ++ { ++ return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock(); ++ } + } + } + +@@ -2425,6 +2464,16 @@ + { + block = null; + } ++ else ++ { ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) ) ++ { ++ block = null; ++ } ++ } ++ } + return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); + } + 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-07-29 16:35:27.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-02 16:07:42.000000000 -0400 @@ -3,8 +3,12 @@ // Decompiler options: packimports(3) braces deadcode @@ -503,8 +594,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/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:05:40.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:07:43.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -525,8 +616,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { return true; 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-02 16:07:43.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -564,8 +655,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch if(j1 != 0) { 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-02 16:05:40.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-02 16:07:43.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -598,8 +689,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int k = i * j + damageRemainder; inventory.damageArmor(i); 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-02 16:07:43.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -627,8 +718,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-02 16:05:40.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-02 16:07:43.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -653,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-02 16:07:43.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -676,8 +767,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:07:43.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -698,8 +789,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-31 21:49:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-02 16:07:43.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -722,8 +813,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/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-29 16:35:28.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-31 21:44:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-02 16:05:40.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-02 16:07:43.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -740,3 +831,94 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Pl updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); } } +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-02 16:05:39.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-03 01:10:51.000000000 -0400 +@@ -7,6 +7,8 @@ + import java.io.PrintStream; + import java.util.*; + ++import net.minecraft.src.forge.IBlockSecondaryProperties; ++ + // Referenced classes of package net.minecraft.src: + // IBlockAccess, WorldProvider, MapStorage, ISaveHandler, + // WorldInfo, ChunkProvider, IChunkProvider, IProgressUpdate, +@@ -166,7 +168,25 @@ + + public boolean isAirBlock(int i, int j, int k) + { +- return getBlockId(i, j, k) == 0; ++ int iBlockID = getBlockId( i, j, k ); ++ ++ if ( iBlockID == 0 ) ++ { ++ return true; ++ } ++ else ++ { ++ Block block = Block.blocksList[iBlockID]; ++ ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k ); ++ } ++ else ++ { ++ return false; ++ } ++ } + } + + public boolean blockExists(int i, int j, int k) +@@ -1409,6 +1429,18 @@ + { + return true; + } ++ else ++ { ++ Block block = Block.blocksList[j2]; ++ ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) ) ++ { ++ return true; ++ } ++ } ++ } + } + + } +@@ -1686,7 +1718,14 @@ + return false; + } else + { +- return block.blockMaterial.getIsOpaque() && block.isACube(); ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); ++ } ++ else ++ { ++ return block.blockMaterial.getIsOpaque() && block.isACube(); ++ } + } + } + +@@ -2178,6 +2217,16 @@ + { + block = null; + } ++ else ++ { ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) ) ++ { ++ block = null; ++ } ++ } ++ } + return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); + } + From 6d0e0319893d4ac77b1cc7289aafa1b190e20639 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 4 Aug 2011 06:10:38 +0000 Subject: [PATCH 043/169] improved installation and setup scripts --- forge/install/README.txt | 10 ++++++++++ forge/install/install.cmd | 8 ++++++++ forge/package.sh | 22 +++++++++++++++------- forge/release.bat | 2 +- forge/setup.bat | 2 +- 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100755 forge/install/README.txt create mode 100755 forge/install/install.cmd diff --git a/forge/install/README.txt b/forge/install/README.txt new file mode 100755 index 0000000000..c649f02191 --- /dev/null +++ b/forge/install/README.txt @@ -0,0 +1,10 @@ +*** HOW TO INSTALL *** + +The forge directory should have been uncompacted right under your MCP root +directory. + +You should a a fresh minecraft and minecraft_server.jar freshly decompiled +with ModLoader and ModLoaderMP. + +Just run the script install.bat. It will copy the Minecraft Forge source on your +src directory, and modify the Minecraft source files. diff --git a/forge/install/install.cmd b/forge/install/install.cmd new file mode 100755 index 0000000000..1aff2b7201 --- /dev/null +++ b/forge/install/install.cmd @@ -0,0 +1,8 @@ +set HOME=%CD% +set MCP=%HOME%\.. +xcopy /Y /E src\* ..\src + +cd %MCP%\src +%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch +%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch +pause diff --git a/forge/package.sh b/forge/package.sh index 8d2f52cfaa..fdb38d87f1 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -46,18 +46,26 @@ rm -rf reobf cd $build_dir +mkdir forge +cd forge mkdir src mkdir src/minecraft mkdir src/minecraft_server -cp -r forge_client/src/* src/minecraft -cp -r forge_server/src/* src/minecraft_server -cp -r forge_common/* src/minecraft -cp -r forge_common/* src/minecraft_server -cp minecraft.patch src +cp -r ../forge_client/src/* src/minecraft +cp -r ../forge_server/src/* src/minecraft_server +cp -r ../forge_common/* src/minecraft +cp -r ../forge_common/* src/minecraft_server +cp ../minecraft.patch . +cp ../lfcr.py . +cp ../install/install.cmd . +cp ../install/README.txt . +cp -r ../doc . cd src remove_svn . cd .. -zip -r $dir/minecraftforge-src-$version.zip src doc -rm -rf src +cd .. + +zip -r $dir/minecraftforge-src-$version.zip forge +rm -rf forge diff --git a/forge/release.bat b/forge/release.bat index 4edfcd6b12..18a5f48ddd 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.0 +sh package.sh 1.0.3 pause diff --git a/forge/setup.bat b/forge/setup.bat index 8ad6e747c1..1a3d8f88e6 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -9,7 +9,7 @@ rmdir /S /Q src_work cmd /C decompile.bat cd src ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch -..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP.patch +..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch cd .. cmd /C recompile.bat cmd /C updatemd5.bat From 4bc2f86ea825dca36d8684b7bb56ecd72b7295e5 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 5 Aug 2011 00:32:56 +0000 Subject: [PATCH 044/169] New install script for Linux users. --- forge/build.sh | 14 +++++----- forge/mlprop.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++ forge/setup.sh | 49 ++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 7 deletions(-) create mode 100644 forge/mlprop.patch create mode 100755 forge/setup.sh diff --git a/forge/build.sh b/forge/build.sh index c527cc9fce..8f0238a3d4 100755 --- a/forge/build.sh +++ b/forge/build.sh @@ -2,15 +2,15 @@ pushd .. -rm -rf src -cp -a src_work src -rm -rf bin +rm -rf src bin -popd +cp -a src_work src_forge -cp -a forge_client/src/net/* ../src/minecraft/net/ -cp -a forge_common/net/* ../src/minecraft/net/ -cp -a forge_common/net/* ../src/minecraft_server/net/ +cp -a forge/forge_client/src/net/* src_forge/minecraft/net/ +cp -a forge/forge_common/net/* src_forge/minecraft/net/ +cp -a forge/forge_common/net/* src_forge/minecraft_server/net/ + +cp -a src_forge src pushd .. diff --git a/forge/mlprop.patch b/forge/mlprop.patch new file mode 100644 index 0000000000..f6f9569792 --- /dev/null +++ b/forge/mlprop.patch @@ -0,0 +1,70 @@ +diff -ru src/minecraft/net/minecraft/src/MLProp.java src_fix/minecraft/net/minecraft/src/MLProp.java +--- src/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400 ++++ src_fix/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:12:55.000000000 -0400 +@@ -1,20 +1,11 @@ +-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. +-// Jad home page: http://www.kpdus.com/jad.html +-// Decompiler options: packimports(3) braces deadcode +- +-package net.minecraft.src; +- +-import java.lang.annotation.Annotation; +- +-public interface MLProp +- extends Annotation +-{ +- +- public abstract String name(); +- +- public abstract String info(); +- +- public abstract double min(); +- +- public abstract double max(); +-} ++package net.minecraft.src; ++import java.lang.annotation.*; ++ ++@Retention(RetentionPolicy.RUNTIME) ++@Target(ElementType.FIELD) ++public @interface MLProp { ++ String name() default ""; ++ String info() default ""; ++ double min() default Double.NEGATIVE_INFINITY; ++ double max() default Double.POSITIVE_INFINITY; ++} +diff -ru src/minecraft_server/net/minecraft/src/MLProp.java src_fix/minecraft_server/net/minecraft/src/MLProp.java +--- src/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400 ++++ src_fix/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:13:00.000000000 -0400 +@@ -1,20 +1,11 @@ +-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. +-// Jad home page: http://www.kpdus.com/jad.html +-// Decompiler options: packimports(3) braces deadcode +- +-package net.minecraft.src; +- +-import java.lang.annotation.Annotation; +- +-public interface MLProp +- extends Annotation +-{ +- +- public abstract String name(); +- +- public abstract String info(); +- +- public abstract double min(); +- +- public abstract double max(); +-} ++package net.minecraft.src; ++import java.lang.annotation.*; ++ ++@Retention(RetentionPolicy.RUNTIME) ++@Target(ElementType.FIELD) ++public @interface MLProp { ++ String name() default ""; ++ String info() default ""; ++ double min() default Double.NEGATIVE_INFINITY; ++ double max() default Double.POSITIVE_INFINITY; ++} diff --git a/forge/setup.sh b/forge/setup.sh new file mode 100755 index 0000000000..81475d6edc --- /dev/null +++ b/forge/setup.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +echo "MinecraftForge Linux Setup Program" +echo + +pushd .. > /dev/null + +if [ -d src ] ; then + echo "!!! WARNING !!!" + echo + echo "This setup will erase your src directory. Make sure to back up" + echo "any changes before continuing." + echo + + read -p "Continue (y/n)? " var + + if [ "$var" != "y" ]; then exit ; fi +fi + +rm -rf src src_work src_forge + +if [ ! -d src_base ] ; then + ./decompile.sh + pushd src > /dev/null + + find -name *.java -exec sed -i 's/\r//g' \{\} \; + patch -p2 -i ../forge/modLoaderMP.patch + patch -p1 -i ../forge/mlprop.patch + + popd > /dev/null + + mv src src_base +fi + +cp -a src_base src_work +pushd src_work > /dev/null + patch -p2 -i ../forge/minecraft.patch +popd > /dev/null + +cp -a src_work src_forge + +cp -a forge/forge_client/src/net/* src_forge/minecraft/net/ +cp -a forge/forge_common/net/* src_forge/minecraft/net/ +cp -a forge/forge_common/net/* src_forge/minecraft_server/net/ + +cp -a src_forge src + +./updatemd5.sh + From f54eecb455206556b46ab506da955f826b0a0682 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 5 Aug 2011 11:07:03 +0000 Subject: [PATCH 045/169] New multiple-tessellator texture renderer. --- forge/build.sh | 6 +- .../minecraft/src/forge/ForgeHooksClient.java | 130 ++++++ .../src/forge/MinecraftForgeClient.java | 44 +- forge/minecraft.patch | 390 ++++++++++++++---- 4 files changed, 450 insertions(+), 120 deletions(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java diff --git a/forge/build.sh b/forge/build.sh index 8f0238a3d4..44f2afaa54 100755 --- a/forge/build.sh +++ b/forge/build.sh @@ -1,8 +1,8 @@ #!/bin/bash -pushd .. +cd .. -rm -rf src bin +rm -rf src bin src_forge cp -a src_work src_forge @@ -12,8 +12,6 @@ cp -a forge/forge_common/net/* src_forge/minecraft_server/net/ cp -a src_forge src -pushd .. - ./recompile.sh diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java new file mode 100644 index 0000000000..d330c8c2a0 --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -0,0 +1,130 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.Block; +import net.minecraft.src.ModLoader; +import net.minecraft.src.RenderBlocks; +import net.minecraft.src.Tessellator; +import org.lwjgl.opengl.GL11; + +import java.util.*; + +public class ForgeHooksClient { + public static boolean canRenderInPass(Block block, int pass) { + if(block instanceof IMultipassRender) { + IMultipassRender impr = (IMultipassRender) block; + return impr.canRenderInPass(pass); + } + if(pass==block.getRenderBlockPass()) return true; + return false; + } + + + static HashMap tessellators=new HashMap(); + static HashMap textures=new HashMap(); + static boolean inWorld=false; + static HashSet renderTextureTest=new HashSet(); + static ArrayList renderTextureList=new ArrayList(); + + protected static void bindTessellator(int tex, int sub) { + List key=Arrays.asList(tex,sub); + Tessellator t; + if(!tessellators.containsKey(key)) { + t=new Tessellator(); + tessellators.put(key,t); + } else { + t=(Tessellator)tessellators.get(key); + } + if(inWorld && !renderTextureTest.contains(key)) { + renderTextureTest.add(key); + renderTextureList.add(key); + t.startDrawingQuads(); + t.setTranslationD(Tessellator.firstInstance.xOffset, + Tessellator.firstInstance.yOffset, + Tessellator.firstInstance.zOffset); + } + Tessellator.instance=t; + } + + protected static void bindTexture(String name, int sub) { + int n; + if(!textures.containsKey(name)) { + n=ModLoader.getMinecraftInstance().renderEngine + .getTexture(name); + textures.put(name,n); + } else { + n=(Integer)textures.get(name); + } + if(!inWorld) { + Tessellator.instance=Tessellator.firstInstance; + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n); + return; + } + bindTessellator(n,sub); + } + + protected static void unbindTexture() { + Tessellator.instance=Tessellator.firstInstance; + if(!inWorld) { + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture("/terrain.png")); + return; + } + } + + public static void beforeRenderPass(int pass) { + Tessellator.instance=Tessellator.firstInstance; + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture("/terrain.png")); + renderTextureTest.clear(); + renderTextureList.clear(); + inWorld=true; + } + + public static void afterRenderPass(int pass) { + inWorld=false; + for(List l : renderTextureList) { + // TODO: call appropriate client hooks + GL11.glBindTexture(GL11.GL_TEXTURE_2D,(Integer)l.toArray()[0]); + Tessellator t=(Tessellator)tessellators.get(l); + t.draw(); + } + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture("/terrain.png")); + Tessellator.instance=Tessellator.firstInstance; + } + + public static void beforeBlockRender(Block block, + RenderBlocks renderblocks) { + if (block instanceof ITextureProvider + && renderblocks.overrideBlockTexture == -1) { + ITextureProvider itp=(ITextureProvider)block; + bindTexture(itp.getTextureFile(),0); + } + } + + public static void afterBlockRender(Block block, + RenderBlocks renderblocks) { + if (block instanceof ITextureProvider + && renderblocks.overrideBlockTexture == -1) { + Tessellator.instance=Tessellator.firstInstance; + } + } + + public static void overrideTexture (Object o) { + if (o instanceof ITextureProvider) { + GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader + .getMinecraftInstance().renderEngine + .getTexture(((ITextureProvider) (o)) + .getTextureFile())); + } + } +} + diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 07497def9d..6533ed8aaf 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -12,41 +12,15 @@ import net.minecraft.src.Tessellator; import org.lwjgl.opengl.GL11; public class MinecraftForgeClient { - - public static void beforeBlockRender(Block block, RenderBlocks renderblocks) { - if (block instanceof ITextureProvider - && renderblocks.overrideBlockTexture == -1) { - Tessellator tessellator = Tessellator.instance; - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1F, 0.0F); + public static void bindTexture(String name, int sub) { + ForgeHooksClient.bindTexture(name,sub); + } - GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader - .getMinecraftInstance().renderEngine - .getTexture(((ITextureProvider) (block)).getTextureFile())); + public static void bindTexture(String name) { + ForgeHooksClient.bindTexture(name,0); + } - } - } - - public static void afterBlockRender(Block block, RenderBlocks renderblocks) { - if (block instanceof ITextureProvider - && renderblocks.overrideBlockTexture == -1) { - Tessellator tessellator = Tessellator.instance; - tessellator.draw(); - tessellator.startDrawingQuads(); - - GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader - .getMinecraftInstance().renderEngine - .getTexture("/terrain.png")); - } - } - - public static void overrideTexture (Object o) { - if (o instanceof ITextureProvider) { - GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader - .getMinecraftInstance().renderEngine - .getTexture(((ITextureProvider) (o)) - .getTextureFile())); - } - } + public static void unbindTexture() { + ForgeHooksClient.unbindTexture(); + } } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2b0d46c84e..a7a4618f7f 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:07:39.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -21,8 +21,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-02 16:07:39.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -60,8 +60,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-02 16:07:40.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-04 20:51:18.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -205,8 +205,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private Random rand; } 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-02 16:07:41.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -239,8 +239,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int k = i * j + damageRemainder; inventory.damageArmor(i); 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-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -269,8 +269,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -295,8 +295,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -317,13 +317,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-05 00:58:57.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; import net.minecraft.client.Minecraft; -+import net.minecraft.src.forge.MinecraftForgeClient; ++import net.minecraft.src.forge.ForgeHooksClient; + import org.lwjgl.opengl.GL11; @@ -332,24 +332,24 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); } else { if(itemstack.itemID < 256) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); } else { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); -+ MinecraftForgeClient.overrideTexture (Item.itemsList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]); } Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-04 20:51:18.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -371,8 +371,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + } } 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -395,14 +395,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-05 00:59:18.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; import java.util.Random; + -+import net.minecraft.src.forge.MinecraftForgeClient; ++import net.minecraft.src.forge.ForgeHooksClient; + import org.lwjgl.opengl.GL11; @@ -411,7 +411,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); loadTexture("/terrain.png"); -+ MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); float f4 = 0.25F; if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16) { @@ -419,12 +419,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte if(itemstack.itemID < 256) { loadTexture("/terrain.png"); -+ MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); } else { loadTexture("/gui/items.png"); - } -+ MinecraftForgeClient.overrideTexture(Item.itemsList[itemstack.itemID]); ++ ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); + } Tessellator tessellator = Tessellator.instance; float f6 = (float)((i % 16) * 16 + 0) / 256F; @@ -441,7 +441,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte { int j1 = i; renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ MinecraftForgeClient.overrideTexture (Block.blocksList[i]); ++ ForgeHooksClient.overrideTexture (Block.blocksList[i]); Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); @@ -449,17 +449,203 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ MinecraftForgeClient.overrideTexture (Block.blocksList[i]); ++ ForgeHooksClient.overrideTexture (Block.blocksList[i]); } else { renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); -+ MinecraftForgeClient.overrideTexture(Item.itemsList[i]); ++ ForgeHooksClient.overrideTexture(Item.itemsList[i]); } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; +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-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-05 05:09:37.000000000 -0400 +@@ -6,6 +6,7 @@ + + import java.io.PrintStream; + import java.nio.*; ++import java.util.*; + import org.lwjgl.opengl.*; + + // Referenced classes of package net.minecraft.src: +@@ -14,8 +15,11 @@ + public class Tessellator + { + +- private Tessellator(int i) +- { ++ public int instanceNo; ++ static int instanceTotal=0; ++ ++ public Tessellator() { ++ instanceNo=instanceTotal++; + vertexCount = 0; + hasColor = false; + hasTexture = false; +@@ -24,20 +28,10 @@ + addedVertices = 0; + isColorDisabled = false; + isDrawing = false; +- useVBO = false; + vboIndex = 0; +- vboCount = 10; +- bufferSize = i; +- byteBuffer = GLAllocation.createDirectByteBuffer(i * 4); +- intBuffer = byteBuffer.asIntBuffer(); +- floatBuffer = byteBuffer.asFloatBuffer(); +- rawBuffer = new int[i]; +- useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; +- if(useVBO) +- { +- vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); +- ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); +- } ++ ++ rawBuffer=null; ++ rawBufferSize=0; + } + + public void draw() +@@ -47,12 +41,20 @@ + throw new IllegalStateException("Not tesselating!"); + } + isDrawing = false; +- if(vertexCount > 0) +- { ++ int offs=0; ++ while(offs < vertexCount) { ++ int vtc; ++ if(drawMode == 7 && convertQuadsToTriangles) { ++ vtc=Math.min(vertexCount-offs,trivertsInBuffer); ++ } else { ++ vtc=Math.min(vertexCount-offs,nativeBufferSize>>5); ++ } ++ + intBuffer.clear(); +- intBuffer.put(rawBuffer, 0, rawBufferIndex); ++ intBuffer.put(rawBuffer, offs*8, vtc*8); + byteBuffer.position(0); +- byteBuffer.limit(rawBufferIndex * 4); ++ byteBuffer.limit(vtc*32); ++ offs+=vtc; + if(useVBO) + { + vboIndex = (vboIndex + 1) % vboCount; +@@ -106,10 +108,10 @@ + GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); + if(drawMode == 7 && convertQuadsToTriangles) + { +- GL11.glDrawArrays(4, 0, vertexCount); ++ GL11.glDrawArrays(4, 0, vtc); + } else + { +- GL11.glDrawArrays(drawMode, 0, vertexCount); ++ GL11.glDrawArrays(drawMode, 0, vtc); + } + GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); + if(hasTexture) +@@ -125,6 +127,10 @@ + GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); + } + } ++ if(rawBufferSize>0x20000 && rawBufferIndex<(rawBufferSize<<3)) { ++ rawBufferSize=0; ++ rawBuffer=null; ++ } + reset(); + } + +@@ -237,6 +243,15 @@ + + public void addVertex(double d, double d1, double d2) + { ++ if(rawBufferIndex >= rawBufferSize-32) { ++ if(rawBufferSize==0) { ++ rawBufferSize=0x10000; ++ rawBuffer=new int[rawBufferSize]; ++ } else { ++ rawBufferSize*=2; ++ rawBuffer=Arrays.copyOf(rawBuffer,rawBufferSize); ++ } ++ } + addedVertices++; + if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) + { +@@ -278,11 +293,6 @@ + rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); + rawBufferIndex += 8; + vertexCount++; +- if(vertexCount % 4 == 0 && rawBufferIndex >= bufferSize - 32) +- { +- draw(); +- isDrawing = true; +- } + } + + public void setColorOpaque_I(int i) +@@ -335,9 +345,7 @@ + + private static boolean convertQuadsToTriangles = true; + private static boolean tryVBO = false; +- private ByteBuffer byteBuffer; +- private IntBuffer intBuffer; +- private FloatBuffer floatBuffer; ++ private static boolean useVBO = false; + private int rawBuffer[]; + private int vertexCount; + private double textureU; +@@ -350,16 +358,40 @@ + private int addedVertices; + private boolean isColorDisabled; + private int drawMode; +- private double xOffset; +- private double yOffset; +- private double zOffset; ++ public double xOffset; ++ public double yOffset; ++ public double zOffset; + private int normal; +- public static final Tessellator instance = new Tessellator(0x200000); + private boolean isDrawing; +- private boolean useVBO; +- private IntBuffer vertexBuffers; + private int vboIndex; +- private int vboCount; +- private int bufferSize; ++ ++ private int rawBufferSize; ++ private static int vboCount; ++ private static IntBuffer vertexBuffers; ++ private static int nativeBufferSize; ++ private static int trivertsInBuffer; ++ private static ByteBuffer byteBuffer; ++ private static IntBuffer intBuffer; ++ private static FloatBuffer floatBuffer; ++ public static Tessellator instance; ++ public static Tessellator firstInstance; ++ ++ static { ++ instance=new Tessellator(); ++ firstInstance=instance; ++ ++ nativeBufferSize = 0x200000; ++ trivertsInBuffer = (nativeBufferSize/48)*6; ++ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); ++ intBuffer = byteBuffer.asIntBuffer(); ++ floatBuffer = byteBuffer.asFloatBuffer(); ++ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; ++ vboCount = 10; ++ if(useVBO) ++ { ++ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); ++ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); ++ } ++ } + + } 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-02 16:05:38.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-03 01:10:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:18.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; @@ -549,8 +735,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-02 16:07:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-05 06:22:55.000000000 -0400 @@ -3,8 +3,12 @@ // Decompiler options: packimports(3) braces deadcode @@ -559,43 +745,85 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend import java.util.*; + -+import net.minecraft.src.forge.MinecraftForgeClient; ++import net.minecraft.src.forge.ForgeHooksClient; + import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -138,14 +142,27 @@ +@@ -125,8 +129,10 @@ + GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); + GL11.glScalef(f, f, f); + GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); +- tessellator.startDrawingQuads(); +- tessellator.setTranslationD(-posX, -posY, -posZ); ++ ++ ForgeHooksClient.beforeRenderPass(i2); ++ Tessellator.instance.startDrawingQuads(); ++ Tessellator.instance.setTranslationD(-posX, -posY, -posZ); } + if(i2 == 0 && Block.isBlockContainer[i3]) + { +@@ -136,17 +142,17 @@ + tileEntityRenderers.add(tileentity); + } + } ++ Block block = Block.blocksList[i3]; int j3 = block.getRenderBlockPass(); -+ -+ if (block instanceof IMultipassRender) { -+ if (j3 != i2) { -+ flag = true; -+ } -+ IMultipassRender impr = (IMultipassRender) block; -+ if (impr.canRenderInPass(i2)) { -+ j3 = i2; -+ } -+ } -+ - if(j3 != i2) - { - flag = true; - continue; - } - if(j3 == i2) +- if(j3 != i2) - { -+ { -+ MinecraftForgeClient.beforeBlockRender(block, renderblocks); - flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); -+ MinecraftForgeClient.afterBlockRender(block, renderblocks); - } +- flag = true; +- continue; +- } +- if(j3 == i2) +- { +- flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); +- } ++ if(j3>i2) flag=true; ++ ++ if(!ForgeHooksClient.canRenderInPass(block,i2)) ++ continue; ++ ++ ForgeHooksClient.beforeBlockRender(block, renderblocks); ++ flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); ++ ForgeHooksClient.afterBlockRender(block, renderblocks); } + } +@@ -155,10 +161,11 @@ + + if(flag2) + { +- tessellator.draw(); ++ ForgeHooksClient.afterRenderPass(i2); ++ Tessellator.instance.draw(); + GL11.glPopMatrix(); + GL11.glEndList(); +- tessellator.setTranslationD(0.0D, 0.0D, 0.0D); ++ Tessellator.instance.setTranslationD(0.0D, 0.0D, 0.0D); + } else + { + flag1 = false; +@@ -251,7 +258,6 @@ + + public World worldObj; + private int glRenderList; +- private static Tessellator tessellator; + public static int chunksUpdated = 0; + public int posX; + public int posY; +@@ -282,8 +288,4 @@ + public List tileEntityRenderers; + private List tileEntities; + +- static +- { +- tessellator = Tessellator.instance; +- } + } 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-02 16:05:40.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -616,8 +844,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { return true; 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -655,8 +883,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch if(j1 != 0) { 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-02 16:05:40.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -689,8 +917,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int k = i * j + damageRemainder; inventory.damageArmor(i); 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -718,8 +946,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-02 16:05:40.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -744,8 +972,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -767,8 +995,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -789,8 +1017,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-04 20:51:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -813,8 +1041,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/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-02 16:05:40.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-02 16:07:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-04 20:51:18.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -832,8 +1060,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/World.java ../src_work/minecraft_server/net/minecraft/src/World.java ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-02 16:05:39.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-03 01:10:51.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:18.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; From 6accd6dfee9f32ce73d8836983fcfc2f27f62f4d Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 5 Aug 2011 11:58:14 +0000 Subject: [PATCH 046/169] Added a texture preloader to avoid render glitches on the first render. --- .../src/net/minecraft/src/forge/MinecraftForgeClient.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 6533ed8aaf..1ab47db98b 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -23,4 +23,9 @@ public class MinecraftForgeClient { public static void unbindTexture() { ForgeHooksClient.unbindTexture(); } + + public static void preloadTexture(String texture) { + ModLoader.getMinecraftInstance().renderEngine + .getTexture(texture); + } } From f530d9f2b2e1bea132ac75594ab207ec49060499 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 5 Aug 2011 14:58:18 +0000 Subject: [PATCH 047/169] Not really a change. --- .../src/net/minecraft/src/forge/ForgeHooksClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index d330c8c2a0..8c03e65dee 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -91,7 +91,8 @@ public class ForgeHooksClient { inWorld=false; for(List l : renderTextureList) { // TODO: call appropriate client hooks - GL11.glBindTexture(GL11.GL_TEXTURE_2D,(Integer)l.toArray()[0]); + Integer[] tn=(Integer[])l.toArray(); + GL11.glBindTexture(GL11.GL_TEXTURE_2D,tn[0]); Tessellator t=(Tessellator)tessellators.get(l); t.draw(); } From 6c19a22244cf8372c61ad58292a658322a8b965d Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 6 Aug 2011 18:22:24 +0000 Subject: [PATCH 048/169] Added a small patch to MovingObjectPosition. --- forge/minecraft.patch | 66 +++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index a7a4618f7f..2bc0e3397c 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -22,7 +22,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return true; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -61,7 +61,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav { 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-05 07:07:18.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -206,7 +206,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-05 07:07:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -240,7 +240,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla inventory.damageArmor(i); 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -270,7 +270,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion { 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-05 07:07:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -296,7 +296,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java --- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-05 07:07:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -318,7 +318,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka return true; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-05 00:58:57.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-05 07:07:18.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -349,7 +349,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende 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 --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-05 07:07:18.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -370,9 +370,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; + } } +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-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:19.000000000 -0400 +@@ -35,4 +35,5 @@ + public int sideHit; + public Vec3D hitVec; + public Entity entityHit; ++ 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 --- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -396,7 +405,7 @@ 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/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-05 00:59:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-05 07:07:18.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -459,7 +468,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f = (float)(k1 >> 16 & 0xff) / 255F; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-05 05:09:37.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-05 07:07:18.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -645,7 +654,7 @@ 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/World.java ../src_work/minecraft/net/minecraft/src/World.java --- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-05 07:07:18.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; @@ -736,7 +745,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-05 06:22:55.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,8 +3,12 @@ // Decompiler options: packimports(3) braces deadcode @@ -823,7 +832,7 @@ 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/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -845,7 +854,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return true; 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -884,7 +893,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch { 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-05 07:07:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -918,7 +927,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En inventory.damageArmor(i); 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -947,7 +956,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex { 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-05 07:07:18.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -973,7 +982,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-05 07:07:18.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -996,7 +1005,7 @@ 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/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java --- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-05 07:07:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1018,7 +1027,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return true; 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-05 07:07:18.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1040,9 +1049,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; + } } +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-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:24.000000000 -0400 +@@ -35,4 +35,5 @@ + public int sideHit; + public Vec3D hitVec; + public Entity entityHit; ++ 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 --- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-05 07:07:18.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -1061,7 +1079,7 @@ 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/World.java ../src_work/minecraft_server/net/minecraft/src/World.java --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-05 07:07:18.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; From cbcdfbcfdbc9d4ce5af81887a6ca8bde7c363a31 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 6 Aug 2011 18:29:58 +0000 Subject: [PATCH 049/169] Added a comment. --- forge/minecraft.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2bc0e3397c..6df7fa30c9 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -372,11 +372,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. } 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:19.000000000 -0400 -@@ -35,4 +35,5 @@ ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:35.000000000 -0400 +@@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; ++ ++ // Added for RedPower subblocks. + 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 @@ -1051,11 +1053,13 @@ 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/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java --- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:24.000000000 -0400 -@@ -35,4 +35,5 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:31.000000000 -0400 +@@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; ++ ++ // Added for RedPower subblocks. + 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 From b813f609a6865a9037c807cdfc9634166a1c3905 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 6 Aug 2011 21:16:53 +0000 Subject: [PATCH 050/169] initial revision of the credit file, to be completed --- forge/credits.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 forge/credits.txt diff --git a/forge/credits.txt b/forge/credits.txt new file mode 100755 index 0000000000..3222918716 --- /dev/null +++ b/forge/credits.txt @@ -0,0 +1,12 @@ +* Eloraam * + +* FlowerChild * + +* Scokeev9 * + +Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. + +ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed. + +* SpaceToad * + From 691b87e876f744e6c6e442f25335eebf73c61447 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 6 Aug 2011 21:18:31 +0000 Subject: [PATCH 051/169] renamed file --- forge/minecraftforge_credits.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 forge/minecraftforge_credits.txt diff --git a/forge/minecraftforge_credits.txt b/forge/minecraftforge_credits.txt new file mode 100755 index 0000000000..3222918716 --- /dev/null +++ b/forge/minecraftforge_credits.txt @@ -0,0 +1,12 @@ +* Eloraam * + +* FlowerChild * + +* Scokeev9 * + +Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. + +ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed. + +* SpaceToad * + From 53dd73f2a52b5daa77fa8b8deef86346f492dfab Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 6 Aug 2011 21:23:38 +0000 Subject: [PATCH 052/169] updated release and package script to take into account credit file --- forge/credits.txt | 12 ------------ forge/package.sh | 4 ++++ forge/release.bat | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100755 forge/credits.txt diff --git a/forge/credits.txt b/forge/credits.txt deleted file mode 100755 index 3222918716..0000000000 --- a/forge/credits.txt +++ /dev/null @@ -1,12 +0,0 @@ -* Eloraam * - -* FlowerChild * - -* Scokeev9 * - -Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. - -ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed. - -* SpaceToad * - diff --git a/forge/package.sh b/forge/package.sh index fdb38d87f1..624b3784b9 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -22,7 +22,10 @@ function remove_svn () { function package_all () { qual=$1 + cp $build_dir/minecraftforge_credits.txt . + zip -r $dir/minecraftforge$qual-$version.zip \ + minecraftforge_credits.txt \ *.class \ forge } @@ -59,6 +62,7 @@ cp ../minecraft.patch . cp ../lfcr.py . cp ../install/install.cmd . cp ../install/README.txt . +cp ../minecraftforge_credits.txt . cp -r ../doc . cd src diff --git a/forge/release.bat b/forge/release.bat index 18a5f48ddd..0fddaa9b5e 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.3 +sh package.sh 1.0.4 pause From 4c259ce5d5cc67cd303ec64ee34f0ced35558dce Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 6 Aug 2011 21:54:56 +0000 Subject: [PATCH 053/169] updated list of contributers --- forge/minecraftforge_credits.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/forge/minecraftforge_credits.txt b/forge/minecraftforge_credits.txt index 3222918716..9616ba32d0 100755 --- a/forge/minecraftforge_credits.txt +++ b/forge/minecraftforge_credits.txt @@ -2,6 +2,8 @@ * FlowerChild * +* Hawkye * + * Scokeev9 * Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. From cfda01b9ff2503384609ac795471dee6f2787e0f Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 7 Aug 2011 21:37:05 +0000 Subject: [PATCH 054/169] Fixed a typo in isBoundingBoxBurning. --- forge/minecraft.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 6df7fa30c9..ee6cf37cad 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -656,7 +656,7 @@ 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/World.java ../src_work/minecraft/net/minecraft/src/World.java --- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-05 07:07:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-07 17:35:52.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; @@ -703,7 +703,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav + + if ( block instanceof IBlockSecondaryProperties ) + { -+ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) ) ++ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, l1, i2 ) ) + { + return true; + } @@ -1083,7 +1083,7 @@ 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/World.java ../src_work/minecraft_server/net/minecraft/src/World.java --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-05 07:07:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-07 17:35:51.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; @@ -1130,7 +1130,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + + if ( block instanceof IBlockSecondaryProperties ) + { -+ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) ) ++ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, l1, i2 ) ) + { + return true; + } From 61b8107ba448e3a633adb438cd9c211a4a3d0c61 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 8 Aug 2011 16:55:50 +0000 Subject: [PATCH 055/169] The ladder hook. --- forge/minecraft.patch | 61 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index ee6cf37cad..c672ac3c02 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,3 +1,31 @@ +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-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-08 12:43:09.000000000 -0400 +@@ -600,6 +600,10 @@ + return blockMaterial.getMaterialMobility(); + } + ++ public boolean isLadder() { ++ return false; ++ } ++ + static Class _mthclass$(String s) + { + try +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-04 20:51:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-08 12:43:21.000000000 -0400 +@@ -63,6 +63,10 @@ + return super.getSelectedBoundingBoxFromPool(world, i, j, k); + } + ++ public boolean isLadder() { ++ return true; ++ } ++ + public boolean isOpaqueCube() + { + return false; 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-04 20:51:16.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-05 07:07:18.000000000 -0400 @@ -204,6 +232,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private RenderEngine renderer; 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 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-04 20:51:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-08 12:43:24.000000000 -0400 +@@ -555,7 +555,9 @@ + int i = MathHelper.floor_double(posX); + int j = MathHelper.floor_double(boundingBox.minY); + int k = MathHelper.floor_double(posZ); +- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; ++ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; ++ if(block==null) return false; ++ return block.isLadder(); + } + + 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 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:17.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-05 07:07:18.000000000 -0400 @@ -747,12 +789,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-05 07:07:18.000000000 -0400 -@@ -3,8 +3,12 @@ - // Decompiler options: packimports(3) braces deadcode - ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-08 12:37:17.000000000 -0400 +@@ -5,6 +5,9 @@ package net.minecraft.src; -+import net.minecraft.src.forge.*; import java.util.*; + @@ -761,7 +800,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -125,8 +129,10 @@ +@@ -125,8 +128,10 @@ GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); GL11.glScalef(f, f, f); GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); @@ -774,7 +813,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } if(i2 == 0 && Block.isBlockContainer[i3]) { -@@ -136,17 +142,17 @@ +@@ -136,17 +141,17 @@ tileEntityRenderers.add(tileentity); } } @@ -801,7 +840,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } } -@@ -155,10 +161,11 @@ +@@ -155,10 +160,11 @@ if(flag2) { @@ -815,7 +854,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } else { flag1 = false; -@@ -251,7 +258,6 @@ +@@ -251,7 +257,6 @@ public World worldObj; private int glRenderList; @@ -823,7 +862,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend public static int chunksUpdated = 0; public int posX; public int posY; -@@ -282,8 +288,4 @@ +@@ -282,8 +287,4 @@ public List tileEntityRenderers; private List tileEntities; @@ -984,7 +1023,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-05 07:07:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-08 02:24:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode From adf31e33fd3e335d25ce24e0d414532918042218 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 8 Aug 2011 19:50:09 +0000 Subject: [PATCH 056/169] Uploaded install fix. --- forge/install/install.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index 1aff2b7201..8e13411ba4 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,5 +1,5 @@ -set HOME=%CD% -set MCP=%HOME%\.. +set HOME=%~dps0 +set MCP=%HOME%.. xcopy /Y /E src\* ..\src cd %MCP%\src From 8d9e0879d8103a0873f2615c78107b6c089cb4b2 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 11 Aug 2011 21:10:52 +0000 Subject: [PATCH 057/169] Fixed for the new version of MCP. --- forge/minecraft.patch | 135 +++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index c672ac3c02..6755e9a861 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,6 @@ 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-08 12:43:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-11 17:02:12.000000000 -0400 @@ -600,6 +600,10 @@ return blockMaterial.getMaterialMobility(); } @@ -13,8 +13,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-08 12:43:21.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 17:02:12.000000000 -0400 @@ -63,6 +63,10 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -27,8 +27,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd { return false; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -49,8 +49,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -88,8 +88,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-11 17:02:12.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -233,8 +233,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-08 12:43:24.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-11 17:02:12.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -247,8 +247,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -281,8 +281,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int k = i * j + damageRemainder; inventory.damageArmor(i); 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -311,8 +311,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-11 17:02:12.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -337,8 +337,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { world.setBlockWithNotify(i, j, k, 0); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -359,8 +359,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka { return true; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-11 17:02:12.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -390,8 +390,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -413,8 +413,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + } } 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:35.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:12.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -424,8 +424,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -448,8 +448,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:12.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -511,8 +511,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; 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-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 17:02:12.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -697,8 +697,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/World.java ../src_work/minecraft/net/minecraft/src/World.java ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-04 20:51:16.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-07 17:35:52.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-11 17:05:55.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; @@ -758,15 +758,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return false; } else { -- return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock(); -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); -+ } -+ else -+ { -+ return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock(); -+ } +- return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); ++ if ( block instanceof IBlockSecondaryProperties ) ++ { ++ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); ++ } ++ else ++ { ++ return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); ++ } } } @@ -787,9 +787,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } +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 ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-08 12:37:17.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-11 17:02:12.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -872,8 +873,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/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -894,8 +895,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { return true; 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/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-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -933,8 +934,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch if(j1 != 0) { 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -967,8 +968,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int k = i * j + damageRemainder; inventory.damageArmor(i); 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/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-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -996,8 +997,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/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-11 17:02:12.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1022,8 +1023,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-08 02:24:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1045,8 +1046,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1067,8 +1068,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return true; 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1091,8 +1092,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/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:31.000000000 -0400 +--- ../src_base/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-11 17:02:12.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1102,8 +1103,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-05 07:07:18.000000000 -0400 +--- ../src_base/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-11 17:02:12.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -1121,8 +1122,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/World.java ../src_work/minecraft_server/net/minecraft/src/World.java ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-07 17:35:51.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-11 17:02:12.000000000 -0400 @@ -7,6 +7,8 @@ import java.io.PrintStream; import java.util.*; From 08b0913f048c48888460959bc993a63649b2854c Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 12 Aug 2011 04:17:33 +0000 Subject: [PATCH 058/169] Uploaded new install file. --- forge/install/install.cmd | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index 8e13411ba4..d100c8bd73 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,8 +1,26 @@ -set HOME=%~dps0 -set MCP=%HOME%.. -xcopy /Y /E src\* ..\src - -cd %MCP%\src -%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch -%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch -pause +@echo off +echo Minecraft Forge Build Script v1.1 +echo -Searching for components... +set MCP=ERROR! +set HOME=ERROR! +if /i exist %~dp0\%~nx0 (set MCP=%~dp0..&& set HOME=%~dp0) +if /i exist %~dp0\forge\%~nx0 (set MCP=%~dp0&& set HOME=%~dp0\forge) +if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.) +if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.) +echo -MCP detected in %MCP% +echo -Forge detected in %HOME% +if /i not exist %MCP%\src\minecraft\net\minecraft\client\minecraft.java (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && decompile >> compile.log && popd) else (echo -Decompiled source detected) +pushd %MCP%\src +echo -Applying forge to the sourcetree... +xcopy /Y /E /G /Q %HOME%\forge_client\src\net\* %MCP%\src\minecraft\net +xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft\net +echo D | xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft_server\net +echo -NEW SESSION >> forgepatch.log +%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch >> forgepatch.log +echo -Patching necessary source files for forge... +%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch >> forgepatch.log +popd +echo -Forge ready for use, recompiling... +pushd %MCP% +cmd /c recompile.bat +popd From fb5f9373c5648b20f654210dae99b967880a2ed1 Mon Sep 17 00:00:00 2001 From: FlowerChild Date: Fri, 12 Aug 2011 13:52:53 +0000 Subject: [PATCH 059/169] Added patches for decompiled by fernflower source. Client only, and not tested enough. Using is currently not recommended. --- forge/minecraft-fern.patch | 637 +++++++++++++++++++++++++++++++++++++ 1 file changed, 637 insertions(+) create mode 100644 forge/minecraft-fern.patch diff --git a/forge/minecraft-fern.patch b/forge/minecraft-fern.patch new file mode 100644 index 0000000000..1de1ab8a9a --- /dev/null +++ b/forge/minecraft-fern.patch @@ -0,0 +1,637 @@ +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-12 13:47:09.501407000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-12 13:55:57.161587800 +0200 +@@ -637,6 +637,10 @@ + public int getMobilityFlag() { + return this.blockMaterial.getMaterialMobility(); + } ++ ++ public boolean isLadder() { ++ return false; ++ } + + static { + Item.itemsList[cloth.blockID] = (new ItemCloth(cloth.blockID - 256)).setItemName("cloth"); +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-12 13:47:09.859427000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-12 13:57:35.729225600 +0200 +@@ -55,6 +55,10 @@ + + return super.getSelectedBoundingBoxFromPool(var1, var2, var3, var4); + } ++ ++ public boolean isLadder() { ++ return true; ++ } + + public boolean isOpaqueCube() { + return false; +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-12 13:47:10.092441000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-12 14:01:13.353673000 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.*; + import java.util.ArrayList; + import java.util.HashSet; + import java.util.Random; +@@ -369,6 +370,9 @@ + return true; + } else if(var5 == 0) { + return false; ++ } else if (Block.blocksList[var5] instanceof IConnectRedstone) { ++ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[var5]; ++ return icr.canConnectRedstone(var0, var1, var2, var3, var4); + } else if(Block.blocksList[var5].canProvidePower()) { + return true; + } else if(var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) { +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-12 13:47:10.334455000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-12 14:07:37.321634700 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.*; + import java.util.ArrayList; + import java.util.HashMap; + import java.util.Iterator; +@@ -256,6 +257,12 @@ + } else { + int var9 = this.xPosition * 16 + var1; + int var10 = this.zPosition * 16 + var3; ++ ++ if (Block.blocksList[var8] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[var8]; ++ if (!iovr.canReplaceBlock(this.worldObj, var9, var2, var10, var4)) ++ return iovr.getReplacedSuccess(); ++ } + this.blocks[var1 << 11 | var3 << 7 | var2] = (byte)(var6 & 255); + if(var8 != 0 && !this.worldObj.multiplayerWorld) { + Block.blocksList[var8].onBlockRemoval(this.worldObj, var9, var2, var10); +@@ -295,6 +302,11 @@ + } else { + int var8 = this.xPosition * 16 + var1; + int var9 = this.zPosition * 16 + var3; ++ if (Block.blocksList[var7] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[var7]; ++ if (!iovr.canReplaceBlock(this.worldObj, var8, var2, var9, var4)) ++ return iovr.getReplacedSuccess(); ++ } + this.blocks[var1 << 11 | var3 << 7 | var2] = (byte)(var5 & 255); + if(var7 != 0) { + Block.blocksList[var7].onBlockRemoval(this.worldObj, var8, var2, var9); +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-12 13:47:10.674474500 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-12 14:23:05.961749800 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.*; + import java.util.ArrayList; + import java.util.List; + import java.util.Random; +@@ -17,6 +18,7 @@ + + protected World worldObj; + private List[] fxLayers = new List[4]; ++ private List effectList = new ArrayList();; + private RenderEngine renderer; + private Random rand = new Random(); + +@@ -53,6 +55,18 @@ + } + } + } ++ ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ if (entityfx.isDead) { ++ entry.effects.remove(y--); ++ } ++ } ++ if (effectList.size() == 0) ++ effectList.remove(x--); ++ } + + } + +@@ -87,12 +101,24 @@ + + for(int var11 = 0; var11 < this.fxLayers[var8].size(); ++var11) { + EntityFX var12 = (EntityFX)this.fxLayers[var8].get(var11); ++ if(var12 instanceof EntityDiggingFX) continue; + var12.renderParticle(var10, var2, var3, var7, var4, var5, var6); + } + + var10.draw(); + } + } ++ Tessellator tessellator = Tessellator.instance; ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); ++ GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, renderer.getTexture(entry.texture)); ++ tessellator.startDrawingQuads(); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ entityfx.renderParticle(tessellator, var2, var3, var7, var4, var5, var6); ++ } ++ tessellator.draw(); ++ } + + } + +@@ -115,6 +141,12 @@ + for(int var2 = 0; var2 < 4; ++var2) { + this.fxLayers[var2].clear(); + } ++ ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); ++ entry.effects.clear(); ++ } ++ effectList.clear(); + + } + +@@ -130,7 +162,9 @@ + double var13 = (double)var2 + ((double)var9 + 0.5D) / (double)var7; + double var15 = (double)var3 + ((double)var10 + 0.5D) / (double)var7; + int var17 = this.rand.nextInt(6); +- this.addEffect((new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (double)var1 - 0.5D, var13 - (double)var2 - 0.5D, var15 - (double)var3 - 0.5D, var6, var17, var5)).func_4041_a(var1, var2, var3)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (double)var1 - 0.5D, var13 - (double)var2 - 0.5D, var15 - (double)var3 - 0.5D, var6, var17, var5); ++ dig_effect.func_4041_a(var1, var2, var3); ++ this.addDigParticleEffect(dig_effect, var6); + } + } + } +@@ -169,10 +203,39 @@ + if(var4 == 5) { + var8 = (double)var1 + var6.maxX + (double)var7; + } +- +- this.addEffect((new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, var4, this.worldObj.getBlockMetadata(var1, var2, var3))).func_4041_a(var1, var2, var3).func_407_b(0.2F).func_405_d(0.6F)); +- } +- } ++ EntityDiggingFX dig_effect = new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, var4, this.worldObj.getBlockMetadata(var1, var2, var3)); ++ dig_effect.func_4041_a(var1, var2, var3); ++ dig_effect.func_407_b(0.2F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, var6); ++ } ++ } ++ ++ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { ++ boolean added = false; ++ String comp; ++ ++ if (block instanceof ITextureProvider) { ++ comp = ((ITextureProvider) block).getTextureFile(); ++ } else { ++ comp = "/terrain.png"; ++ } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ if (entry.texture.equals(comp)) { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if (!added) { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ this.addEffect(dig_effect); ++ } + + public String getStatistics() { + return "" + (this.fxLayers[0].size() + this.fxLayers[1].size() + this.fxLayers[2].size()); +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-12 13:47:11.117499000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-12 14:25:47.273976400 +0200 +@@ -566,7 +566,9 @@ + int var1 = MathHelper.floor_double(this.posX); + int var2 = MathHelper.floor_double(this.boundingBox.minY); + int var3 = MathHelper.floor_double(this.posZ); +- return this.worldObj.getBlockId(var1, var2, var3) == Block.ladder.blockID; ++ Block block=Block.blocksList[worldObj.getBlockId(var1, var2, var3)]; ++ if(block==null) return false; ++ return block.isLadder(); + } + + public void writeEntityToNBT(NBTTagCompound var1) { +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-12 13:47:11.258507000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-12 14:28:36.672665400 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.ISpecialArmor; + import java.util.Iterator; + import java.util.List; + import net.minecraft.src.AchievementList; +@@ -460,6 +461,18 @@ + } + + protected void damageEntity(int var1) { ++ boolean doRegularComputation = true; ++ for (ItemStack stack : this.inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ var1 = armor.adjustArmorDamage(var1); ++ doRegularComputation = doRegularComputation && armor.allowRegularComputation(); ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(var1); ++ } + int var2 = 25 - this.inventory.getTotalArmorValue(); + int var3 = var1 * var2 + this.damageRemainder; + this.inventory.damageArmor(var1); +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-12 13:47:11.653530000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-12 14:34:12.001845200 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.ISpecialResistance; + import java.util.ArrayList; + import java.util.HashSet; + import java.util.List; +@@ -67,7 +68,17 @@ + int var24 = MathHelper.floor_double(var19); + int var25 = this.worldObj.getBlockId(var22, var23, var24); + if(var25 > 0) { +- var14 -= (Block.blocksList[var25].getExplosionResistance(this.exploder) + 0.3F) * var21; ++ if (Block.blocksList[var25] instanceof ISpecialResistance) { ++ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[var25]; ++ var14 -= (isr.getSpecialExplosionResistance( ++ this.worldObj, var22, var23, var24, this.explosionX, ++ this.explosionY, this.explosionZ, this.exploder) + 0.3F) ++ * var21; ++ } else { ++ var14 -= (Block.blocksList[var25] ++ .getExplosionResistance(this.exploder) + 0.3F) ++ * var21; ++ } + } + + if(var14 > 0.0F) { +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-12 13:47:12.457576000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-12 14:37:03.833673400 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.MinecraftForge; + import net.minecraft.src.Block; + import net.minecraft.src.EntityCow; + import net.minecraft.src.EntityPlayer; +@@ -52,6 +53,13 @@ + } + + if(this.isFull == 0) { ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(var2, ++ var25, var26, var27); ++ ++ if (customBucket != null) { ++ return customBucket; ++ } ++ + if(var2.getBlockMaterial(var25, var26, var27) == Material.water && var2.getBlockMetadata(var25, var26, var27) == 0) { + var2.setBlockWithNotify(var25, var26, var27, 0); + return new ItemStack(Item.bucketWater); +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java +--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-12 13:47:12.719591000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-12 14:40:12.313453800 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.MinecraftForge; + import net.minecraft.src.Block; + import net.minecraft.src.EnumToolMaterial; + import net.minecraft.src.ItemTool; +@@ -15,6 +16,7 @@ + } + + public boolean canHarvestBlock(Block var1) { ++ if (MinecraftForge.canHarvestBlock(this, var1)) return true; + return var1 == Block.obsidian?this.toolMaterial.getHarvestLevel() == 3:(var1 != Block.blockDiamond && var1 != Block.oreDiamond?(var1 != Block.blockGold && var1 != Block.oreGold?(var1 != Block.blockSteel && var1 != Block.oreIron?(var1 != Block.blockLapis && var1 != Block.oreLapis?(var1 != Block.oreRedstone && var1 != Block.oreRedstoneGlowing?(var1.blockMaterial == Material.rock?true:var1.blockMaterial == Material.iron):this.toolMaterial.getHarvestLevel() >= 2):this.toolMaterial.getHarvestLevel() >= 1):this.toolMaterial.getHarvestLevel() >= 1):this.toolMaterial.getHarvestLevel() >= 2):this.toolMaterial.getHarvestLevel() >= 2); + } + +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-12 13:47:12.779594900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-12 15:46:50.977164300 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; + import net.minecraft.client.Minecraft; + import net.minecraft.src.Block; + import net.minecraft.src.EntityLiving; +@@ -38,12 +39,15 @@ + GL11.glPushMatrix(); + if(var2.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var2.itemID].getRenderType())) { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[var2.itemID]); + this.renderBlocksInstance.renderBlockOnInventory(Block.blocksList[var2.itemID], var2.getItemDamage(), var1.getEntityBrightness(1.0F)); + } else { + if(var2.itemID < 256) { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[var2.itemID]); + } else { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/gui/items.png")); ++ ForgeHooksClient.overrideTexture (Item.itemsList[var2.itemID]); + } + + Tessellator var3 = Tessellator.instance; +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-12 13:47:12.875600000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-12 14:44:44.057996700 +0200 +@@ -1,5 +1,7 @@ + package net.minecraft.src; + ++import java.util.Arrays; ++ + import net.minecraft.src.Block; + import net.minecraft.src.Entity; + import net.minecraft.src.EntityLiving; +@@ -52,4 +54,11 @@ + public boolean isFull3D() { + return true; + } ++ ++ public void addBlockEffectiveAgainst (Block block) { ++ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, ++ blocksEffectiveAgainst.length + 1); ++ ++ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; ++ } + } +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-12 13:47:13.829654000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-12 14:45:53.427964400 +0200 +@@ -13,6 +13,9 @@ + public int sideHit; + public Vec3D hitVec; + public Entity entityHit; ++ ++ // Added for RedPower subblocks. ++ public int subHit=0; + + + public MovingObjectPosition(int var1, int var2, int var3, int var4, Vec3D var5) { +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-12 13:47:14.822711000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-12 14:48:25.809680200 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.*; + import net.minecraft.client.Minecraft; + import net.minecraft.src.Block; + import net.minecraft.src.Entity; +@@ -74,6 +75,12 @@ + public void func_6473_b(EntityPlayer var1) {} + + public boolean sendPlaceBlock(EntityPlayer var1, World var2, ItemStack var3, int var4, int var5, int var6, int var7) { ++ if (var3 != null && var3.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif = (IUseItemFirst) var3.getItem(); ++ if (iuif.onItemUseFirst(var3, var1, var2, var4, var5, var6, var7)) { ++ return true; ++ } ++ } + int var8 = var2.getBlockId(var4, var5, var6); + return var8 > 0 && Block.blocksList[var8].blockActivated(var2, var4, var5, var6, var1)?true:(var3 == null?false:var3.useItem(var1, var2, var4, var5, var6, var7)); + } +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-12 13:47:15.680760800 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-12 14:54:24.801213300 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; + import java.util.Random; + import net.minecraft.src.Block; + import net.minecraft.src.Entity; +@@ -53,6 +54,7 @@ + if(var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) { + GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); + this.loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(Block.blocksList[var10.itemID]); + float var29 = 0.25F; + if(!Block.blocksList[var10.itemID].renderAsNormalBlock() && var10.itemID != Block.stairSingle.blockID && Block.blocksList[var10.itemID].getRenderType() != 16) { + var29 = 0.5F; +@@ -77,8 +79,10 @@ + int var14 = var10.getIconIndex(); + if(var10.itemID < 256) { + this.loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(Block.blocksList[var10.itemID]); + } else { + this.loadTexture("/gui/items.png"); ++ ForgeHooksClient.overrideTexture(Item.itemsList[var10.itemID]); + } + + Tessellator var15 = Tessellator.instance; +@@ -131,6 +135,7 @@ + float var11; + if(var3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var3].getRenderType())) { + var2.bindTexture(var2.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[var3]); + Block var14 = Block.blocksList[var3]; + GL11.glPushMatrix(); + GL11.glTranslatef((float)(var6 - 2), (float)(var7 + 3), -3.0F); +@@ -156,8 +161,10 @@ + GL11.glDisable(2896 /*GL_LIGHTING*/); + if(var3 < 256) { + var2.bindTexture(var2.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[var3]); + } else { + var2.bindTexture(var2.getTexture("/gui/items.png")); ++ ForgeHooksClient.overrideTexture (Item.itemsList[var3]); + } + + int var8 = Item.itemsList[var3].getColorFromDamage(var4); +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-12 13:47:16.233792400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-12 15:40:09.194183600 +0200 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import java.util.*; + import java.nio.ByteBuffer; + import java.nio.ByteOrder; + import java.nio.FloatBuffer; +@@ -13,9 +14,6 @@ + + private static boolean convertQuadsToTriangles = true; + private static boolean tryVBO = false; +- private ByteBuffer byteBuffer; +- private IntBuffer intBuffer; +- private FloatBuffer floatBuffer; + private int[] rawBuffer; + private int vertexCount = 0; + private double textureU; +@@ -28,31 +26,33 @@ + private int addedVertices = 0; + private boolean isColorDisabled = false; + private int drawMode; +- private double xOffset; +- private double yOffset; +- private double zOffset; ++ public double xOffset; ++ public double yOffset; ++ public double zOffset; + private int normal; +- public static final Tessellator instance = new Tessellator(2097152); + private boolean isDrawing = false; +- private boolean useVBO = false; +- private IntBuffer vertexBuffers; ++ private static boolean useVBO = false; + private int vboIndex = 0; +- private int vboCount = 10; + private int bufferSize; +- +- +- private Tessellator(int var1) { +- this.bufferSize = var1; +- this.byteBuffer = GLAllocation.createDirectByteBuffer(var1 * 4); +- this.intBuffer = this.byteBuffer.asIntBuffer(); +- this.floatBuffer = this.byteBuffer.asFloatBuffer(); +- this.rawBuffer = new int[var1]; +- this.useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; +- if(this.useVBO) { +- this.vertexBuffers = GLAllocation.createDirectIntBuffer(this.vboCount); +- ARBVertexBufferObject.glGenBuffersARB(this.vertexBuffers); +- } +- ++ public int instanceNo; ++ static int instanceTotal=0; ++ ++ private int rawBufferSize; ++ private static int vboCount; ++ private static IntBuffer vertexBuffers; ++ private static int nativeBufferSize; ++ private static int trivertsInBuffer; ++ private static ByteBuffer byteBuffer; ++ private static IntBuffer intBuffer; ++ private static FloatBuffer floatBuffer; ++ public static Tessellator instance; ++ public static Tessellator firstInstance; ++ ++ ++ public Tessellator() { ++ this.instanceNo=instanceTotal++; ++ this.rawBuffer=null; ++ this.rawBufferSize=0; + } + + public void draw() { +@@ -61,10 +61,19 @@ + } else { + this.isDrawing = false; + if(this.vertexCount > 0) { +- this.intBuffer.clear(); +- this.intBuffer.put(this.rawBuffer, 0, this.rawBufferIndex); +- this.byteBuffer.position(0); +- this.byteBuffer.limit(this.rawBufferIndex * 4); ++ int offs=0; ++ while(offs < vertexCount) { ++ int vtc; ++ if(drawMode == 7 && convertQuadsToTriangles) { ++ vtc=Math.min(vertexCount-offs,trivertsInBuffer); ++ } else { ++ vtc=Math.min(vertexCount-offs,nativeBufferSize>>5); ++ } ++ this.intBuffer.clear(); ++ this.intBuffer.put(this.rawBuffer, offs*8, vtc*8); ++ this.byteBuffer.position(0); ++ this.byteBuffer.limit(vtc*32); ++ offs+=vtc; + if(this.useVBO) { + this.vboIndex = (this.vboIndex + 1) % this.vboCount; + ARBVertexBufferObject.glBindBufferARB('\u8892', this.vertexBuffers.get(this.vboIndex)); +@@ -113,9 +122,9 @@ + + GL11.glEnableClientState('\u8074'); + if(this.drawMode == 7 && convertQuadsToTriangles) { +- GL11.glDrawArrays(4, 0, this.vertexCount); ++ GL11.glDrawArrays(4, 0, vtc); + } else { +- GL11.glDrawArrays(this.drawMode, 0, this.vertexCount); ++ GL11.glDrawArrays(drawMode, 0, vtc); + } + + GL11.glDisableClientState('\u8074'); +@@ -131,9 +140,14 @@ + GL11.glDisableClientState('\u8075'); + } + } ++ if(this.rawBufferSize>0x20000 && this.rawBufferIndex<(this.rawBufferSize<<3)) { ++ this.rawBufferSize=0; ++ this.rawBuffer=null; ++ } + + this.reset(); + } ++ } + } + + private void reset() { +@@ -229,6 +243,15 @@ + } + + public void addVertex(double var1, double var3, double var5) { ++ if(this.rawBufferIndex >= this.rawBufferSize-32) { ++ if(this.rawBufferSize==0) { ++ this.rawBufferSize=0x10000; ++ this.rawBuffer=new int[this.rawBufferSize]; ++ } else { ++ this.rawBufferSize*=2; ++ this.rawBuffer=Arrays.copyOf(this.rawBuffer,this.rawBufferSize); ++ } ++ } + ++this.addedVertices; + if(this.drawMode == 7 && convertQuadsToTriangles && this.addedVertices % 4 == 0) { + for(int var7 = 0; var7 < 2; ++var7) { +@@ -268,10 +291,6 @@ + this.rawBuffer[this.rawBufferIndex + 2] = Float.floatToRawIntBits((float)(var5 + this.zOffset)); + this.rawBufferIndex += 8; + ++this.vertexCount; +- if(this.vertexCount % 4 == 0 && this.rawBufferIndex >= this.bufferSize - 32) { +- this.draw(); +- this.isDrawing = true; +- } + + } + +@@ -316,5 +335,23 @@ + this.yOffset += (double)var2; + this.zOffset += (double)var3; + } ++ ++ static { ++ instance=new Tessellator(); ++ firstInstance=instance; ++ ++ nativeBufferSize = 0x200000; ++ trivertsInBuffer = (nativeBufferSize/48)*6; ++ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); ++ intBuffer = byteBuffer.asIntBuffer(); ++ floatBuffer = byteBuffer.asFloatBuffer(); ++ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; ++ vboCount = 10; ++ if(useVBO) ++ { ++ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); ++ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); ++ } ++ } + + } From 12b64fa287b017cc5a824dca57c0dc5a8b1868c8 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 12 Aug 2011 23:53:30 +0000 Subject: [PATCH 060/169] Updates: - Added warning message for non-preloaded textures. - Documentation - Ladder fix for SMP. - Obsoleted IBlockSecondaryProperties - Added hooks for place-by-side. - Fixed texture 3 and piston texture bug. - Added new tool system. --- .../minecraft/src/forge/ForgeHooksClient.java | 4 +- .../src/forge/MinecraftForgeClient.java | 23 + .../src/forge/IBlockSecondaryProperties.java | 3 + .../minecraft/src/forge/IHarvestHandler.java | 23 - .../minecraft/src/forge/MinecraftForge.java | 118 +- forge/minecraft.patch | 1925 +++++++++++++++-- 6 files changed, 1823 insertions(+), 273 deletions(-) delete mode 100755 forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 8c03e65dee..48fe22dd50 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -79,6 +79,7 @@ public class ForgeHooksClient { public static void beforeRenderPass(int pass) { Tessellator.instance=Tessellator.firstInstance; + Tessellator.renderingWorldRenderer=true; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); @@ -100,6 +101,7 @@ public class ForgeHooksClient { .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); Tessellator.instance=Tessellator.firstInstance; + Tessellator.renderingWorldRenderer=false; } public static void beforeBlockRender(Block block, @@ -115,7 +117,7 @@ public class ForgeHooksClient { RenderBlocks renderblocks) { if (block instanceof ITextureProvider && renderblocks.overrideBlockTexture == -1) { - Tessellator.instance=Tessellator.firstInstance; + unbindTexture(); } } diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 1ab47db98b..37c6c35b53 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -12,20 +12,43 @@ import net.minecraft.src.Tessellator; import org.lwjgl.opengl.GL11; public class MinecraftForgeClient { + /** Bind a texture. This is used to bind a texture file when + * performing your own rendering, rather than using ITextureProvider. + * + * This variation is reserved for future expansion. + */ public static void bindTexture(String name, int sub) { ForgeHooksClient.bindTexture(name,sub); } + /** Bind a texture. This is used to bind a texture file when + * performing your own rendering, rather than using ITextureProvider. + */ public static void bindTexture(String name) { ForgeHooksClient.bindTexture(name,0); } + /** Unbind a texture. This binds the default texture, when you are + * finished performing custom rendering. + */ public static void unbindTexture() { ForgeHooksClient.unbindTexture(); } + /** Preload a texture. Textures must be preloaded before the first + * use, or they will cause visual anomalies. + */ public static void preloadTexture(String texture) { ModLoader.getMinecraftInstance().renderEngine .getTexture(texture); } + + /** Render a block. Render a block which may have a custom texture. + */ + public static void renderBlock(RenderBlocks rb, Block bl, int i, int + j, int k) { + ForgeHooksClient.beforeBlockRender(bl,rb); + rb.renderBlockByRenderType(bl,i,j,k); + ForgeHooksClient.afterBlockRender(bl,rb); + } } diff --git a/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java index cb6482b531..06515816d4 100644 --- a/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java +++ b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java @@ -11,6 +11,9 @@ import net.minecraft.src.World; /** * This interface provides access to a number of secondary block properties through providing * overrides to methods within world.class. + * + * This interface is DEPRECATED. The functions are now provided directly by + * Block. */ public interface IBlockSecondaryProperties diff --git a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java b/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java deleted file mode 100755 index e697c7207e..0000000000 --- a/forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This software is provided under the terms of the Minecraft Forge Public - * License v1.0. - */ - -package net.minecraft.src.forge; - -import net.minecraft.src.Block; -import net.minecraft.src.ItemTool; - -public interface IHarvestHandler { - - /** - * Return true if the tool in parameter is known to be able to harvest - * the given block, false if this handler does not know of any particular - * harvesting. Other rules may activate the harvesting outside of this - * handler. This is typically used to add e.g. blocks only extracted by - * diamond pickaxe - * - * @see MinecraftForge#registerHarvestHandler(IHarvestHandler) - */ - public boolean canHarvestBlock(ItemTool item, Block block); -} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 89b5ff85d9..e20345ea0f 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -5,8 +5,6 @@ package net.minecraft.src.forge; -import java.util.LinkedList; - import net.minecraft.src.BiomeGenBase; import net.minecraft.src.Block; import net.minecraft.src.Item; @@ -14,10 +12,11 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.ItemTool; import net.minecraft.src.World; +import java.util.*; + public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); - private static LinkedList harvestHandlers = new LinkedList(); /** * Registers a new custom bucket handler. @@ -25,13 +24,6 @@ public class MinecraftForge { public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); } - - /** - * Registers a new harvest handler. - */ - public static void registerHarvestHandler(IHarvestHandler handler) { - harvestHandlers.add(handler); - } /** * This is not supposed to be called outside of Minecraft internals. @@ -48,28 +40,100 @@ public class MinecraftForge { return null; } - /** - * This is not supposed to be called outside of Minecraft internals. + /** Register a tool as a tool class with a given harvest level. + * + * @param tool The custom tool to register. + * @param tclass The tool class to register as. The predefined tool + * clases are "pickaxe", "shovel", "axe". You can add others for custom + * tools. + * @param hlevel The harvest level of the tool. */ - public static boolean canHarvestBlock(ItemTool item, Block block) { - for (IHarvestHandler handler : harvestHandlers) { - if (handler.canHarvestBlock(item, block)) { - return true; - } - } - - return false; + public static void setToolClass(Item tool, String tclass, int hlevel) { + ForgeHooks.initTools(); + ForgeHooks.toolClasses.put(tool.shiftedIndex, + Arrays.asList(tclass,hlevel)); + } + + /** Register a block to be harvested by a tool class. This is the metadata + * sensitive version, use it if your blocks are using metadata variants. + * By default, this sets the block class as effective against that type. + * + * @param bl The block to register. + * @param md The metadata for the block subtype. + * @param tclass The tool class to register as able to remove this block. + * You may register the same block multiple times with different tool + * classes, if multiple tool types can be used to harvest this block. + * @param hlevel The minimum tool harvest level required to successfully + * harvest the block. + * @see setToolClass for details on tool classes. + */ + public static void setBlockHarvestLevel(Block bl, int md, String tclass, + int hlevel) { + ForgeHooks.initTools(); + List key=Arrays.asList(bl.blockID,md,tclass); + ForgeHooks.toolHarvestLevels.put(key,hlevel); + ForgeHooks.toolEffectiveness.add(key); + } + + /** Remove a block effectiveness mapping. Since setBlockHarvestLevel + * makes the tool class effective against the block by default, this can be + * used to remove that mapping. This will force a block to be harvested at + * the same speed regardless of tool quality, while still requiring a given + * harvesting level. + * @param bl The block to remove effectiveness from. + * @param md The metadata for the block subtype. + * @param tclass The tool class to remove the effectiveness mapping from. + * @see setToolClass for details on tool classes. + */ + public static void removeBlockEffectiveness(Block bl, int md, + String tclass) { + ForgeHooks.initTools(); + List key=Arrays.asList(bl.blockID,md,tclass); + ForgeHooks.toolEffectiveness.remove(key); + } + + /** Register a block to be harvested by a tool class. + * By default, this sets the block class as effective against that type. + * + * @param bl The block to register. + * @param tclass The tool class to register as able to remove this block. + * You may register the same block multiple times with different tool + * classes, if multiple tool types can be used to harvest this block. + * @param hlevel The minimum tool harvest level required to successfully + * harvest the block. + * @see setToolClass for details on tool classes. + */ + public static void setBlockHarvestLevel(Block bl, String tclass, + int hlevel) { + ForgeHooks.initTools(); + for(int md=0; md<16; md++) { + List key=Arrays.asList(bl.blockID,md,tclass); + ForgeHooks.toolHarvestLevels.put(key,hlevel); + ForgeHooks.toolEffectiveness.add(key); + } + } + + /** Remove a block effectiveness mapping. Since setBlockHarvestLevel + * makes the tool class effective against the block by default, this can be + * used to remove that mapping. This will force a block to be harvested at + * the same speed regardless of tool quality, while still requiring a given + * harvesting level. + * @param bl The block to remove effectiveness from. + * @param tclass The tool class to remove the effectiveness mapping from. + * @see setToolClass for details on tool classes. + */ + public static void removeBlockEffectiveness(Block bl, String tclass) { + ForgeHooks.initTools(); + for(int md=0; md<16; md++) { + List key=Arrays.asList(bl.blockID,md,tclass); + ForgeHooks.toolEffectiveness.remove(key); + } } /** - * Add a block to the list of blocks to which the pickaxe is know to be - * effective. + * This function is deprecated and will be removed eventually. */ public static void addPickaxeBlockEffectiveAgainst (Block block) { - ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block); - ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block); - ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block); - ((ItemTool) Item.pickaxeGold).addBlockEffectiveAgainst(block); - ((ItemTool) Item.pickaxeDiamond).addBlockEffectiveAgainst(block); + setBlockHarvestLevel(block,"pickaxe",0); } } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 6755e9a861..cbccfa3109 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,24 +1,292 @@ +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_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-11 21:40:22.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +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_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-11 22:00:30.000000000 -0400 +@@ -230,23 +230,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } +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_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-11 22:01:46.000000000 -0400 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -241,7 +241,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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_work/minecraft/net/minecraft/src/Block.java 2011-08-11 17:02:12.000000000 -0400 -@@ -600,6 +600,10 @@ ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-12 19:07:50.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -276,19 +277,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -600,6 +594,72 @@ return blockMaterial.getMaterialMobility(); } ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ + public boolean isLadder() { + return false; + } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } + static Class _mthclass$(String s) { try 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_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 17:02:12.000000000 -0400 -@@ -63,6 +63,10 @@ ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:59.000000000 -0400 +@@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } ++ /* FORGE: Implemented base method, see Block.isLadder */ + public boolean isLadder() { + return true; + } @@ -26,6 +294,239 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd public boolean isOpaqueCube() { return false; +@@ -80,37 +85,37 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) + { + int i1 = world.getBlockMetadata(i, j, k); +- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) ++ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 2; + } +- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) ++ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) ++ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 4; + } +- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) ++ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 5; + } +@@ -121,19 +126,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + flag = true; + } +- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + flag = true; + } +- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + flag = true; + } +- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + flag = true; + } +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_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-11 22:12:11.000000000 -0400 +@@ -40,44 +40,44 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return true; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -86,23 +86,23 @@ + int j1 = i1 & 8; + i1 &= 7; + i1 = -1; +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + i1 = 5 + world.rand.nextInt(2); + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -124,27 +124,27 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) + { + flag = true; + } +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_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:17:55.000000000 -0400 +@@ -46,7 +46,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -56,7 +56,7 @@ + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + flag = true; + } +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_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:18:50.000000000 -0400 +@@ -27,7 +27,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else +@@ -38,7 +38,7 @@ + + public boolean canBlockStay(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else 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_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 @@ -48,6 +549,111 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds if(Block.blocksList[i1].canProvidePower()) { return true; +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_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-11 22:30:24.000000000 -0400 +@@ -41,24 +41,24 @@ + + private boolean func_31032_h(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +@@ -72,19 +72,19 @@ + { + i1 = 5; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -102,19 +102,19 @@ + + public void onBlockAdded(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + world.setBlockMetadataWithNotify(i, j, k, 1); + } else +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + world.setBlockMetadataWithNotify(i, j, k, 2); + } else +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + world.setBlockMetadataWithNotify(i, j, k, 3); + } else +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + world.setBlockMetadataWithNotify(i, j, k, 4); + } else +@@ -131,19 +131,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } 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_work/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 @@ -248,7 +854,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-12 18:00:55.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -258,7 +864,41 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -477,6 +479,21 @@ +@@ -316,6 +318,8 @@ + worldObj.entityJoinedWorld(entityitem); + } + ++ /* FORGE: This isn't called anymore ++ */ + public float getCurrentPlayerStrVsBlock(Block block) + { + float f = inventory.getStrVsBlock(block); +@@ -330,6 +334,24 @@ + return f; + } + ++ /* FORGE: Extended to allow metadata. ++ */ ++ public float getCurrentPlayerStrVsBlock(Block block, int md) ++ { ++ float f = 1.0F; ++ ItemStack ist=inventory.getCurrentItem(); ++ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); ++ if(isInsideOfMaterial(Material.water)) ++ { ++ f /= 5F; ++ } ++ if(!onGround) ++ { ++ f /= 5F; ++ } ++ return f; ++ } ++ + public boolean canHarvestBlock(Block block) + { + return inventory.canHarvestBlock(block); +@@ -477,6 +499,21 @@ protected void damageEntity(int i) { @@ -336,28 +976,23 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { world.setBlockWithNotify(i, j, k, 0); -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 -@@ -4,6 +4,8 @@ +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_work/minecraft/net/minecraft/src/Item.java 2011-08-12 17:59:17.000000000 -0400 +@@ -75,6 +75,13 @@ + return 1.0F; + } - package net.minecraft.src; - -+import net.minecraft.src.forge.MinecraftForge; ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } + - - // Referenced classes of package net.minecraft.src: - // ItemTool, Block, EnumToolMaterial, Material -@@ -42,6 +44,9 @@ - { - return toolMaterial.getHarvestLevel() >= 2; - } -+ if (MinecraftForge.canHarvestBlock(this, block)) { -+ return true; -+ } - if(block.blockMaterial == Material.rock) - { - return true; + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-11 17:02:12.000000000 -0400 @@ -391,27 +1026,31 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende 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 --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 -@@ -4,6 +4,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-12 18:38:09.000000000 -0400 +@@ -4,6 +4,8 @@ package net.minecraft.src; +import java.util.Arrays; ++import net.minecraft.src.forge.ForgeHooks; // Referenced classes of package net.minecraft.src: // Item, EnumToolMaterial, ItemStack, Block, -@@ -63,4 +64,11 @@ - private float efficiencyOnProperMaterial; - private int damageVsEntity; - protected EnumToolMaterial toolMaterial; -+ -+ public void addBlockEffectiveAgainst (Block block) { -+ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, -+ blocksEffectiveAgainst.length + 1); -+ -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; +@@ -37,6 +39,14 @@ + return 1.0F; + } + ++ /* FORGE: Overridden to allow custom tool effectiveness ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { ++ if(ForgeHooks.isToolEffective(itemstack,block,md)) ++ return efficiencyOnProperMaterial; ++ return getStrVsBlock(itemstack,block); + } - } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving 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 --- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:12.000000000 -0400 @@ -447,6 +1086,145 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { +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_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-12 00:47:04.000000000 -0400 +@@ -63,7 +63,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } else +@@ -106,7 +106,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamageMP += block.blockStrength(mc.thePlayer); ++ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + if(field_9441_h % 4F == 0.0F && block != null) + { + 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 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-12 19:08:13.000000000 -0400 +@@ -37,7 +37,7 @@ + int j1 = mc.theWorld.getBlockMetadata(i, j, k); + boolean flag = super.sendBlockRemoved(i, j, k, l); + ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); +- boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); ++ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); + if(itemstack != null) + { + itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); +@@ -62,7 +62,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } +@@ -89,7 +89,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamage += block.blockStrength(mc.thePlayer); ++ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + if(field_1069_h % 4F == 0.0F && block != null) + { + 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 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-12 19:29:14.000000000 -0400 +@@ -2171,7 +2171,7 @@ + colorBlueTopRight *= f27; + int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, i1); +- if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -2256,7 +2256,7 @@ + colorBlueTopRight *= f28; + int j1 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); +- if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -2341,7 +2341,7 @@ + colorBlueTopRight *= f29; + int k1 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, k1); +- if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -2426,7 +2426,7 @@ + colorBlueTopRight *= f30; + int l1 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, l1); +- if(cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -2510,7 +2510,7 @@ + tessellator.setColorOpaque_F(f11 * f22, f14 * f22, f17 * f22); + int l = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, l); +- if(cfgGrassFix && l == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && l == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f11 * f22 * f, f14 * f22 * f1, f17 * f22 * f2); + renderEastFace(block, i, j, k, 38); +@@ -2527,7 +2527,7 @@ + tessellator.setColorOpaque_F(f11 * f23, f14 * f23, f17 * f23); + int i1 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, i1); +- if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f11 * f23 * f, f14 * f23 * f1, f17 * f23 * f2); + renderWestFace(block, i, j, k, 38); +@@ -2544,7 +2544,7 @@ + tessellator.setColorOpaque_F(f12 * f24, f15 * f24, f18 * f24); + int j1 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, j1); +- if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f12 * f24 * f, f15 * f24 * f1, f18 * f24 * f2); + renderNorthFace(block, i, j, k, 38); +@@ -2561,7 +2561,7 @@ + tessellator.setColorOpaque_F(f12 * f25, f15 * f25, f18 * f25); + int k1 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, k1); +- if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f12 * f25 * f, f15 * f25 * f1, f18 * f25 * f2); + 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 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-11 23:20:23.000000000 -0400 +@@ -126,6 +126,9 @@ + } + try + { ++ if(Tessellator.renderingWorldRenderer) { ++ System.out.printf("Warning: Texture %s not preloaded, will cause render glitches!\n",s); ++ } + singleIntBuffer.clear(); + GLAllocation.generateTextureNames(singleIntBuffer); + int i = singleIntBuffer.get(0); 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_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:12.000000000 -0400 @@ -512,7 +1290,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f = (float)(k1 >> 16 & 0xff) / 255F; 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_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 23:13:28.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -521,21 +1299,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat import org.lwjgl.opengl.*; // Referenced classes of package net.minecraft.src: -@@ -14,8 +15,11 @@ +@@ -13,9 +14,7 @@ + public class Tessellator { - +- - private Tessellator(int i) - { -+ public int instanceNo; -+ static int instanceTotal=0; -+ + public Tessellator() { -+ instanceNo=instanceTotal++; vertexCount = 0; hasColor = false; hasTexture = false; -@@ -24,20 +28,10 @@ +@@ -24,20 +23,10 @@ addedVertices = 0; isColorDisabled = false; isDrawing = false; @@ -559,7 +1334,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void draw() -@@ -47,12 +41,20 @@ +@@ -47,12 +36,20 @@ throw new IllegalStateException("Not tesselating!"); } isDrawing = false; @@ -584,7 +1359,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat if(useVBO) { vboIndex = (vboIndex + 1) % vboCount; -@@ -106,10 +108,10 @@ +@@ -106,10 +103,10 @@ GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(drawMode == 7 && convertQuadsToTriangles) { @@ -597,7 +1372,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(hasTexture) -@@ -125,6 +127,10 @@ +@@ -125,6 +122,10 @@ GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); } } @@ -608,7 +1383,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat reset(); } -@@ -237,6 +243,15 @@ +@@ -237,6 +238,15 @@ public void addVertex(double d, double d1, double d2) { @@ -624,7 +1399,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat addedVertices++; if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) { -@@ -278,11 +293,6 @@ +@@ -278,11 +288,6 @@ rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); rawBufferIndex += 8; vertexCount++; @@ -636,7 +1411,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void setColorOpaque_I(int i) -@@ -335,9 +345,7 @@ +@@ -335,9 +340,7 @@ private static boolean convertQuadsToTriangles = true; private static boolean tryVBO = false; @@ -647,7 +1422,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -350,16 +358,40 @@ +@@ -350,16 +353,43 @@ private int addedVertices; private boolean isColorDisabled; private int drawMode; @@ -666,6 +1441,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - private int vboCount; - private int bufferSize; + ++ public static boolean renderingWorldRenderer=false; ++ public boolean defaultTexture=false; + private int rawBufferSize; + private static int vboCount; + private static IntBuffer vertexBuffers; @@ -680,6 +1457,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + static { + instance=new Tessellator(); + firstInstance=instance; ++ firstInstance.defaultTexture=true; + + nativeBufferSize = 0x200000; + trivertsInBuffer = (nativeBufferSize/48)*6; @@ -696,19 +1474,37 @@ 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 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-12 19:32:56.000000000 -0400 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; + import net.minecraft.client.Minecraft; + import org.lwjgl.opengl.GL11; + +@@ -38,6 +39,7 @@ + { + GL11.glShadeModel(7424 /*GL_FLAT*/); + } ++ ForgeHooksClient.beforeBlockRender(block,field_31071_b); + tessellator.startDrawingQuads(); + tessellator.setTranslationD(((float)d - (float)tileentitypiston.xCoord) + tileentitypiston.func_31017_b(f), ((float)d1 - (float)tileentitypiston.yCoord) + tileentitypiston.func_31014_c(f), ((float)d2 - (float)tileentitypiston.zCoord) + tileentitypiston.func_31013_d(f)); + tessellator.setColorOpaque(1, 1, 1); +@@ -58,6 +60,7 @@ + } + tessellator.setTranslationD(0.0D, 0.0D, 0.0D); + tessellator.draw(); ++ ForgeHooksClient.afterBlockRender(block,field_31071_b); + RenderHelper.enableStandardItemLighting(); + } + } 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_work/minecraft/net/minecraft/src/World.java 2011-08-11 17:05:55.000000000 -0400 -@@ -7,6 +7,8 @@ - import java.io.PrintStream; - import java.util.*; - -+import net.minecraft.src.forge.IBlockSecondaryProperties; -+ - // Referenced classes of package net.minecraft.src: - // IBlockAccess, WorldProvider, WorldInfo, MapStorage, - // ISaveHandler, ChunkProvider, EntityPlayer, ChunkProviderLoadOrGenerate, -@@ -313,7 +315,25 @@ ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-12 19:51:21.000000000 -0400 +@@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) { @@ -716,81 +1512,69 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav + int iBlockID = getBlockId( i, j, k ); + + if ( iBlockID == 0 ) -+ { + return true; -+ } -+ else -+ { -+ Block block = Block.blocksList[iBlockID]; -+ -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k ); -+ } -+ else -+ { -+ return false; -+ } -+ } ++ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); } public boolean blockExists(int i, int j, int k) -@@ -1608,6 +1628,18 @@ +@@ -1607,7 +1611,10 @@ + if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; - } -+ else -+ { -+ Block block = Block.blocksList[j2]; -+ -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, l1, i2 ) ) -+ { -+ return true; -+ } -+ } -+ } +- } ++ } else { ++ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) ++ return true; ++ } } } -@@ -1900,7 +1932,14 @@ - return false; - } else - { +@@ -1895,13 +1902,18 @@ + public boolean isBlockNormalCube(int i, int j, int k) + { + Block block = Block.blocksList[getBlockId(i, j, k)]; +- if(block == null) +- { +- return false; +- } else +- { - return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); -+ } -+ else -+ { -+ return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); -+ } - } +- } ++ if(block == null) return false; ++ return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); ++ } ++ ++ /* FORGE: Determine if the given block is considered solid on the ++ * specified side. Used by placement logic. ++ */ ++ public boolean isBlockSolidOnSide(int i, int j, int k, int side) ++ { ++ Block block = Block.blocksList[getBlockId(i, j, k)]; ++ if(block == null) return false; ++ return block.isBlockSolidOnSide(this,i,j,k,side); } -@@ -2425,6 +2464,16 @@ + public void saveWorldIndirectly(IProgressUpdate iprogressupdate) +@@ -2425,6 +2437,7 @@ { block = null; } -+ else -+ { -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) ) -+ { -+ block = null; -+ } -+ } -+ } ++ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -Only in ../src_work/minecraft/net/minecraft/src: World.java.orig +@@ -2913,7 +2926,7 @@ + public int field_27172_i; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; 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_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-12 19:23:40.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -837,7 +1621,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend + + ForgeHooksClient.beforeBlockRender(block, renderblocks); + flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); -+ ForgeHooksClient.afterBlockRender(block, renderblocks); ++ ForgeHooksClient.afterBlockRender(block, renderblocks); } } @@ -872,6 +1656,535 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } +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_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-11 21:44:46.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-11 22:01:13.000000000 -0400 +@@ -140,23 +140,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-11 22:02:01.000000000 -0400 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -230,7 +230,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + +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_work/minecraft_server/net/minecraft/src/Block.java 2011-08-12 19:07:46.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -221,19 +222,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -526,6 +520,72 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return blockMaterial.getIsOpaque() && isACube(); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:05.000000000 -0400 +@@ -40,6 +40,11 @@ + return super.getCollisionBoundingBoxFromPool(world, i, j, k); + } + ++ /* FORGE: Implemented base method, see Block.isLadder */ ++ public boolean isLadder() { ++ return true; ++ } ++ + public boolean isOpaqueCube() + { + return false; +@@ -52,37 +57,37 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) + { + int i1 = world.getBlockMetadata(i, j, k); +- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) ++ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 2; + } +- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) ++ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) ++ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 4; + } +- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) ++ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 5; + } +@@ -93,19 +98,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + flag = true; + } +- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + flag = true; + } +- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + flag = true; + } +- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-11 22:13:32.000000000 -0400 +@@ -35,44 +35,44 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return true; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -81,23 +81,23 @@ + int j1 = i1 & 8; + i1 &= 7; + i1 = -1; +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + i1 = 5 + world.rand.nextInt(2); + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -119,27 +119,27 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:18:08.000000000 -0400 +@@ -46,7 +46,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -56,7 +56,7 @@ + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:19:02.000000000 -0400 +@@ -27,7 +27,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else +@@ -38,7 +38,7 @@ + + public boolean canBlockStay(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 @@ -894,6 +2207,111 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl if(Block.blocksList[i1].canProvidePower()) { 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-11 22:31:30.000000000 -0400 +@@ -36,24 +36,24 @@ + + private boolean func_31028_g(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +@@ -67,19 +67,19 @@ + { + i1 = 5; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -97,19 +97,19 @@ + + public void onBlockAdded(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + world.setBlockMetadataWithNotify(i, j, k, 1); + } else +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + world.setBlockMetadataWithNotify(i, j, k, 2); + } else +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + world.setBlockMetadataWithNotify(i, j, k, 3); + } else +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + world.setBlockMetadataWithNotify(i, j, k, 4); + } else +@@ -126,19 +126,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } 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_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 @@ -933,9 +2351,23 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); 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 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-11 20:47:14.000000000 -0400 +@@ -532,7 +532,9 @@ + int i = MathHelper.floor_double(posX); + int j = MathHelper.floor_double(boundingBox.minY); + int k = MathHelper.floor_double(posZ); +- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; ++ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; ++ if(block==null) return false; ++ return block.isLadder(); + } + + 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 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-12 18:00:54.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.*; @@ -945,7 +2377,41 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -457,6 +459,21 @@ +@@ -296,6 +298,8 @@ + worldObj.entityJoinedWorld(entityitem); + } + ++ /* FORGE: This isn't called anymore ++ */ + public float getCurrentPlayerStrVsBlock(Block block) + { + float f = inventory.getStrVsBlock(block); +@@ -310,6 +314,24 @@ + return f; + } + ++ /* FORGE: Extended to allow metadata. ++ */ ++ public float getCurrentPlayerStrVsBlock(Block block, int md) ++ { ++ float f = 1.0F; ++ ItemStack ist=inventory.getCurrentItem(); ++ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); ++ if(isInsideOfMaterial(Material.water)) ++ { ++ f /= 5F; ++ } ++ if(!onGround) ++ { ++ f /= 5F; ++ } ++ return f; ++ } ++ + public boolean canHarvestBlock(Block block) + { + return inventory.canHarvestBlock(block); +@@ -457,6 +479,21 @@ protected void damageEntity(int i) { @@ -1024,7 +2490,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-12 19:08:10.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1033,7 +2499,44 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It // Referenced classes of package net.minecraft.src: -@@ -145,6 +146,11 @@ +@@ -29,7 +30,8 @@ + if(j != 0) + { + Block block = Block.blocksList[j]; +- float f = block.blockStrength(thisPlayer) * (float)(i + 1); ++ float f = block.blockStrength(thisWorld,thisPlayer, ++ field_22049_l,field_22048_m,field_22047_n) * (float)(i + 1); + if(f >= 1.0F) + { + field_22050_k = false; +@@ -51,7 +53,7 @@ + { + Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(thisPlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(thisWorld,thisPlayer,i,j,k) >= 1.0F) + { + blockHarvessted(i, j, k); + } else +@@ -71,7 +73,7 @@ + if(i1 != 0) + { + Block block = Block.blocksList[i1]; +- float f = block.blockStrength(thisPlayer) * (float)(l + 1); ++ float f = block.blockStrength(thisWorld,thisPlayer,i,j,k) * (float)(l + 1); + if(f >= 0.7F) + { + blockHarvessted(i, j, k); +@@ -117,7 +119,7 @@ + thisPlayer.destroyCurrentEquippedItem(); + } + } +- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) ++ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) + { + Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); + ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld)); +@@ -145,6 +147,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -1045,52 +2548,50 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-08-11 17:02:12.000000000 -0400 -@@ -4,6 +4,8 @@ +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_work/minecraft_server/net/minecraft/src/Item.java 2011-08-12 17:59:16.000000000 -0400 +@@ -65,6 +65,13 @@ + return 1.0F; + } - package net.minecraft.src; - -+import net.minecraft.src.forge.MinecraftForge; ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } + - - // Referenced classes of package net.minecraft.src: - // ItemTool, Block, EnumToolMaterial, Material -@@ -42,6 +44,9 @@ - { - return toolMaterial.getHarvestLevel() >= 2; - } -+ if (MinecraftForge.canHarvestBlock(this, block)) { -+ return true; -+ } - if(block.blockMaterial == Material.rock) - { - return true; + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-12 18:38:14.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; +import java.util.Arrays; -+ ++import net.minecraft.src.forge.ForgeHooks; // Referenced classes of package net.minecraft.src: // Item, EnumToolMaterial, ItemStack, Block, -@@ -58,4 +60,11 @@ - private float efficiencyOnProperMaterial; - private int damageVsEntity; - protected EnumToolMaterial toolMaterial; -+ -+ public void addBlockEffectiveAgainst (Block block) { -+ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, -+ blocksEffectiveAgainst.length + 1); -+ -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; +@@ -37,6 +39,14 @@ + return 1.0F; + } + ++ /* FORGE: Overridden to allow custom tool effectiveness ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { ++ if(ForgeHooks.isToolEffective(itemstack,block,md)) ++ return efficiencyOnProperMaterial; ++ return getStrVsBlock(itemstack,block); + } - } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving 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 --- ../src_base/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-11 17:02:12.000000000 -0400 @@ -1123,17 +2624,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/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_work/minecraft_server/net/minecraft/src/World.java 2011-08-11 17:02:12.000000000 -0400 -@@ -7,6 +7,8 @@ - import java.io.PrintStream; - import java.util.*; - -+import net.minecraft.src.forge.IBlockSecondaryProperties; -+ - // Referenced classes of package net.minecraft.src: - // IBlockAccess, WorldProvider, MapStorage, ISaveHandler, - // WorldInfo, ChunkProvider, IChunkProvider, IProgressUpdate, -@@ -166,7 +168,25 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-12 19:51:26.000000000 -0400 +@@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) { @@ -1141,74 +2633,63 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + int iBlockID = getBlockId( i, j, k ); + + if ( iBlockID == 0 ) -+ { + return true; -+ } -+ else -+ { -+ Block block = Block.blocksList[iBlockID]; -+ -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k ); -+ } -+ else -+ { -+ return false; -+ } -+ } ++ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); } public boolean blockExists(int i, int j, int k) -@@ -1409,6 +1429,18 @@ +@@ -1408,7 +1412,10 @@ + if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; - } -+ else -+ { -+ Block block = Block.blocksList[j2]; -+ -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, l1, i2 ) ) -+ { -+ return true; -+ } -+ } -+ } +- } ++ } else { ++ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) ++ return true; ++ } } } -@@ -1686,7 +1718,14 @@ - return false; - } else - { +@@ -1681,13 +1688,18 @@ + public boolean isBlockNormalCube(int i, int j, int k) + { + Block block = Block.blocksList[getBlockId(i, j, k)]; +- if(block == null) +- { +- return false; +- } else +- { - return block.blockMaterial.getIsOpaque() && block.isACube(); -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k ); -+ } -+ else -+ { -+ return block.blockMaterial.getIsOpaque() && block.isACube(); -+ } - } +- } ++ if(block == null) return false; ++ return block.blockMaterial.getIsOpaque() && block.isACube(); ++ } ++ ++ /* FORGE: Determine if the given block is considered solid on the ++ * specified side. Used by placement logic. ++ */ ++ public boolean isBlockSolidOnSide(int i, int j, int k, int side) ++ { ++ Block block = Block.blocksList[getBlockId(i, j, k)]; ++ if(block == null) return false; ++ return block.isBlockSolidOnSide(this,i,j,k,side); } -@@ -2178,6 +2217,16 @@ + public boolean func_6156_d() +@@ -2178,6 +2190,7 @@ { block = null; } -+ else -+ { -+ if ( block instanceof IBlockSecondaryProperties ) -+ { -+ if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) ) -+ { -+ block = null; -+ } -+ } -+ } ++ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } +@@ -2601,7 +2614,7 @@ + public int field_27080_i; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; From 1d1906920397127649d93dc18331df2687685f36 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 13 Aug 2011 18:26:31 +0000 Subject: [PATCH 061/169] Forgot the forge hooks. --- .../net/minecraft/src/forge/ForgeHooks.java | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 forge/forge_common/net/minecraft/src/forge/ForgeHooks.java diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java new file mode 100644 index 0000000000..d740aa94ce --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -0,0 +1,118 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; +import net.minecraft.src.Block; +import net.minecraft.src.World; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.ItemStack; +import net.minecraft.src.Item; + +import java.util.*; + +public class ForgeHooks { + // TODO: move all app-side hooks from MinecraftForge + // + + public static boolean canHarvestBlock(Block bl, + EntityPlayer player, int md) { + if(bl.blockMaterial.getIsHarvestable()) + return true; + ItemStack itemstack = player.inventory.getCurrentItem(); + if(itemstack == null) return false; + + List tc=(List)toolClasses.get(itemstack.itemID); + if(tc==null) return itemstack.canHarvestBlock(bl); + Object[] ta=tc.toArray(); + String cls=(String)ta[0]; int hvl=(Integer)ta[1]; + + Integer bhl=(Integer)toolHarvestLevels.get(Arrays.asList( + bl.blockID,md,cls)); + if(bhl==null) return itemstack.canHarvestBlock(bl); + if(bhl>hvl) return false; + return itemstack.canHarvestBlock(bl); + } + + public static float blockStrength(Block bl, + EntityPlayer player, int md) { + float bh=bl.getHardness(md); + if(bh < 0.0F) return 0.0F; + + if(!canHarvestBlock(bl,player,md)) { + return 1.0F / bh / 100F; + } else { + return player.getCurrentPlayerStrVsBlock(bl,md) / + bh / 30F; + } + } + + public static boolean isToolEffective(ItemStack ist, Block bl, int md) { + List tc=(List)toolClasses.get(ist.itemID); + if(tc==null) return false; + Object[] ta=tc.toArray(); + String cls=(String)ta[0]; + + return toolEffectiveness.contains(Arrays.asList( + bl.blockID,md,cls)); + } + + static void initTools() { + if(toolInit) return; + toolInit=true; + + MinecraftForge.setToolClass(Item.pickaxeWood,"pickaxe",0); + MinecraftForge.setToolClass(Item.pickaxeStone,"pickaxe",1); + MinecraftForge.setToolClass(Item.pickaxeSteel,"pickaxe",2); + MinecraftForge.setToolClass(Item.pickaxeGold,"pickaxe",0); + MinecraftForge.setToolClass(Item.pickaxeDiamond,"pickaxe",3); + + MinecraftForge.setToolClass(Item.axeWood,"axe",0); + MinecraftForge.setToolClass(Item.axeStone,"axe",1); + MinecraftForge.setToolClass(Item.axeSteel,"axe",2); + MinecraftForge.setToolClass(Item.axeGold,"axe",0); + MinecraftForge.setToolClass(Item.axeDiamond,"axe",3); + + MinecraftForge.setToolClass(Item.shovelWood,"shovel",0); + MinecraftForge.setToolClass(Item.shovelStone,"shovel",1); + MinecraftForge.setToolClass(Item.shovelSteel,"shovel",2); + MinecraftForge.setToolClass(Item.shovelGold,"shovel",0); + MinecraftForge.setToolClass(Item.shovelDiamond,"shovel",3); + + MinecraftForge.setBlockHarvestLevel(Block.obsidian,"pickaxe",3); + MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,"pickaxe",2); + MinecraftForge.setBlockHarvestLevel(Block.blockDiamond,"pickaxe",2); + MinecraftForge.setBlockHarvestLevel(Block.oreGold,"pickaxe",2); + MinecraftForge.setBlockHarvestLevel(Block.blockGold,"pickaxe",2); + MinecraftForge.setBlockHarvestLevel(Block.oreIron,"pickaxe",1); + MinecraftForge.setBlockHarvestLevel(Block.blockSteel,"pickaxe",1); + MinecraftForge.setBlockHarvestLevel(Block.oreLapis,"pickaxe",1); + MinecraftForge.setBlockHarvestLevel(Block.blockLapis,"pickaxe",1); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,"pickaxe",2); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe"); + + Block[] pickeff ={ + Block.cobblestone, Block.stairDouble, + Block.stairSingle, Block.stone, Block.sandStone, + Block.cobblestoneMossy, Block.oreIron, + Block.blockSteel, Block.oreCoal, Block.blockGold, + Block.oreGold, Block.oreDiamond, Block.blockDiamond, + Block.ice, Block.netherrack, Block.oreLapis, + Block.blockLapis + }; + for(Block bl : pickeff) { + MinecraftForge.setBlockHarvestLevel(bl,"pickaxe",0); + } + + // TODO: add other tool tables. + } + + static boolean toolInit=false; + static HashMap toolClasses=new HashMap(); + static HashMap toolHarvestLevels=new HashMap(); + static HashSet toolEffectiveness=new HashSet(); +} + From 72864e4bc2262511a2385965cbfe33d3f00c8455 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 17 Aug 2011 10:23:10 +0000 Subject: [PATCH 062/169] Added a little support for two-pass rendering. --- .../src/net/minecraft/src/forge/ForgeHooksClient.java | 3 +++ .../src/net/minecraft/src/forge/MinecraftForgeClient.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 48fe22dd50..f75dbbcb89 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -77,7 +77,9 @@ public class ForgeHooksClient { } } + static int renderPass=-1; public static void beforeRenderPass(int pass) { + renderPass=pass; Tessellator.instance=Tessellator.firstInstance; Tessellator.renderingWorldRenderer=true; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader @@ -89,6 +91,7 @@ public class ForgeHooksClient { } public static void afterRenderPass(int pass) { + renderPass=-1; inWorld=false; for(List l : renderTextureList) { // TODO: call appropriate client hooks diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 37c6c35b53..86d685eea9 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -51,4 +51,10 @@ public class MinecraftForgeClient { rb.renderBlockByRenderType(bl,i,j,k); ForgeHooksClient.afterBlockRender(bl,rb); } + + /** Get the current render pass. + */ + public static int getRenderPass() { + return ForgeHooksClient.renderPass; + } } From 231c65da06518b085bc6c5023a15d85a5b7ae281 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 17 Aug 2011 16:05:38 +0000 Subject: [PATCH 063/169] Checking in the new crafting hook. --- .../net/minecraft/src/forge/ForgeHooks.java | 9 +++++ .../minecraft/src/forge/ICraftingHandler.java | 20 ++++++++++ .../minecraft/src/forge/MinecraftForge.java | 13 +++++++ forge/minecraft.patch | 39 +++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index d740aa94ce..4879a68508 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -7,6 +7,7 @@ package net.minecraft.src.forge; import net.minecraft.src.Block; import net.minecraft.src.World; import net.minecraft.src.EntityPlayer; +import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.Item; @@ -15,6 +16,14 @@ import java.util.*; public class ForgeHooks { // TODO: move all app-side hooks from MinecraftForge // + public static void onTakenFromCrafting(EntityPlayer player, ItemStack ist, + IInventory craftMatrix) { + for (ICraftingHandler handler : craftingHandlers) { + handler.onTakenFromCrafting(player,ist,craftMatrix); + } + } + + static LinkedList craftingHandlers = new LinkedList(); public static boolean canHarvestBlock(Block bl, EntityPlayer player, int md) { diff --git a/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java b/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java new file mode 100644 index 0000000000..60d635b7bb --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java @@ -0,0 +1,20 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.IInventory; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.ItemStack; + +public interface ICraftingHandler { + + /** + * Called after an item is taken from crafting. + */ + public void onTakenFromCrafting(EntityPlayer player, ItemStack ist, + IInventory craftMatrix); + +} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index e20345ea0f..64e2e6e14e 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -20,11 +20,24 @@ public class MinecraftForge { /** * Registers a new custom bucket handler. + * @deprecated Spelling mistake, don't use this function! It will go away + * soon. */ public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); } + public static void registerCustomBucketHandler(IBucketHandler handler) { + bucketHandlers.add(handler); + } + + /** + * Registers a new crafting handler. + */ + public static void registerCraftingHandler(ICraftingHandler handler) { + ForgeHooks.craftingHandlers.add(handler); + } + /** * This is not supposed to be called outside of Minecraft internals. */ diff --git a/forge/minecraft.patch b/forge/minecraft.patch index cbccfa3109..0e5d4f08fd 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1288,6 +1288,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; +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_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:26.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + + // Referenced classes of package net.minecraft.src: +@@ -60,6 +61,7 @@ + thePlayer.addStat(AchievementList.buildSword, 1); + } + ModLoader.TakenFromCrafting(thePlayer, itemstack); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); + for(int i = 0; i < craftMatrix.getSizeInventory(); 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 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 23:13:28.000000000 -0400 @@ -1572,6 +1591,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public int difficultySetting; public Random rand; 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 --- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-12 19:23:40.000000000 -0400 @@ -2622,6 +2642,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Pl updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); } } +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_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:29.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + + // Referenced classes of package net.minecraft.src: +@@ -60,6 +61,7 @@ + field_25004_e.addStat(AchievementList.field_27101_r, 1); + } + ModLoader.TakenFromCrafting(field_25004_e, itemstack); ++ ForgeHooks.onTakenFromCrafting(field_25004_e, itemstack, craftMatrix); + for(int i = 0; i < craftMatrix.getSizeInventory(); 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 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-12 19:51:26.000000000 -0400 From 622f536f80fb1491babca1646583ddc2b9014af9 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 18 Aug 2011 00:14:09 +0000 Subject: [PATCH 064/169] Improved BTW compatibility. Finished the placement hook changes. Added a sleep handler. Added a current item destroyed handler. --- .../net/minecraft/src/forge/ForgeHooks.java | 21 +- .../src/forge/IDestroyToolHandler.java | 15 + .../minecraft/src/forge/ISleepHandler.java | 21 ++ .../minecraft/src/forge/MinecraftForge.java | 17 + forge/minecraft.patch | 338 ++++++++++++++++-- 5 files changed, 385 insertions(+), 27 deletions(-) create mode 100644 forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java create mode 100644 forge/forge_common/net/minecraft/src/forge/ISleepHandler.java diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 4879a68508..d84ff671a8 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -10,6 +10,7 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.Item; +import net.minecraft.src.EnumStatus; import java.util.*; @@ -24,7 +25,25 @@ public class ForgeHooks { } static LinkedList craftingHandlers = new LinkedList(); - + + public static void onDestroyCurrentItem(EntityPlayer player) { + for (IDestroyToolHandler handler : destroyToolHandlers) { + handler.onDestroyCurrentItem(player); + } + } + + static LinkedList destroyToolHandlers = new LinkedList(); + + public static EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k) { + for (ISleepHandler handler : sleepHandlers) { + EnumStatus status = handler.sleepInBedAt(player, i, j, k); + if (status != null) + return status; + } + return null; + } + + static LinkedList sleepHandlers = new LinkedList(); public static boolean canHarvestBlock(Block bl, EntityPlayer player, int md) { if(bl.blockMaterial.getIsHarvestable()) diff --git a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java new file mode 100644 index 0000000000..a69dd9954e --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java @@ -0,0 +1,15 @@ +/* + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.EnumStatus; + +public interface IDestroyToolHandler { + /** Called when the user's currently equipped item is destroyed. + */ + public void onDestroyCurrentItem(EntityPlayer player); +} + diff --git a/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java b/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java new file mode 100644 index 0000000000..b8e9ab3545 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java @@ -0,0 +1,21 @@ +/* + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.EnumStatus; + +public interface ISleepHandler { + /** + * This is called before a player sleeps in a bed. If it returns a + * non-null result, then the normal sleeping process will be skipped, and + * the value returned by this method will be returned to + * BlockBed.blockActivated. + * + * @see MinecraftForge#registerSleepHandler(ISleepHandler) + */ + public EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k); +} + diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 64e2e6e14e..9a70550b87 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -27,10 +27,27 @@ public class MinecraftForge { bucketHandlers.add(handler); } + /** + * Register a new custom bucket handler. + */ public static void registerCustomBucketHandler(IBucketHandler handler) { bucketHandlers.add(handler); } + /** + * Registers a new sleeping handler. + */ + public static void registerSleepHandler(ISleepHandler handler) { + ForgeHooks.sleepHandlers.add(handler); + } + + /** + * Registers a new destroy tool handler. + */ + public static void registerDestroyToolHandler(IDestroyToolHandler handler) { + ForgeHooks.destroyToolHandlers.add(handler); + } + /** * Registers a new crafting handler. */ diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 0e5d4f08fd..68b19fa8cb 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -173,7 +173,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-12 19:07:50.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-17 17:54:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -206,7 +206,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -600,6 +594,72 @@ +@@ -600,6 +594,80 @@ return blockMaterial.getMaterialMobility(); } @@ -217,11 +217,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav + return false; + } + ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ } ++ + /* FORGE: Return true if the block is solid on the given side. This + * is used by placement logic. */ + public boolean isBlockSolidOnSide( World world, int i, int j, int k, + int side ) { -+ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ return isBlockNormalCube(world,i,j,k); + } + + /* FORGE: Return true if the player can place a new block in the block @@ -506,6 +514,62 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres { flag = true; } +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_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-17 17:10:13.000000000 -0400 +@@ -16,12 +16,12 @@ + public static final boolean isRailBlockAt(World world, int i, int j, int k) + { + int l = world.getBlockId(i, j, k); +- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; ++ return Block.blocksList[l] instanceof BlockRail; + } + + public static final boolean isRailBlock(int i) + { +- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; ++ return Block.blocksList[i] instanceof BlockRail; + } + + protected BlockRail(int i, int j, boolean flag) +@@ -97,7 +97,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -121,23 +121,23 @@ + j1 &= 7; + } + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + flag = true; + } +- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) ++ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) + { + flag = true; + } +- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) ++ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) + { + flag = true; + } +- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) ++ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) + { + flag = true; + } +- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) ++ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) + { + flag = true; + } 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_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:18:50.000000000 -0400 @@ -529,7 +593,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } else 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_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:29.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -538,6 +602,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds import java.util.*; +@@ -53,7 +54,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 1); + } + + private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) @@ -451,6 +452,10 @@ { return false; @@ -654,6 +727,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc { flag = true; } +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_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:38.000000000 -0400 +@@ -147,7 +147,7 @@ + { + j1--; + } +- if(!world.isBlockNormalCube(j1, j, k1)) ++ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) + { + world.setBlockWithNotify(i, j, k, 0); + dropBlockAsItem(world, i, j, k, i1); +@@ -213,11 +213,15 @@ + { + i--; + } +- return world.isBlockNormalCube(i, j, k); ++ return world.isBlockSolidOnSide(i, j, k, l); + } + + public static boolean isTrapdoorOpen(int i) + { + return (i & 4) != 0; + } ++ ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ 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 --- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.000000000 -0400 @@ -854,17 +956,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-12 18:00:55.000000000 -0400 -@@ -6,6 +6,8 @@ ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-17 19:06:38.000000000 -0400 +@@ -6,6 +6,9 @@ import java.util.*; +import net.minecraft.src.forge.ISpecialArmor; ++import net.minecraft.src.forge.ForgeHooks; + // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -316,6 +318,8 @@ +@@ -316,6 +319,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -873,7 +976,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -330,6 +334,24 @@ +@@ -330,6 +335,24 @@ return f; } @@ -898,7 +1001,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -477,6 +499,21 @@ +@@ -477,6 +500,21 @@ protected void damageEntity(int i) { @@ -920,6 +1023,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); +@@ -523,6 +561,7 @@ + public void destroyCurrentEquippedItem() + { + inventory.setInventorySlotContents(inventory.currentItem, null); ++ ForgeHooks.onDestroyCurrentItem(this); + } + + public double getYOffset() +@@ -594,6 +633,10 @@ + + public EnumStatus sleepInBedAt(int i, int j, int k) + { ++ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); ++ if (customSleep != null) { ++ return customSleep; ++ } + if(!worldObj.multiplayerWorld) + { + if(isPlayerSleeping() || !isEntityAlive()) 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_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 @@ -1064,7 +1186,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj } 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_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-17 20:02:41.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1073,7 +1195,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon import net.minecraft.client.Minecraft; -@@ -98,6 +99,12 @@ +@@ -71,6 +72,7 @@ + if(itemstack1.stackSize == 0) + { + entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; ++ ForgeHooks.onDestroyCurrentItem(entityplayer); + } + return true; + } else +@@ -98,6 +100,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -1086,6 +1216,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { +@@ -108,7 +116,11 @@ + return false; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ return true; + } + } + 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_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-12 00:47:04.000000000 -0400 @@ -1522,7 +1665,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-12 19:51:21.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-17 17:56:22.000000000 -0400 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1560,7 +1703,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav - return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); - } + if(block == null) return false; -+ return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); ++ return block.isBlockNormalCube(this,i,j,k); + } + + /* FORGE: Determine if the given block is considered solid on the @@ -1851,7 +1994,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-12 19:07:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-17 17:55:56.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1884,7 +2027,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -526,6 +520,72 @@ +@@ -526,6 +520,80 @@ return blockMaterial.getMaterialMobility(); } @@ -1895,11 +2038,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + return false; + } + ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && isACube(); ++ } ++ + /* FORGE: Return true if the block is solid on the given side. This + * is used by placement logic. */ + public boolean isBlockSolidOnSide( World world, int i, int j, int k, + int side ) { -+ return blockMaterial.getIsOpaque() && isACube(); ++ return isBlockNormalCube(world,i,j,k); + } + + /* FORGE: Return true if the player can place a new block in the block @@ -2184,6 +2335,62 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-17 17:10:08.000000000 -0400 +@@ -16,12 +16,12 @@ + public static final boolean func_27029_g(World world, int i, int j, int k) + { + int l = world.getBlockId(i, j, k); +- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; ++ return Block.blocksList[l] instanceof BlockRail; + } + + public static final boolean func_27030_c(int i) + { +- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; ++ return Block.blocksList[i] instanceof BlockRail; + } + + protected BlockRail(int i, int j, boolean flag) +@@ -92,7 +92,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -116,23 +116,23 @@ + j1 &= 7; + } + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + flag = true; + } +- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) ++ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) + { + flag = true; + } +- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) ++ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) + { + flag = true; + } +- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) ++ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) + { + flag = true; + } +- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) ++ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 17:02:12.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:19:02.000000000 -0400 @@ -2207,7 +2414,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:42.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2216,6 +2423,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl import java.util.*; +@@ -43,7 +44,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 1); + } + + private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) @@ -413,6 +414,10 @@ { return false; @@ -2332,6 +2548,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-11 17:02:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:43.000000000 -0400 +@@ -130,7 +130,7 @@ + { + j1--; + } +- if(!world.isBlockNormalCube(j1, j, k1)) ++ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) + { + world.setBlockWithNotify(i, j, k, 0); + dropBlockAsItem(world, i, j, k, i1); +@@ -196,11 +196,15 @@ + { + i--; + } +- return world.isBlockNormalCube(i, j, k); ++ return world.isBlockSolidOnSide(i, j, k,l); + } + + public static boolean func_28038_d(int i) + { + return (i & 4) != 0; + } ++ ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ 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 --- ../src_base/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-11 17:02:12.000000000 -0400 @@ -2387,17 +2632,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-12 18:00:54.000000000 -0400 -@@ -6,6 +6,8 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-17 19:06:41.000000000 -0400 +@@ -6,6 +6,9 @@ import java.util.*; +import net.minecraft.src.forge.ISpecialArmor; ++import net.minecraft.src.forge.ForgeHooks; + // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -296,6 +298,8 @@ +@@ -296,6 +299,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -2406,7 +2652,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -310,6 +314,24 @@ +@@ -310,6 +315,24 @@ return f; } @@ -2431,7 +2677,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -457,6 +479,21 @@ +@@ -457,6 +480,21 @@ protected void damageEntity(int i) { @@ -2453,6 +2699,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); +@@ -503,6 +541,7 @@ + public void destroyCurrentEquippedItem() + { + inventory.setInventorySlotContents(inventory.currentItem, null); ++ ForgeHooks.onDestroyCurrentItem(this); + } + + public double getYOffset() +@@ -568,6 +607,10 @@ + + public EnumStatus goToSleep(int i, int j, int k) + { ++ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); ++ if (customSleep != null) { ++ return customSleep; ++ } + if(!worldObj.singleplayerWorld) + { + 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 --- ../src_base/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-11 17:02:12.000000000 -0400 @@ -2510,7 +2775,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-12 19:08:10.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-17 20:02:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2556,7 +2821,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld)); -@@ -145,6 +147,11 @@ +@@ -135,6 +137,7 @@ + if(itemstack1.stackSize == 0) + { + entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; ++ ForgeHooks.onDestroyCurrentItem(entityplayer); + } + return true; + } else +@@ -145,6 +148,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -2568,6 +2841,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { +@@ -155,7 +163,11 @@ + return false; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ return true; + } + } + 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_work/minecraft_server/net/minecraft/src/Item.java 2011-08-12 17:59:16.000000000 -0400 @@ -2663,7 +2949,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl 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 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-12 19:51:26.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-17 17:56:37.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -2701,7 +2987,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo - return block.blockMaterial.getIsOpaque() && block.isACube(); - } + if(block == null) return false; -+ return block.blockMaterial.getIsOpaque() && block.isACube(); ++ return block.isBlockNormalCube(this,i,j,k); + } + + /* FORGE: Determine if the given block is considered solid on the From 651af867950e2c1eea8f1414b95f7f7e7c684ed8 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 20 Aug 2011 08:59:05 +0000 Subject: [PATCH 065/169] Version control logic, improved the destroy handling hook. --- .../net/minecraft/src/forge/ForgeHooks.java | 11 +++- .../src/forge/IDestroyToolHandler.java | 3 +- .../minecraft/src/forge/MinecraftForge.java | 51 +++++++++++++++++++ forge/minecraft.patch | 32 +++++++----- 4 files changed, 80 insertions(+), 17 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index d84ff671a8..690a93a9a9 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -26,9 +26,9 @@ public class ForgeHooks { static LinkedList craftingHandlers = new LinkedList(); - public static void onDestroyCurrentItem(EntityPlayer player) { + public static void onDestroyCurrentItem(EntityPlayer player, ItemStack orig) { for (IDestroyToolHandler handler : destroyToolHandlers) { - handler.onDestroyCurrentItem(player); + handler.onDestroyCurrentItem(player,orig); } } @@ -138,6 +138,13 @@ public class ForgeHooks { // TODO: add other tool tables. } + public static final int majorVersion=1; + public static final int minorVersion=1; + public static final int revisionVersion=5; + static { + System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); + } + static boolean toolInit=false; static HashMap toolClasses=new HashMap(); static HashMap toolHarvestLevels=new HashMap(); diff --git a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java index a69dd9954e..07688e286f 100644 --- a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java @@ -4,12 +4,13 @@ */ package net.minecraft.src.forge; +import net.minecraft.src.ItemStack; import net.minecraft.src.EntityPlayer; import net.minecraft.src.EnumStatus; public interface IDestroyToolHandler { /** Called when the user's currently equipped item is destroyed. */ - public void onDestroyCurrentItem(EntityPlayer player); + public void onDestroyCurrentItem(EntityPlayer player, ItemStack orig); } diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 9a70550b87..7458cb8501 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -166,4 +166,55 @@ public class MinecraftForge { public static void addPickaxeBlockEffectiveAgainst (Block block) { setBlockHarvestLevel(block,"pickaxe",0); } + + /** + * Kill minecraft with an error message. + */ + public static void killMinecraft(String modname, String msg) { + throw new RuntimeException(modname+": "+msg); + } + + /** + * Version checking. Ensures that a sufficiently recent version of Forge + * is installed. Will result in a fatal error if the major versions + * mismatch or if the version is too old. Will print a warning message if + * the minor versions don't match. + */ + public static void versionDetect(String modname, + int major, int minor, int revision) { + if(major!=ForgeHooks.majorVersion) { + killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x"); + } else if(minor!=ForgeHooks.minorVersion) { + if(minor>ForgeHooks.minorVersion) { + killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision); + } else { + System.out.println(modname + ": MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x, may lead to unexpected behavior"); + } + } else if(revision>ForgeHooks.revisionVersion) { + killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision); + } + } + + /** + * Strict version checking. Ensures that a sufficiently recent version of + * Forge is installed. Will result in a fatal error if the major or minor + * versions mismatch or if the version is too old. Use this function for + * mods that use recent, new, or unstable APIs to prevent + * incompatibilities. + */ + public static void versionDetectStrict(String modname, + int major, int minor, int revision) { + if(major!=ForgeHooks.majorVersion) { + killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x"); + } else if(minor!=ForgeHooks.minorVersion) { + if(minor>ForgeHooks.minorVersion) { + killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision); + } else { + killMinecraft(modname,"MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x"); + } + } else if(revision>ForgeHooks.revisionVersion) { + killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision); + } + } + } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 68b19fa8cb..bae16af76d 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -956,7 +956,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-17 19:06:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-20 03:54:26.000000000 -0400 @@ -6,6 +6,9 @@ import java.util.*; @@ -1023,15 +1023,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); -@@ -523,6 +561,7 @@ +@@ -522,7 +560,9 @@ + public void destroyCurrentEquippedItem() { ++ ItemStack orig=inventory.getCurrentItem(); inventory.setInventorySlotContents(inventory.currentItem, null); -+ ForgeHooks.onDestroyCurrentItem(this); ++ ForgeHooks.onDestroyCurrentItem(this,orig); } public double getYOffset() -@@ -594,6 +633,10 @@ +@@ -594,6 +634,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { @@ -1186,7 +1188,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj } 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_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-17 20:02:41.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-20 03:56:00.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1199,7 +1201,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; -+ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); } return true; } else @@ -1224,7 +1226,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon + if(!itemstack.useItem(entityplayer, world, i, j, k, l)) + return false; + if(itemstack.stackSize == 0) -+ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); + return true; } } @@ -2632,7 +2634,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-17 19:06:41.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-20 03:53:18.000000000 -0400 @@ -6,6 +6,9 @@ import java.util.*; @@ -2699,15 +2701,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); -@@ -503,6 +541,7 @@ +@@ -502,7 +540,9 @@ + public void destroyCurrentEquippedItem() { ++ ItemStack orig=inventory.getCurrentItem(); inventory.setInventorySlotContents(inventory.currentItem, null); -+ ForgeHooks.onDestroyCurrentItem(this); ++ ForgeHooks.onDestroyCurrentItem(this,orig); } public double getYOffset() -@@ -568,6 +607,10 @@ +@@ -568,6 +608,10 @@ public EnumStatus goToSleep(int i, int j, int k) { @@ -2775,7 +2779,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-17 20:02:48.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-20 03:56:01.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2825,7 +2829,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; -+ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); } return true; } else @@ -2849,7 +2853,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + if(!itemstack.useItem(entityplayer, world, i, j, k, l)) + return false; + if(itemstack.stackSize == 0) -+ ForgeHooks.onDestroyCurrentItem(entityplayer); ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); + return true; } } From 4cdb1cb3d0c6ac7a65c74455a38d9d5a3fd4ccd7 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 20 Aug 2011 10:35:14 +0000 Subject: [PATCH 066/169] Handler for custom block highlight. --- .../minecraft/src/forge/ForgeHooksClient.java | 19 +++++++++- .../src/forge/IHighlightHandler.java | 23 ++++++++++++ .../src/forge/MinecraftForgeClient.java | 7 ++++ forge/minecraft.patch | 37 +++++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index f75dbbcb89..e0d27efe6d 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -9,11 +9,29 @@ import net.minecraft.src.Block; import net.minecraft.src.ModLoader; import net.minecraft.src.RenderBlocks; import net.minecraft.src.Tessellator; +import net.minecraft.src.RenderGlobal; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.MovingObjectPosition; +import net.minecraft.src.ItemStack; import org.lwjgl.opengl.GL11; import java.util.*; public class ForgeHooksClient { + + public static boolean onBlockHighlight(RenderGlobal renderglobal, + EntityPlayer player, MovingObjectPosition mop, int i, + ItemStack itemstack, float f) { + for (IHighlightHandler handler : highlightHandlers) { + if(handler.onBlockHighlight(renderglobal,player,mop, + i,itemstack,f)) + return true; + } + return false; + } + + static LinkedList highlightHandlers = new LinkedList(); + public static boolean canRenderInPass(Block block, int pass) { if(block instanceof IMultipassRender) { IMultipassRender impr = (IMultipassRender) block; @@ -23,7 +41,6 @@ public class ForgeHooksClient { return false; } - static HashMap tessellators=new HashMap(); static HashMap textures=new HashMap(); static boolean inWorld=false; diff --git a/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java b/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java new file mode 100644 index 0000000000..a2fc3ce09a --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java @@ -0,0 +1,23 @@ +/* + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.EnumStatus; +import net.minecraft.src.RenderGlobal; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.MovingObjectPosition; +import net.minecraft.src.ItemStack; + +public interface IHighlightHandler { + /** + * Allow custom handling of highlights. Return true if the hilight has + * been handled. + */ + public boolean onBlockHighlight(RenderGlobal renderglobal, + EntityPlayer player, MovingObjectPosition mop, int i, + ItemStack itemstack, float f); +} + diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 86d685eea9..3256dfc95d 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -12,6 +12,13 @@ import net.minecraft.src.Tessellator; import org.lwjgl.opengl.GL11; public class MinecraftForgeClient { + /** + * Registers a new block highlight handler. + */ + public static void registerHighlightHandler(IHighlightHandler handler) { + ForgeHooksClient.highlightHandlers.add(handler); + } + /** Bind a texture. This is used to bind a texture file when * performing your own rendering, rather than using ITextureProvider. * diff --git a/forge/minecraft.patch b/forge/minecraft.patch index bae16af76d..c232072d20 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1044,6 +1044,43 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla if(!worldObj.multiplayerWorld) { 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 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-20 06:25:56.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooksClient; + + import java.nio.FloatBuffer; + import java.util.List; +@@ -573,8 +574,12 @@ + { + EntityPlayer entityplayer = (EntityPlayer)entityliving; + GL11.glDisable(3008 /*GL_ALPHA_TEST*/); ++ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, ++ mc.objectMouseOver,0, ++ entityplayer.inventory.getCurrentItem(),f)) { + renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); + renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ } + GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + } + GL11.glBlendFunc(770, 771); +@@ -619,8 +624,12 @@ + { + EntityPlayer entityplayer1 = (EntityPlayer)entityliving; + GL11.glDisable(3008 /*GL_ALPHA_TEST*/); ++ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer1, ++ mc.objectMouseOver,0, ++ entityplayer1.inventory.getCurrentItem(),f)) { + renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); + renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); ++ } + GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + } + renderRainSnow(f); 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_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 From 6ac2161f36960374acb638ba5e6cc971a09dee68 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 20 Aug 2011 22:23:29 +0000 Subject: [PATCH 067/169] Changed some field permissions. --- forge/minecraft.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index c232072d20..083f30f8f5 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1081,6 +1081,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen GL11.glEnable(3008 /*GL_ALPHA_TEST*/); } 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 --- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.000000000 -0400 @@ -1407,6 +1408,31 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng singleIntBuffer.clear(); GLAllocation.generateTextureNames(singleIntBuffer); 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 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-11 17:02:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-20 18:22:41.000000000 -0400 +@@ -1558,8 +1558,8 @@ + } + + public List tileEntities; +- private World worldObj; +- private RenderEngine renderEngine; ++ public World worldObj; ++ public RenderEngine renderEngine; + private List worldRenderersToUpdate; + private WorldRenderer sortedWorldRenderers[]; + private WorldRenderer worldRenderers[]; +@@ -1567,8 +1567,8 @@ + private int renderChunksTall; + private int renderChunksDeep; + private int glRenderListBase; +- private Minecraft mc; +- private RenderBlocks globalRenderBlocks; ++ public Minecraft mc; ++ public RenderBlocks globalRenderBlocks; + private IntBuffer glOcclusionQueryBase; + private boolean occlusionEnabled; + 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 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:11.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:12.000000000 -0400 From 9d22e76927a75e46538c0f16f1d4753d7bfd2c90 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 21 Aug 2011 07:50:09 +0000 Subject: [PATCH 068/169] Fixed the version number. --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 690a93a9a9..e793ab2e68 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -139,7 +139,7 @@ public class ForgeHooks { } public static final int majorVersion=1; - public static final int minorVersion=1; + public static final int minorVersion=0; public static final int revisionVersion=5; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); From b0efd106bd6e7df636429af0334f859edeb88930 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 24 Aug 2011 04:18:57 +0000 Subject: [PATCH 069/169] New install script for Windows. --- forge/install/install.cmd | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index d100c8bd73..00dd872ab1 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,26 +1,34 @@ @echo off -echo Minecraft Forge Build Script v1.1 +echo Minecraft Forge Install and Build Script v1.2 echo -Searching for components... set MCP=ERROR! set HOME=ERROR! -if /i exist %~dp0\%~nx0 (set MCP=%~dp0..&& set HOME=%~dp0) -if /i exist %~dp0\forge\%~nx0 (set MCP=%~dp0&& set HOME=%~dp0\forge) +if /i exist "%~dp0\%~nx0" (set MCP="%~dp0.."&& set HOME="%~dp0") +if /i exist "%~dp0..\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..") +if /i exist "%~dp0\forge\%~nx0" (set MCP="%~dp0" && set HOME="%~dp0\forge") if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.) if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.) echo -MCP detected in %MCP% echo -Forge detected in %HOME% -if /i not exist %MCP%\src\minecraft\net\minecraft\client\minecraft.java (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && decompile >> compile.log && popd) else (echo -Decompiled source detected) +echo -Rectifying Paths... +set MCP=%MCP:"=% +set MCP=%MCP:'=% +set HOME=%HOME:"=% +set HOME=%HOME:'=% +if /i not exist "%MCP%\src\minecraft\net\minecraft\client\minecraft.java" (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && cmd /c "runtime\bin\python\python_mcp runtime\decompile.py %*" && popd) else (echo -Decompiled source detected) pushd %MCP%\src echo -Applying forge to the sourcetree... -xcopy /Y /E /G /Q %HOME%\forge_client\src\net\* %MCP%\src\minecraft\net -xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft\net -echo D | xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft_server\net +xcopy /Y /E /G /Q "%HOME%"\forge_client\src\net\* "%MCP%"\src\minecraft\net +xcopy /Y /E /G /Q "%HOME%"\forge_common\net\* "%MCP%"\src\minecraft\net +echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%"\src\minecraft_server\net echo -NEW SESSION >> forgepatch.log -%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch >> forgepatch.log +"%MCP%\runtime\bin\python\python_mcp" "%HOME%\lfcr.py" "%HOME%\minecraft.patch" "%HOME%\minecraft-win.patch" >> forgepatch.log echo -Patching necessary source files for forge... -%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch >> forgepatch.log +"%MCP%\runtime\bin\applydiff.exe" -uf -p2 < "%HOME%\minecraft-win.patch" >> forgepatch.log popd echo -Forge ready for use, recompiling... pushd %MCP% -cmd /c recompile.bat +cmd /c "runtime\bin\python\python_mcp runtime\recompile.py %*" popd +echo -Recompilation complete! +echo. From 0457d8057fa639a2fa04d2f2c719e5e5fa809621 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 25 Aug 2011 00:23:31 +0000 Subject: [PATCH 070/169] Added armor texture hook. --- .../src/forge/IArmorTextureProvider.java | 23 ++ forge/minecraft.patch | 265 ++++++++++-------- 2 files changed, 168 insertions(+), 120 deletions(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java b/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java new file mode 100644 index 0000000000..5b996c6d8a --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java @@ -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(); + +} + diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 083f30f8f5..e44e48650e 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-11 21:40:22.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-21 03:48:05.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-11 22:00:30.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-21 03:48:05.000000000 -0400 @@ -230,23 +230,23 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-11 22:01:46.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-21 03:48:05.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-17 17:54:54.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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 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_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:59.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-21 03:48:05.000000000 -0400 @@ -63,6 +63,11 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-11 22:12: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-21 03:48:05.000000000 -0400 @@ -40,44 +40,44 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:17:55.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-21 03:48:05.000000000 -0400 @@ -46,7 +46,7 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-17 17:10:13.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-21 03:48:05.000000000 -0400 @@ -16,12 +16,12 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:18:50.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-21 03:48:05.000000000 -0400 @@ -27,7 +27,7 @@ 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; } else 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_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:29.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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; 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_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-11 22:30:24.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-21 03:48:05.000000000 -0400 @@ -41,24 +41,24 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:38.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-21 03:48:05.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -757,8 +757,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; 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; } 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_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); 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) 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_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-20 03:54:26.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-21 03:48:05.000000000 -0400 @@ -6,6 +6,9 @@ import java.util.*; @@ -1045,8 +1045,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-20 06:25:56.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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*/); } 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 ---- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -6,6 +6,8 @@ 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); 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_work/minecraft/net/minecraft/src/Item.java 2011-08-12 17:59:17.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-21 03:48:05.000000000 -0400 @@ -75,6 +75,13 @@ return 1.0F; } @@ -1156,8 +1155,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -5,6 +5,8 @@ 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; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-12 18:38:09.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-21 03:48:05.000000000 -0400 @@ -4,6 +4,8 @@ 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); 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_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1225,8 +1224,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-20 03:56:00.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-12 00:47:04.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-21 03:48:05.000000000 -0400 @@ -63,7 +63,7 @@ { 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); 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_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-12 19:08:13.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-21 03:48:05.000000000 -0400 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); 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); 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_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-12 19:29:14.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-21 03:48:05.000000000 -0400 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; 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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-11 23:20:23.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-21 03:48:05.000000000 -0400 @@ -126,6 +126,9 @@ } try @@ -1409,8 +1408,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-20 18:22:41.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-21 03:48:05.000000000 -0400 @@ -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 int cloudOffsetX; 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_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-11 17:02:12.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-21 03:48:05.000000000 -0400 @@ -5,6 +5,9 @@ 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); 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:26.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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); 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_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-11 23:13:28.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-21 03:48:05.000000000 -0400 @@ -6,6 +6,7 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-12 19:32:56.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-21 03:48:05.000000000 -0400 @@ -4,6 +4,7 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-17 17:56:22.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-21 03:48:05.000000000 -0400 @@ -313,7 +313,11 @@ 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 Random rand; 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 ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-11 17:02:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-12 19:23:40.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-21 03:48:05.000000000 -0400 @@ -5,6 +5,9 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-11 21:44:46.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-21 03:48:05.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-11 22:01:13.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-21 03:48:05.000000000 -0400 @@ -140,23 +140,23 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-11 22:02:01.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-21 03:48:05.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-17 17:55:56.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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 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_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-11 22:07:05.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-21 03:48:05.000000000 -0400 @@ -40,6 +40,11 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-11 22:13:32.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-21 03:48:05.000000000 -0400 @@ -35,44 +35,44 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-11 22:18:08.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-21 03:48:05.000000000 -0400 @@ -46,7 +46,7 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-17 17:10:08.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-21 03:48:05.000000000 -0400 @@ -16,12 +16,12 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-11 22:19:02.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-21 03:48:05.000000000 -0400 @@ -27,7 +27,7 @@ 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; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-17 18:00:42.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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; 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_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-11 22:31:30.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-21 03:48:05.000000000 -0400 @@ -36,24 +36,24 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-17 17:38:43.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-21 03:48:05.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2643,8 +2668,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/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-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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-11 20:47:14.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-21 03:48:05.000000000 -0400 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); 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) 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_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-20 03:53:18.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-21 03:48:05.000000000 -0400 @@ -6,6 +6,9 @@ import java.util.*; @@ -2786,8 +2811,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/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-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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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_work/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-21 03:48:05.000000000 -0400 @@ -6,6 +6,8 @@ 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); 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_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-20 03:56:01.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-12 17:59:16.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-21 03:48:05.000000000 -0400 @@ -65,6 +65,13 @@ return 1.0F; } @@ -2939,8 +2964,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-12 18:38:14.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-21 03:48:05.000000000 -0400 @@ -4,6 +4,8 @@ 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); 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_work/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-21 03:48:05.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; 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; } 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_work/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-21 03:48:05.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); 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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-11 17:02:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-17 11:26:29.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-21 03:48:05.000000000 -0400 @@ -3,6 +3,7 @@ // 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); 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_work/minecraft_server/net/minecraft/src/World.java 2011-08-17 17:56:37.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-21 03:48:05.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) From 33bd0947e319714081c940765faa146271b08ff5 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 25 Aug 2011 07:17:10 +0000 Subject: [PATCH 071/169] Small RedPower-specific patch. --- forge/minecraft.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index e44e48650e..f8de7b96e1 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1214,14 +1214,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 --- ../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-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:48.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; + + // Added for RedPower subblocks. -+ public int subHit=0; ++ 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 --- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-21 03:48:04.000000000 -0400 @@ -2992,14 +2992,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../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-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:45.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; + + // Added for RedPower subblocks. -+ public int subHit=0; ++ 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 --- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-21 03:48:05.000000000 -0400 From 1c11f0eeb0adae526a59606268dd84e9b967ce06 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 25 Aug 2011 07:19:49 +0000 Subject: [PATCH 072/169] Fixed a typo. --- forge/minecraft.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index f8de7b96e1..24a3ad588e 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1497,12 +1497,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte 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 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-25 03:19:02.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; -+import net.minecraft.src.forge.IItemArmorPlayerTextureProvider; ++import net.minecraft.src.forge.IArmorTextureProvider; import net.minecraft.client.Minecraft; import org.lwjgl.opengl.GL11; From d2878faa3319b56a518ad5754ae8b1ff89a8ce84 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 25 Aug 2011 17:15:02 +0000 Subject: [PATCH 073/169] Patched the installer again. --- forge/install/install.cmd | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index 00dd872ab1..df6806d609 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,10 +1,10 @@ @echo off -echo Minecraft Forge Install and Build Script v1.2 +echo Minecraft Forge Install and Build Script v1.3 echo -Searching for components... set MCP=ERROR! set HOME=ERROR! if /i exist "%~dp0\%~nx0" (set MCP="%~dp0.."&& set HOME="%~dp0") -if /i exist "%~dp0..\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..") +if /i exist "%~dp0\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..") if /i exist "%~dp0\forge\%~nx0" (set MCP="%~dp0" && set HOME="%~dp0\forge") if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.) if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.) @@ -18,9 +18,9 @@ set HOME=%HOME:'=% if /i not exist "%MCP%\src\minecraft\net\minecraft\client\minecraft.java" (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && cmd /c "runtime\bin\python\python_mcp runtime\decompile.py %*" && popd) else (echo -Decompiled source detected) pushd %MCP%\src echo -Applying forge to the sourcetree... -xcopy /Y /E /G /Q "%HOME%"\forge_client\src\net\* "%MCP%"\src\minecraft\net -xcopy /Y /E /G /Q "%HOME%"\forge_common\net\* "%MCP%"\src\minecraft\net -echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%"\src\minecraft_server\net +xcopy /Y /E /G /Q "%HOME%\forge_client\src\net\*" "%MCP%\src\minecraft\net" +xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft\net" +echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft_server\net" echo -NEW SESSION >> forgepatch.log "%MCP%\runtime\bin\python\python_mcp" "%HOME%\lfcr.py" "%HOME%\minecraft.patch" "%HOME%\minecraft-win.patch" >> forgepatch.log echo -Patching necessary source files for forge... @@ -30,5 +30,3 @@ echo -Forge ready for use, recompiling... pushd %MCP% cmd /c "runtime\bin\python\python_mcp runtime\recompile.py %*" popd -echo -Recompilation complete! -echo. From e9cd63abf71abbea4d390de03bc152971c12f33a Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 25 Aug 2011 19:47:34 +0000 Subject: [PATCH 074/169] updated credits --- forge/minecraftforge_credits.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge/minecraftforge_credits.txt b/forge/minecraftforge_credits.txt index 9616ba32d0..eed84fe482 100755 --- a/forge/minecraftforge_credits.txt +++ b/forge/minecraftforge_credits.txt @@ -4,6 +4,10 @@ * Hawkye * +* MALfunction84 * + +Submitted the sleep handler code for his mod (Somnia) and others to use. + * Scokeev9 * Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. From aead41197feed123632737d4b00879a70be6cf29 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 27 Aug 2011 01:12:20 +0000 Subject: [PATCH 075/169] temporary reverted to r61 --- forge/install/install.cmd | 40 ++++++++------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index df6806d609..8e13411ba4 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,32 +1,8 @@ -@echo off -echo Minecraft Forge Install and Build Script v1.3 -echo -Searching for components... -set MCP=ERROR! -set HOME=ERROR! -if /i exist "%~dp0\%~nx0" (set MCP="%~dp0.."&& set HOME="%~dp0") -if /i exist "%~dp0\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..") -if /i exist "%~dp0\forge\%~nx0" (set MCP="%~dp0" && set HOME="%~dp0\forge") -if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.) -if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.) -echo -MCP detected in %MCP% -echo -Forge detected in %HOME% -echo -Rectifying Paths... -set MCP=%MCP:"=% -set MCP=%MCP:'=% -set HOME=%HOME:"=% -set HOME=%HOME:'=% -if /i not exist "%MCP%\src\minecraft\net\minecraft\client\minecraft.java" (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && cmd /c "runtime\bin\python\python_mcp runtime\decompile.py %*" && popd) else (echo -Decompiled source detected) -pushd %MCP%\src -echo -Applying forge to the sourcetree... -xcopy /Y /E /G /Q "%HOME%\forge_client\src\net\*" "%MCP%\src\minecraft\net" -xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft\net" -echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft_server\net" -echo -NEW SESSION >> forgepatch.log -"%MCP%\runtime\bin\python\python_mcp" "%HOME%\lfcr.py" "%HOME%\minecraft.patch" "%HOME%\minecraft-win.patch" >> forgepatch.log -echo -Patching necessary source files for forge... -"%MCP%\runtime\bin\applydiff.exe" -uf -p2 < "%HOME%\minecraft-win.patch" >> forgepatch.log -popd -echo -Forge ready for use, recompiling... -pushd %MCP% -cmd /c "runtime\bin\python\python_mcp runtime\recompile.py %*" -popd +set HOME=%~dps0 +set MCP=%HOME%.. +xcopy /Y /E src\* ..\src + +cd %MCP%\src +%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch +%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch +pause From a6ed5709efc6c929879afca5211b85096e03c9ed Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 27 Aug 2011 05:49:09 +0000 Subject: [PATCH 076/169] Fixed the permissions on a couple fields in ItemTool. --- forge/minecraft.patch | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 24a3ad588e..79010def6c 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1187,7 +1187,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende 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 --- ../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-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 01:47:43.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1212,6 +1212,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); +@@ -60,7 +70,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + 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 --- ../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-25 03:16:48.000000000 -0400 @@ -2965,7 +2975,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../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-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 01:47:55.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2990,6 +3000,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); +@@ -55,7 +65,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + 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 --- ../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-25 03:16:45.000000000 -0400 From 705e5e62a04b1221239dac0f8defc6294180499f Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 27 Aug 2011 11:42:48 +0000 Subject: [PATCH 077/169] fixed headers, implemented new armor computation for IC2 --- .../minecraft/src/forge/ArmorProperties.java | 11 + .../net/minecraft/src/forge/ForgeHooks.java | 2 +- .../src/forge/IBlockSecondaryProperties.java | 1 - .../src/forge/IDestroyToolHandler.java | 4 +- .../minecraft/src/forge/ISleepHandler.java | 3 +- .../minecraft/src/forge/ISpecialArmor.java | 12 + .../minecraft/src/forge/MinecraftForge.java | 2 - forge/minecraft.patch | 846 +++++++++--------- forge/release.bat | 2 +- 9 files changed, 457 insertions(+), 426 deletions(-) create mode 100755 forge/forge_common/net/minecraft/src/forge/ArmorProperties.java diff --git a/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java b/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java new file mode 100755 index 0000000000..44eeb00335 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java @@ -0,0 +1,11 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +public class ArmorProperties { + public int damageRemove = 0; + public boolean allowRegularComputation = false; +} diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index e793ab2e68..69b9a4e932 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -4,8 +4,8 @@ */ package net.minecraft.src.forge; + import net.minecraft.src.Block; -import net.minecraft.src.World; import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; diff --git a/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java index 06515816d4..310da675c7 100644 --- a/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java +++ b/forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java @@ -5,7 +5,6 @@ package net.minecraft.src.forge; -import net.minecraft.src.EntityPlayer; import net.minecraft.src.World; /** diff --git a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java index 07688e286f..5c67a0476e 100644 --- a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java @@ -1,12 +1,12 @@ -/* +/** * This software is provided under the terms of the Minecraft Forge Public * License v1.0. */ + package net.minecraft.src.forge; import net.minecraft.src.ItemStack; import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EnumStatus; public interface IDestroyToolHandler { /** Called when the user's currently equipped item is destroyed. diff --git a/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java b/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java index b8e9ab3545..abaf2ce31a 100644 --- a/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java @@ -1,7 +1,8 @@ -/* +/** * This software is provided under the terms of the Minecraft Forge Public * License v1.0. */ + package net.minecraft.src.forge; import net.minecraft.src.EntityPlayer; diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java index 754883625e..c950cd2923 100755 --- a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java +++ b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java @@ -5,6 +5,9 @@ package net.minecraft.src.forge; +import javax.swing.text.html.parser.Entity; + +import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemArmor; /** @@ -15,13 +18,22 @@ import net.minecraft.src.ItemArmor; * @see ItemArmor */ public interface ISpecialArmor { + /** * This interface will adjust the amount of damage received by the entity. + * @deprecated use getProperties instead. */ public int adjustArmorDamage (int damage); /** * When this return true, the regular armor computation will be cancelled + * @deprecated use getProperties instead. */ public boolean allowRegularComputation (); + + /** + * Return extra properties for the armor + */ + public ArmorProperties getProperties(EntityPlayer player, + int intitialDamage, int currentDamage); } diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 7458cb8501..6a1e92a78a 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -5,11 +5,9 @@ package net.minecraft.src.forge; -import net.minecraft.src.BiomeGenBase; import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; -import net.minecraft.src.ItemTool; import net.minecraft.src.World; import java.util.*; diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 79010def6c..18f889015b 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,122 @@ +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-27 13:36:14.084021000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-27 13:38:17.237064900 +0200 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -276,19 +277,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -600,6 +594,80 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + try 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-27 13:36:14.096021000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-27 13:38:17.223064100 +0200 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -119,8 +235,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt flag = true; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-08-27 13:36:14.105022000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-27 13:38:17.227064400 +0200 @@ -230,23 +230,23 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) { @@ -151,8 +267,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-08-27 13:36:14.129023000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-27 13:38:17.232064600 +0200 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -171,125 +287,9 @@ 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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.ArrayList; - import java.util.Random; -@@ -276,19 +277,12 @@ - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -600,6 +594,80 @@ - return blockMaterial.getMaterialMobility(); - } - -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - try 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-08-27 13:36:14.168025000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-27 13:38:17.241065200 +0200 @@ -63,6 +63,11 @@ 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-08-27 13:36:14.177026000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-27 13:38:17.246065400 +0200 @@ -40,44 +40,44 @@ 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:36:14.216028000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:38:17.250065700 +0200 @@ -46,7 +46,7 @@ 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-08-27 13:36:14.222028000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-27 13:38:17.255066000 +0200 @@ -16,12 +16,12 @@ 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:36:14.228029000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:38:17.259066200 +0200 @@ -27,7 +27,7 @@ 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; } else 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:36:14.236029000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:38:17.264066500 +0200 @@ -3,6 +3,7 @@ // 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; 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-08-27 13:36:14.276031000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-27 13:38:17.269066800 +0200 @@ -41,24 +41,24 @@ 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:36:14.279031000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:38:17.274067000 +0200 @@ -147,7 +147,7 @@ { j1--; @@ -757,8 +757,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-27 13:36:14.306033000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-27 13:38:17.281067400 +0200 @@ -3,6 +3,7 @@ // 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) { 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-27 13:36:14.565048500 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-27 13:38:17.294068200 +0200 @@ -7,6 +7,9 @@ import java.util.*; 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; } 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-27 13:36:14.718057000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-27 13:38:17.301068600 +0200 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -955,19 +955,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -6,6 +6,9 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-27 13:36:14.788061000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-27 13:40:31.393738200 +0200 +@@ -6,6 +6,10 @@ import java.util.*; ++import net.minecraft.src.forge.ArmorProperties; +import net.minecraft.src.forge.ISpecialArmor; +import net.minecraft.src.forge.ForgeHooks; + // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -316,6 +319,8 @@ +@@ -316,6 +320,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -976,7 +977,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -330,6 +335,24 @@ +@@ -330,6 +336,24 @@ return f; } @@ -1001,29 +1002,33 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -477,6 +500,21 @@ +@@ -477,6 +501,25 @@ protected void damageEntity(int i) { -+ boolean doRegularComputation = true; -+ for (ItemStack stack : inventory.armorInventory) { -+ if (stack != null && stack.getItem() instanceof ISpecialArmor) { -+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ -+ i = armor.adjustArmorDamage(i); -+ doRegularComputation = doRegularComputation -+ && armor.allowRegularComputation(); -+ } -+ } -+ -+ if (!doRegularComputation) { -+ super.damageEntity(i); -+ } ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(i); ++ return; ++ } + int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); -@@ -522,7 +560,9 @@ +@@ -522,7 +565,9 @@ public void destroyCurrentEquippedItem() { @@ -1033,7 +1038,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla } public double getYOffset() -@@ -594,6 +634,10 @@ +@@ -594,6 +639,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { @@ -1045,8 +1050,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-27 13:36:14.838064100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-27 13:38:17.318069600 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1082,8 +1087,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-27 13:36:14.926069000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-27 13:38:17.323069800 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1111,9 +1116,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { +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-27 13:36:15.161082000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-27 13:38:17.330070200 +0200 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-27 13:36:15.178083000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-27 13:38:17.326070000 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1137,26 +1159,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-27 13:36:15.241087200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-27 13:38:17.335070500 +0200 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -1186,8 +1191,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../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-27 01:47:43.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 13:36:15.269088000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 13:38:17.339070800 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1223,8 +1228,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../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-25 03:16:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:36:15.541104000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:38:17.344071000 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1234,8 +1239,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-27 13:36:15.809119000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-27 13:38:17.348071300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1279,8 +1284,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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-27 13:36:15.813119000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-27 13:38:17.352071500 +0200 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1300,8 +1305,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); 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-27 13:36:15.816119000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-27 13:38:17.356071700 +0200 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1330,8 +1335,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); 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-27 13:36:16.116137200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-27 13:38:17.364072200 +0200 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1405,8 +1410,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); 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-27 13:36:16.136138300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-27 13:38:17.369072500 +0200 @@ -126,6 +126,9 @@ } try @@ -1418,8 +1423,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-27 13:36:16.215142900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-27 13:38:17.374072800 +0200 @@ -1558,8 +1558,8 @@ } @@ -1443,8 +1448,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-27 13:36:16.224143400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-27 13:38:17.378073000 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1506,8 +1511,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-25 03:19:02.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-27 13:36:16.257145300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-27 13:38:17.382073200 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1533,8 +1538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-27 13:36:16.317148000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-27 13:38:17.386073400 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1552,8 +1557,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-27 13:36:16.396153200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-27 13:38:17.392073800 +0200 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1738,8 +1743,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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-27 13:36:16.491158700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-27 13:38:17.397074100 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1765,8 +1770,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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-27 13:36:16.604165000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-27 13:38:17.403074400 +0200 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1836,8 +1841,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-27 13:36:16.691170100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-27 13:38:17.407074700 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1919,9 +1924,125 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } +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-27 13:36:28.235830000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-27 13:38:17.426075700 +0200 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -221,19 +222,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -526,6 +520,80 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && isACube(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + try 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-21 03:48:05.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-27 13:36:28.247831000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-27 13:38:17.411074900 +0200 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2040,8 +2161,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-27 13:36:28.255831000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-27 13:38:17.416075200 +0200 @@ -140,23 +140,23 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) { @@ -2072,8 +2193,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-27 13:36:28.279832000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-27 13:38:17.421075500 +0200 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2092,125 +2213,9 @@ 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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.ArrayList; - import java.util.Random; -@@ -221,19 +222,12 @@ - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -526,6 +520,80 @@ - return blockMaterial.getMaterialMobility(); - } - -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && isACube(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-27 13:36:28.317835000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-27 13:38:17.430076000 +0200 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2294,8 +2299,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-27 13:36:28.329835000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-27 13:38:17.434076200 +0200 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2415,8 +2420,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:36:28.836864000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:38:17.439076500 +0200 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2436,8 +2441,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-27 13:36:28.842864000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-27 13:38:17.444076800 +0200 @@ -16,12 +16,12 @@ public static final boolean func_27029_g(World world, int i, int j, int k) { @@ -2492,8 +2497,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:36:28.847865000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:38:17.448077000 +0200 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2513,8 +2518,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:36:28.855865000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:38:17.452077200 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2544,8 +2549,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-27 13:36:28.896868000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-27 13:38:17.457077500 +0200 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2649,8 +2654,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:36:28.899868000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:38:17.461077700 +0200 @@ -130,7 +130,7 @@ { j1--; @@ -2678,8 +2683,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-27 13:36:28.913869000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-27 13:38:17.465078000 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2717,8 +2722,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-27 13:36:29.125881000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-27 13:38:17.470078300 +0200 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2731,19 +2736,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -6,6 +6,9 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-27 13:36:29.169883000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-27 13:40:52.299934000 +0200 +@@ -6,6 +6,10 @@ import java.util.*; ++import net.minecraft.src.forge.ArmorProperties; +import net.minecraft.src.forge.ISpecialArmor; +import net.minecraft.src.forge.ForgeHooks; + // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, ContainerPlayer, World, // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -296,6 +299,8 @@ +@@ -296,6 +300,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -2752,7 +2758,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -310,6 +315,24 @@ +@@ -310,6 +316,24 @@ return f; } @@ -2777,29 +2783,33 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -457,6 +480,21 @@ +@@ -457,6 +481,25 @@ protected void damageEntity(int i) { -+ boolean doRegularComputation = true; -+ for (ItemStack stack : inventory.armorInventory) { -+ if (stack != null && stack.getItem() instanceof ISpecialArmor) { -+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ -+ i = armor.adjustArmorDamage(i); -+ doRegularComputation = doRegularComputation -+ && armor.allowRegularComputation(); -+ } -+ } -+ -+ if (!doRegularComputation) { -+ super.damageEntity(i); -+ } ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(i); ++ return; ++ } + int j = 25 - inventory.getTotalArmorValue(); int k = i * j + damageRemainder; inventory.damageArmor(i); -@@ -502,7 +540,9 @@ +@@ -502,7 +545,9 @@ public void destroyCurrentEquippedItem() { @@ -2809,7 +2819,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En } public double getYOffset() -@@ -568,6 +608,10 @@ +@@ -568,6 +613,10 @@ public EnumStatus goToSleep(int i, int j, int k) { @@ -2821,8 +2831,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-27 13:36:29.247888000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-27 13:38:17.479078800 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2849,9 +2859,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { +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-27 13:36:29.313892000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-27 13:38:17.492079500 +0200 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-21 03:48:05.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-27 13:36:29.331893000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-27 13:38:17.483079000 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -2876,8 +2903,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-27 13:36:29.359894000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-27 13:38:17.487079200 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2956,26 +2983,9 @@ 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 ---- ../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-21 03:48:05.000000000 -0400 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - 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 ---- ../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-27 01:47:55.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 13:36:29.415897000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 13:38:17.497079800 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3011,8 +3021,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../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-25 03:16:45.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:36:29.488902000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:38:17.502080100 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3022,8 +3032,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-27 13:36:29.747916000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-27 13:38:17.506080300 +0200 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3041,8 +3051,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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-27 13:36:29.837922000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-27 13:38:17.509080500 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3060,8 +3070,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../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-21 03:48:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-27 13:36:29.995931000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-27 13:38:17.515080800 +0200 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/release.bat b/forge/release.bat index 0fddaa9b5e..f3ef746cb6 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.4 +sh package.sh 1.0.5 pause From 62e7bdf805f5edc7c63d471775b10860b6c118d2 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 28 Aug 2011 12:33:16 +0000 Subject: [PATCH 078/169] added ArmorProperties constructors, remove deprecated subprograms (supposedly not used by anyone) --- .../net/minecraft/src/forge/ArmorProperties.java | 9 +++++++++ .../net/minecraft/src/forge/ISpecialArmor.java | 14 -------------- forge/install/README.txt | 14 ++++++++------ forge/release.bat | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java b/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java index 44eeb00335..0a12b754f7 100755 --- a/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java +++ b/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java @@ -8,4 +8,13 @@ package net.minecraft.src.forge; public class ArmorProperties { public int damageRemove = 0; public boolean allowRegularComputation = false; + + public ArmorProperties () { + + } + + public ArmorProperties (int damageRemove, boolean allowRegularCompuation) { + this.damageRemove = damageRemove; + this.allowRegularComputation = allowRegularCompuation; + } } diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java index c950cd2923..d6dbfa0268 100755 --- a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java +++ b/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java @@ -5,8 +5,6 @@ package net.minecraft.src.forge; -import javax.swing.text.html.parser.Entity; - import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemArmor; @@ -18,18 +16,6 @@ import net.minecraft.src.ItemArmor; * @see ItemArmor */ public interface ISpecialArmor { - - /** - * This interface will adjust the amount of damage received by the entity. - * @deprecated use getProperties instead. - */ - public int adjustArmorDamage (int damage); - - /** - * When this return true, the regular armor computation will be cancelled - * @deprecated use getProperties instead. - */ - public boolean allowRegularComputation (); /** * Return extra properties for the armor diff --git a/forge/install/README.txt b/forge/install/README.txt index c649f02191..7d55174933 100755 --- a/forge/install/README.txt +++ b/forge/install/README.txt @@ -1,10 +1,12 @@ *** HOW TO INSTALL *** -The forge directory should have been uncompacted right under your MCP root -directory. +Extract the download archive directly into your MCP-directiory. +It should create a folder "forge" within that directory, containing all +extracted files. -You should a a fresh minecraft and minecraft_server.jar freshly decompiled -with ModLoader and ModLoaderMP. +You should use freshly decompiled jars, solely including ModLoader & +ModLoaderMP respectively. Anything else can eventually cause conflicts. + +Now just start the install-bat, MCForge will install itself into the proper +locations and copy all ned files, as well as modifying the ned baseclasses. -Just run the script install.bat. It will copy the Minecraft Forge source on your -src directory, and modify the Minecraft source files. diff --git a/forge/release.bat b/forge/release.bat index f3ef746cb6..a7ae2d692d 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.5 +sh package.sh 1.0.6-beta pause From e7ca40009e130b143628095370c3360a6091d624 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 28 Aug 2011 12:54:47 +0000 Subject: [PATCH 079/169] bumped forge version # to 1.0.6 --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- forge/release.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 69b9a4e932..a578468baa 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -140,7 +140,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=0; - public static final int revisionVersion=5; + public static final int revisionVersion=6; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/release.bat b/forge/release.bat index a7ae2d692d..99f6233321 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.6-beta +sh package.sh 1.0.6-beta2 pause From 17132962c92dcad72da85688b335f1ee7174aa95 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 30 Aug 2011 06:18:32 +0000 Subject: [PATCH 080/169] Fixed new MCP mappings. --- forge/minecraft.patch | 776 +++++++++++++++++++++--------------------- 1 file changed, 388 insertions(+), 388 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 18f889015b..f90fe17ebc 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,122 +1,6 @@ -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-27 13:36:14.084021000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-27 13:38:17.237064900 +0200 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.ArrayList; - import java.util.Random; -@@ -276,19 +277,12 @@ - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -600,6 +594,80 @@ - return blockMaterial.getMaterialMobility(); - } - -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - try 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-27 13:36:14.096021000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-27 13:38:17.223064100 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 02:13:13.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -235,8 +119,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt flag = true; } 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-27 13:36:14.105022000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-27 13:38:17.227064400 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 02:13:13.000000000 -0400 @@ -230,23 +230,23 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) { @@ -267,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-27 13:36:14.129023000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-27 13:38:17.232064600 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:13.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -287,9 +171,125 @@ 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 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-30 02:13:13.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -276,19 +277,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -600,6 +594,80 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + try 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-27 13:36:14.168025000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-27 13:38:17.241065200 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:13.000000000 -0400 @@ -63,6 +63,11 @@ 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; } 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-27 13:36:14.177026000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-27 13:38:17.246065400 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 02:13:13.000000000 -0400 @@ -40,44 +40,44 @@ 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; } 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-27 13:36:14.216028000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:38:17.250065700 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:13.000000000 -0400 @@ -46,7 +46,7 @@ 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; } 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-27 13:36:14.222028000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-27 13:38:17.255066000 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 02:13:13.000000000 -0400 @@ -16,12 +16,12 @@ 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; } 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-27 13:36:14.228029000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:38:17.259066200 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:13.000000000 -0400 @@ -27,7 +27,7 @@ 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; } else 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-27 13:36:14.236029000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:38:17.264066500 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // 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; 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-27 13:36:14.276031000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-27 13:38:17.269066800 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:13.000000000 -0400 @@ -41,24 +41,24 @@ 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; } 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-27 13:36:14.279031000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:38:17.274067000 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:13:13.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -757,8 +757,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-27 13:36:14.306033000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-27 13:38:17.281067400 +0200 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-30 02:13:10.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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-27 13:36:14.565048500 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-27 13:38:17.294068200 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 02:13:13.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; 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; } 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-27 13:36:14.718057000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-27 13:38:17.301068600 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:13.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); 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) 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-27 13:36:14.788061000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-27 13:40:31.393738200 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -1050,8 +1050,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-27 13:36:14.838064100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-27 13:38:17.318069600 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1087,8 +1087,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-27 13:36:14.926069000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-27 13:38:17.323069800 +0200 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1116,26 +1116,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { -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-27 13:36:15.161082000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-27 13:38:17.330070200 +0200 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-27 13:36:15.178083000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-27 13:38:17.326070000 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1159,9 +1142,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-30 02:13:13.000000000 -0400 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-27 13:36:15.241087200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-27 13:38:17.335070500 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 02:13:13.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -1191,8 +1191,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 13:36:15.269088000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 13:38:17.339070800 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 02:13:13.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1228,8 +1228,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:36:15.541104000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:38:17.344071000 +0200 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:13.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1239,8 +1239,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-27 13:36:15.809119000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-27 13:38:17.348071300 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1284,8 +1284,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-27 13:36:15.813119000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-27 13:38:17.352071500 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 02:13:13.000000000 -0400 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1305,8 +1305,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); 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-27 13:36:15.816119000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-27 13:38:17.356071700 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 02:13:13.000000000 -0400 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1335,8 +1335,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); 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-27 13:36:16.116137200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-27 13:38:17.364072200 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 02:13:13.000000000 -0400 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1410,8 +1410,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-27 13:36:16.136138300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-27 13:38:17.369072500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 02:13:13.000000000 -0400 @@ -126,6 +126,9 @@ } try @@ -1423,8 +1423,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-27 13:36:16.215142900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-27 13:38:17.374072800 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 02:13:13.000000000 -0400 @@ -1558,8 +1558,8 @@ } @@ -1448,8 +1448,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-27 13:36:16.224143400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-27 13:38:17.378073000 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 02:13:13.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1511,8 +1511,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-27 13:36:16.257145300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-27 13:38:17.382073200 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 02:13:13.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1538,8 +1538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-27 13:36:16.317148000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-27 13:38:17.386073400 +0200 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1557,8 +1557,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-27 13:36:16.396153200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-27 13:38:17.392073800 +0200 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 02:13:13.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1743,8 +1743,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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-27 13:36:16.491158700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-27 13:38:17.397074100 +0200 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 02:13:13.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1770,8 +1770,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-27 13:36:16.604165000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-27 13:38:17.403074400 +0200 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-30 02:13:13.000000000 -0400 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1841,8 +1841,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-27 13:36:16.691170100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-27 13:38:17.407074700 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 02:13:11.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 02:13:13.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1924,125 +1924,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } -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-27 13:36:28.235830000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-27 13:38:17.426075700 +0200 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.ArrayList; - import java.util.Random; -@@ -221,19 +222,12 @@ - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -526,6 +520,80 @@ - return blockMaterial.getMaterialMobility(); - } - -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && isACube(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - try 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-27 13:36:28.247831000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-27 13:38:17.411074900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 02:13:13.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2161,8 +2045,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-27 13:36:28.255831000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-27 13:38:17.416075200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 02:13:13.000000000 -0400 @@ -140,23 +140,23 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) { @@ -2193,8 +2077,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-27 13:36:28.279832000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-27 13:38:17.421075500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:13.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2213,9 +2097,125 @@ 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 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-30 02:13:13.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -221,19 +222,12 @@ + return blockID; + } + ++ /* FORGE: This function isn't called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -526,6 +520,80 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && isACube(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata 'md'. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * 'md' against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata 'md'. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-27 13:36:28.317835000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-27 13:38:17.430076000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:13.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2299,8 +2299,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-27 13:36:28.329835000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-27 13:38:17.434076200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 02:13:13.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2420,8 +2420,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:36:28.836864000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-27 13:38:17.439076500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:13.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2441,20 +2441,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-27 13:36:28.842864000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-27 13:38:17.444076800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 02:14:50.000000000 -0400 @@ -16,12 +16,12 @@ - public static final boolean func_27029_g(World world, int i, int j, int k) + public static final boolean isRailBlockAt(World world, int i, int j, int k) { int l = world.getBlockId(i, j, k); - return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; -+ return Block.blocksList[l] instanceof BlockRail; ++ return Block.blocksList[i] instanceof BlockRail; } - public static final boolean func_27030_c(int i) + public static final boolean isRailBlock(int i) { - return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; -+ return Block.blocksList[i] instanceof BlockRail; ++ return Block.blocksList[i] instanceof BlockRail; } protected BlockRail(int i, int j, boolean flag) @@ -2497,8 +2497,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:36:28.847865000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-27 13:38:17.448077000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:13.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2518,8 +2518,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:36:28.855865000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-27 13:38:17.452077200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2549,8 +2549,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-27 13:36:28.896868000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-27 13:38:17.457077500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:13.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2654,8 +2654,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:36:28.899868000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-27 13:38:17.461077700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:15:37.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2670,21 +2670,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl i--; } - return world.isBlockNormalCube(i, j, k); -+ return world.isBlockSolidOnSide(i, j, k,l); ++ return world.isBlockSolidOnSide(i, j, k, l); } - public static boolean func_28038_d(int i) + public static boolean isTrapdoorOpen(int i) { return (i & 4) != 0; } + + /* FORGE: Set this to allow trapdoors to remain free-floating -+ */ ++ */ + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-27 13:36:28.913869000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-27 13:38:17.465078000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2722,8 +2722,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-27 13:36:29.125881000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-27 13:38:17.470078300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:13.000000000 -0400 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2736,8 +2736,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-27 13:36:29.169883000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-27 13:40:52.299934000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -2831,8 +2831,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-27 13:36:29.247888000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-27 13:38:17.479078800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2859,26 +2859,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { -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-27 13:36:29.313892000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-27 13:38:17.492079500 +0200 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-27 13:36:29.331893000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-27 13:38:17.483079000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -2903,8 +2886,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-27 13:36:29.359894000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-27 13:38:17.487079200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 02:13:13.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2983,9 +2966,26 @@ 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 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-30 02:13:13.000000000 -0400 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 13:36:29.415897000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 13:38:17.497079800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 02:13:13.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3021,8 +3021,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:36:29.488902000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-27 13:38:17.502080100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:13.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3032,8 +3032,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-27 13:36:29.747916000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-27 13:38:17.506080300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 02:13:13.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3051,8 +3051,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-27 13:36:29.837922000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-27 13:38:17.509080500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 02:16:10.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3062,16 +3062,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl // Referenced classes of package net.minecraft.src: @@ -60,6 +61,7 @@ - field_25004_e.addStat(AchievementList.field_27101_r, 1); + thePlayer.addStat(AchievementList.buildSword, 1); } - ModLoader.TakenFromCrafting(field_25004_e, itemstack); -+ ForgeHooks.onTakenFromCrafting(field_25004_e, itemstack, craftMatrix); + ModLoader.TakenFromCrafting(thePlayer, itemstack); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); for(int i = 0; i < craftMatrix.getSizeInventory(); 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-27 13:36:29.995931000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-27 13:38:17.515080800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-30 02:13:12.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-30 02:13:13.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) From 3e09d92cd410b588d0fa891e0d135de1755313a6 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 30 Aug 2011 10:32:14 +0000 Subject: [PATCH 081/169] New lighting hook. --- forge/minecraft.patch | 334 +++++++++++++++++++++++++----------------- 1 file changed, 203 insertions(+), 131 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index f90fe17ebc..dd4e9146de 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 @@ -230,23 +230,23 @@ 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; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-30 03:44:31.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -182,7 +182,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav import java.util.ArrayList; import java.util.Random; -@@ -276,19 +277,12 @@ +@@ -149,7 +150,8 @@ + + public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k) + { +- return iblockaccess.getBrightness(i, j, k, lightValue[blockID]); ++ return iblockaccess.getBrightness(i, j, k, ++ getLightValue(iblockaccess,i,j,k)); + } + + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) +@@ -276,19 +278,12 @@ return blockID; } @@ -206,10 +216,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -600,6 +594,80 @@ +@@ -600,6 +595,86 @@ return blockMaterial.getMaterialMobility(); } ++ /* FORGE: Allow a block to set illumination on a coordinate basis. ++ */ ++ public int getLightValue(IBlockAccess iba, int i, int j, int k) { ++ return lightValue[blockID]; ++ } ++ + /* FORGE: Implement and return true if you wish this block to behave + * like a ladder when the player is inside. + */ @@ -288,8 +304,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -373,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -494,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -515,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -571,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -592,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -623,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -728,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -757,8 +773,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-30 02:13:10.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -796,8 +812,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 03:13:19.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -941,8 +957,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -955,8 +971,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -1050,8 +1066,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1087,8 +1103,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1117,8 +1133,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1143,8 +1159,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-30 03:13:19.000000000 -0400 @@ -75,6 +75,13 @@ return 1.0F; } @@ -1160,8 +1176,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 03:13:19.000000000 -0400 @@ -5,6 +5,8 @@ package net.minecraft.src; @@ -1191,8 +1207,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1227,9 +1243,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + public int damageVsEntity; protected EnumToolMaterial toolMaterial; } +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java +--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:17.000000000 -0400 +@@ -95,7 +95,7 @@ + } else + if(blockEnum == EnumSkyBlock.Block) + { +- l3 = Block.lightValue[j3]; ++ l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); + } + if(k3 >= 15 && l3 == 0) + { 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1239,8 +1267,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1284,8 +1312,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 03:13:19.000000000 -0400 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1305,8 +1333,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); 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 03:13:19.000000000 -0400 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1335,8 +1363,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); 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 03:13:19.000000000 -0400 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1410,8 +1438,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 03:13:19.000000000 -0400 @@ -126,6 +126,9 @@ } try @@ -1423,8 +1451,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 03:13:19.000000000 -0400 @@ -1558,8 +1558,8 @@ } @@ -1448,8 +1476,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 03:13:19.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1511,8 +1539,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 03:13:19.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1538,8 +1566,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1557,8 +1585,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 03:13:19.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1743,8 +1771,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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 03:13:19.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1770,8 +1798,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-30 03:13:17.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-30 04:12:35.000000000 -0400 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1785,7 +1813,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public boolean blockExists(int i, int j, int k) -@@ -1607,7 +1611,10 @@ +@@ -711,9 +715,10 @@ + if(enumskyblock == EnumSkyBlock.Block) + { + int i1 = getBlockId(i, j, k); +- if(Block.lightValue[i1] > l) ++ int bl=(i1==0)?0:Block.blocksList[i1].getLightValue(this,i,j,k); ++ if(bl > l) + { +- l = Block.lightValue[i1]; ++ l = bl; + } + } + if(getSavedLightValue(enumskyblock, i, j, k) != l) +@@ -1607,7 +1612,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -1797,7 +1838,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } -@@ -1895,13 +1902,18 @@ +@@ -1895,13 +1903,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -1823,7 +1864,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2425,6 +2437,7 @@ +@@ -2425,6 +2438,7 @@ { block = null; } @@ -1831,7 +1872,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2913,7 +2926,7 @@ +@@ -2913,7 +2927,7 @@ public int field_27172_i; public boolean editingBlocks; private long lockTimestamp; @@ -1841,8 +1882,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-30 02:13:11.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 03:13:19.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1925,8 +1966,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2045,8 +2086,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 @@ -140,23 +140,23 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) { @@ -2077,8 +2118,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2098,8 +2139,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-30 03:35:23.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2132,10 +2173,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -526,6 +520,80 @@ +@@ -526,6 +520,86 @@ return blockMaterial.getMaterialMobility(); } ++ /* FORGE: Allow a block to set illumination on a coordinate basis. ++ */ ++ public int getLightValue(IBlockAccess iba, int i, int j, int k) { ++ return lightValue[blockID]; ++ } ++ + /* FORGE: Implement and return true if you wish this block to behave + * like a ladder when the player is inside. + */ @@ -2214,8 +2261,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2299,8 +2346,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2420,8 +2467,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2441,8 +2488,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 02:14:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2497,8 +2544,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2518,8 +2565,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2549,8 +2596,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2654,8 +2701,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 02:15:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2683,8 +2730,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2722,8 +2769,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2736,8 +2783,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -2831,8 +2878,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2860,8 +2907,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -2886,8 +2933,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2967,8 +3014,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-30 03:13:19.000000000 -0400 @@ -65,6 +65,13 @@ return 1.0F; } @@ -2984,8 +3031,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3020,9 +3067,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + public int damageVsEntity; protected EnumToolMaterial toolMaterial; } +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java +--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:11.000000000 -0400 +@@ -95,7 +95,7 @@ + } else + if(field_957_a == EnumSkyBlock.Block) + { +- l3 = Block.lightValue[j3]; ++ l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); + } + if(k3 >= 15 && l3 == 0) + { 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-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3032,8 +3091,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 03:13:19.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3051,8 +3110,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 02:16:10.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3070,8 +3129,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-30 02:13:12.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-30 02:13:13.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-30 03:13:18.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-30 04:12:48.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3085,7 +3144,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public boolean blockExists(int i, int j, int k) -@@ -1408,7 +1412,10 @@ +@@ -564,9 +568,10 @@ + if(enumskyblock == EnumSkyBlock.Block) + { + int i1 = getBlockId(i, j, k); +- if(Block.lightValue[i1] > l) ++ int bl=(i1==0)?0:Block.blocksList[i1].getLightValue(this,i,j,k); ++ if(bl > l) + { +- l = Block.lightValue[i1]; ++ l = bl; + } + } + if(getSavedLightValue(enumskyblock, i, j, k) != l) +@@ -1408,7 +1413,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -3097,7 +3169,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } } -@@ -1681,13 +1688,18 @@ +@@ -1681,13 +1689,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -3123,7 +3195,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public boolean func_6156_d() -@@ -2178,6 +2190,7 @@ +@@ -2178,6 +2191,7 @@ { block = null; } @@ -3131,7 +3203,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2601,7 +2614,7 @@ +@@ -2601,7 +2615,7 @@ public int field_27080_i; public boolean editingBlocks; private long lockTimestamp; From 8ced84d8d343cff5c0dfc78d2530368131c08f38 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 1 Sep 2011 08:01:47 +0000 Subject: [PATCH 082/169] Improved trapdoor hook. --- forge/minecraft.patch | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index dd4e9146de..d2e1a6b7ed 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -745,7 +745,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc } 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:04.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -755,7 +755,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap { world.setBlockWithNotify(i, j, k, 0); dropBlockAsItem(world, i, j, k, i1); -@@ -213,11 +213,15 @@ +@@ -189,6 +189,7 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { ++ if(disableValidation) return true; + if(l == 0) + { + return false; +@@ -213,11 +214,15 @@ { i--; } @@ -2702,7 +2710,7 @@ 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/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java --- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:11.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2712,7 +2720,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { world.setBlockWithNotify(i, j, k, 0); dropBlockAsItem(world, i, j, k, i1); -@@ -196,11 +196,15 @@ +@@ -172,6 +172,7 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { ++ if(disableValidation) return true; + if(l == 0) + { + return false; +@@ -196,11 +197,15 @@ { i--; } From 71c77d9e9afe00717f002465bc5c24be40a819b9 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 3 Sep 2011 11:46:59 +0000 Subject: [PATCH 083/169] updated to latest MCP, and added custom item rendering facilities --- .../minecraft/src/forge/ForgeHooksClient.java | 14 + .../src/forge/ICustomItemRenderer.java | 7 + .../src/forge/MinecraftForgeClient.java | 13 +- forge/minecraft.patch | 1083 +++++++++-------- forge/release.bat | 2 +- 5 files changed, 617 insertions(+), 502 deletions(-) create mode 100755 forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index e0d27efe6d..84651596cc 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -149,5 +149,19 @@ public class ForgeHooksClient { .getTextureFile())); } } + + public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) { + Tessellator tessellator = Tessellator.instance; + if (renderBlocks.useInventoryTint) { + int j = 0xffffff;//block.getRenderColor(i); + float f1 = (float) (j >> 16 & 0xff) / 255F; + float f3 = (float) (j >> 8 & 0xff) / 255F; + float f5 = (float) (j & 0xff) / 255F; + GL11.glColor4f(f1 * f, f3 * f, f5 * f, 1.0F); + } + +// ModLoader.RenderInvBlock(this, block, i, k); + customRenderer.renderInventory(renderBlocks, itemID, meta); + } } diff --git a/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java b/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java new file mode 100755 index 0000000000..030678b1da --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java @@ -0,0 +1,7 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.RenderBlocks; + +public interface ICustomItemRenderer { + public void renderInventory (RenderBlocks renderblocks, int itemID, int meta); +} diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 3256dfc95d..4163783968 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -6,10 +6,9 @@ package net.minecraft.src.forge; import net.minecraft.src.Block; +import net.minecraft.src.Item; import net.minecraft.src.ModLoader; import net.minecraft.src.RenderBlocks; -import net.minecraft.src.Tessellator; -import org.lwjgl.opengl.GL11; public class MinecraftForgeClient { /** @@ -64,4 +63,14 @@ public class MinecraftForgeClient { public static int getRenderPass() { return ForgeHooksClient.renderPass; } + + private static ICustomItemRenderer [] customItemRenderers = new ICustomItemRenderer [Item.itemsList.length]; + + public static void registerCustomItemRenderer (int itemID, ICustomItemRenderer renderer) { + customItemRenderers [itemID] = renderer; + } + + public static ICustomItemRenderer getCustomItemRenderer (int itemID) { + return customItemRenderers [itemID]; + } } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index d2e1a6b7ed..2414210872 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,179 +1,6 @@ -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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 -@@ -230,23 +230,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - return true; - } -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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 -@@ -178,7 +178,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -241,7 +241,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-30 03:44:31.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-03 12:18:32.126541000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-03 12:19:32.548997700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -303,9 +130,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try +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-03 12:18:32.143542000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.537997100 +0200 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +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-03 12:18:32.156543000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.540997200 +0200 +@@ -230,23 +230,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } +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-03 12:18:32.191545000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.544997500 +0200 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -241,7 +241,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-03 12:18:32.257549000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.552997900 +0200 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -389,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-03 12:18:32.271549000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.555998100 +0200 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -510,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:18:32.332553000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.560998400 +0200 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -531,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-03 12:18:32.340553000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.563998500 +0200 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -587,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:18:32.351554000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.566998700 +0200 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -608,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:18:32.364555000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.570998900 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -639,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-03 12:18:32.433559000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.574999200 +0200 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -744,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:04.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:18:32.437559000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.577999300 +0200 @@ -147,7 +147,7 @@ { j1--; @@ -781,8 +781,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-03 12:18:32.476561000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.581999600 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -820,8 +820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-03 12:18:32.624570200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-03 12:19:32.586999900 +0200 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -965,8 +965,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-03 12:18:32.813580000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.590000000 +0200 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -979,8 +979,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-03 12:18:32.888585000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.594000300 +0200 @@ -6,6 +6,10 @@ import java.util.*; @@ -1074,8 +1074,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-03 12:18:32.948588700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-03 12:19:32.599000600 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1111,8 +1111,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-03 12:18:33.076596000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.602000700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1140,9 +1140,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { +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-03 12:18:33.419615000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-03 12:19:32.609001100 +0200 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-03 12:18:33.448617000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.605000900 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1166,37 +1183,32 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-30 03:13:19.000000000 -0400 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 03:13:19.000000000 -0400 -@@ -5,6 +5,8 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-03 12:18:33.541622700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-03 13:41:51.273476600 +0200 +@@ -5,6 +5,10 @@ package net.minecraft.src; import net.minecraft.client.Minecraft; +import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -34,15 +36,18 @@ - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) +@@ -31,18 +35,27 @@ + public void renderItem(EntityLiving entityliving, ItemStack itemstack) + { + GL11.glPushMatrix(); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); @@ -1215,8 +1227,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-03 12:18:33.588625000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.617001600 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1252,8 +1264,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:17.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:18:33.857640000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.621001800 +0200 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -1264,8 +1276,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataC if(k3 >= 15 && l3 == 0) { 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:18:34.108655000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.624002000 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1275,8 +1287,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-03 12:18:34.468675000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-03 12:19:32.628002200 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1320,8 +1332,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-03 12:18:34.473675000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-03 12:19:32.631002400 +0200 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1341,8 +1353,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); 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-03 12:18:34.478676000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-03 12:19:32.635002600 +0200 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1371,8 +1383,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); 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-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-03 12:18:34.797694500 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-03 12:19:32.641003000 +0200 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1446,8 +1458,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-03 12:18:34.822695900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-03 12:19:32.646003200 +0200 @@ -126,6 +126,9 @@ } try @@ -1459,8 +1471,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-03 12:18:34.911701000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-03 12:19:32.651003500 +0200 @@ -1558,8 +1558,8 @@ } @@ -1484,19 +1496,51 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 03:13:19.000000000 -0400 -@@ -5,6 +5,9 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-03 12:18:34.923701700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-03 13:45:05.006557500 +0200 +@@ -5,6 +5,11 @@ package net.minecraft.src; import java.util.Random; + +import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -51,6 +54,7 @@ +@@ -47,10 +52,36 @@ + } + GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); + GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); ++ loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(itemstack.getItem()); ++ float f4 = 0.25F; ++ f4 = 0.5F; ++ GL11.glScalef(f4, f4, f4); ++ for(int j = 0; j < byte0; j++) ++ { ++ GL11.glPushMatrix(); ++ if(j > 0) ++ { ++ float f5 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f7 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f9 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ GL11.glTranslatef(f5, f7, f9); ++ } ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, ++ itemstack.itemID, itemstack.getItemDamage(), ++ entityitem.getEntityBrightness(f1)); ++ GL11.glPopMatrix(); ++ } ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); loadTexture("/terrain.png"); @@ -1504,7 +1548,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f4 = 0.25F; if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16) { -@@ -78,10 +82,12 @@ +@@ -78,10 +109,12 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -1518,7 +1562,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Tessellator tessellator = Tessellator.instance; float f6 = (float)((i % 16) * 16 + 0) / 256F; float f8 = (float)((i % 16) * 16 + 16) / 256F; -@@ -92,6 +98,7 @@ +@@ -92,6 +125,7 @@ float f14 = 0.25F; if(field_27004_a) { @@ -1526,7 +1570,38 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage()); float f15 = (float)(k >> 16 & 0xff) / 255F; float f17 = (float)(k >> 8 & 0xff) / 255F; -@@ -131,6 +138,7 @@ +@@ -127,10 +161,37 @@ + + public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) + { +- if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i); ++ if (customRenderer != null) { ++ int j1 = i; ++ renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ Item item = Item.itemsList[i]; ++ ForgeHooksClient.overrideTexture (Item.itemsList [i]); ++ GL11.glPushMatrix(); ++ GL11.glTranslatef(l - 2, i1 + 3, -3F); ++ GL11.glScalef(10F, 10F, 10F); ++ GL11.glTranslatef(1.0F, 0.5F, 1.0F); ++ GL11.glScalef(1.0F, 1.0F, -1F); ++ GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F); ++ GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); ++ int l1 = Item.itemsList[i].getColorFromDamage(j); ++ float f2 = (float)(l1 >> 16 & 0xff) / 255F; ++ float f4 = (float)(l1 >> 8 & 0xff) / 255F; ++ float f5 = (float)(l1 & 0xff) / 255F; ++ if(field_27004_a) ++ { ++ GL11.glColor4f(f2, f4, f5, 1.0F); ++ } ++ GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); ++ renderBlocks.useInventoryTint = field_27004_a; ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, i, j, 1.0F); ++ renderBlocks.useInventoryTint = true; ++ GL11.glPopMatrix(); ++ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) { int j1 = i; renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1534,7 +1609,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -159,9 +167,11 @@ +@@ -152,16 +213,17 @@ + renderBlocks.renderBlockOnInventory(block, j, 1.0F); + renderBlocks.useInventoryTint = true; + GL11.glPopMatrix(); +- } else +- if(k >= 0) ++ } else if(k >= 0) + { + GL11.glDisable(2896 /*GL_LIGHTING*/); if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1547,8 +1630,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-03 12:18:34.964704100 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-03 12:19:32.658003900 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1574,8 +1657,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-03 12:18:35.048708000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.662004200 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1593,8 +1676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-03 12:18:35.156715000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-03 12:19:32.666004400 +0200 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1779,8 +1862,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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-03 12:18:35.289722600 +0200 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-03 12:19:32.669004600 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1806,8 +1889,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-30 04:12:35.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-03 12:18:35.412729000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-03 12:19:32.675004900 +0200 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1890,8 +1973,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-03 12:18:35.529736400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-03 12:19:32.679005100 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1973,182 +2056,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } -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-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.000000000 -0400 -@@ -140,23 +140,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.000000000 -0400 -@@ -167,7 +167,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -230,7 +230,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-30 03:35:23.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-03 12:18:49.774551000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-03 12:19:32.695006000 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2268,9 +2178,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl static Class _mthclass$(String s) { try +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-03 12:18:49.789551000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.683005400 +0200 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-03 12:18:49.800552000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.687005600 +0200 +@@ -140,23 +140,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-03 12:18:49.831554000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.690005800 +0200 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -230,7 +230,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-03 12:18:49.880557000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.699006300 +0200 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2354,8 +2437,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-03 12:18:49.891557000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.703006500 +0200 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2475,8 +2558,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:18:49.942560000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.706006700 +0200 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2496,8 +2579,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-03 12:18:49.950561000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.710006900 +0200 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2552,8 +2635,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:18:49.958561000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.713007100 +0200 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2573,8 +2656,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:18:49.967562000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.717007300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2604,8 +2687,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-03 12:18:50.020565000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.721007500 +0200 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2709,8 +2792,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:11.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:18:50.024565000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.725007800 +0200 @@ -130,7 +130,7 @@ { j1--; @@ -2746,8 +2829,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-03 12:18:50.043566000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.729008000 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2785,8 +2868,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-03 12:18:50.299581000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.734008300 +0200 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2799,8 +2882,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-03 12:18:50.351584000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.738008500 +0200 @@ -6,6 +6,10 @@ import java.util.*; @@ -2894,8 +2977,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-03 12:18:50.455590000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.742008700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2922,9 +3005,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { +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-03 12:18:50.545595000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-03 12:19:32.761009800 +0200 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-03 12:18:50.570596000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.750009200 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -2949,8 +3049,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-03 12:18:50.609598000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-03 12:19:32.756009500 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3029,26 +3129,9 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-30 03:13:19.000000000 -0400 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-03 12:18:50.690603000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.765010000 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3084,20 +3167,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:11.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:18:50.764607000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.769010300 +0200 @@ -95,7 +95,7 @@ } else - if(field_957_a == EnumSkyBlock.Block) + if(blockEnum == EnumSkyBlock.Block) { - l3 = Block.lightValue[j3]; + l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); } if(k3 >= 15 && l3 == 0) { +Seulement dans ../src_work/minecraft_server/net/minecraft/src: MetadataChunk~ 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-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:18:50.790609000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.775010600 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3107,8 +3191,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-03 12:18:51.186631000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-03 12:19:32.778010800 +0200 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3126,8 +3210,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-03 12:18:51.308638000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.782011000 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3145,8 +3229,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-30 04:12:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-03 12:18:51.499649000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-03 12:19:32.788011400 +0200 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3210,7 +3294,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + return block.isBlockSolidOnSide(this,i,j,k,side); } - public boolean func_6156_d() + public boolean updatingLighting() @@ -2178,6 +2191,7 @@ { block = null; @@ -3228,3 +3312,4 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; +Seulement dans ../src_work/minecraft_server/net/minecraft/src: World.java~ diff --git a/forge/release.bat b/forge/release.bat index 99f6233321..21ccc13758 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.6-beta2 +sh package.sh 1.0.6 pause From 8b5440b3518f06ca6b5f14a796ff574a6a4a0a29 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 7 Sep 2011 14:58:08 +0000 Subject: [PATCH 084/169] Optifine compatibility patch. --- .../minecraft/src/forge/ForgeHooksClient.java | 16 +- forge/minecraft.patch | 984 +++++++++--------- 2 files changed, 498 insertions(+), 502 deletions(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 84651596cc..7cfe0b9d35 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -46,6 +46,7 @@ public class ForgeHooksClient { static boolean inWorld=false; static HashSet renderTextureTest=new HashSet(); static ArrayList renderTextureList=new ArrayList(); + static Tessellator defaultTessellator=null; protected static void bindTessellator(int tex, int sub) { List key=Arrays.asList(tex,sub); @@ -60,9 +61,9 @@ public class ForgeHooksClient { renderTextureTest.add(key); renderTextureList.add(key); t.startDrawingQuads(); - t.setTranslationD(Tessellator.firstInstance.xOffset, - Tessellator.firstInstance.yOffset, - Tessellator.firstInstance.zOffset); + t.setTranslationD(defaultTessellator.xOffset, + defaultTessellator.yOffset, + defaultTessellator.zOffset); } Tessellator.instance=t; } @@ -77,7 +78,6 @@ public class ForgeHooksClient { n=(Integer)textures.get(name); } if(!inWorld) { - Tessellator.instance=Tessellator.firstInstance; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n); return; } @@ -85,8 +85,9 @@ public class ForgeHooksClient { } protected static void unbindTexture() { - Tessellator.instance=Tessellator.firstInstance; - if(!inWorld) { + if(inWorld) { + Tessellator.instance=defaultTessellator; + } else { GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); @@ -97,7 +98,7 @@ public class ForgeHooksClient { static int renderPass=-1; public static void beforeRenderPass(int pass) { renderPass=pass; - Tessellator.instance=Tessellator.firstInstance; + defaultTessellator=Tessellator.instance; Tessellator.renderingWorldRenderer=true; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine @@ -120,7 +121,6 @@ public class ForgeHooksClient { GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); - Tessellator.instance=Tessellator.firstInstance; Tessellator.renderingWorldRenderer=false; } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2414210872..1c8dcc0eb7 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,179 @@ +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-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +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-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 +@@ -230,23 +230,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } +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-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -241,7 +241,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-03 12:18:32.126541000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-03 12:19:32.548997700 +0200 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -130,182 +303,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try -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-03 12:18:32.143542000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.537997100 +0200 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-03 12:18:32.156543000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.540997200 +0200 -@@ -230,23 +230,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - return true; - } -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-03 12:18:32.191545000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.544997500 +0200 -@@ -178,7 +178,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -241,7 +241,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-03 12:18:32.257549000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.552997900 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -389,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-03 12:18:32.271549000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.555998100 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -510,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-03 12:18:32.332553000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.560998400 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -531,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-03 12:18:32.340553000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.563998500 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -587,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-03 12:18:32.351554000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.566998700 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -608,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-03 12:18:32.364555000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.570998900 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -639,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-03 12:18:32.433559000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.574999200 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -744,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-03 12:18:32.437559000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.577999300 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -781,8 +781,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-03 12:18:32.476561000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.581999600 +0200 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -820,8 +820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-03 12:18:32.624570200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-03 12:19:32.586999900 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:34.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -965,8 +965,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-03 12:18:32.813580000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.590000000 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -979,8 +979,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-03 12:18:32.888585000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.594000300 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -1074,8 +1074,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-03 12:18:32.948588700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-03 12:19:32.599000600 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1111,8 +1111,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-03 12:18:33.076596000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.602000700 +0200 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1140,26 +1140,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { -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-03 12:18:33.419615000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-03 12:19:32.609001100 +0200 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-03 12:18:33.448617000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.605000900 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1183,9 +1166,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-03 12:18:33.541622700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-03 13:41:51.273476600 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 10:43:34.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1227,8 +1227,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-03 12:18:33.588625000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.617001600 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1264,8 +1264,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:18:33.857640000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.621001800 +0200 +--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -1276,8 +1276,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataC if(k3 >= 15 && l3 == 0) { 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-03 12:18:34.108655000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.624002000 +0200 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1287,8 +1287,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-03 12:18:34.468675000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-03 12:19:32.628002200 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1332,8 +1332,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-03 12:18:34.473675000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-03 12:19:32.631002400 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:34.000000000 -0400 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1353,8 +1353,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); 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-03 12:18:34.478676000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-03 12:19:32.635002600 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 10:43:34.000000000 -0400 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1383,8 +1383,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); 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-03 12:18:34.797694500 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-03 12:19:32.641003000 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 10:43:34.000000000 -0400 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1458,8 +1458,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-03 12:18:34.822695900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-03 12:19:32.646003200 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:34.000000000 -0400 @@ -126,6 +126,9 @@ } try @@ -1471,8 +1471,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-03 12:18:34.911701000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-03 12:19:32.651003500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:34.000000000 -0400 @@ -1558,8 +1558,8 @@ } @@ -1496,8 +1496,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-03 12:18:34.923701700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-03 13:45:05.006557500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:34.000000000 -0400 @@ -5,6 +5,11 @@ package net.minecraft.src; @@ -1630,8 +1630,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-03 12:18:34.964704100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-03 12:19:32.658003900 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 10:43:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1657,8 +1657,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-03 12:18:35.048708000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.662004200 +0200 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1676,8 +1676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-03 12:18:35.156715000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-03 12:19:32.666004400 +0200 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:57:28.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1809,7 +1809,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -350,16 +353,43 @@ +@@ -350,16 +353,41 @@ private int addedVertices; private boolean isColorDisabled; private int drawMode; @@ -1839,12 +1839,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + private static IntBuffer intBuffer; + private static FloatBuffer floatBuffer; + public static Tessellator instance; -+ public static Tessellator firstInstance; + + static { + instance=new Tessellator(); -+ firstInstance=instance; -+ firstInstance.defaultTexture=true; ++ instance.defaultTexture=true; + + nativeBufferSize = 0x200000; + trivertsInBuffer = (nativeBufferSize/48)*6; @@ -1862,8 +1860,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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-03 12:18:35.289722600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-03 12:19:32.669004600 +0200 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1889,8 +1887,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-03 12:18:35.412729000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-03 12:19:32.675004900 +0200 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1973,8 +1971,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-03 12:18:35.529736400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-03 12:19:32.679005100 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 10:43:34.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -2056,9 +2054,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } +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-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 +@@ -140,23 +140,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -230,7 +230,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-03 12:18:49.774551000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-03 12:19:32.695006000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2178,182 +2349,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl static Class _mthclass$(String s) { try -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-03 12:18:49.789551000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.683005400 +0200 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-03 12:18:49.800552000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.687005600 +0200 -@@ -140,23 +140,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-03 12:18:49.831554000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.690005800 +0200 -@@ -167,7 +167,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -230,7 +230,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-03 12:18:49.880557000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.699006300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2437,8 +2435,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-03 12:18:49.891557000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.703006500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2558,8 +2556,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:18:49.942560000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.706006700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2579,8 +2577,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-03 12:18:49.950561000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.710006900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2635,8 +2633,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:18:49.958561000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.713007100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2656,8 +2654,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:18:49.967562000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.717007300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2687,8 +2685,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-03 12:18:50.020565000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.721007500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2792,8 +2790,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:18:50.024565000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.725007800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2829,8 +2827,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-03 12:18:50.043566000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.729008000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2868,8 +2866,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-03 12:18:50.299581000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.734008300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2882,8 +2880,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-03 12:18:50.351584000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.738008500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -2977,8 +2975,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-03 12:18:50.455590000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.742008700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3005,26 +3003,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { -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-03 12:18:50.545595000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-03 12:19:32.761009800 +0200 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-03 12:18:50.570596000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.750009200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3049,8 +3030,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-03 12:18:50.609598000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-03 12:19:32.756009500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3129,9 +3110,26 @@ 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 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-03 12:18:50.690603000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.765010000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3167,8 +3165,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:18:50.764607000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.769010300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -3178,10 +3176,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Me } if(k3 >= 15 && l3 == 0) { -Seulement dans ../src_work/minecraft_server/net/minecraft/src: MetadataChunk~ 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-03 12:18:50.790609000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.775010600 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3191,8 +3188,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-03 12:18:51.186631000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-03 12:19:32.778010800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3210,8 +3207,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-03 12:18:51.308638000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.782011000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3229,8 +3226,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-03 12:18:51.499649000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-03 12:19:32.788011400 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3312,4 +3309,3 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; -Seulement dans ../src_work/minecraft_server/net/minecraft/src: World.java~ From 878cac26971791805a055bc0f0d64824fc2a4320 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 7 Sep 2011 15:14:01 +0000 Subject: [PATCH 085/169] A few small patches to fix obscure piston rendering bugs. --- .../src/net/minecraft/src/forge/ForgeHooksClient.java | 10 ++++++++++ forge/minecraft.patch | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 7cfe0b9d35..af3871964c 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -78,6 +78,11 @@ public class ForgeHooksClient { n=(Integer)textures.get(name); } if(!inWorld) { + if(Tessellator.instance.isDrawing) { + int mode=Tessellator.instance.drawMode; + Tessellator.instance.draw(); + Tessellator.instance.startDrawing(mode); + } GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n); return; } @@ -88,6 +93,11 @@ public class ForgeHooksClient { if(inWorld) { Tessellator.instance=defaultTessellator; } else { + if(Tessellator.instance.isDrawing) { + int mode=Tessellator.instance.drawMode; + Tessellator.instance.draw(); + Tessellator.instance.startDrawing(mode); + } GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 1c8dcc0eb7..34cbd93cae 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1677,7 +1677,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft 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 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:57:28.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 11:12:23.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1809,21 +1809,24 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -350,16 +353,41 @@ +@@ -349,17 +352,42 @@ + private int rawBufferIndex; private int addedVertices; private boolean isColorDisabled; - private int drawMode; +- private int drawMode; - private double xOffset; - private double yOffset; - private double zOffset; ++ public int drawMode; + public double xOffset; + public double yOffset; + public double zOffset; private int normal; - public static final Tessellator instance = new Tessellator(0x200000); - private boolean isDrawing; +- private boolean isDrawing; - private boolean useVBO; - private IntBuffer vertexBuffers; ++ public boolean isDrawing; private int vboIndex; - private int vboCount; - private int bufferSize; From 5c74f5efb9c849d26bf2716d7528c55c1a40f8e7 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Wed, 7 Sep 2011 19:57:53 +0000 Subject: [PATCH 086/169] fixed SMP bug related to BuildCraft issue #226 --- forge/forge_client/.classpath | 2 +- forge/minecraft.patch | 1009 +++++++++++++++++---------------- forge/release.bat | 2 +- 3 files changed, 520 insertions(+), 493 deletions(-) diff --git a/forge/forge_client/.classpath b/forge/forge_client/.classpath index fae6017a3b..34ef34d1b6 100755 --- a/forge/forge_client/.classpath +++ b/forge/forge_client/.classpath @@ -7,6 +7,6 @@ - + diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 34cbd93cae..6cdb963b4f 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,179 +1,6 @@ -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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 -@@ -230,23 +230,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - return true; - } -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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 -@@ -178,7 +178,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -241,7 +241,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-07 21:52:10.331793000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 21:53:05.657957800 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -303,9 +130,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try +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-07 21:52:10.345794000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.647957200 +0200 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +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-07 21:52:10.356794000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.650957400 +0200 +@@ -230,23 +230,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } +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-07 21:52:10.383796000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.653957600 +0200 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -241,7 +241,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 21:52:10.429798000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.660958000 +0200 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -389,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 21:52:10.439799000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.663958100 +0200 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -510,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:52:10.485802000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.666958300 +0200 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -531,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 21:52:10.492802000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.669958500 +0200 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -587,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:52:10.498802000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.672958700 +0200 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -608,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:52:10.508803000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.675958800 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -639,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 21:52:10.556806000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.678959000 +0200 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -744,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:52:10.559806000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.681959200 +0200 @@ -147,7 +147,7 @@ { j1--; @@ -781,8 +781,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:52:10.593808000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.684959300 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -820,8 +820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 21:52:10.730816200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 21:53:05.688959600 +0200 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -965,8 +965,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:52:10.892825000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.691959700 +0200 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -979,8 +979,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:10.951828000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.701960300 +0200 @@ -6,6 +6,10 @@ import java.util.*; @@ -1074,8 +1074,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:52:11.003831800 +0200 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:53:05.704960500 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1111,8 +1111,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-07 21:52:11.106837000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.707960700 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1140,9 +1140,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { +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-07 21:52:11.394854000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 21:53:05.713961000 +0200 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 21:52:11.418855000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.710960800 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1166,26 +1183,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 21:52:11.494859900 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 21:53:05.716961200 +0200 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1227,8 +1227,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:52:11.528861000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.719961400 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1264,8 +1264,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:11.738873000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.722961500 +0200 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -1276,8 +1276,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataC if(k3 >= 15 && l3 == 0) { 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:52:11.858880000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.725961700 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1287,8 +1287,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:52:12.966944000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:53:05.728961900 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1332,8 +1332,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:52:12.970944000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:53:05.731962000 +0200 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1353,8 +1353,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); 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 21:52:12.974944000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 21:53:05.733962200 +0200 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1383,8 +1383,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); 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-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 21:52:13.275961700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 21:53:05.739962500 +0200 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1458,8 +1458,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:52:13.298963000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:53:05.743962700 +0200 @@ -126,6 +126,9 @@ } try @@ -1471,8 +1471,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:52:13.380967700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:53:05.747963000 +0200 @@ -1558,8 +1558,8 @@ } @@ -1496,8 +1496,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:52:13.389968200 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:53:05.750963100 +0200 @@ -5,6 +5,11 @@ package net.minecraft.src; @@ -1630,8 +1630,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 21:52:13.427970400 +0200 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 21:53:05.753963300 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1657,8 +1657,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:13.498974000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.756963500 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1676,8 +1676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 11:12:23.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:52:13.588979600 +0200 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:53:05.760963700 +0200 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1863,8 +1863,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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:52:13.700986000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:53:05.763963900 +0200 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1890,8 +1890,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 21:52:13.815992000 +0200 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 21:54:44.038584900 +0200 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1930,7 +1930,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } -@@ -1895,13 +1903,18 @@ +@@ -1847,7 +1855,25 @@ + tileentity.xCoord = i; + tileentity.yCoord = j; + tileentity.zCoord = k; +- addedTileEntityList.add(tileentity); ++ ++ // FORGE: This loop fixes a problem where, when scanning, the ++ // same entity is added several times, making the client lag ++ // crazyly when tile are requested during the scanning ++ // process. ++ boolean found = false; ++ ++ for (Object o : addedTileEntityList) { ++ TileEntity e = (TileEntity) o; ++ ++ if (e.xCoord == i && e.yCoord == j && e.zCoord == k) { ++ found = true; ++ break; ++ } ++ } ++ ++ if (!found) { ++ addedTileEntityList.add(tileentity); ++ } + } else + { + loadedTileEntityList.add(tileentity); +@@ -1895,13 +1921,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -1956,7 +1983,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2425,6 +2438,7 @@ +@@ -2425,6 +2456,7 @@ { block = null; } @@ -1964,7 +1991,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2913,7 +2927,7 @@ +@@ -2913,7 +2945,7 @@ public int field_27172_i; public boolean editingBlocks; private long lockTimestamp; @@ -1974,8 +2001,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 21:52:13.915998300 +0200 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 21:53:05.771964300 +0200 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -2057,182 +2084,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } -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-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400 -@@ -140,23 +140,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400 -@@ -167,7 +167,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -230,7 +230,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-07 21:52:24.970630000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 21:53:05.784965100 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2352,9 +2206,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl static Class _mthclass$(String s) { try +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-07 21:52:24.984631000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.774964500 +0200 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:52:24.994632000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.777964700 +0200 +@@ -140,23 +140,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:52:25.022633000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.780964800 +0200 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -230,7 +230,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 21:52:25.067636000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.787965200 +0200 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2438,8 +2465,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:52:25.077636000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.790965400 +0200 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2559,8 +2586,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:52:25.121639000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.793965600 +0200 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2580,8 +2607,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:52:25.128639000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.796965800 +0200 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2636,8 +2663,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:52:25.134639000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.799965900 +0200 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2657,8 +2684,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:52:25.143640000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.802966100 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2688,8 +2715,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:52:25.191643000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.805966300 +0200 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2793,8 +2820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:52:25.194643000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.808966400 +0200 @@ -130,7 +130,7 @@ { j1--; @@ -2830,8 +2857,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:52:25.210644000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.811966600 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2869,8 +2896,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 21:52:25.444657000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.814966800 +0200 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2883,8 +2910,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:25.489660000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.818967000 +0200 @@ -6,6 +6,10 @@ import java.util.*; @@ -2978,8 +3005,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:52:25.578665000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.820967100 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3006,9 +3033,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { +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-07 21:52:25.654669000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 21:53:05.830967700 +0200 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 21:52:25.675670000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.823967300 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3033,8 +3077,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:52:25.706672000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:53:05.827967500 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3113,26 +3157,9 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:52:25.772676000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.832967800 +0200 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3168,8 +3195,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:25.835680000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.835968000 +0200 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -3180,8 +3207,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Me if(k3 >= 15 && l3 == 0) { 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-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:52:25.857681000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.838968200 +0200 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3191,8 +3218,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:52:26.166698000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:53:05.840968300 +0200 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3210,8 +3237,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:26.268704000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.843968400 +0200 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3229,8 +3256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:52:26.443714000 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:53:05.847968700 +0200 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/release.bat b/forge/release.bat index 21ccc13758..8f7c89964e 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.6 +sh package.sh 1.0.7 pause From 4f4a75d8659098491b57d4e4595dd58ec92c4333 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 8 Sep 2011 21:33:03 +0000 Subject: [PATCH 087/169] Redesigned TileEntity handling. --- forge/minecraft.patch | 1395 ++++++++++++++++++++++++++--------------- 1 file changed, 873 insertions(+), 522 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 6cdb963b4f..38f2302cfa 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,6 +1,179 @@ +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-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-08 13:52:48.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +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-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-08 13:52:48.000000000 -0400 +@@ -230,23 +230,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } +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-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:48.000000000 -0400 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -241,7 +241,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-07 21:52:10.331793000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 21:53:05.657957800 +0200 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -130,182 +303,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try -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-07 21:52:10.345794000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.647957200 +0200 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-07 21:52:10.356794000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.650957400 +0200 -@@ -230,23 +230,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - return true; - } -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-07 21:52:10.383796000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.653957600 +0200 -@@ -178,7 +178,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -241,7 +241,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-07 21:52:10.429798000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.660958000 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:48.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -389,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-07 21:52:10.439799000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.663958100 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-08 13:52:48.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -510,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-07 21:52:10.485802000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.666958300 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:48.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -531,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-07 21:52:10.492802000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.669958500 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-08 13:52:48.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -587,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-07 21:52:10.498802000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.672958700 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:48.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -608,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-07 21:52:10.508803000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.675958800 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -639,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-07 21:52:10.556806000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.678959000 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:48.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -744,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-07 21:52:10.559806000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.681959200 +0200 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:48.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -781,8 +781,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:52:10.593808000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.684959300 +0200 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-08 16:31:16.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -819,9 +819,55 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { +@@ -438,7 +453,7 @@ + { + return null; + } +- BlockContainer blockcontainer = (BlockContainer)Block.blocksList[l]; ++ Block blockcontainer = Block.blocksList[l]; + blockcontainer.onBlockAdded(worldObj, xPosition * 16 + i, j, zPosition * 16 + k); + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + } +@@ -460,7 +475,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -471,7 +486,7 @@ + tileentity.xCoord = xPosition * 16 + i; + tileentity.yCoord = j; + tileentity.zCoord = zPosition * 16 + k; +- if(getBlockID(i, j, k) == 0 || !(Block.blocksList[getBlockID(i, j, k)] instanceof BlockContainer)) ++ if(getBlockID(i, j, k) == 0 || !Block.isBlockContainer[getBlockID(i, j, k)]) + { + System.out.println("Attempted to place a tile entity where there was no entity tile!"); + return; +@@ -496,6 +511,18 @@ + } + } + ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) ++ { ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); ++ } ++ } ++ + public void onChunkLoad() + { + isChunkLoaded = true; 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-07 21:52:10.730816200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 21:53:05.688959600 +0200 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-08 13:52:48.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -965,8 +1011,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:52:10.892825000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.691959700 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:48.000000000 -0400 @@ -555,7 +555,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -979,8 +1025,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:10.951828000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.701960300 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:48.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -1074,8 +1120,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:52:11.003831800 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:53:05.704960500 +0200 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1111,8 +1157,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-07 21:52:11.106837000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.707960700 +0200 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1140,26 +1186,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } if(f1 > 0.0F) { -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-07 21:52:11.394854000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 21:53:05.713961000 +0200 -@@ -75,6 +75,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-07 21:52:11.418855000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.710960800 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:48.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1183,9 +1212,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-08 13:52:48.000000000 -0400 +@@ -75,6 +75,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; 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-07 21:52:11.494859900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 21:53:05.716961200 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-08 13:52:48.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1227,8 +1273,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:52:11.528861000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.719961400 +0200 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-08 13:52:48.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1264,8 +1310,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:11.738873000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.722961500 +0200 +--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:48.000000000 -0400 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -1276,8 +1322,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataC if(k3 >= 15 && l3 == 0) { 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-07 21:52:11.858880000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.725961700 +0200 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:48.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1287,8 +1333,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:52:12.966944000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:53:05.728961900 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1332,8 +1378,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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:52:12.970944000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:53:05.731962000 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-08 13:52:48.000000000 -0400 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1353,8 +1399,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); 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-07 21:52:12.974944000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 21:53:05.733962200 +0200 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-08 13:52:48.000000000 -0400 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1383,8 +1429,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); 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-07 21:52:13.275961700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 21:53:05.739962500 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-08 13:52:48.000000000 -0400 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1458,8 +1504,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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:52:13.298963000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:53:05.743962700 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-08 13:52:48.000000000 -0400 @@ -126,6 +126,9 @@ } try @@ -1471,8 +1517,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:52:13.380967700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:53:05.747963000 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-08 13:52:48.000000000 -0400 @@ -1558,8 +1558,8 @@ } @@ -1496,8 +1542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:52:13.389968200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:53:05.750963100 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-08 13:52:48.000000000 -0400 @@ -5,6 +5,11 @@ package net.minecraft.src; @@ -1630,8 +1676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-07 21:52:13.427970400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 21:53:05.753963300 +0200 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-08 13:52:48.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1657,8 +1703,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:13.498974000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.756963500 +0200 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1676,8 +1722,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:52:13.588979600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:53:05.760963700 +0200 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-08 13:52:48.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1862,9 +1908,26 @@ 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/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-08 15:23:42.000000000 -0400 +@@ -60,6 +60,13 @@ + { + } + ++ /* FORGE: Return false if this TileEntity does not require updateEntity() ++ * calls. ++ */ ++ public boolean canUpdate() { ++ return true; ++ } ++ + public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) + { + 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:52:13.700986000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:53:05.763963900 +0200 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-08 13:52:48.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1890,8 +1953,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 21:52:13.815992000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 21:54:44.038584900 +0200 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-08 13:52:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-08 16:26:17.000000000 -0400 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1918,7 +1981,59 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } if(getSavedLightValue(enumskyblock, i, j, k) != l) -@@ -1607,7 +1612,10 @@ +@@ -1408,7 +1413,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } while(true); +@@ -1429,12 +1434,13 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); ++ } else { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); + } + } while(true); + addedTileEntityList.clear(); +@@ -1443,13 +1449,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- addedTileEntityList.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1607,7 +1619,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -1930,34 +2045,65 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } -@@ -1847,7 +1855,25 @@ - tileentity.xCoord = i; - tileentity.yCoord = j; - tileentity.zCoord = k; +@@ -1840,44 +1855,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(!tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; - addedTileEntityList.add(tileentity); -+ -+ // FORGE: This loop fixes a problem where, when scanning, the -+ // same entity is added several times, making the client lag -+ // crazyly when tile are requested during the scanning -+ // process. -+ boolean found = false; -+ -+ for (Object o : addedTileEntityList) { -+ TileEntity e = (TileEntity) o; -+ -+ if (e.xCoord == i && e.yCoord == j && e.zCoord == k) { -+ found = true; -+ break; -+ } -+ } -+ -+ if (!found) { -+ addedTileEntityList.add(tileentity); -+ } - } else - { - loadedTileEntityList.add(tileentity); -@@ -1895,13 +1921,18 @@ +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public boolean isBlockOpaqueCube(int i, int j, int k) +@@ -1895,13 +1889,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -1983,7 +2129,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2425,6 +2456,7 @@ +@@ -2425,6 +2424,7 @@ { block = null; } @@ -1991,7 +2137,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2913,7 +2945,7 @@ +@@ -2913,7 +2913,7 @@ public int field_27172_i; public boolean editingBlocks; private long lockTimestamp; @@ -2001,8 +2147,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-07 21:52:13.915998300 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 21:53:05.771964300 +0200 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-08 13:52:48.000000000 -0400 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -2084,9 +2230,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - tessellator = Tessellator.instance; - } } +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-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-08 13:52:48.000000000 -0400 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-08 13:52:48.000000000 -0400 +@@ -140,23 +140,23 @@ + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:48.000000000 -0400 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -230,7 +230,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + 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-07 21:52:24.970630000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 21:53:05.784965100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2206,182 +2525,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl static Class _mthclass$(String s) { try -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-07 21:52:24.984631000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.774964500 +0200 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:52:24.994632000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.777964700 +0200 -@@ -140,23 +140,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:52:25.022633000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.780964800 +0200 -@@ -167,7 +167,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -230,7 +230,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - 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-07 21:52:25.067636000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.787965200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:48.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2465,8 +2611,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:52:25.077636000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.790965400 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-08 13:52:48.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2586,8 +2732,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:52:25.121639000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.793965600 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:48.000000000 -0400 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2607,8 +2753,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:52:25.128639000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.796965800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-08 13:52:48.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2663,8 +2809,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:52:25.134639000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.799965900 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:48.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2684,8 +2830,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:52:25.143640000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.802966100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2715,8 +2861,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:52:25.191643000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.805966300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:48.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2820,8 +2966,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:52:25.194643000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.808966400 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:48.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -2857,8 +3003,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:52:25.210644000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.811966600 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-08 16:31:36.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2895,9 +3041,55 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { +@@ -416,7 +431,7 @@ + { + return null; + } +- BlockContainer blockcontainer = (BlockContainer)Block.blocksList[l]; ++ Block blockcontainer = Block.blocksList[l]; + blockcontainer.onBlockAdded(worldObj, xPosition * 16 + i, j, zPosition * 16 + k); + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + } +@@ -438,7 +453,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -449,7 +464,7 @@ + tileentity.xCoord = xPosition * 16 + i; + tileentity.yCoord = j; + tileentity.zCoord = zPosition * 16 + k; +- if(getBlockID(i, j, k) == 0 || !(Block.blocksList[getBlockID(i, j, k)] instanceof BlockContainer)) ++ if(getBlockID(i, j, k) == 0 || !Block.isBlockContainer[getBlockID(i, j, k)]) + { + System.out.println("Attempted to place a tile entity where there was no entity tile!"); + return; +@@ -474,6 +489,18 @@ + } + } + ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) ++ { ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); ++ } ++ } ++ + public void onChunkLoad() + { + isChunkLoaded = true; 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-07 21:52:25.444657000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.814966800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:48.000000000 -0400 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2910,8 +3102,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:25.489660000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.818967000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:48.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3005,8 +3197,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:52:25.578665000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.820967100 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3033,26 +3225,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } if(f1 > 0.0F) { -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-07 21:52:25.654669000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 21:53:05.830967700 +0200 -@@ -65,6 +65,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; 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-07 21:52:25.675670000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.823967300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:48.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3077,8 +3252,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:52:25.706672000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:53:05.827967500 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3157,9 +3332,26 @@ 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 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-08 13:52:48.000000000 -0400 +@@ -65,6 +65,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:52:25.772676000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.832967800 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-08 13:52:48.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3195,8 +3387,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It protected EnumToolMaterial toolMaterial; } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:25.835680000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.835968000 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:48.000000000 -0400 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -3207,8 +3399,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Me if(k3 >= 15 && l3 == 0) { 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-07 21:52:25.857681000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.838968200 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:48.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3218,8 +3410,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:52:26.166698000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:53:05.840968300 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-08 13:52:48.000000000 -0400 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3237,8 +3429,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:26.268704000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.843968400 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:48.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3255,9 +3447,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl for(int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack itemstack1 = craftMatrix.getStackInSlot(i); +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-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-08 15:23:33.000000000 -0400 +@@ -60,6 +60,13 @@ + { + } + ++ /* FORGE: Return false if this TileEntity does not require updateEntity() ++ * calls. ++ */ ++ public boolean canUpdate() { ++ return true; ++ } ++ + public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) + { + 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:52:26.443714000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:53:05.847968700 +0200 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-08 13:52:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-08 16:26:27.000000000 -0400 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3284,7 +3493,59 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } } if(getSavedLightValue(enumskyblock, i, j, k) != l) -@@ -1408,7 +1413,10 @@ +@@ -1169,7 +1174,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } while(true); +@@ -1190,12 +1195,13 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); ++ } else { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); + } + } while(true); + field_20912_E.clear(); +@@ -1204,13 +1210,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- field_20912_E.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? field_20912_E : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? field_20912_E : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1408,7 +1420,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -3296,7 +3557,65 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } } -@@ -1681,13 +1689,18 @@ +@@ -1626,44 +1641,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(!tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; +- field_20912_E.add(tileentity); +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? field_20912_E : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public boolean isBlockOpaqueCube(int i, int j, int k) +@@ -1681,13 +1675,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -3322,7 +3641,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public boolean updatingLighting() -@@ -2178,6 +2191,7 @@ +@@ -2178,6 +2177,7 @@ { block = null; } @@ -3330,7 +3649,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2601,7 +2615,7 @@ +@@ -2601,7 +2601,7 @@ public int field_27080_i; public boolean editingBlocks; private long lockTimestamp; @@ -3339,3 +3658,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; +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-08 13:52:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-08 16:26:47.000000000 -0400 +@@ -54,15 +54,19 @@ + public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) + { + ArrayList arraylist = new ArrayList(); +- for(int k1 = 0; k1 < loadedTileEntityList.size(); k1++) +- { +- TileEntity tileentity = (TileEntity)loadedTileEntityList.get(k1); +- if(tileentity.xCoord >= i && tileentity.yCoord >= j && tileentity.zCoord >= k && tileentity.xCoord < l && tileentity.yCoord < i1 && tileentity.zCoord < j1) +- { +- arraylist.add(tileentity); +- } +- } +- ++ for(int x=(i>>4); x<=(l>>4); x++) ++ for(int z=(k>>4); z<=(j1>>4); z++) { ++ Chunk ch=getChunkFromChunkCoords(x,z); ++ if(ch==null) continue; ++ for(Object ob : ch.chunkTileEntityMap.values()) { ++ TileEntity te=(TileEntity)ob; ++ if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k ++ && te.xCoord Date: Sun, 11 Sep 2011 03:49:01 +0000 Subject: [PATCH 088/169] A small fix to hopefully make the script work on a mac. --- forge/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/setup.sh b/forge/setup.sh index 81475d6edc..286d435a93 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -23,7 +23,7 @@ if [ ! -d src_base ] ; then ./decompile.sh pushd src > /dev/null - find -name *.java -exec sed -i 's/\r//g' \{\} \; + find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch patch -p1 -i ../forge/mlprop.patch From 3b61068a3c98c50ab6e8e41268fe73e26828a70a Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 11 Sep 2011 04:05:39 +0000 Subject: [PATCH 089/169] Another try for osx. --- forge/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/setup.sh b/forge/setup.sh index 286d435a93..bdb50298ae 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -23,7 +23,7 @@ if [ ! -d src_base ] ; then ./decompile.sh pushd src > /dev/null - find . -name *.java -exec sed -i 's/\r//g' \{\} \; + find . -name *.java -exec sed -i\"\" 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch patch -p1 -i ../forge/mlprop.patch From 0a874de91d6b26a9369d1ab0fb19ebe47a5124e3 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 11 Sep 2011 04:46:16 +0000 Subject: [PATCH 090/169] Unrolled a mistaken fix. --- forge/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/setup.sh b/forge/setup.sh index bdb50298ae..286d435a93 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -23,7 +23,7 @@ if [ ! -d src_base ] ; then ./decompile.sh pushd src > /dev/null - find . -name *.java -exec sed -i\"\" 's/\r//g' \{\} \; + find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch patch -p1 -i ../forge/mlprop.patch From bb6751cc591ecb3f840a2332d6ab6cd7cfc46816 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 19 Sep 2011 01:30:41 +0000 Subject: [PATCH 091/169] First attempt at a 1.8.1 version. May not work. --- forge/minecraft.patch | 1766 +++++++++++++++++++---------------------- forge/setup.sh | 2 +- 2 files changed, 813 insertions(+), 955 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 38f2302cfa..4451d547be 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1,17 +1,17 @@ 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-18 17:51:10.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) { - if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) { return true; } - if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) { return true; } @@ -32,7 +32,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt return true; } - if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) { return true; } @@ -119,12 +119,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-08 13:52:48.000000000 -0400 -@@ -230,23 +230,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-18 17:52:42.000000000 -0400 +@@ -423,23 +423,23 @@ + { + return true; + } - if(world.isBlockNormalCube(i, j + 1, k)) + if(world.isBlockSolidOnSide(i, j + 1, k,0)) { @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 17:54:16.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -162,27 +162,27 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor { world.setBlockWithNotify(i, j, k, 0); flag = true; -@@ -241,7 +241,7 @@ +@@ -242,7 +242,7 @@ return false; } else { - return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); +++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); } } 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-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-18 18:00:27.000000000 -0400 +@@ -4,6 +4,7 @@ package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; ++import net.minecraft.src.forge.ForgeHooks; import java.util.ArrayList; import java.util.Random; -@@ -149,7 +150,8 @@ + +@@ -151,12 +152,14 @@ public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k) { @@ -191,8 +191,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav + getLightValue(iblockaccess,i,j,k)); } + public int func_35275_c(IBlockAccess iblockaccess, int i, int j, int k) + { +- return iblockaccess.func_35451_b(i, j, k, lightValue[blockID]); ++ return iblockaccess.func_35451_b(i, j, k, ++ getLightValue(iblockaccess,i,j,k)); + } + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -276,19 +278,12 @@ +@@ -283,19 +286,12 @@ return blockID; } @@ -216,8 +223,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -600,6 +595,86 @@ - return blockMaterial.getMaterialMobility(); +@@ -618,6 +614,86 @@ + return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } + /* FORGE: Allow a block to set illumination on a coordinate basis. @@ -304,8 +311,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-18 18:04:12.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -389,8 +396,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-18 18:07:05.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -510,29 +517,31 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:48.000000000 -0400 -@@ -46,7 +46,7 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 18:09:41.000000000 -0400 +@@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); +- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j - 1, k,1) ++ || world.getBlockId(i, j - 1, k) == Block.fence.blockID; } public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +56,7 @@ +@@ -56,7 +57,8 @@ public void onNeighborBlockChange(World world, int i, int j, int k, int l) { boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k)) +- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) + if(!world.isBlockSolidOnSide(i, j - 1, k,1)) ++ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) { flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-18 18:12:22.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -587,8 +596,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 18:13:04.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -608,17 +617,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import java.util.*; - -@@ -53,7 +54,7 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 18:13:57.000000000 -0400 +@@ -53,7 +53,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -627,7 +628,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -451,6 +452,10 @@ +@@ -451,6 +451,10 @@ { return false; } @@ -639,8 +640,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-18 18:16:48.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -744,8 +745,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-18 18:18:39.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -781,8 +782,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-08 16:31:16.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-18 18:38:26.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -791,10 +792,150 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav import java.io.PrintStream; import java.util.*; -@@ -249,6 +250,13 @@ +@@ -26,7 +27,6 @@ + hasEntities = false; + lastSaveTime = 0L; + field_35846_u = false; +- world.getClass(); + entities = new List[128 / 16]; + worldObj = world; + xPosition = i; +@@ -44,11 +44,8 @@ + { + this(world, i, j); + blocks = abyte0; +- world.getClass(); + data = new NibbleArray(abyte0.length, 7); +- world.getClass(); + skylightMap = new NibbleArray(abyte0.length, 7); +- world.getClass(); + blocklightMap = new NibbleArray(abyte0.length, 7); + } + +@@ -68,16 +65,12 @@ + + public void generateHeightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int k = 0; k < 16; k++) + { +- worldObj.getClass(); + int l = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + for(int i1 = j << 11 | k << 7; l > 0 && Block.lightOpacity[blocks[(i1 + l) - 1] & 0xff] == 0; l--) { } + heightMap[k << 4 | j] = (byte)l; + if(l < i) +@@ -94,16 +87,12 @@ + + public void generateSkylightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int l = 0; l < 16; l++) + { +- worldObj.getClass(); + int j1 = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + int k1; + for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } + heightMap[l << 4 | j] = (byte)j1; +@@ -116,7 +105,6 @@ + continue; + } + int l1 = 15; +- worldObj.getClass(); + int i2 = 128 - 1; + do + { +@@ -154,7 +142,6 @@ + + private void func_35839_k() + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) + { + for(int i = 0; i < 16; i++) +@@ -216,7 +203,6 @@ + { + if(l > k) + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) + { + for(int i1 = k; i1 < l; i1++) +@@ -237,8 +223,6 @@ + { + i1 = j; + } +- worldObj.getClass(); +- worldObj.getClass(); + for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } + if(i1 == l) + { +@@ -251,7 +235,6 @@ + lowestBlockHeight = i1; + } else + { +- worldObj.getClass(); + int k1 = 128 - 1; + for(int i2 = 0; i2 < 16; i2++) + { +@@ -320,8 +303,6 @@ + + public int getBlockID(int i, int j, int k) + { +- worldObj.getClass(); +- worldObj.getClass(); + return blocks[i << 11 | k << 7 | j] & 0xff; + } + +@@ -334,8 +315,6 @@ + field_35845_c[j1] = -999; + } + int k1 = heightMap[k << 4 | i] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int l1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(l1 == l && data.getNibble(i, j, k) == i1) + { +@@ -343,8 +322,13 @@ + } + int i2 = xPosition * 16 + i; + int j2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ ++ if (Block.blocksList[l1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; ++ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(l1 != 0 && !worldObj.multiplayerWorld) + { +@@ -410,8 +394,6 @@ + field_35845_c[i1] = -999; + } + int j1 = heightMap[i1] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int k1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(k1 == l) + { +@@ -419,8 +401,13 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); + + if (Block.blocksList[k1] instanceof IOverrideReplace) { + IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; @@ -803,71 +944,55 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav + } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(k1 != 0 && !worldObj.multiplayerWorld) + if(k1 != 0) { -@@ -292,6 +300,13 @@ - } - int k1 = xPosition * 16 + i; - int l1 = zPosition * 16 + k; -+ -+ if (Block.blocksList[j1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[j1]; -+ if (!iovr.canReplaceBlock(worldObj, k1, j, l1, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(j1 != 0) +@@ -777,8 +764,6 @@ { -@@ -438,7 +453,7 @@ + for(int l2 = k; l2 < j1; l2++) { - return null; - } -- BlockContainer blockcontainer = (BlockContainer)Block.blocksList[l]; -+ Block blockcontainer = Block.blocksList[l]; - blockcontainer.onBlockAdded(worldObj, xPosition * 16 + i, j, zPosition * 16 + k); - tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); - } -@@ -460,7 +475,7 @@ - setChunkBlockTileEntity(i, j, k, tileentity); - if(isChunkLoaded) +- worldObj.getClass(); +- worldObj.getClass(); + int l3 = l1 << 11 | l2 << 7 | j; + int l4 = i1 - j; + System.arraycopy(abyte0, k1, blocks, l3, l4); +@@ -792,8 +777,6 @@ { -- worldObj.loadedTileEntityList.add(tileentity); -+ worldObj.addTileEntity(tileentity); - } - } - -@@ -471,7 +486,7 @@ - tileentity.xCoord = xPosition * 16 + i; - tileentity.yCoord = j; - tileentity.zCoord = zPosition * 16 + k; -- if(getBlockID(i, j, k) == 0 || !(Block.blocksList[getBlockID(i, j, k)] instanceof BlockContainer)) -+ if(getBlockID(i, j, k) == 0 || !Block.isBlockContainer[getBlockID(i, j, k)]) + for(int i3 = k; i3 < j1; i3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int i4 = (i2 << 11 | i3 << 7 | j) >> 1; + int i5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, data.data, i4, i5); +@@ -806,8 +789,6 @@ { - System.out.println("Attempted to place a tile entity where there was no entity tile!"); - return; -@@ -496,6 +511,18 @@ - } - } - -+ /* FORGE: Used to remove only invalid TileEntities */ -+ public void cleanChunkBlockTileEntity(int i, int j, int k) -+ { -+ ChunkPosition chunkposition = new ChunkPosition(i, j, k); -+ if(isChunkLoaded) -+ { -+ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity!=null && tileentity.isInvalid()) -+ chunkTileEntityMap.remove(chunkposition); -+ } -+ } -+ - public void onChunkLoad() - { - isChunkLoaded = true; + for(int j3 = k; j3 < j1; j3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int j4 = (j2 << 11 | j3 << 7 | j) >> 1; + int j5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); +@@ -820,8 +801,6 @@ + { + for(int k3 = k; k3 < j1; k3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int k4 = (k2 << 11 | k3 << 7 | j) >> 1; + int k5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); +@@ -880,7 +859,6 @@ + int l = field_35845_c[k]; + if(l == -999) + { +- worldObj.getClass(); + int i1 = 128 - 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-18 18:55:11.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -886,10 +1011,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen fxLayers = new List[4]; rand = new Random(); if(world != null) -@@ -55,6 +59,18 @@ +@@ -55,7 +59,18 @@ } } +- + for (int x = 0; x < effectList.size(); x++) { + BlockTextureParticles entry = (BlockTextureParticles) effectList + .get(x); @@ -902,21 +1028,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen + if (effectList.size() == 0) + effectList.remove(x--); + } - } -@@ -93,11 +109,26 @@ + public void renderParticles(Entity entity, float f) +@@ -94,6 +109,7 @@ for(int k = 0; k < fxLayers[i].size(); k++) { EntityFX entityfx = (EntityFX)fxLayers[i].get(k); -+ if(entityfx instanceof EntityDiggingFX) continue; ++ if(entityfx instanceof EntityDiggingFX) continue; + tessellator.func_35835_b(entityfx.func_35115_a(f)); entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); } - +@@ -101,6 +117,20 @@ tessellator.draw(); } + + Tessellator tessellator = Tessellator.instance; -+ + for (int x = 0; x < effectList.size(); x++) { + BlockTextureParticles entry = (BlockTextureParticles) effectList + .get(x); @@ -929,24 +1056,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen + } + tessellator.draw(); + } - ++ } -@@ -124,6 +155,13 @@ + public void func_1187_b(Entity entity, float f) +@@ -132,7 +162,12 @@ { fxLayers[i].clear(); } -+ +- + for (int x = 0; x < effectList.size(); x++) { + BlockTextureParticles entry = (BlockTextureParticles) effectList + .get(x); + entry.effects.clear(); + } + effectList.clear(); - } -@@ -145,7 +183,12 @@ + public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) +@@ -153,7 +188,12 @@ double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; int j2 = rand.nextInt(6); @@ -960,7 +1088,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } } -@@ -190,16 +233,48 @@ +@@ -198,16 +238,48 @@ { d = (double)i + block.maxX + (double)f; } @@ -1011,9 +1139,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:48.000000000 -0400 -@@ -555,7 +555,9 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-18 18:55:53.000000000 -0400 +@@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); int k = MathHelper.floor_double(posZ); @@ -1025,20 +1153,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:48.000000000 -0400 -@@ -6,6 +6,10 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-18 19:01:21.000000000 -0400 +@@ -4,6 +4,10 @@ - import java.util.*; + package net.minecraft.src; +import net.minecraft.src.forge.ArmorProperties; +import net.minecraft.src.forge.ISpecialArmor; +import net.minecraft.src.forge.ForgeHooks; + + import java.util.*; + // Referenced classes of package net.minecraft.src: - // EntityLiving, InventoryPlayer, ContainerPlayer, World, - // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -316,6 +320,8 @@ +@@ -485,6 +489,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -1047,7 +1175,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -330,6 +336,24 @@ +@@ -507,6 +513,32 @@ return f; } @@ -1066,39 +1194,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla + { + f /= 5F; + } ++ if(func_35160_a(Potion.field_35675_e)) ++ { ++ f *= 1.0F + (float)(func_35167_b(Potion.field_35675_e).func_35801_c() + 1) * 0.2F; ++ } ++ if(func_35160_a(Potion.field_35672_f)) ++ { ++ f *= 1.0F - (float)(func_35167_b(Potion.field_35672_f).func_35801_c() + 1) * 0.2F; ++ } + return f; + } + public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -477,6 +501,25 @@ - - protected void damageEntity(int i) - { -+ boolean doRegularComputation = true; -+ int initialDamage = i; -+ -+ for (ItemStack stack : inventory.armorInventory) { -+ if (stack != null && stack.getItem() instanceof ISpecialArmor) { -+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ -+ ArmorProperties props = armor.getProperties(this, initialDamage, i); -+ i = i - props.damageRemove; -+ doRegularComputation = doRegularComputation -+ && props.allowRegularComputation; -+ } -+ } -+ -+ if (!doRegularComputation) { -+ super.damageEntity(i); -+ return; -+ } -+ - int j = 25 - inventory.getTotalArmorValue(); - int k = i * j + damageRemainder; - inventory.damageArmor(i); -@@ -522,7 +565,9 @@ +@@ -720,7 +752,9 @@ public void destroyCurrentEquippedItem() { @@ -1108,7 +1218,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla } public double getYOffset() -@@ -594,6 +639,10 @@ +@@ -815,6 +849,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { @@ -1120,30 +1230,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-18 19:03:56.000000000 -0400 +@@ -4,6 +4,7 @@ package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ForgeHooksClient; + import java.awt.image.BufferedImage; import java.nio.FloatBuffer; - import java.util.List; -@@ -573,8 +574,12 @@ - { - EntityPlayer entityplayer = (EntityPlayer)entityliving; - GL11.glDisable(3008 /*GL_ALPHA_TEST*/); -+ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, + import java.util.Random; +@@ -803,8 +804,12 @@ + { + EntityPlayer entityplayer = (EntityPlayer)entityliving; + GL11.glDisable(3008 /*GL_ALPHA_TEST*/); ++ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, + mc.objectMouseOver,0, + entityplayer.inventory.getCurrentItem(),f)) { - renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); - renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); -+ } - GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); + renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ } + GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + } } - GL11.glBlendFunc(770, 771); -@@ -619,8 +624,12 @@ +@@ -853,8 +858,12 @@ { EntityPlayer entityplayer1 = (EntityPlayer)entityliving; GL11.glDisable(3008 /*GL_ALPHA_TEST*/); @@ -1157,17 +1267,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-18 19:05:02.000000000 -0400 +@@ -5,6 +5,7 @@ package net.minecraft.src; -+import net.minecraft.src.forge.ISpecialResistance; import java.util.*; ++import net.minecraft.src.forge.ISpecialResistance; -@@ -65,7 +66,17 @@ + // Referenced classes of package net.minecraft.src: + // World, MathHelper, Block, ChunkPosition, +@@ -66,7 +67,17 @@ int i5 = worldObj.getBlockId(j4, k4, l4); if(i5 > 0) { @@ -1187,8 +1297,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-18 19:06:31.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1198,24 +1308,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke // Referenced classes of package net.minecraft.src: // Item, EntityPlayer, Vec3D, MathHelper, // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -55,6 +57,13 @@ - } - if(isFull == 0) - { +@@ -60,6 +62,11 @@ + { + return itemstack; + } + ItemStack customBucket = MinecraftForge.fillCustomBucket(world, + i, j, k); -+ + if (customBucket != null) { + return customBucket; + } -+ if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-08 13:52:48.000000000 -0400 -@@ -75,6 +75,13 @@ +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-18 19:07:25.000000000 -0400 +@@ -76,6 +76,13 @@ return 1.0F; } @@ -1230,8 +1338,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-18 19:10:03.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1241,9 +1349,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende +import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; + import org.lwjgl.opengl.GL13; - // Referenced classes of package net.minecraft.src: -@@ -31,18 +35,27 @@ +@@ -32,18 +36,27 @@ public void renderItem(EntityLiving entityliving, ItemStack itemstack) { GL11.glPushMatrix(); @@ -1258,7 +1366,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); - renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); } else { if(itemstack.itemID < 256) @@ -1273,8 +1381,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-18 19:11:23.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1309,21 +1417,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. + public int damageVsEntity; protected EnumToolMaterial toolMaterial; } -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:48.000000000 -0400 -@@ -95,7 +95,7 @@ - } else - if(blockEnum == EnumSkyBlock.Block) - { -- l3 = Block.lightValue[j3]; -+ l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); - } - if(k3 >= 15 && l3 == 0) - { 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-18 19:14:26.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1333,8 +1429,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-18 19:15:17.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1343,7 +1439,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon import net.minecraft.client.Minecraft; -@@ -71,6 +72,7 @@ +@@ -64,6 +65,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -1351,7 +1447,85 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon } return true; } else -@@ -98,6 +100,12 @@ +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-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 19:22:49.000000000 -0400 +@@ -91,7 +91,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } else +@@ -137,7 +137,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamageMP += block.blockStrength(mc.thePlayer); ++ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + if(field_9441_h % 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); +@@ -204,6 +204,13 @@ + { + syncCurrentPlayItem(); + netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); ++ ++ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); ++ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { +@@ -223,7 +230,11 @@ + return flag; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); ++ return true; + } + } + +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-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 19:27:32.000000000 -0400 +@@ -42,7 +42,7 @@ + int j1 = mc.theWorld.getBlockMetadata(i, j, k); + boolean flag = super.sendBlockRemoved(i, j, k, l); + ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); +- boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); ++ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); + if(itemstack != null) + { + itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); +@@ -71,7 +71,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } +@@ -102,7 +102,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamage += block.blockStrength(mc.thePlayer); ++ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + if(field_1069_h % 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); +@@ -165,6 +165,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -1364,7 +1538,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -108,7 +116,11 @@ +@@ -175,7 +181,11 @@ return false; } else { @@ -1377,136 +1551,85 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-08 13:52:48.000000000 -0400 -@@ -63,7 +63,7 @@ - { - Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); - } -- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) -+ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) - { - sendBlockRemoved(i, j, k, l); - } else -@@ -106,7 +106,7 @@ - return; - } - Block block = Block.blocksList[i1]; -- curBlockDamageMP += block.blockStrength(mc.thePlayer); -+ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - if(field_9441_h % 4F == 0.0F && block != null) - { - 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-08 13:52:48.000000000 -0400 -@@ -37,7 +37,7 @@ - int j1 = mc.theWorld.getBlockMetadata(i, j, k); - boolean flag = super.sendBlockRemoved(i, j, k, l); - ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); -- boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); -+ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); - if(itemstack != null) - { - itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -62,7 +62,7 @@ - { - Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); - } -- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) -+ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) - { - sendBlockRemoved(i, j, k, l); - } -@@ -89,7 +89,7 @@ - return; - } - Block block = Block.blocksList[i1]; -- curBlockDamage += block.blockStrength(mc.thePlayer); -+ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - if(field_1069_h % 4F == 0.0F && block != null) - { - 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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-08 13:52:48.000000000 -0400 -@@ -2171,7 +2171,7 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-18 19:30:11.000000000 -0400 +@@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; + int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, j2); +- if(cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3085,7 +3085,7 @@ + colorBlueTopRight *= f28; + int k2 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); +- if(cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3190,7 +3190,7 @@ + colorBlueTopRight *= f29; + int l2 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, l2); +- if(cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3295,7 +3295,7 @@ + colorBlueTopRight *= f30; + int i3 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, i3); +- if(cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3388,7 +3388,7 @@ + tessellator.setColorOpaque_F(f11, f14, f17); int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); renderEastFace(block, i, j, k, i1); - if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -2256,7 +2256,7 @@ - colorBlueTopRight *= f28; + tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); + renderEastFace(block, i, j, k, 38); +@@ -3401,7 +3401,7 @@ + tessellator.setColorOpaque_F(f11, f14, f17); int j1 = block.getBlockTexture(blockAccess, i, j, k, 3); - renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); + renderWestFace(block, i, j, k, j1); - if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -2341,7 +2341,7 @@ - colorBlueTopRight *= f29; + tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); + renderWestFace(block, i, j, k, 38); +@@ -3414,7 +3414,7 @@ + tessellator.setColorOpaque_F(f12, f15, f18); int k1 = block.getBlockTexture(blockAccess, i, j, k, 4); renderNorthFace(block, i, j, k, k1); - if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -2426,7 +2426,7 @@ - colorBlueTopRight *= f30; + tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); + renderNorthFace(block, i, j, k, 38); +@@ -3427,7 +3427,7 @@ + tessellator.setColorOpaque_F(f12, f15, f18); int l1 = block.getBlockTexture(blockAccess, i, j, k, 5); renderSouthFace(block, i, j, k, l1); - if(cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -2510,7 +2510,7 @@ - tessellator.setColorOpaque_F(f11 * f22, f14 * f22, f17 * f22); - int l = block.getBlockTexture(blockAccess, i, j, k, 2); - renderEastFace(block, i, j, k, l); -- if(cfgGrassFix && l == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && l == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f11 * f22 * f, f14 * f22 * f1, f17 * f22 * f2); - renderEastFace(block, i, j, k, 38); -@@ -2527,7 +2527,7 @@ - tessellator.setColorOpaque_F(f11 * f23, f14 * f23, f17 * f23); - int i1 = block.getBlockTexture(blockAccess, i, j, k, 3); - renderWestFace(block, i, j, k, i1); -- if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f11 * f23 * f, f14 * f23 * f1, f17 * f23 * f2); - renderWestFace(block, i, j, k, 38); -@@ -2544,7 +2544,7 @@ - tessellator.setColorOpaque_F(f12 * f24, f15 * f24, f18 * f24); - int j1 = block.getBlockTexture(blockAccess, i, j, k, 4); - renderNorthFace(block, i, j, k, j1); -- if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f12 * f24 * f, f15 * f24 * f1, f18 * f24 * f2); - renderNorthFace(block, i, j, k, 38); -@@ -2561,7 +2561,7 @@ - tessellator.setColorOpaque_F(f12 * f25, f15 * f25, f18 * f25); - int k1 = block.getBlockTexture(blockAccess, i, j, k, 5); - renderSouthFace(block, i, j, k, k1); -- if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f12 * f25 * f, f15 * f25 * f1, f18 * f25 * f2); + tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-08 13:52:48.000000000 -0400 -@@ -126,6 +126,9 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-18 19:33:08.000000000 -0400 +@@ -128,6 +128,9 @@ } try { @@ -1517,9 +1640,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-08 13:52:48.000000000 -0400 -@@ -1558,8 +1558,8 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-18 19:33:55.000000000 -0400 +@@ -1635,8 +1635,8 @@ } public List tileEntities; @@ -1530,7 +1653,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private List worldRenderersToUpdate; private WorldRenderer sortedWorldRenderers[]; private WorldRenderer worldRenderers[]; -@@ -1567,8 +1567,8 @@ +@@ -1644,8 +1644,8 @@ private int renderChunksTall; private int renderChunksDeep; private int glRenderListBase; @@ -1542,26 +1665,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-08 13:52:48.000000000 -0400 -@@ -5,6 +5,11 @@ - package net.minecraft.src; - - import java.util.Random; -+ -+import net.minecraft.src.forge.ForgeHooksClient; -+import net.minecraft.src.forge.ICustomItemRenderer; -+import net.minecraft.src.forge.MinecraftForgeClient; -+ - import org.lwjgl.opengl.GL11; - - // Referenced classes of package net.minecraft.src: -@@ -47,10 +52,36 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 19:41:51.000000000 -0400 +@@ -47,10 +47,36 @@ } GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) -+ ++ + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); + + if (customRenderer != null) { @@ -1592,9 +1703,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte loadTexture("/terrain.png"); + ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); float f4 = 0.25F; - if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16) - { -@@ -78,10 +109,12 @@ + int j = Block.blocksList[itemstack.itemID].getRenderType(); + if(j == 1 || j == 19 || j == 12 || j == 2) +@@ -80,9 +106,11 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -1602,21 +1713,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } else { loadTexture("/gui/items.png"); -- } + ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); -+ } + } Tessellator tessellator = Tessellator.instance; - float f6 = (float)((i % 16) * 16 + 0) / 256F; - float f8 = (float)((i % 16) * 16 + 16) / 256F; -@@ -92,6 +125,7 @@ - float f14 = 0.25F; - if(field_27004_a) - { -+ - int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage()); - float f15 = (float)(k >> 16 & 0xff) / 255F; - float f17 = (float)(k >> 8 & 0xff) / 255F; -@@ -127,10 +161,37 @@ + float f5 = (float)((i % 16) * 16 + 0) / 256F; +@@ -129,10 +157,37 @@ public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) { @@ -1655,15 +1756,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -152,16 +213,17 @@ - renderBlocks.renderBlockOnInventory(block, j, 1.0F); - renderBlocks.useInventoryTint = true; - GL11.glPopMatrix(); -- } else -- if(k >= 0) -+ } else if(k >= 0) - { - GL11.glDisable(2896 /*GL_LIGHTING*/); +@@ -161,9 +216,11 @@ if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1676,17 +1769,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-08 13:52:48.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.IArmorTextureProvider; - import net.minecraft.client.Minecraft; - import org.lwjgl.opengl.GL11; - -@@ -34,7 +35,14 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 19:43:11.000000000 -0400 +@@ -34,7 +34,14 @@ if(item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; @@ -1703,8 +1788,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-18 19:43:41.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1716,34 +1801,25 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft @@ -60,6 +61,7 @@ thePlayer.addStat(AchievementList.buildSword, 1); } - ModLoader.TakenFromCrafting(thePlayer, itemstack); + ModLoader.TakenFromCrafting(thePlayer, itemstack, craftMatrix); + ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); for(int i = 0; i < craftMatrix.getSizeInventory(); 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-08 13:52:48.000000000 -0400 -@@ -6,6 +6,7 @@ - - import java.io.PrintStream; - import java.nio.*; -+import java.util.*; - import org.lwjgl.opengl.*; - - // Referenced classes of package net.minecraft.src: -@@ -13,9 +14,7 @@ - +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 19:59:43.000000000 -0400 +@@ -13,8 +13,7 @@ public class Tessellator { -- + - private Tessellator(int i) - { + public Tessellator() { vertexCount = 0; hasColor = false; hasTexture = false; -@@ -24,20 +23,10 @@ +@@ -24,21 +23,10 @@ addedVertices = 0; isColorDisabled = false; isDrawing = false; @@ -1754,6 +1830,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - byteBuffer = GLAllocation.createDirectByteBuffer(i * 4); - intBuffer = byteBuffer.asIntBuffer(); - floatBuffer = byteBuffer.asFloatBuffer(); +- field_35836_g = byteBuffer.asShortBuffer(); - rawBuffer = new int[i]; - useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; - if(useVBO) @@ -1767,7 +1844,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void draw() -@@ -47,12 +36,20 @@ +@@ -48,12 +36,20 @@ throw new IllegalStateException("Not tesselating!"); } isDrawing = false; @@ -1792,7 +1869,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat if(useVBO) { vboIndex = (vboIndex + 1) % vboCount; -@@ -106,10 +103,10 @@ +@@ -121,10 +117,10 @@ GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(drawMode == 7 && convertQuadsToTriangles) { @@ -1805,7 +1882,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(hasTexture) -@@ -125,6 +122,10 @@ +@@ -146,6 +142,10 @@ GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); } } @@ -1816,7 +1893,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat reset(); } -@@ -237,6 +238,15 @@ +@@ -265,6 +265,15 @@ public void addVertex(double d, double d1, double d2) { @@ -1832,7 +1909,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat addedVertices++; if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) { -@@ -278,11 +288,6 @@ +@@ -314,11 +323,6 @@ rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); rawBufferIndex += 8; vertexCount++; @@ -1844,18 +1921,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void setColorOpaque_I(int i) -@@ -335,9 +340,7 @@ +@@ -367,10 +371,7 @@ - private static boolean convertQuadsToTriangles = true; + private static boolean convertQuadsToTriangles = false; private static boolean tryVBO = false; - private ByteBuffer byteBuffer; - private IntBuffer intBuffer; - private FloatBuffer floatBuffer; +- private ShortBuffer field_35836_g; + private static boolean useVBO = false; private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -349,17 +352,42 @@ +@@ -384,17 +385,42 @@ private int rawBufferIndex; private int addedVertices; private boolean isColorDisabled; @@ -1872,11 +1950,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - private boolean isDrawing; - private boolean useVBO; - private IntBuffer vertexBuffers; -+ public boolean isDrawing; private int vboIndex; - private int vboCount; - private int bufferSize; -+ + + public static boolean renderingWorldRenderer=false; + public boolean defaultTexture=false; + private int rawBufferSize; @@ -1887,6 +1964,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + private static ByteBuffer byteBuffer; + private static IntBuffer intBuffer; + private static FloatBuffer floatBuffer; ++ private static ShortBuffer field_35836_g; + public static Tessellator instance; + + static { @@ -1898,6 +1976,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); + intBuffer = byteBuffer.asIntBuffer(); + floatBuffer = byteBuffer.asFloatBuffer(); ++ field_35836_g = byteBuffer.asShortBuffer(); + useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; + vboCount = 10; + if(useVBO) @@ -1906,12 +1985,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); + } + } - } 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-08 15:23:42.000000000 -0400 -@@ -60,6 +60,13 @@ +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-18 20:01:14.000000000 -0400 +@@ -61,6 +61,13 @@ { } @@ -1926,8 +2004,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-18 20:02:27.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1953,87 +2031,21 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-08 13:52:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-08 16:26:17.000000000 -0400 -@@ -313,7 +313,11 @@ +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-18 17:42:58.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-18 20:07:22.000000000 -0400 +@@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) { - return getBlockId(i, j, k) == 0; + int iBlockID = getBlockId( i, j, k ); -+ + if ( iBlockID == 0 ) + return true; + return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); } public boolean blockExists(int i, int j, int k) -@@ -711,9 +715,10 @@ - if(enumskyblock == EnumSkyBlock.Block) - { - int i1 = getBlockId(i, j, k); -- if(Block.lightValue[i1] > l) -+ int bl=(i1==0)?0:Block.blocksList[i1].getLightValue(this,i,j,k); -+ if(bl > l) - { -- l = Block.lightValue[i1]; -+ l = bl; - } - } - if(getSavedLightValue(enumskyblock, i, j, k) != l) -@@ -1408,7 +1413,7 @@ - Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); - if(chunk != null) - { -- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); -+ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); - } - } - } while(true); -@@ -1429,12 +1434,13 @@ - { - loadedTileEntityList.add(tileentity1); - } -+ markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); -+ } else { - Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); - if(chunk1 != null) - { -- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); -+ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); - } -- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); - } - } while(true); - addedTileEntityList.clear(); -@@ -1443,13 +1449,19 @@ - - public void addTileEntity(Collection collection) - { -- if(scanningTileEntities) -- { -- addedTileEntityList.addAll(collection); -- } else -- { -- loadedTileEntityList.addAll(collection); -- } -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } -+ } -+ -+ /* FORGE: Used as a bugfix */ -+ public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); - } - - public void updateEntity(Entity entity) -@@ -1607,7 +1619,10 @@ +@@ -1684,7 +1687,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -2045,65 +2057,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } -@@ -1840,44 +1855,23 @@ - - public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) - { -- if(!tileentity.isInvalid()) -- { -- if(scanningTileEntities) -- { -- tileentity.xCoord = i; -- tileentity.yCoord = j; -- tileentity.zCoord = k; -- addedTileEntityList.add(tileentity); -- } else -- { -- loadedTileEntityList.add(tileentity); -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -- } -- } -- } -+ if(tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } - } - - public void removeBlockTileEntity(int i, int j, int k) - { -- TileEntity tileentity = getBlockTileEntity(i, j, k); -- if(tileentity != null && scanningTileEntities) -- { -- tileentity.invalidate(); -- } else -- { -- if(tileentity != null) -- { -- loadedTileEntityList.remove(tileentity); -- } -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -- } -- } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } - } - - public boolean isBlockOpaqueCube(int i, int j, int k) -@@ -1895,13 +1889,18 @@ +@@ -1977,13 +1983,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -2129,7 +2083,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2425,6 +2424,7 @@ +@@ -2308,7 +2319,7 @@ + + private int func_35458_d(int i, int j, int k, int l, int i1, int j1) + { +- int k1 = Block.lightValue[i1]; ++ int k1=(i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); + int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; + int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; + int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; +@@ -2679,6 +2690,7 @@ { block = null; } @@ -2137,7 +2100,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2913,7 +2913,7 @@ +@@ -3193,7 +3205,7 @@ public int field_27172_i; public boolean editingBlocks; private long lockTimestamp; @@ -2147,38 +2110,33 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-08 13:52:48.000000000 -0400 -@@ -5,6 +5,9 @@ +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-18 20:12:00.000000000 -0400 +@@ -4,6 +4,8 @@ + package net.minecraft.src; - import java.util.*; -+ +import net.minecraft.src.forge.ForgeHooksClient; + + import java.util.*; import org.lwjgl.opengl.GL11; - // Referenced classes of package net.minecraft.src: -@@ -125,8 +128,10 @@ +@@ -125,8 +127,9 @@ GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); GL11.glScalef(f, f, f); GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); - tessellator.startDrawingQuads(); - tessellator.setTranslationD(-posX, -posY, -posZ); -+ + ForgeHooksClient.beforeRenderPass(i2); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setTranslationD(-posX, -posY, -posZ); } if(i2 == 0 && Block.isBlockContainer[i3]) { -@@ -136,17 +141,17 @@ - tileEntityRenderers.add(tileentity); - } +@@ -142,15 +145,13 @@ + { + flag1 = true; } -+ - Block block = Block.blocksList[i3]; - int j3 = block.getRenderBlockPass(); - if(j3 != i2) - { - flag = true; @@ -2189,7 +2147,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend - flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); - } + if(j3>i2) flag=true; -+ + if(!ForgeHooksClient.canRenderInPass(block,i2)) + continue; + @@ -2199,7 +2156,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } } -@@ -155,10 +160,11 @@ +@@ -159,10 +160,11 @@ if(flag2) { @@ -2213,7 +2170,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend } else { flag1 = false; -@@ -251,7 +257,6 @@ +@@ -255,7 +257,6 @@ public World worldObj; private int glRenderList; @@ -2221,7 +2178,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend public static int chunksUpdated = 0; public int posX; public int posY; -@@ -282,8 +287,4 @@ +@@ -286,8 +287,4 @@ public List tileEntityRenderers; private List tileEntities; @@ -2231,8 +2188,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-18 20:19:50.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2351,12 +2308,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-08 13:52:48.000000000 -0400 -@@ -140,23 +140,23 @@ - public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) - { - Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k); +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-18 20:21:35.000000000 -0400 +@@ -328,23 +328,23 @@ + { + return true; + } - if(world.isBlockNormalCube(i, j + 1, k)) + if(world.isBlockSolidOnSide(i, j + 1, k,0)) { @@ -2383,8 +2340,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-18 20:22:48.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2394,7 +2351,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { world.setBlockWithNotify(i, j, k, 0); flag = true; -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ return false; } else { @@ -2404,8 +2361,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-18 20:25:11.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2414,7 +2371,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl import java.util.ArrayList; import java.util.Random; -@@ -221,19 +222,12 @@ +@@ -223,19 +224,12 @@ return blockID; } @@ -2438,7 +2395,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -526,6 +520,86 @@ +@@ -529,6 +523,86 @@ return blockMaterial.getMaterialMobility(); } @@ -2526,8 +2483,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-18 20:28:10.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2611,8 +2568,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-18 20:31:37.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2732,35 +2689,37 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-08 13:52:48.000000000 -0400 -@@ -46,7 +46,7 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-18 20:33:43.000000000 -0400 +@@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); +- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j - 1, k,1) || ++ world.getBlockId(i, j - 1, k) == Block.fence.blockID; } public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +56,7 @@ +@@ -56,7 +57,8 @@ public void onNeighborBlockChange(World world, int i, int j, int k, int l) { boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) +- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) ++ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-18 20:36:04.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { int l = world.getBlockId(i, j, k); - return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; -+ return Block.blocksList[i] instanceof BlockRail; ++ return Block.blocksList[l] instanceof BlockRail; } public static final boolean isRailBlock(int i) @@ -2809,8 +2768,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 20:37:01.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2830,8 +2789,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 20:37:35.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2861,8 +2820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-18 20:40:00.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2966,8 +2925,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-18 20:40:43.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3003,8 +2962,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-08 16:31:36.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-18 20:42:37.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3013,84 +2972,170 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch import java.io.PrintStream; import java.util.*; -@@ -227,6 +228,13 @@ +@@ -68,16 +69,12 @@ + + public void generateSkylightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int l = 0; l < 16; l++) + { +- worldObj.getClass(); + int j1 = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + int k1; + for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } + heightMap[l << 4 | j] = (byte)j1; +@@ -90,7 +87,6 @@ + continue; + } + int l1 = 15; +- worldObj.getClass(); + int i2 = 128 - 1; + do + { +@@ -128,7 +124,6 @@ + + private void func_35633_i() + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) + { + for(int i = 0; i < 16; i++) +@@ -190,7 +185,6 @@ + { + if(l > k) + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) + { + for(int i1 = k; i1 < l; i1++) +@@ -211,8 +205,6 @@ + { + i1 = j; + } +- worldObj.getClass(); +- worldObj.getClass(); + for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } + if(i1 == l) + { +@@ -225,7 +217,6 @@ + lowestBlockHeight = i1; + } else + { +- worldObj.getClass(); + int k1 = 128 - 1; + for(int i2 = 0; i2 < 16; i2++) + { +@@ -294,8 +285,6 @@ + + public int getBlockID(int i, int j, int k) + { +- worldObj.getClass(); +- worldObj.getClass(); + return blocks[i << 11 | k << 7 | j] & 0xff; + } + +@@ -308,8 +297,6 @@ + field_35637_c[j1] = -999; + } + int k1 = heightMap[k << 4 | i] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int l1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(l1 == l && data.getNibble(i, j, k) == i1) + { +@@ -317,8 +304,12 @@ + } + int i2 = xPosition * 16 + i; + int j2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ if (Block.blocksList[l1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; ++ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(l1 != 0 && !worldObj.singleplayerWorld) + { +@@ -384,8 +375,6 @@ + field_35637_c[i1] = -999; + } + int j1 = heightMap[i1] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int k1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(k1 == l) + { +@@ -393,8 +382,13 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); + -+ if(Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1]; -+ if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(k1 != 0 && !worldObj.singleplayerWorld) - { -@@ -270,6 +278,13 @@ - } - int k1 = xPosition * 16 + i; - int l1 = zPosition * 16 + k; -+ -+ if(Block.blocksList[j1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1]; -+ if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(j1 != 0) - { -@@ -416,7 +431,7 @@ - { - return null; - } -- BlockContainer blockcontainer = (BlockContainer)Block.blocksList[l]; -+ Block blockcontainer = Block.blocksList[l]; - blockcontainer.onBlockAdded(worldObj, xPosition * 16 + i, j, zPosition * 16 + k); - tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); - } -@@ -438,7 +453,7 @@ - setChunkBlockTileEntity(i, j, k, tileentity); - if(isChunkLoaded) - { -- worldObj.loadedTileEntityList.add(tileentity); -+ worldObj.addTileEntity(tileentity); - } - } - -@@ -449,7 +464,7 @@ - tileentity.xCoord = xPosition * 16 + i; - tileentity.yCoord = j; - tileentity.zCoord = zPosition * 16 + k; -- if(getBlockID(i, j, k) == 0 || !(Block.blocksList[getBlockID(i, j, k)] instanceof BlockContainer)) -+ if(getBlockID(i, j, k) == 0 || !Block.isBlockContainer[getBlockID(i, j, k)]) - { - System.out.println("Attempted to place a tile entity where there was no entity tile!"); - return; -@@ -474,6 +489,18 @@ - } - } - -+ /* FORGE: Used to remove only invalid TileEntities */ -+ public void cleanChunkBlockTileEntity(int i, int j, int k) -+ { -+ ChunkPosition chunkposition = new ChunkPosition(i, j, k); -+ if(isChunkLoaded) -+ { -+ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity!=null && tileentity.isInvalid()) -+ chunkTileEntityMap.remove(chunkposition); ++ if (Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; ++ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) ++ return iovr.getReplacedSuccess(); + } -+ } + - public void onChunkLoad() - { - isChunkLoaded = true; + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); + if(k1 != 0) + { +@@ -766,8 +760,6 @@ + { + for(int k3 = k; k3 < j1; k3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int k4 = k2 << 11 | k3 << 7 | j; + int k5 = i1 - j; + System.arraycopy(blocks, k4, abyte0, k1, k5); +@@ -780,8 +772,6 @@ + { + for(int l3 = k; l3 < j1; l3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int l4 = (l2 << 11 | l3 << 7 | j) >> 1; + int l5 = (i1 - j) / 2; + System.arraycopy(data.data, l4, abyte0, k1, l5); +@@ -794,8 +784,6 @@ + { + for(int i4 = k; i4 < j1; i4++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int i5 = (i3 << 11 | i4 << 7 | j) >> 1; + int i6 = (i1 - j) / 2; + System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); +@@ -808,8 +796,6 @@ + { + for(int j4 = k; j4 < j1; j4++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int j5 = (j3 << 11 | j4 << 7 | j) >> 1; + int j6 = (i1 - j) / 2; + System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); +@@ -857,7 +843,6 @@ + int l = field_35637_c[k]; + if(l == -999) + { +- worldObj.getClass(); + int i1 = 128 - 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-08 13:52:48.000000000 -0400 -@@ -532,7 +532,9 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-18 20:43:15.000000000 -0400 +@@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); int k = MathHelper.floor_double(posZ); @@ -3102,8 +3147,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-18 20:47:39.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3113,9 +3158,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En +import net.minecraft.src.forge.ForgeHooks; + // Referenced classes of package net.minecraft.src: - // EntityLiving, InventoryPlayer, ContainerPlayer, World, - // ChunkCoordinates, DataWatcher, Container, StatList, -@@ -296,6 +300,8 @@ + // EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, + // ContainerPlayer, World, ChunkCoordinates, DataWatcher, +@@ -433,6 +437,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -3124,7 +3169,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -310,6 +316,24 @@ +@@ -455,6 +461,32 @@ return f; } @@ -3143,39 +3188,21 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En + { + f /= 5F; + } ++ if(func_35184_a(Potion.field_35452_e)) ++ { ++ f *= 1.0F + (float)(func_35187_b(Potion.field_35452_e).func_35652_c() + 1) * 0.2F; ++ } ++ if(func_35184_a(Potion.field_35449_f)) ++ { ++ f *= 1.0F - (float)(func_35187_b(Potion.field_35449_f).func_35652_c() + 1) * 0.2F; ++ } + return f; + } + public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -457,6 +481,25 @@ - - protected void damageEntity(int i) - { -+ boolean doRegularComputation = true; -+ int initialDamage = i; -+ -+ for (ItemStack stack : inventory.armorInventory) { -+ if (stack != null && stack.getItem() instanceof ISpecialArmor) { -+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ -+ ArmorProperties props = armor.getProperties(this, initialDamage, i); -+ i = i - props.damageRemove; -+ doRegularComputation = doRegularComputation -+ && props.allowRegularComputation; -+ } -+ } -+ -+ if (!doRegularComputation) { -+ super.damageEntity(i); -+ return; -+ } -+ - int j = 25 - inventory.getTotalArmorValue(); - int k = i * j + damageRemainder; - inventory.damageArmor(i); -@@ -502,7 +545,9 @@ +@@ -668,7 +700,9 @@ public void destroyCurrentEquippedItem() { @@ -3185,9 +3212,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En } public double getYOffset() -@@ -568,6 +613,10 @@ +@@ -757,6 +791,10 @@ - public EnumStatus goToSleep(int i, int j, int k) + public EnumStatus sleepInBedAt(int i, int j, int k) { + EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); + if (customSleep != null) { @@ -3197,8 +3224,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-18 20:48:52.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3207,7 +3234,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex import java.util.*; -@@ -65,7 +66,16 @@ +@@ -66,7 +67,16 @@ int i5 = worldObj.getBlockId(j4, k4, l4); if(i5 > 0) { @@ -3226,8 +3253,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-18 20:50:40.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3237,32 +3264,23 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It // Referenced classes of package net.minecraft.src: // Item, EntityPlayer, Vec3D, MathHelper, // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -55,6 +57,13 @@ +@@ -56,6 +58,12 @@ } if(isFull == 0) { + ItemStack customBucket = MinecraftForge.fillCustomBucket(world, + i, j, k); -+ + if (customBucket != null) { + return customBucket; + } + - if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) + if(!entityplayer.func_35200_c(i, j, k)) { - world.setBlockWithNotify(i, j, k, 0); + return itemstack; 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-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - - // Referenced classes of package net.minecraft.src: -@@ -29,7 +30,8 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 20:54:16.000000000 -0400 +@@ -66,7 +66,8 @@ if(j != 0) { Block block = Block.blocksList[j]; @@ -3272,7 +3290,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 1.0F) { field_22050_k = false; -@@ -51,7 +53,7 @@ +@@ -93,7 +94,7 @@ { Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); } @@ -3281,7 +3299,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { blockHarvessted(i, j, k); } else -@@ -71,7 +73,7 @@ +@@ -113,7 +114,7 @@ if(i1 != 0) { Block block = Block.blocksList[i1]; @@ -3290,16 +3308,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -117,7 +119,7 @@ - thisPlayer.destroyCurrentEquippedItem(); +@@ -164,7 +165,7 @@ + thisPlayer.destroyCurrentEquippedItem(); + } } - } -- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) -+ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) - { - Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); - ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld)); -@@ -135,6 +137,7 @@ +- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) ++ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) + { + Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); + } +@@ -188,6 +189,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -3307,7 +3325,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } return true; } else -@@ -145,6 +148,11 @@ +@@ -198,6 +200,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -3319,8 +3337,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -155,7 +163,11 @@ - return false; +@@ -217,7 +224,11 @@ + return flag; } else { - return itemstack.useItem(entityplayer, world, i, j, k, l); @@ -3333,9 +3351,9 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-08 13:52:48.000000000 -0400 -@@ -65,6 +65,13 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-18 20:55:42.000000000 -0400 +@@ -66,6 +66,13 @@ return 1.0F; } @@ -3350,8 +3368,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-18 20:56:44.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3386,21 +3404,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It + public int damageVsEntity; protected EnumToolMaterial toolMaterial; } -diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-08 13:52:48.000000000 -0400 -@@ -95,7 +95,7 @@ - } else - if(blockEnum == EnumSkyBlock.Block) - { -- l3 = Block.lightValue[j3]; -+ l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); - } - if(k3 >= 15 && l3 == 0) - { 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-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-08 13:52:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-18 20:57:05.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3410,17 +3416,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-08 13:52:48.000000000 -0400 -@@ -169,12 +169,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-18 21:09:31.000000000 -0400 +@@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) { - int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); -- int i2 = numBlocksToUpdate & 0xff; -- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); + int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); -+ int i2 = blocksToUpdate[k] & 0xff; + int i2 = numBlocksToUpdate & 0xff; +- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); + int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) { @@ -3429,28 +3434,29 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-08 13:52:48.000000000 -0400 -@@ -3,6 +3,7 @@ +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-18 21:10:22.000000000 -0400 +@@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode package net.minecraft.src; +- +import net.minecraft.src.forge.ForgeHooks; - // Referenced classes of package net.minecraft.src: -@@ -60,6 +61,7 @@ + // Slot, EntityPlayer, ItemStack, Block, +@@ -59,6 +59,7 @@ + { thePlayer.addStat(AchievementList.buildSword, 1); } - ModLoader.TakenFromCrafting(thePlayer, itemstack); + ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); for(int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack itemstack1 = craftMatrix.getStackInSlot(i); 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-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-08 15:23:33.000000000 -0400 -@@ -60,6 +60,13 @@ +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-18 17:43:00.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-18 21:10:36.000000000 -0400 +@@ -61,6 +61,13 @@ { } @@ -3465,9 +3471,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-08 13:52:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-08 16:26:27.000000000 -0400 -@@ -166,7 +166,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-18 17:42:59.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:13:31.000000000 -0400 +@@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) { @@ -3480,142 +3486,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public boolean blockExists(int i, int j, int k) -@@ -564,9 +568,10 @@ - if(enumskyblock == EnumSkyBlock.Block) - { - int i1 = getBlockId(i, j, k); -- if(Block.lightValue[i1] > l) -+ int bl=(i1==0)?0:Block.blocksList[i1].getLightValue(this,i,j,k); -+ if(bl > l) - { -- l = Block.lightValue[i1]; -+ l = bl; - } - } - if(getSavedLightValue(enumskyblock, i, j, k) != l) -@@ -1169,7 +1174,7 @@ - Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); - if(chunk != null) - { -- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); -+ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); - } - } - } while(true); -@@ -1190,12 +1195,13 @@ - { - loadedTileEntityList.add(tileentity1); - } -+ markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); -+ } else { - Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); - if(chunk1 != null) - { -- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); -+ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); - } -- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); - } - } while(true); - field_20912_E.clear(); -@@ -1204,13 +1210,19 @@ - - public void addTileEntity(Collection collection) - { -- if(scanningTileEntities) -- { -- field_20912_E.addAll(collection); -- } else -- { -- loadedTileEntityList.addAll(collection); -- } -+ List dest=scanningTileEntities ? field_20912_E : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } -+ } -+ -+ /* FORGE: Used as a bugfix */ -+ public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? field_20912_E : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); - } - - public void updateEntity(Entity entity) -@@ -1408,7 +1420,10 @@ +@@ -1372,6 +1376,9 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; -- } + } else { + if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) + return true; -+ } + } } - } -@@ -1626,44 +1641,23 @@ - - public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) - { -- if(!tileentity.isInvalid()) -- { -- if(scanningTileEntities) -- { -- tileentity.xCoord = i; -- tileentity.yCoord = j; -- tileentity.zCoord = k; -- field_20912_E.add(tileentity); -- } else -- { -- loadedTileEntityList.add(tileentity); -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -- } -- } -- } -+ if(tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? field_20912_E : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } - } - - public void removeBlockTileEntity(int i, int j, int k) - { -- TileEntity tileentity = getBlockTileEntity(i, j, k); -- if(tileentity != null && scanningTileEntities) -- { -- tileentity.invalidate(); -- } else -- { -- if(tileentity != null) -- { -- loadedTileEntityList.remove(tileentity); -- } -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -- } -- } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } - } - - public boolean isBlockOpaqueCube(int i, int j, int k) -@@ -1681,13 +1675,18 @@ +@@ -1650,13 +1657,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -3640,8 +3521,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + return block.isBlockSolidOnSide(this,i,j,k,side); } - public boolean updatingLighting() -@@ -2178,6 +2177,7 @@ + public void calculateInitialSkylight() +@@ -1976,7 +1988,7 @@ + + private int func_35241_e(int i, int j, int k, int l, int i1, int j1) + { +- int k1 = Block.lightValue[i1]; ++ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(world,j,k,l); + int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; + int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; + int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; +@@ -2315,6 +2327,7 @@ { block = null; } @@ -3649,7 +3539,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2601,7 +2601,7 @@ +@@ -2759,7 +2772,7 @@ public int field_27080_i; public boolean editingBlocks; private long lockTimestamp; @@ -3658,35 +3548,3 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; -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-08 13:52:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-08 16:26:47.000000000 -0400 -@@ -54,15 +54,19 @@ - public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) - { - ArrayList arraylist = new ArrayList(); -- for(int k1 = 0; k1 < loadedTileEntityList.size(); k1++) -- { -- TileEntity tileentity = (TileEntity)loadedTileEntityList.get(k1); -- if(tileentity.xCoord >= i && tileentity.yCoord >= j && tileentity.zCoord >= k && tileentity.xCoord < l && tileentity.yCoord < i1 && tileentity.zCoord < j1) -- { -- arraylist.add(tileentity); -- } -- } -- -+ for(int x=(i>>4); x<=(l>>4); x++) -+ for(int z=(k>>4); z<=(j1>>4); z++) { -+ Chunk ch=getChunkFromChunkCoords(x,z); -+ if(ch==null) continue; -+ for(Object ob : ch.chunkTileEntityMap.values()) { -+ TileEntity te=(TileEntity)ob; -+ if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k -+ && te.xCoord /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; - patch -p2 -i ../forge/modLoaderMP.patch +# patch -p2 -i ../forge/modLoaderMP.patch patch -p1 -i ../forge/mlprop.patch popd > /dev/null From 115de819b392f1399983e3a8543491021c3292c7 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 19 Sep 2011 01:44:40 +0000 Subject: [PATCH 092/169] A bunch of little patches to make it actually build for 1.8.1. --- forge/minecraft.patch | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 110 insertions(+), 45 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 4451d547be..0c45727278 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -152,7 +152,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes } 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 17:54:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 21:33:35.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -167,7 +167,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor } else { - return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); } } @@ -518,7 +518,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve } 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 18:09:41.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 21:33:44.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -534,7 +534,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres { boolean flag = false; - if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) + && world.getBlockId(i, j - 1, k) != Block.fence.blockID) { flag = true; @@ -618,8 +618,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } else 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 18:13:57.000000000 -0400 -@@ -53,7 +53,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 21:37:57.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -53,7 +54,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -628,7 +636,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -451,6 +451,10 @@ +@@ -451,6 +452,10 @@ { return false; } @@ -1449,8 +1457,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon } else 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 19:22:49.000000000 -0400 -@@ -91,7 +91,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 21:36:47.000000000 -0400 +@@ -4,6 +4,9 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; ++ + import net.minecraft.client.Minecraft; + + // Referenced classes of package net.minecraft.src: +@@ -91,7 +94,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -1459,7 +1477,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon { sendBlockRemoved(i, j, k, l); } else -@@ -137,7 +137,7 @@ +@@ -137,7 +140,7 @@ return; } Block block = Block.blocksList[i1]; @@ -1468,7 +1486,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(field_9441_h % 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); -@@ -204,6 +204,13 @@ +@@ -204,6 +207,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); @@ -1482,7 +1500,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -223,7 +230,11 @@ +@@ -223,7 +233,11 @@ return flag; } else { @@ -1497,8 +1515,17 @@ 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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 19:27:32.000000000 -0400 -@@ -42,7 +42,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 21:38:41.000000000 -0400 +@@ -3,6 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; + + import net.minecraft.client.Minecraft; + +@@ -42,7 +44,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); @@ -1507,7 +1534,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -71,7 +71,7 @@ +@@ -71,7 +73,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -1516,7 +1543,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon { sendBlockRemoved(i, j, k, l); } -@@ -102,7 +102,7 @@ +@@ -102,7 +104,7 @@ return; } Block block = Block.blocksList[i1]; @@ -1525,7 +1552,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(field_1069_h % 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); -@@ -165,6 +165,12 @@ +@@ -165,6 +167,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -1538,7 +1565,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -175,7 +181,11 @@ +@@ -175,7 +183,11 @@ return false; } else { @@ -1666,8 +1693,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo 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 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 19:41:51.000000000 -0400 -@@ -47,10 +47,36 @@ ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 21:35:01.000000000 -0400 +@@ -4,6 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import java.util.Random; + import org.lwjgl.opengl.GL11; + +@@ -47,10 +51,36 @@ } GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); @@ -1705,7 +1743,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f4 = 0.25F; int j = Block.blocksList[itemstack.itemID].getRenderType(); if(j == 1 || j == 19 || j == 12 || j == 2) -@@ -80,9 +106,11 @@ +@@ -80,9 +110,11 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -1717,7 +1755,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } Tessellator tessellator = Tessellator.instance; float f5 = (float)((i % 16) * 16 + 0) / 256F; -@@ -129,10 +157,37 @@ +@@ -129,10 +161,37 @@ public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) { @@ -1756,7 +1794,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -161,9 +216,11 @@ +@@ -161,9 +220,11 @@ if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1770,8 +1808,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte 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-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 19:43:11.000000000 -0400 -@@ -34,7 +34,14 @@ ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 21:37:36.000000000 -0400 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IArmorTextureProvider; + import net.minecraft.client.Minecraft; + import org.lwjgl.opengl.GL11; + +@@ -34,7 +35,14 @@ if(item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; @@ -1808,8 +1854,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft 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 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 19:59:43.000000000 -0400 -@@ -13,8 +13,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 21:38:26.000000000 -0400 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.nio.*; ++import java.util.*; + import org.lwjgl.opengl.*; + + // Referenced classes of package net.minecraft.src: +@@ -13,8 +14,7 @@ public class Tessellator { @@ -1819,7 +1873,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat vertexCount = 0; hasColor = false; hasTexture = false; -@@ -24,21 +23,10 @@ +@@ -24,21 +24,10 @@ addedVertices = 0; isColorDisabled = false; isDrawing = false; @@ -1844,7 +1898,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void draw() -@@ -48,12 +36,20 @@ +@@ -48,12 +37,20 @@ throw new IllegalStateException("Not tesselating!"); } isDrawing = false; @@ -1869,7 +1923,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat if(useVBO) { vboIndex = (vboIndex + 1) % vboCount; -@@ -121,10 +117,10 @@ +@@ -121,10 +118,10 @@ GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(drawMode == 7 && convertQuadsToTriangles) { @@ -1882,7 +1936,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(hasTexture) -@@ -146,6 +142,10 @@ +@@ -146,6 +143,10 @@ GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); } } @@ -1893,7 +1947,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat reset(); } -@@ -265,6 +265,15 @@ +@@ -265,6 +266,15 @@ public void addVertex(double d, double d1, double d2) { @@ -1909,7 +1963,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat addedVertices++; if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) { -@@ -314,11 +323,6 @@ +@@ -314,11 +324,6 @@ rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); rawBufferIndex += 8; vertexCount++; @@ -1921,7 +1975,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void setColorOpaque_I(int i) -@@ -367,10 +371,7 @@ +@@ -367,10 +372,7 @@ private static boolean convertQuadsToTriangles = false; private static boolean tryVBO = false; @@ -1933,7 +1987,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -384,17 +385,42 @@ +@@ -384,17 +386,43 @@ private int rawBufferIndex; private int addedVertices; private boolean isColorDisabled; @@ -1950,6 +2004,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - private boolean isDrawing; - private boolean useVBO; - private IntBuffer vertexBuffers; ++ public boolean isDrawing; private int vboIndex; - private int vboCount; - private int bufferSize; @@ -3279,8 +3334,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return itemstack; 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 20:54:16.000000000 -0400 -@@ -66,7 +66,8 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 21:40:02.000000000 -0400 +@@ -3,7 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; +- ++import net.minecraft.src.forge.ForgeHooks; ++import net.minecraft.src.forge.IUseItemFirst; + + // Referenced classes of package net.minecraft.src: + // EntityPlayer, PlayerCapabilities, World, Block, +@@ -66,7 +67,8 @@ if(j != 0) { Block block = Block.blocksList[j]; @@ -3290,7 +3355,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 1.0F) { field_22050_k = false; -@@ -93,7 +94,7 @@ +@@ -93,7 +95,7 @@ { Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); } @@ -3299,7 +3364,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { blockHarvessted(i, j, k); } else -@@ -113,7 +114,7 @@ +@@ -113,7 +115,7 @@ if(i1 != 0) { Block block = Block.blocksList[i1]; @@ -3308,7 +3373,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -164,7 +165,7 @@ +@@ -164,7 +166,7 @@ thisPlayer.destroyCurrentEquippedItem(); } } @@ -3317,7 +3382,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); } -@@ -188,6 +189,7 @@ +@@ -188,6 +190,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -3325,7 +3390,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } return true; } else -@@ -198,6 +200,11 @@ +@@ -198,6 +201,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -3337,7 +3402,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -217,7 +224,11 @@ +@@ -217,7 +225,11 @@ return flag; } else { @@ -3472,7 +3537,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti 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 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:13:31.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:39:35.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3527,7 +3592,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo private int func_35241_e(int i, int j, int k, int l, int i1, int j1) { - int k1 = Block.lightValue[i1]; -+ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(world,j,k,l); ++ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; From 5ecff4e5a18a66dbcf31b3fcf54e9006381df451 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 19 Sep 2011 20:30:34 +0000 Subject: [PATCH 093/169] Fixed the 1.8.1 version for MLMP support. --- forge/minecraft.patch | 257 +++++++++++++++++++++--------------------- forge/setup.sh | 2 +- 2 files changed, 131 insertions(+), 128 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 0c45727278..d3725fe595 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-18 17:51:10.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:25:47.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-18 17:52:42.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:25:47.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 21:33:35.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:47.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-18 18:00:27.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -311,8 +311,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-18 18:04:12.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:47.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -396,8 +396,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-18 18:07:05.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:25:47.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -517,8 +517,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 21:33:44.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:47.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -540,8 +540,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-18 18:12:22.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:25:47.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -596,8 +596,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 18:13:04.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:47.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -617,8 +617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 21:37:57.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -648,8 +648,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-18 18:16:48.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:47.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -753,8 +753,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-18 18:18:39.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:47.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -790,8 +790,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-18 18:38:26.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:25:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -999,8 +999,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-18 18:55:11.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:25:47.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1147,8 +1147,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-18 18:55:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:47.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1161,8 +1161,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-18 19:01:21.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1238,8 +1238,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-18 19:03:56.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1275,8 +1275,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-18 19:05:02.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:25:47.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1305,8 +1305,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-18 19:06:31.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:47.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1329,8 +1329,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-18 19:07:25.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-19 16:25:47.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1346,8 +1346,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-18 19:10:03.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:25:47.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1389,8 +1389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-18 19:11:23.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1426,8 +1426,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-18 19:14:26.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:47.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1437,8 +1437,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-18 19:15:17.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1456,8 +1456,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon return true; } else 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-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 21:36:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1514,8 +1514,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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 21:38:41.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1579,8 +1579,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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-18 19:30:11.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:25:47.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1654,8 +1654,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-18 19:33:08.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:25:47.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1667,8 +1667,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-18 19:33:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:25:47.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1692,8 +1692,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 21:35:01.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1807,8 +1807,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 21:37:36.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1834,8 +1834,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-18 19:43:41.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1853,8 +1853,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 21:38:26.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:25:47.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2042,8 +2042,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/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-18 20:01:14.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:25:47.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2059,8 +2059,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-18 20:02:27.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2086,8 +2086,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-18 20:07:22.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-19 16:25:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-19 16:25:47.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2165,8 +2165,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-18 20:12:00.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2243,8 +2243,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-18 20:19:50.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:25:47.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2363,8 +2363,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-18 20:21:35.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:25:47.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2395,8 +2395,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-18 20:22:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:47.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2416,8 +2416,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-18 20:25:11.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2538,8 +2538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-18 20:28:10.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:47.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2623,8 +2623,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-18 20:31:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:25:47.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2744,8 +2744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-18 20:33:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:47.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2767,8 +2767,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-18 20:36:04.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:25:47.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2823,8 +2823,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-18 20:37:01.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:47.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2844,8 +2844,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 20:37:35.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2875,8 +2875,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-18 20:40:00.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:47.000000000 -0400 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2980,8 +2980,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-18 20:40:43.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:47.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3017,8 +3017,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-18 20:42:37.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3188,8 +3188,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-18 20:43:15.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:47.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3202,8 +3202,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-18 20:47:39.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3279,8 +3279,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-18 20:48:52.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3308,8 +3308,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-18 20:50:40.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:47.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3333,8 +3333,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return itemstack; 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-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 21:40:02.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:25:47.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -3416,8 +3416,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-18 20:55:42.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:25:47.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -3433,8 +3433,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-18 20:56:44.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:25:47.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3470,8 +3470,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-18 20:57:05.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:47.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3481,8 +3481,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-18 21:09:31.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:25:47.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3499,8 +3499,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-18 21:10:22.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:29:56.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3510,17 +3510,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl // Referenced classes of package net.minecraft.src: // Slot, EntityPlayer, ItemStack, Block, -@@ -59,6 +59,7 @@ - { +@@ -60,6 +60,7 @@ thePlayer.addStat(AchievementList.buildSword, 1); } -+ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); + ModLoader.TakenFromCrafting(thePlayer, itemstack); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); for(int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack itemstack1 = craftMatrix.getStackInSlot(i); +Only in ../src_work/minecraft_server/net/minecraft/src: SlotCrafting.java.orig +Only in ../src_work/minecraft_server/net/minecraft/src: SlotCrafting.java.rej +Only in ../src_work/minecraft_server/net/minecraft/src: .SlotCrafting.java.rej.swp 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-18 17:43:00.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-18 21:10:36.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:25:47.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -3536,8 +3539,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:39:35.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:25:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:25:47.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/setup.sh b/forge/setup.sh index 4b13824759..286d435a93 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -24,7 +24,7 @@ if [ ! -d src_base ] ; then pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; -# patch -p2 -i ../forge/modLoaderMP.patch + patch -p2 -i ../forge/modLoaderMP.patch patch -p1 -i ../forge/mlprop.patch popd > /dev/null From c9b6cdef1fbe98a20121ecf5eeed944068da7a21 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 19 Sep 2011 20:40:07 +0000 Subject: [PATCH 094/169] Fixes for MCP updates. --- forge/minecraft.patch | 286 +++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 142 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index d3725fe595..ff7f069d95 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:32:53.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:32:53.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:53.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-19 16:35:38.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -188,14 +188,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { - return iblockaccess.getBrightness(i, j, k, lightValue[blockID]); + return iblockaccess.getBrightness(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); ++ getLightValue(iblockaccess,i,j,k)); } public int func_35275_c(IBlockAccess iblockaccess, int i, int j, int k) { -- return iblockaccess.func_35451_b(i, j, k, lightValue[blockID]); -+ return iblockaccess.func_35451_b(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); +- return iblockaccess.getLightBrightnessFromSunlight(i, j, k, lightValue[blockID]); ++ return iblockaccess.getLightBrightnessFromSunlight(i, j, k, ++ getLightValue(iblockaccess,i,j,k)); } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) @@ -310,9 +310,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try +Only in ../src_work/minecraft/net/minecraft/src: Block.java.orig +Only in ../src_work/minecraft/net/minecraft/src: Block.java.rej 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:53.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -396,8 +398,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:32:53.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -517,8 +519,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:53.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -540,8 +542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:32:53.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -596,8 +598,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:53.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -617,8 +619,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:53.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -648,8 +650,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:53.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -753,8 +755,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:53.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -790,8 +792,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:25:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:32:53.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -999,8 +1001,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:36:34.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1043,8 +1045,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen for(int k = 0; k < fxLayers[i].size(); k++) { EntityFX entityfx = (EntityFX)fxLayers[i].get(k); -+ if(entityfx instanceof EntityDiggingFX) continue; - tessellator.func_35835_b(entityfx.func_35115_a(f)); ++ if(entityfx instanceof EntityDiggingFX) continue; + tessellator.setBrightness(entityfx.func_35115_a(f)); entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); } @@ -101,6 +117,20 @@ @@ -1146,9 +1148,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private RenderEngine renderer; private Random rand; } +Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.orig +Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.rej 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1161,8 +1165,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:04.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1202,13 +1206,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla + { + f /= 5F; + } -+ if(func_35160_a(Potion.field_35675_e)) ++ if(func_35160_a(Potion.potionDigSpeed)) + { -+ f *= 1.0F + (float)(func_35167_b(Potion.field_35675_e).func_35801_c() + 1) * 0.2F; ++ f *= 1.0F + (float)(func_35167_b(Potion.potionDigSpeed).func_35801_c() + 1) * 0.2F; + } -+ if(func_35160_a(Potion.field_35672_f)) ++ if(func_35160_a(Potion.potionDigSlow)) + { -+ f *= 1.0F - (float)(func_35167_b(Potion.field_35672_f).func_35801_c() + 1) * 0.2F; ++ f *= 1.0F - (float)(func_35167_b(Potion.potionDigSlow).func_35801_c() + 1) * 0.2F; + } + return f; + } @@ -1238,8 +1242,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1275,8 +1279,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1305,8 +1309,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1329,8 +1333,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1346,8 +1350,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:32:54.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1389,8 +1393,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1426,8 +1430,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1437,8 +1441,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1456,8 +1460,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon return true; } else 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-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1514,8 +1518,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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1579,8 +1583,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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:32:54.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1654,8 +1658,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:32:54.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1667,8 +1671,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:32:54.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1692,8 +1696,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1807,8 +1811,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1834,8 +1838,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1853,8 +1857,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:32:54.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2042,8 +2046,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/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2059,8 +2063,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2086,8 +2090,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-19 16:25:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-19 16:32:51.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2165,8 +2169,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2243,8 +2247,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:32:54.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2363,8 +2367,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:32:54.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2395,8 +2399,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:54.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2416,8 +2420,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2538,8 +2542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:54.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2623,8 +2627,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:32:54.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2744,8 +2748,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:54.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2767,8 +2771,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:32:54.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2823,8 +2827,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:54.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2844,8 +2848,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2875,11 +2879,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:54.000000000 -0400 @@ -36,24 +36,24 @@ - private boolean func_31028_g(World world, int i, int j, int k) + private boolean canPlaceTorchOn(World world, int i, int j, int k) { - return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; + return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; @@ -2979,9 +2983,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { flag = true; } +Only in ../src_work/minecraft_server/net/minecraft/src: BlockTorch.java.orig 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-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:54.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3017,8 +3022,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3188,8 +3193,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3202,8 +3207,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:48.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3243,13 +3248,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En + { + f /= 5F; + } -+ if(func_35184_a(Potion.field_35452_e)) ++ if(func_35184_a(Potion.digSpeed)) + { -+ f *= 1.0F + (float)(func_35187_b(Potion.field_35452_e).func_35652_c() + 1) * 0.2F; ++ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).func_35652_c() + 1) * 0.2F; + } -+ if(func_35184_a(Potion.field_35449_f)) ++ if(func_35184_a(Potion.digSlowdown)) + { -+ f *= 1.0F - (float)(func_35187_b(Potion.field_35449_f).func_35652_c() + 1) * 0.2F; ++ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).func_35652_c() + 1) * 0.2F; + } + return f; + } @@ -3279,8 +3284,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3308,8 +3313,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3333,8 +3338,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return itemstack; 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-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -3416,8 +3421,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -3433,8 +3438,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3470,8 +3475,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3481,8 +3486,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:32:54.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3499,8 +3504,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:29:56.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3518,12 +3523,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl for(int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack itemstack1 = craftMatrix.getStackInSlot(i); -Only in ../src_work/minecraft_server/net/minecraft/src: SlotCrafting.java.orig -Only in ../src_work/minecraft_server/net/minecraft/src: SlotCrafting.java.rej -Only in ../src_work/minecraft_server/net/minecraft/src: .SlotCrafting.java.rej.swp 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-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -3539,8 +3541,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:25:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:25:47.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) From 9fa40cb43240fa3d76c8e819eb5d22d14554e415 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Sep 2011 00:55:09 +0000 Subject: [PATCH 095/169] Metadata-sensitive smelting patch. --- forge/minecraft.patch | 144 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index ff7f069d95..712e60e5c9 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1308,6 +1308,57 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion } 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 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-20 20:52:59.000000000 -0400 +@@ -6,6 +6,7 @@ + + import java.util.HashMap; + import java.util.Map; ++import java.util.Arrays; + + // Referenced classes of package net.minecraft.src: + // Block, ItemStack, Item +@@ -40,11 +41,32 @@ + smeltingList.put(Integer.valueOf(i), itemstack); + } + ++ /* FORGE: Add a metadata-sensitive furnace recipe. ++ */ ++ public void addSmelting(int i, int meta, ItemStack itemstack) ++ { ++ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); ++ } ++ ++ /* FORGE: Not used anymore. ++ */ + public ItemStack getSmeltingResult(int i) + { + return (ItemStack)smeltingList.get(Integer.valueOf(i)); + } + ++ /* FORGE: Added to allow metadata-sensitive smelting. ++ */ ++ public ItemStack getSmeltingResult(ItemStack src) { ++ ItemStack tr; ++ ++ if(src==null) return null; ++ tr=(ItemStack)metaSmeltingList.get( ++ Arrays.asList(src.itemID,src.getItemDamage())); ++ if(tr!=null) return tr; ++ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); ++ } ++ + public Map getSmeltingList() + { + return smeltingList; +@@ -52,5 +74,6 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + } 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-19 16:32:52.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 @@ -2045,6 +2096,27 @@ 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/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:52.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:51:30.000000000 -0400 +@@ -196,7 +196,7 @@ + { + return false; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(itemstack == null) + { + return false; +@@ -222,7 +222,7 @@ + { + return; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(furnaceItemStacks[2] == null) + { + furnaceItemStacks[2] = itemstack.copy(); 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-19 16:32:52.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 @@ -3312,6 +3384,57 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex } 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 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-20 20:52:55.000000000 -0400 +@@ -6,6 +6,7 @@ + + import java.util.HashMap; + import java.util.Map; ++import java.util.Arrays; + + // Referenced classes of package net.minecraft.src: + // Block, ItemStack, Item +@@ -40,11 +41,32 @@ + smeltingList.put(Integer.valueOf(i), itemstack); + } + ++ /* FORGE: Add a metadata-sensitive furnace recipe. ++ */ ++ public void addSmelting(int i, int meta, ItemStack itemstack) ++ { ++ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); ++ } ++ ++ /* FORGE: Not used anymore. ++ */ + public ItemStack getSmeltingResult(int i) + { + return (ItemStack)smeltingList.get(Integer.valueOf(i)); + } + ++ /* FORGE: Added to allow metadata-sensitive smelting. ++ */ ++ public ItemStack getSmeltingResult(ItemStack src) { ++ ItemStack tr; ++ ++ if(src==null) return null; ++ tr=(ItemStack)metaSmeltingList.get( ++ Arrays.asList(src.itemID,src.getItemDamage())); ++ if(tr!=null) return tr; ++ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); ++ } ++ + public Map getSmeltingList() + { + return smeltingList; +@@ -52,5 +74,6 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + } 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-19 16:32:53.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 @@ -3523,6 +3646,27 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl for(int i = 0; i < craftMatrix.getSizeInventory(); 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 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:53.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:51:40.000000000 -0400 +@@ -176,7 +176,7 @@ + { + return false; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(itemstack == null) + { + return false; +@@ -204,7 +204,7 @@ + { + return; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(furnaceItemStacks[2] == null) + { + furnaceItemStacks[2] = itemstack.copy(); 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-19 16:32:53.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 From cab70ce17a4d74e7159ed6b773fa2897f2dfefad Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Sep 2011 00:59:37 +0000 Subject: [PATCH 096/169] Small bugfix for furnace patch. --- forge/minecraft.patch | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 712e60e5c9..71aea80b6b 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -2098,7 +2098,7 @@ 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/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java --- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:51:30.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:51.000000000 -0400 @@ -196,7 +196,7 @@ { return false; @@ -2108,7 +2108,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit if(itemstack == null) { return false; -@@ -222,7 +222,7 @@ +@@ -222,12 +222,12 @@ { return; } @@ -2117,6 +2117,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit if(furnaceItemStacks[2] == null) { furnaceItemStacks[2] = itemstack.copy(); + } else +- if(furnaceItemStacks[2].itemID == itemstack.itemID) ++ if(furnaceItemStacks[2].isItemEqual(itemstack)) + { + furnaceItemStacks[2].stackSize++; + } 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-19 16:32:52.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 @@ -3648,7 +3654,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl 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 --- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:51:40.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:42.000000000 -0400 @@ -176,7 +176,7 @@ { return false; @@ -3658,7 +3664,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti if(itemstack == null) { return false; -@@ -204,7 +204,7 @@ +@@ -204,12 +204,12 @@ { return; } @@ -3667,6 +3673,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti if(furnaceItemStacks[2] == null) { furnaceItemStacks[2] = itemstack.copy(); + } else +- if(furnaceItemStacks[2].itemID == itemstack.itemID) ++ if(furnaceItemStacks[2].isItemEqual(itemstack)) + { + furnaceItemStacks[2].stackSize++; + } 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-19 16:32:53.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 From 0392ecd8da0526013d3664067b3d4081a330098f Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Sep 2011 01:05:44 +0000 Subject: [PATCH 097/169] Fixed another bug in the furnace patch. Works now. --- forge/minecraft.patch | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 71aea80b6b..63abdb14a1 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1310,7 +1310,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion { 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-20 20:52:59.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:53.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -1319,7 +1319,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe // Referenced classes of package net.minecraft.src: // Block, ItemStack, Item -@@ -40,11 +41,32 @@ +@@ -21,6 +22,7 @@ + private FurnaceRecipes() + { + smeltingList = new HashMap(); ++ metaSmeltingList = new HashMap(); + addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); + addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); + addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); +@@ -40,11 +42,32 @@ smeltingList.put(Integer.valueOf(i), itemstack); } @@ -1352,7 +1360,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe public Map getSmeltingList() { return smeltingList; -@@ -52,5 +74,6 @@ +@@ -52,5 +75,6 @@ private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); private Map smeltingList; @@ -3392,7 +3400,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex { 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-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-20 20:52:55.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:46.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -3401,7 +3409,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu // Referenced classes of package net.minecraft.src: // Block, ItemStack, Item -@@ -40,11 +41,32 @@ +@@ -21,6 +22,7 @@ + private FurnaceRecipes() + { + smeltingList = new HashMap(); ++ metaSmeltingList = new HashMap(); + addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); + addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); + addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); +@@ -40,11 +42,32 @@ smeltingList.put(Integer.valueOf(i), itemstack); } @@ -3434,7 +3450,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu public Map getSmeltingList() { return smeltingList; -@@ -52,5 +74,6 @@ +@@ -52,5 +75,6 @@ private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); private Map smeltingList; From afdbc4064bf61a4d7abbe9d3c8f0b96a99e41b24 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Sep 2011 07:14:53 +0000 Subject: [PATCH 098/169] Fixed up a few bugs in the tool path. --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index a578468baa..647f19505b 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -60,7 +60,7 @@ public class ForgeHooks { bl.blockID,md,cls)); if(bhl==null) return itemstack.canHarvestBlock(bl); if(bhl>hvl) return false; - return itemstack.canHarvestBlock(bl); + return true; } public static float blockStrength(Block bl, @@ -125,9 +125,8 @@ public class ForgeHooks { Block[] pickeff ={ Block.cobblestone, Block.stairDouble, Block.stairSingle, Block.stone, Block.sandStone, - Block.cobblestoneMossy, Block.oreIron, - Block.blockSteel, Block.oreCoal, Block.blockGold, - Block.oreGold, Block.oreDiamond, Block.blockDiamond, + Block.cobblestoneMossy, + Block.oreCoal, Block.ice, Block.netherrack, Block.oreLapis, Block.blockLapis }; From 7a242e956276fc135851ca35d3a4a28491be2ad9 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Sep 2011 08:08:58 +0000 Subject: [PATCH 099/169] Metadata-sensitive quantity dropped. --- forge/minecraft.patch | 54 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 63abdb14a1..c461805a2b 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -173,7 +173,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-19 16:35:38.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 03:50:55.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -199,7 +199,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -283,19 +286,12 @@ +@@ -278,24 +281,24 @@ + return 1; + } + ++ /* FORGE: Metadata-sensitive version. ++ */ ++ public int quantityDropped(int i, Random random) ++ { ++ return quantityDropped(random); ++ } ++ + public int idDropped(int i, Random random) + { return blockID; } @@ -223,7 +235,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -618,6 +614,86 @@ +@@ -309,7 +312,7 @@ + { + return; + } +- int i1 = quantityDropped(world.rand); ++ int i1 = quantityDropped(l,world.rand); + for(int j1 = 0; j1 < i1; j1++) + { + if(world.rand.nextFloat() > f) +@@ -618,6 +621,86 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -2507,7 +2528,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:32:54.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 03:50:53.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2516,7 +2537,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl import java.util.ArrayList; import java.util.Random; -@@ -223,19 +224,12 @@ +@@ -218,24 +219,24 @@ + return 1; + } + ++ /* FORGE: Metadata-sensitive version. ++ */ ++ public int quantityDropped(int i, Random random) ++ { ++ return quantityDropped(random); ++ } ++ + public int idDropped(int i, Random random) + { return blockID; } @@ -2540,7 +2573,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -529,6 +523,86 @@ +@@ -249,7 +250,7 @@ + { + return; + } +- int i1 = quantityDropped(world.rand); ++ int i1 = quantityDropped(l,world.rand); + for(int j1 = 0; j1 < i1; j1++) + { + if(world.rand.nextFloat() > f) +@@ -529,6 +530,86 @@ return blockMaterial.getMaterialMobility(); } From 1a8d32f7de6648f5965136637d5ba83a88245e0f Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 22 Sep 2011 02:45:47 +0000 Subject: [PATCH 100/169] Code to remove a single block effectiveness. --- .../net/minecraft/src/forge/MinecraftForge.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 6a1e92a78a..89e1266ea6 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -158,6 +158,22 @@ public class MinecraftForge { } } + /** Remove a block effectiveness mapping. Since setBlockHarvestLevel + * makes the tool class effective against the block by default, this can be + * used to remove that mapping. This will force a block to be harvested at + * the same speed regardless of tool quality, while still requiring a given + * harvesting level. + * @param bl The block to remove effectiveness from. + * @param md The metadata for the block subtype. + * @param tclass The tool class to remove the effectiveness mapping from. + * @see setToolClass for details on tool classes. + */ + public static void removeBlockEffectiveness(Block bl, int md, String tclass) { + ForgeHooks.initTools(); + List key=Arrays.asList(bl.blockID,md,tclass); + ForgeHooks.toolEffectiveness.remove(key); + } + /** * This function is deprecated and will be removed eventually. */ From a386d0a8dc4de721154894a84f581efa5393896e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 22 Sep 2011 02:49:33 +0000 Subject: [PATCH 101/169] Undid that. Whoops. --- .../net/minecraft/src/forge/MinecraftForge.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 89e1266ea6..6a1e92a78a 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -158,22 +158,6 @@ public class MinecraftForge { } } - /** Remove a block effectiveness mapping. Since setBlockHarvestLevel - * makes the tool class effective against the block by default, this can be - * used to remove that mapping. This will force a block to be harvested at - * the same speed regardless of tool quality, while still requiring a given - * harvesting level. - * @param bl The block to remove effectiveness from. - * @param md The metadata for the block subtype. - * @param tclass The tool class to remove the effectiveness mapping from. - * @see setToolClass for details on tool classes. - */ - public static void removeBlockEffectiveness(Block bl, int md, String tclass) { - ForgeHooks.initTools(); - List key=Arrays.asList(bl.blockID,md,tclass); - ForgeHooks.toolEffectiveness.remove(key); - } - /** * This function is deprecated and will be removed eventually. */ From ed7c3436476dcdcf0af9ce040ece6d4b3182f2a3 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 22 Sep 2011 03:01:10 +0000 Subject: [PATCH 102/169] More MCP mapping fixes. --- forge/minecraft.patch | 287 +++++++++++++++++++++--------------------- 1 file changed, 141 insertions(+), 146 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index c461805a2b..be36890dcc 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 03:50:55.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -188,14 +188,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { - return iblockaccess.getBrightness(i, j, k, lightValue[blockID]); + return iblockaccess.getBrightness(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); ++ getLightValue(iblockaccess,i,j,k)); } - public int func_35275_c(IBlockAccess iblockaccess, int i, int j, int k) + public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k) { -- return iblockaccess.getLightBrightnessFromSunlight(i, j, k, lightValue[blockID]); -+ return iblockaccess.getLightBrightnessFromSunlight(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); +- return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]); ++ return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, ++ getLightValue(iblockaccess,i,j,k)); } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) @@ -331,11 +331,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav static Class _mthclass$(String s) { try -Only in ../src_work/minecraft/net/minecraft/src: Block.java.orig -Only in ../src_work/minecraft/net/minecraft/src: Block.java.rej 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -419,8 +417,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -540,8 +538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -563,8 +561,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -619,8 +617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -640,8 +638,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -671,8 +669,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -776,8 +774,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -813,8 +811,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:32:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1022,8 +1020,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:36:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:09.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1169,11 +1167,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen private RenderEngine renderer; private Random rand; } -Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.orig -Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.rej 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1186,8 +1182,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:04.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 23:00:12.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1227,13 +1223,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla + { + f /= 5F; + } -+ if(func_35160_a(Potion.potionDigSpeed)) ++ if(isPotionActive(Potion.potionDigSpeed)) + { -+ f *= 1.0F + (float)(func_35167_b(Potion.potionDigSpeed).func_35801_c() + 1) * 0.2F; ++ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; + } -+ if(func_35160_a(Potion.potionDigSlow)) ++ if(isPotionActive(Potion.potionDigSlow)) + { -+ f *= 1.0F - (float)(func_35167_b(Potion.potionDigSlow).func_35801_c() + 1) * 0.2F; ++ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; + } + return f; + } @@ -1263,8 +1259,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1300,8 +1296,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1330,8 +1326,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:53.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -1389,8 +1385,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/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1413,8 +1409,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1430,8 +1426,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:09.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1473,8 +1469,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1510,8 +1506,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1521,8 +1517,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1540,8 +1536,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon return true; } else 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1598,8 +1594,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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1663,8 +1659,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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:09.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1738,8 +1734,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:09.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1751,8 +1747,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:09.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1776,8 +1772,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1891,8 +1887,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1918,8 +1914,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1937,8 +1933,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:09.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2126,8 +2122,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/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:51.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400 @@ -196,7 +196,7 @@ { return false; @@ -2153,8 +2149,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit furnaceItemStacks[2].stackSize++; } 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2170,8 +2166,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2197,8 +2193,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-19 16:32:51.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2276,8 +2272,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-19 16:32:52.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2354,8 +2350,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2474,8 +2470,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2506,8 +2502,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2527,8 +2523,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 03:50:53.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2670,8 +2666,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2755,8 +2751,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2876,8 +2872,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2899,8 +2895,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2955,8 +2951,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2976,8 +2972,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3007,8 +3003,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) @@ -3111,10 +3107,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { flag = true; } -Only in ../src_work/minecraft_server/net/minecraft/src: BlockTorch.java.orig 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-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3150,8 +3145,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3321,8 +3316,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3335,8 +3330,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:48.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:09.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3412,8 +3407,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3441,8 +3436,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:46.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -3500,8 +3495,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/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3525,8 +3520,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return itemstack; 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-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -3608,8 +3603,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -3625,8 +3620,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3662,8 +3657,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3673,8 +3668,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-21 22:59:09.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3691,8 +3686,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3711,8 +3706,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:42.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400 @@ -176,7 +176,7 @@ { return false; @@ -3738,8 +3733,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti furnaceItemStacks[2].stackSize++; } 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-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -3755,8 +3750,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:32:53.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) From 47749d454abd39c3f5ace203a1ad73cd76de31c3 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 22 Sep 2011 10:12:05 +0000 Subject: [PATCH 103/169] Added a fix for onItemUse regression. --- forge/minecraft.patch | 168 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index be36890dcc..2b36b72194 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -1384,6 +1384,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe + private Map metaSmeltingList; } +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-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:18.000000000 -0400 +@@ -62,7 +62,7 @@ + { + return false; + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } 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-21 22:59:07.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 @@ -1408,6 +1420,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-22 06:02:44.000000000 -0400 +@@ -35,7 +35,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } +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-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:02:54.000000000 -0400 +@@ -46,7 +46,7 @@ + { + i++; + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } +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-21 22:59:06.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-22 06:03:24.000000000 -0400 +@@ -21,7 +21,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } 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-21 22:59:06.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400 @@ -1425,6 +1473,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; +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-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-22 06:03:35.000000000 -0400 +@@ -50,7 +50,7 @@ + return false; + } + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } +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-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-22 06:04:20.000000000 -0400 +@@ -52,7 +52,7 @@ + i++; + } + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } 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-21 22:59:06.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:09.000000000 -0400 @@ -1468,6 +1540,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende } Tessellator tessellator = Tessellator.instance; 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 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-22 06:03:52.000000000 -0400 +@@ -24,7 +24,7 @@ + { + return false; + } +- if(!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k)) ++ if(entityplayer!=null && (!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k))) + { + return false; + } 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-21 22:59:06.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 @@ -3494,6 +3578,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu + private Map metaSmeltingList; } +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-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:38.000000000 -0400 +@@ -62,7 +62,7 @@ + { + return false; + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:08.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 @@ -3519,6 +3615,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(!entityplayer.func_35200_c(i, j, k)) { 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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-22 06:04:56.000000000 -0400 +@@ -29,7 +29,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } +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-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:05:03.000000000 -0400 +@@ -46,7 +46,7 @@ + { + i++; + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-21 22:59:07.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-22 06:05:12.000000000 -0400 +@@ -21,7 +21,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:07.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:09.000000000 -0400 @@ -3619,6 +3751,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { 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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-22 06:05:19.000000000 -0400 +@@ -50,7 +50,7 @@ + return false; + } + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-22 06:05:35.000000000 -0400 +@@ -52,7 +52,7 @@ + i++; + } + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + 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 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:08.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-22 06:05:28.000000000 -0400 +@@ -24,7 +24,7 @@ + { + return false; + } +- if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)) ++ if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:07.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 From d290970b49d16c1979b548732f995452871684a8 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 26 Sep 2011 19:37:28 +0000 Subject: [PATCH 104/169] Fixed digging particles. --- forge/minecraft.patch | 329 +++++++++++++++++++++--------------------- 1 file changed, 165 insertions(+), 164 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2b36b72194..ae7a7c9e85 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -332,8 +332,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -417,8 +417,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -538,8 +538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -561,8 +561,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -617,8 +617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -638,8 +638,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -669,8 +669,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -774,8 +774,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -811,8 +811,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1020,8 +1020,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:34:24.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1068,7 +1068,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen tessellator.setBrightness(entityfx.func_35115_a(f)); entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); } -@@ -101,6 +117,20 @@ +@@ -101,6 +117,21 @@ tessellator.draw(); } @@ -1081,6 +1081,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen + tessellator.startDrawingQuads(); + for (int y = 0; y < entry.effects.size(); y++) { + EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ tessellator.setBrightness(entityfx.func_35115_a(f)); + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + tessellator.draw(); @@ -1089,7 +1090,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } public void func_1187_b(Entity entity, float f) -@@ -132,7 +162,12 @@ +@@ -132,7 +163,12 @@ { fxLayers[i].clear(); } @@ -1103,7 +1104,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) -@@ -153,7 +188,12 @@ +@@ -153,7 +189,12 @@ double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; int j2 = rand.nextInt(6); @@ -1117,7 +1118,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } } -@@ -198,16 +238,48 @@ +@@ -198,16 +239,48 @@ { d = (double)i + block.maxX + (double)f; } @@ -1168,8 +1169,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1182,8 +1183,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 23:00:12.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1259,8 +1260,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1296,8 +1297,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1326,8 +1327,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -1385,8 +1386,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 ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:18.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -1397,8 +1398,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock return false; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1421,8 +1422,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-22 06:02:44.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400 @@ -35,7 +35,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1433,8 +1434,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.j return false; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:02:54.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -1445,8 +1446,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint return false; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-22 06:03:24.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1457,8 +1458,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.j return false; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1474,8 +1475,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-22 06:03:35.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -1486,8 +1487,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst return false; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-22 06:04:20.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -1498,8 +1499,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed. return false; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-23 19:09:34.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1541,8 +1542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-22 06:03:52.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -1553,8 +1554,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds return false; } 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1590,8 +1591,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1601,8 +1602,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1620,8 +1621,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon return true; } else 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-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1678,8 +1679,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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1743,8 +1744,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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:34.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1818,8 +1819,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:34.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1831,8 +1832,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:34.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1856,8 +1857,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1971,8 +1972,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1998,8 +1999,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2017,8 +2018,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:34.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2206,8 +2207,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/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 @@ -196,7 +196,7 @@ { return false; @@ -2233,8 +2234,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit furnaceItemStacks[2].stackSize++; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2250,8 +2251,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2277,8 +2278,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:06.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:32.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2356,8 +2357,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2434,8 +2435,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2554,8 +2555,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2586,8 +2587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2607,8 +2608,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2750,8 +2751,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2835,8 +2836,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2956,8 +2957,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2979,8 +2980,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -3035,8 +3036,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -3056,8 +3057,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3087,8 +3088,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) @@ -3192,8 +3193,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3229,8 +3230,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3400,8 +3401,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3414,8 +3415,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3491,8 +3492,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3520,8 +3521,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -3579,8 +3580,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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:38.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -3591,8 +3592,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3616,8 +3617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-22 06:04:56.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400 @@ -29,7 +29,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3628,8 +3629,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return false; } 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-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:05:03.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -3640,8 +3641,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-22 06:05:12.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3652,8 +3653,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -3735,8 +3736,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -3752,8 +3753,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-22 06:05:19.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -3764,8 +3765,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-22 06:05:35.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -3776,8 +3777,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-22 06:05:28.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -3788,8 +3789,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3825,8 +3826,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3836,8 +3837,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3854,8 +3855,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3874,8 +3875,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 @@ -176,7 +176,7 @@ { return false; @@ -3901,8 +3902,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti furnaceItemStacks[2].stackSize++; } 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-21 22:59:08.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -3918,8 +3919,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:07.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:33.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) From 07dfc35e0e764f6f623cede43bf982fb467db36b Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 28 Sep 2011 23:35:31 +0000 Subject: [PATCH 105/169] Fixed TileEntities, bumped version number. --- .../net/minecraft/src/forge/ForgeHooks.java | 4 +- forge/minecraft.patch | 783 ++++++++++++++---- 2 files changed, 603 insertions(+), 184 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 647f19505b..c6030ac91a 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -138,8 +138,8 @@ public class ForgeHooks { } public static final int majorVersion=1; - public static final int minorVersion=0; - public static final int revisionVersion=6; + public static final int minorVersion=1; + public static final int revisionVersion=0; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index ae7a7c9e85..4553da4d8f 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -150,9 +150,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes { return true; } +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_work/minecraft/net/minecraft/src/BlockContainer.java 2011-09-28 18:22:54.000000000 -0400 +@@ -26,7 +26,7 @@ + public void onBlockAdded(World world, int i, int j, int k) + { + super.onBlockAdded(world, i, j, k); +- world.setBlockTileEntity(i, j, k, getBlockEntity()); ++ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); + } + + public void onBlockRemoval(World world, int i, int j, int k) +@@ -37,6 +37,12 @@ + + public abstract TileEntity getBlockEntity(); + ++ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. ++ */ ++ public TileEntity getBlockEntity(int md) { ++ return getBlockEntity(); ++ } ++ + public void playBlock(World world, int i, int j, int k, int l, int i1) + { + super.playBlock(world, i, j, k, l, i1); 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -172,8 +197,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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -332,8 +357,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -417,8 +442,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd flag = true; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-26 15:46:46.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -538,8 +563,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve flag = true; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -561,8 +586,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres flag = true; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -617,8 +642,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail flag = true; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:46.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -638,8 +663,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return false; } else 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -669,8 +694,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds { return true; 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -774,8 +799,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc flag = true; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:46.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -811,8 +836,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-28 19:16:54.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -950,6 +975,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(l1 != 0 && !worldObj.multiplayerWorld) { +@@ -380,7 +364,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) @@ -410,8 +394,6 @@ field_35845_c[i1] = -999; } @@ -975,7 +1009,53 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(k1 != 0) { -@@ -777,8 +764,6 @@ +@@ -452,7 +439,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -603,7 +590,7 @@ + } + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); + worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); + } + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); +@@ -618,6 +605,18 @@ + } + } + ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) ++ { ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); ++ } ++ } ++ + public void addTileEntity(TileEntity tileentity) + { + int i = tileentity.xCoord - xPosition * 16; +@@ -626,7 +625,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -777,8 +776,6 @@ { for(int l2 = k; l2 < j1; l2++) { @@ -984,7 +1064,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int l3 = l1 << 11 | l2 << 7 | j; int l4 = i1 - j; System.arraycopy(abyte0, k1, blocks, l3, l4); -@@ -792,8 +777,6 @@ +@@ -792,8 +789,6 @@ { for(int i3 = k; i3 < j1; i3++) { @@ -993,7 +1073,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int i4 = (i2 << 11 | i3 << 7 | j) >> 1; int i5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, data.data, i4, i5); -@@ -806,8 +789,6 @@ +@@ -806,8 +801,6 @@ { for(int j3 = k; j3 < j1; j3++) { @@ -1002,7 +1082,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int j4 = (j2 << 11 | j3 << 7 | j) >> 1; int j5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); -@@ -820,8 +801,6 @@ +@@ -820,8 +813,6 @@ { for(int k3 = k; k3 < j1; k3++) { @@ -1011,7 +1091,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int k4 = (k2 << 11 | k3 << 7 | j) >> 1; int k5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -880,7 +859,6 @@ +@@ -880,7 +871,6 @@ int l = field_35845_c[k]; if(l == -999) { @@ -1020,8 +1100,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav 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 ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:34:24.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:46:46.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1169,8 +1249,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen 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 ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1183,8 +1263,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1260,8 +1340,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1297,8 +1377,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-26 15:46:46.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1327,8 +1407,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion 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 ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -1386,8 +1466,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 ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:46.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -1398,8 +1478,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock return false; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1422,8 +1502,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke { 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 ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:46.000000000 -0400 @@ -35,7 +35,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1434,8 +1514,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.j return false; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:46.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -1446,8 +1526,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint return false; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:46.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1458,8 +1538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.j return false; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-26 15:46:46.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1475,8 +1555,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -1487,8 +1567,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst return false; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -1499,8 +1579,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed. return false; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-26 15:46:46.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1542,8 +1622,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende Tessellator tessellator = Tessellator.instance; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -1554,8 +1634,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds return false; } 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1591,8 +1671,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1602,8 +1682,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1621,8 +1701,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon return true; } else 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-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1679,8 +1759,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/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1744,8 +1824,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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:46.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1819,8 +1899,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:46.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1832,8 +1912,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:46.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1857,8 +1937,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private boolean occlusionEnabled; 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 ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1972,8 +2052,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k1 = Item.itemsList[i].getColorFromDamage(j); 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-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1999,8 +2079,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2018,8 +2098,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft { 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 ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-26 15:46:46.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2207,8 +2287,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/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:46.000000000 -0400 @@ -196,7 +196,7 @@ { return false; @@ -2234,8 +2314,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit furnaceItemStacks[2].stackSize++; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2251,8 +2331,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2278,8 +2358,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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:32.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-26 15:46:44.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-28 19:01:50.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2292,7 +2372,63 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public boolean blockExists(int i, int j, int k) -@@ -1684,7 +1687,10 @@ +@@ -1476,7 +1479,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } +@@ -1503,16 +1506,16 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ } else { + if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) + { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); +- } ++ } + } while(true); + addedTileEntityList.clear(); + } +@@ -1520,13 +1523,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- addedTileEntityList.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1684,7 +1693,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -2304,7 +2440,65 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } } -@@ -1977,13 +1983,18 @@ +@@ -1917,44 +1929,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(tileentity != null && !tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; +- addedTileEntityList.add(tileentity); +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public void func_35455_a(TileEntity tileentity) +@@ -1977,13 +1968,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -2330,7 +2524,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav } public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2308,7 +2319,7 @@ +@@ -2308,7 +2304,7 @@ private int func_35458_d(int i, int j, int k, int l, int i1, int j1) { @@ -2339,7 +2533,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2679,6 +2690,7 @@ +@@ -2679,6 +2675,7 @@ { block = null; } @@ -2347,7 +2541,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -3193,7 +3205,7 @@ +@@ -3193,7 +3190,7 @@ public int field_27172_i; public boolean editingBlocks; private long lockTimestamp; @@ -2357,8 +2551,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2435,8 +2629,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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2555,8 +2749,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2586,9 +2780,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-28 18:22:50.000000000 -0400 +@@ -26,7 +26,7 @@ + public void onBlockAdded(World world, int i, int j, int k) + { + super.onBlockAdded(world, i, j, k); +- world.setBlockTileEntity(i, j, k, getBlockEntity()); ++ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); + } + + public void onBlockRemoval(World world, int i, int j, int k) +@@ -37,6 +37,12 @@ + + public abstract TileEntity getBlockEntity(); + ++ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. ++ */ ++ public TileEntity getBlockEntity(int md) { ++ return getBlockEntity(); ++ } ++ + public void playBlock(World world, int i, int j, int k, int l, int i1) + { + super.playBlock(world, i, j, k, l, i1); 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-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2608,8 +2827,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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2751,8 +2970,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2836,8 +3055,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-26 15:46:46.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2957,8 +3176,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2980,8 +3199,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -3036,8 +3255,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:46.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -3057,8 +3276,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl return false; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3088,8 +3307,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) @@ -3193,8 +3412,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:46.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3230,8 +3449,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-28 18:18:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3331,6 +3550,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(l1 != 0 && !worldObj.singleplayerWorld) { +@@ -354,7 +345,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) @@ -384,8 +375,6 @@ field_35637_c[i1] = -999; } @@ -3356,7 +3584,53 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(k1 != 0) { -@@ -766,8 +760,6 @@ +@@ -426,7 +420,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -577,7 +571,7 @@ + } + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); + worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); + } + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); +@@ -592,6 +586,18 @@ + } + } + ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) ++ { ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); ++ } ++ } ++ + public void addTileEntity(TileEntity tileentity) + { + int i = tileentity.xCoord - xPosition * 16; +@@ -600,7 +606,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -766,8 +772,6 @@ { for(int k3 = k; k3 < j1; k3++) { @@ -3365,7 +3639,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int k4 = k2 << 11 | k3 << 7 | j; int k5 = i1 - j; System.arraycopy(blocks, k4, abyte0, k1, k5); -@@ -780,8 +772,6 @@ +@@ -780,8 +784,6 @@ { for(int l3 = k; l3 < j1; l3++) { @@ -3374,7 +3648,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int l4 = (l2 << 11 | l3 << 7 | j) >> 1; int l5 = (i1 - j) / 2; System.arraycopy(data.data, l4, abyte0, k1, l5); -@@ -794,8 +784,6 @@ +@@ -794,8 +796,6 @@ { for(int i4 = k; i4 < j1; i4++) { @@ -3383,7 +3657,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int i5 = (i3 << 11 | i4 << 7 | j) >> 1; int i6 = (i1 - j) / 2; System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); -@@ -808,8 +796,6 @@ +@@ -808,8 +808,6 @@ { for(int j4 = k; j4 < j1; j4++) { @@ -3392,7 +3666,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int j5 = (j3 << 11 | j4 << 7 | j) >> 1; int j6 = (i1 - j) / 2; System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); -@@ -857,7 +843,6 @@ +@@ -857,7 +855,6 @@ int l = field_35637_c[k]; if(l == -999) { @@ -3401,8 +3675,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3415,8 +3689,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3492,8 +3766,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3521,8 +3795,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex 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 ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -3580,8 +3854,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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:46.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -3592,8 +3866,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3617,8 +3891,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:46.000000000 -0400 @@ -29,7 +29,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3629,8 +3903,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return false; } 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-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:46.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -3641,8 +3915,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:46.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3653,8 +3927,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -3736,8 +4010,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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:46.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -3753,8 +4027,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -3765,8 +4039,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -3777,8 +4051,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -3789,8 +4063,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-26 15:46:46.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3826,8 +4100,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3837,16 +4111,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo + 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 ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-28 18:52:36.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) { - int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); -+ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); - int i2 = numBlocksToUpdate & 0xff; +- int i2 = numBlocksToUpdate & 0xff; - int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); ++ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); ++ int i2 = blocksToUpdate[k] & 0xff; + int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) { @@ -3855,8 +4130,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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:46.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3875,8 +4150,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl { 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 ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:46.000000000 -0400 @@ -176,7 +176,7 @@ { return false; @@ -3902,8 +4177,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti furnaceItemStacks[2].stackSize++; } 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-23 19:09:34.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -3919,8 +4194,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti { 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 ---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:33.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-28 19:01:54.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3934,7 +4209,61 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public boolean blockExists(int i, int j, int k) -@@ -1372,6 +1376,9 @@ +@@ -1124,7 +1128,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } +@@ -1151,15 +1155,15 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ } else { + if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) + { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); + } + } while(true); + field_34901_P.clear(); +@@ -1168,13 +1172,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- field_34901_P.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? field_34901_P : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? field_34901_P : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1372,6 +1382,9 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -3944,7 +4273,65 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } } -@@ -1650,13 +1657,18 @@ +@@ -1590,44 +1603,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(tileentity != null && !tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; +- field_34901_P.add(tileentity); +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? field_34901_P : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public void func_35239_a(TileEntity tileentity) +@@ -1650,13 +1642,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -3970,7 +4357,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo } public void calculateInitialSkylight() -@@ -1976,7 +1988,7 @@ +@@ -1976,7 +1973,7 @@ private int func_35241_e(int i, int j, int k, int l, int i1, int j1) { @@ -3979,7 +4366,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2315,6 +2327,7 @@ +@@ -2315,6 +2312,7 @@ { block = null; } @@ -3987,7 +4374,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2759,7 +2772,7 @@ +@@ -2759,7 +2757,7 @@ public int field_27080_i; public boolean editingBlocks; private long lockTimestamp; @@ -3996,3 +4383,35 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; +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_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-28 18:17:23.000000000 -0400 +@@ -54,15 +54,19 @@ + public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) + { + ArrayList arraylist = new ArrayList(); +- for(int k1 = 0; k1 < loadedTileEntityList.size(); k1++) +- { +- TileEntity tileentity = (TileEntity)loadedTileEntityList.get(k1); +- if(tileentity.xCoord >= i && tileentity.yCoord >= j && tileentity.zCoord >= k && tileentity.xCoord < l && tileentity.yCoord < i1 && tileentity.zCoord < j1) +- { +- arraylist.add(tileentity); +- } +- } +- ++ for(int x=(i>>4); x<=(l>>4); x++) ++ for(int z=(k>>4); z<=(j1>>4); z++) { ++ Chunk ch=getChunkFromChunkCoords(x,z); ++ if(ch==null) continue; ++ for(Object ob : ch.chunkTileEntityMap.values()) { ++ TileEntity te=(TileEntity)ob; ++ if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k ++ && te.xCoord Date: Fri, 30 Sep 2011 12:32:27 +0000 Subject: [PATCH 106/169] Hopefully fixed the major TileEntity bugs. --- forge/minecraft.patch | 426 ++++++++++++++++++++++++++++-------------- 1 file changed, 290 insertions(+), 136 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 4553da4d8f..2822159b1b 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 --- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -120,7 +120,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt } 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_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -152,7 +152,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes } 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_work/minecraft/net/minecraft/src/BlockContainer.java 2011-09-28 18:22:54.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.000000000 -0400 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { @@ -177,7 +177,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCont super.playBlock(world, i, j, k, l, i1); 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_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -198,7 +198,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -358,7 +358,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav try 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_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.000000000 -0400 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } @@ -443,7 +443,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd } 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_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.000000000 -0400 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -564,7 +564,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve } 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_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -587,7 +587,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres } 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_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -643,7 +643,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail } 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_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -664,7 +664,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } else 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_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -695,7 +695,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds return true; 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_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) @@ -800,7 +800,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc } 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_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -837,7 +837,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap } 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_work/minecraft/net/minecraft/src/Chunk.java 2011-09-28 19:16:54.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-30 08:25:56.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -959,7 +959,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int l1 = blocks[i << 11 | k << 7 | j] & 0xff; if(l1 == l && data.getNibble(i, j, k) == i1) { -@@ -343,8 +322,13 @@ +@@ -343,12 +322,18 @@ } int i2 = xPosition * 16 + i; int j2 = zPosition * 16 + k; @@ -973,9 +973,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav + } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(l1 != 0 && !worldObj.multiplayerWorld) - { -@@ -380,7 +364,7 @@ +- if(l1 != 0 && !worldObj.multiplayerWorld) +- { +- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ if(l1 != 0) { ++ if(!worldObj.multiplayerWorld) ++ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, i1); + if(!worldObj.worldProvider.hasNoSky) +@@ -380,7 +365,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -984,7 +992,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -410,8 +394,6 @@ +@@ -388,14 +373,6 @@ + tileentity.func_35144_b(); + } + } +- } else +- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35144_b(); +- } + } + isModified = true; + return true; +@@ -410,8 +387,6 @@ field_35845_c[i1] = -999; } int j1 = heightMap[i1] & 0xff; @@ -993,7 +1016,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int k1 = blocks[i << 11 | k << 7 | j] & 0xff; if(k1 == l) { -@@ -419,8 +401,13 @@ +@@ -419,12 +394,18 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; @@ -1007,9 +1030,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav + } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(k1 != 0) - { -@@ -452,7 +439,7 @@ +- if(k1 != 0) +- { +- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ if(k1 != 0) { ++ if(!worldObj.multiplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, 0); + if(Block.lightOpacity[byte0 & 0xff] != 0) +@@ -452,7 +433,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -1018,7 +1049,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -603,7 +590,7 @@ +@@ -460,14 +441,6 @@ + tileentity.func_35144_b(); + } + } +- } else +- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35144_b(); +- } + } + isModified = true; + return true; +@@ -594,6 +567,11 @@ + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity != null && tileentity.isInvalid()) ++ { ++ chunkTileEntityMap.remove(chunkposition); ++ tileentity=null; ++ } + if(tileentity == null) + { + int l = getBlockID(i, j, k); +@@ -603,18 +581,23 @@ } if(tileentity == null) { @@ -1027,26 +1085,29 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); } tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -@@ -618,6 +605,18 @@ } - } - +- if(tileentity != null && tileentity.isInvalid()) +- { +- chunkTileEntityMap.remove(chunkposition); +- return null; +- } else ++ return tileentity; ++ } ++ + /* FORGE: Used to remove only invalid TileEntities */ + public void cleanChunkBlockTileEntity(int i, int j, int k) + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + if(isChunkLoaded) -+ { + { +- return tileentity; + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + if(tileentity!=null && tileentity.isInvalid()) + chunkTileEntityMap.remove(chunkposition); -+ } -+ } -+ - public void addTileEntity(TileEntity tileentity) - { - int i = tileentity.xCoord - xPosition * 16; -@@ -626,7 +625,7 @@ + } + } + +@@ -626,7 +609,7 @@ setChunkBlockTileEntity(i, j, k, tileentity); if(isChunkLoaded) { @@ -1055,7 +1116,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav } } -@@ -777,8 +776,6 @@ +@@ -643,6 +626,8 @@ + return; + } else + { ++ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(old!=null) old.invalidate(); + tileentity.validate(); + chunkTileEntityMap.put(chunkposition, tileentity); + return; +@@ -777,8 +762,6 @@ { for(int l2 = k; l2 < j1; l2++) { @@ -1064,7 +1134,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int l3 = l1 << 11 | l2 << 7 | j; int l4 = i1 - j; System.arraycopy(abyte0, k1, blocks, l3, l4); -@@ -792,8 +789,6 @@ +@@ -792,8 +775,6 @@ { for(int i3 = k; i3 < j1; i3++) { @@ -1073,7 +1143,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int i4 = (i2 << 11 | i3 << 7 | j) >> 1; int i5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, data.data, i4, i5); -@@ -806,8 +801,6 @@ +@@ -806,8 +787,6 @@ { for(int j3 = k; j3 < j1; j3++) { @@ -1082,7 +1152,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int j4 = (j2 << 11 | j3 << 7 | j) >> 1; int j5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); -@@ -820,8 +813,6 @@ +@@ -820,8 +799,6 @@ { for(int k3 = k; k3 < j1; k3++) { @@ -1091,7 +1161,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int k4 = (k2 << 11 | k3 << 7 | j) >> 1; int k5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -880,7 +871,6 @@ +@@ -834,6 +811,12 @@ + for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) + { + tileentity = (TileEntity)iterator.next(); ++ if( (tileentity.xCoord&15)>=i && (tileentity.xCoord&15)<=l && ++ tileentity.yCoord>=j && tileentity.yCoord<=i1 && ++ (tileentity.zCoord&15)>=k && (tileentity.zCoord&15)<=j1) { ++ ++ tileentity.invalidate(); ++ } + } + + return k1; +@@ -880,7 +863,6 @@ int l = field_35845_c[k]; if(l == -999) { @@ -1101,7 +1184,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav { 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_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-28 22:34:34.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; @@ -1250,7 +1333,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen } 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_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -1264,7 +1347,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv 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 --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1341,7 +1424,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla 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 --- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1378,7 +1461,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen renderRainSnow(f); 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_work/minecraft/net/minecraft/src/Explosion.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -1408,7 +1491,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion { 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_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -1467,7 +1550,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -1479,7 +1562,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock } 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_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1503,7 +1586,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke 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 --- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-28 22:34:34.000000000 -0400 @@ -35,7 +35,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1515,7 +1598,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -1527,7 +1610,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint } 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_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -1539,7 +1622,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.j } 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_work/minecraft/net/minecraft/src/Item.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-28 22:34:34.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1556,7 +1639,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java return itemstack; 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_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -1568,7 +1651,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst } 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_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -1580,7 +1663,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed. } 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_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-28 22:34:34.000000000 -0400 @@ -5,6 +5,10 @@ package net.minecraft.src; @@ -1623,7 +1706,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende 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 --- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -1635,7 +1718,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds } 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_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1672,7 +1755,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. } 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_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1683,7 +1766,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj } 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_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1702,7 +1785,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon } else 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_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1760,7 +1843,7 @@ 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/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_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -1825,7 +1908,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-28 22:34:34.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1900,7 +1983,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo 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 --- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-28 22:34:34.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -1913,7 +1996,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng 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 --- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-28 22:34:34.000000000 -0400 @@ -1635,8 +1635,8 @@ } @@ -1938,7 +2021,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo 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 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -2053,7 +2136,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte 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-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2080,7 +2163,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla 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 --- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2099,7 +2182,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft 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 --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-28 22:34:34.000000000 -0400 @@ -5,6 +5,7 @@ package net.minecraft.src; @@ -2288,7 +2371,7 @@ 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/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_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-28 22:34:34.000000000 -0400 @@ -196,7 +196,7 @@ { return false; @@ -2315,7 +2398,7 @@ 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/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_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2332,7 +2415,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit 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 --- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2359,7 +2442,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-28 19:01:50.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-28 22:34:34.000000000 -0400 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) @@ -2552,7 +2635,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public boolean isNewWorld; 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_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2630,7 +2713,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.000000000 -0400 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2750,7 +2833,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -2782,7 +2865,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-28 18:22:50.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.000000000 -0400 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { @@ -2807,7 +2890,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl super.playBlock(world, i, j, k, l, i1); 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_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -2828,7 +2911,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2971,7 +3054,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.000000000 -0400 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -3056,7 +3139,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.000000000 -0400 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -3177,7 +3260,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -3200,7 +3283,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.000000000 -0400 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -3256,7 +3339,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.000000000 -0400 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -3277,7 +3360,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl } 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3308,7 +3391,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) @@ -3413,7 +3496,7 @@ 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/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_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3450,7 +3533,7 @@ 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/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_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-28 18:18:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-30 08:25:53.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3535,7 +3618,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int l1 = blocks[i << 11 | k << 7 | j] & 0xff; if(l1 == l && data.getNibble(i, j, k) == i1) { -@@ -317,8 +304,12 @@ +@@ -317,12 +304,17 @@ } int i2 = xPosition * 16 + i; int j2 = zPosition * 16 + k; @@ -3548,9 +3631,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch + } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(l1 != 0 && !worldObj.singleplayerWorld) - { -@@ -354,7 +345,7 @@ +- if(l1 != 0 && !worldObj.singleplayerWorld) +- { +- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ if(l1 != 0) { ++ if(!worldObj.singleplayerWorld) ++ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, i1); + if(!worldObj.worldProvider.hasNoSky) +@@ -354,7 +346,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -3559,7 +3650,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -384,8 +375,6 @@ +@@ -362,14 +354,6 @@ + tileentity.func_35164_g(); + } + } +- } else +- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35164_g(); +- } + } + isModified = true; + return true; +@@ -384,8 +368,6 @@ field_35637_c[i1] = -999; } int j1 = heightMap[i1] & 0xff; @@ -3568,7 +3674,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int k1 = blocks[i << 11 | k << 7 | j] & 0xff; if(k1 == l) { -@@ -393,8 +382,13 @@ +@@ -393,12 +375,18 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; @@ -3582,9 +3688,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch + } + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); - if(k1 != 0) - { -@@ -426,7 +420,7 @@ +- if(k1 != 0) +- { +- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ if(k1 != 0) { ++ if(!worldObj.singleplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, 0); + if(Block.lightOpacity[byte0 & 0xff] != 0) +@@ -426,7 +414,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -3593,7 +3707,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -577,7 +571,7 @@ +@@ -434,14 +422,6 @@ + tileentity.func_35164_g(); + } + } +- } else +- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35164_g(); +- } + } + isModified = true; + return true; +@@ -568,6 +548,11 @@ + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity != null && tileentity.isInvalid()) ++ { ++ chunkTileEntityMap.remove(chunkposition); ++ tileentity=null; ++ } + if(tileentity == null) + { + int l = getBlockID(i, j, k); +@@ -577,18 +562,23 @@ } if(tileentity == null) { @@ -3602,26 +3743,29 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); } tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -@@ -592,6 +586,18 @@ } - } - +- if(tileentity != null && tileentity.isInvalid()) +- { +- chunkTileEntityMap.remove(chunkposition); +- return null; +- } else ++ return tileentity; ++ } ++ + /* FORGE: Used to remove only invalid TileEntities */ + public void cleanChunkBlockTileEntity(int i, int j, int k) + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + if(isChunkLoaded) -+ { + { +- return tileentity; + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + if(tileentity!=null && tileentity.isInvalid()) + chunkTileEntityMap.remove(chunkposition); -+ } -+ } -+ - public void addTileEntity(TileEntity tileentity) - { - int i = tileentity.xCoord - xPosition * 16; -@@ -600,7 +606,7 @@ + } + } + +@@ -600,7 +590,7 @@ setChunkBlockTileEntity(i, j, k, tileentity); if(isChunkLoaded) { @@ -3630,7 +3774,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch } } -@@ -766,8 +772,6 @@ +@@ -617,6 +607,8 @@ + return; + } else + { ++ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(old!=null) old.invalidate(); + tileentity.validate(); + chunkTileEntityMap.put(chunkposition, tileentity); + return; +@@ -766,8 +758,6 @@ { for(int k3 = k; k3 < j1; k3++) { @@ -3639,7 +3792,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int k4 = k2 << 11 | k3 << 7 | j; int k5 = i1 - j; System.arraycopy(blocks, k4, abyte0, k1, k5); -@@ -780,8 +784,6 @@ +@@ -780,8 +770,6 @@ { for(int l3 = k; l3 < j1; l3++) { @@ -3648,7 +3801,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int l4 = (l2 << 11 | l3 << 7 | j) >> 1; int l5 = (i1 - j) / 2; System.arraycopy(data.data, l4, abyte0, k1, l5); -@@ -794,8 +796,6 @@ +@@ -794,8 +782,6 @@ { for(int i4 = k; i4 < j1; i4++) { @@ -3657,7 +3810,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int i5 = (i3 << 11 | i4 << 7 | j) >> 1; int i6 = (i1 - j) / 2; System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); -@@ -808,8 +808,6 @@ +@@ -808,8 +794,6 @@ { for(int j4 = k; j4 < j1; j4++) { @@ -3666,7 +3819,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch int j5 = (j3 << 11 | j4 << 7 | j) >> 1; int j6 = (i1 - j) / 2; System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); -@@ -857,7 +855,6 @@ +@@ -857,7 +841,6 @@ int l = field_35637_c[k]; if(l == -999) { @@ -3676,7 +3829,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch { 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_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -3690,7 +3843,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -3767,7 +3920,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En 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 --- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3796,7 +3949,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex { 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_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.000000000 -0400 @@ -6,6 +6,7 @@ import java.util.HashMap; @@ -3855,7 +4008,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -3867,7 +4020,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3892,7 +4045,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-28 22:34:34.000000000 -0400 @@ -29,7 +29,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3904,7 +4057,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -3916,7 +4069,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.000000000 -0400 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) @@ -3928,7 +4081,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode @@ -4011,7 +4164,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-28 22:34:34.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -4028,7 +4181,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -4040,7 +4193,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -4052,7 +4205,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -4064,7 +4217,7 @@ 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/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_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -4101,7 +4254,7 @@ 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/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_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -4112,7 +4265,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo } 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_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-28 18:52:36.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-28 22:34:34.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -4131,7 +4284,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.000000000 -0400 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -4151,7 +4304,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl 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 --- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-28 22:34:34.000000000 -0400 @@ -176,7 +176,7 @@ { return false; @@ -4178,7 +4331,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti } 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_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -4195,7 +4348,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti 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 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-28 19:01:54.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-28 22:34:34.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -4385,8 +4538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public boolean isNewWorld; 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_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-28 18:17:23.000000000 -0400 -@@ -54,15 +54,19 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-30 08:24:14.000000000 -0400 +@@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { ArrayList arraylist = new ArrayList(); @@ -4405,6 +4558,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + if(ch==null) continue; + for(Object ob : ch.chunkTileEntityMap.values()) { + TileEntity te=(TileEntity)ob; ++ if(te.isInvalid()) continue; + if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k + && te.xCoord Date: Sun, 2 Oct 2011 08:55:31 +0000 Subject: [PATCH 107/169] - Added an ItemStack parameter to IArmorTextureProvider - Added ISidedInventory - Added IBonemealHandler - Added hooks in grow-on-grass and in break tall grass. - Fixed furnace output of multiple items. - Added getBlockDropped(). - Bumped version number to 1.1.1. --- .../src/forge/IArmorTextureProvider.java | 4 +- .../net/minecraft/src/forge/ForgeHooks.java | 95 +++- .../minecraft/src/forge/IBonemealHandler.java | 18 + .../minecraft/src/forge/ISidedInventory.java | 29 + .../minecraft/src/forge/MinecraftForge.java | 44 +- forge/minecraft.patch | 495 +++++++++++++++++- 6 files changed, 637 insertions(+), 48 deletions(-) create mode 100644 forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java create mode 100644 forge/forge_common/net/minecraft/src/forge/ISidedInventory.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java b/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java index 5b996c6d8a..e024e23cbd 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java +++ b/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java @@ -5,6 +5,8 @@ package net.minecraft.src.forge; +import net.minecraft.src.ItemStack; + /** * 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 @@ -17,7 +19,7 @@ public interface IArmorTextureProvider { * 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(); + public String getArmorTextureFile(ItemStack itemstack); } diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index c6030ac91a..18815faee8 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -11,12 +11,16 @@ import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.Item; import net.minecraft.src.EnumStatus; +import net.minecraft.src.World; import java.util.*; public class ForgeHooks { // TODO: move all app-side hooks from MinecraftForge - // + + + // List Handling Hooks + // ------------------------------------------------------------ public static void onTakenFromCrafting(EntityPlayer player, ItemStack ist, IInventory craftMatrix) { for (ICraftingHandler handler : craftingHandlers) { @@ -34,6 +38,17 @@ public class ForgeHooks { static LinkedList destroyToolHandlers = new LinkedList(); + public static boolean onUseBonemeal(World world, + int bid, int i, int j, int k) { + for(IBonemealHandler handler : bonemealHandlers) { + if(handler.onUseBonemeal(world,bid,i,j,k)) + return true; + } + return false; + } + + static LinkedList bonemealHandlers = new LinkedList(); + public static EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k) { for (ISleepHandler handler : sleepHandlers) { EnumStatus status = handler.sleepInBedAt(player, i, j, k); @@ -44,6 +59,82 @@ public class ForgeHooks { } static LinkedList sleepHandlers = new LinkedList(); + + // Plant Management + // ------------------------------------------------------------ + static class ProbableItem { + public ProbableItem(int item, int md, int q, int st, int e) { + wstart=st; wend=e; + itemid=item; meta=md; + qty=q; + } + int wstart, wend; + int itemid, meta; + int qty; + } + + static ProbableItem getRandomItem(List list, int prop) { + int n=Collections.binarySearch(list,prop,new Comparator(){ + public int compare(Object o1, Object o2) { + ProbableItem pi=(ProbableItem)o1; + Integer i1=(Integer)o2; + if(i1=pi.wend) return -1; + return 0; + } + }); + if(n<0) return null; + return list.get(n); + } + + static List plantGrassList; + static int plantGrassWeight; + + static List seedGrassList; + static int seedGrassWeight; + + static { + plantGrassList=new ArrayList(); + plantGrassList.add(new ProbableItem( + Block.plantYellow.blockID,0,1,0,30)); + plantGrassList.add(new ProbableItem( + Block.plantRed.blockID,0,1,30,40)); + plantGrassWeight=40; + + seedGrassList=new ArrayList(); + seedGrassList.add(new ProbableItem( + Item.seeds.shiftedIndex,0,1,0,10)); + seedGrassWeight=10; + } + + public static void plantGrassPlant(World world, int i, int j, int k) { + int n=world.rand.nextInt(plantGrassWeight); + ProbableItem pi=getRandomItem(plantGrassList,n); + if(pi==null) return; + world.setBlockAndMetadataWithNotify(i,j,k,pi.itemid,pi.meta); + } + + public static void addPlantGrass(int item, int md, int prop) { + plantGrassList.add(new ProbableItem( + item,md,1,plantGrassWeight,plantGrassWeight+prop)); + plantGrassWeight+=prop; + } + + public static ItemStack getGrassSeed(World world) { + int n=world.rand.nextInt(seedGrassWeight); + ProbableItem pi=getRandomItem(seedGrassList,n); + if(pi==null) return null; + return new ItemStack(pi.itemid,pi.qty,pi.meta); + } + + public static void addGrassSeed(int item, int md, int qty, int prop) { + seedGrassList.add(new ProbableItem( + item,md,qty,seedGrassWeight,seedGrassWeight+prop)); + seedGrassWeight+=prop; + } + + // Tool Path + // ------------------------------------------------------------ public static boolean canHarvestBlock(Block bl, EntityPlayer player, int md) { if(bl.blockMaterial.getIsHarvestable()) @@ -139,7 +230,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=1; - public static final int revisionVersion=0; + public static final int revisionVersion=1; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java b/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java new file mode 100644 index 0000000000..ac2ae0b339 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java @@ -0,0 +1,18 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.World; + +public interface IBonemealHandler { + /** Called when bonemeal is used on a block. This is also called for + * multiplayer servers, which must still return true if appropriate but + * shouldn't actually perform world manipulation. + * @return true to use up the bonemeal and stop processing. + */ + public boolean onUseBonemeal(World world, int bid, int i, int j, int k); +} + diff --git a/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java b/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java new file mode 100644 index 0000000000..c6d4755b12 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java @@ -0,0 +1,29 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +/** Inventory ranges mapped by side. This class is implemented by TileEntities + * that provide different inventory slot ranges to different sides. + */ +public interface ISidedInventory { + + /** Get the start of the side inventory. + * @param side The global side to get the start of range. + * 0: -Y (bottom side) + * 1: +Y (top side) + * 2: -Z + * 3: +Z + * 4: -X + * 5: +x + */ + int getStartInventorySide(int side); + + /** Get the size of the side inventory. + * @param side The global side. + */ + int getSizeInventorySide(int side); +} + diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 6a1e92a78a..51bff0894b 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -16,15 +16,6 @@ public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); - /** - * Registers a new custom bucket handler. - * @deprecated Spelling mistake, don't use this function! It will go away - * soon. - */ - public static void registerCustomBucketHander(IBucketHandler handler) { - bucketHandlers.add(handler); - } - /** * Register a new custom bucket handler. */ @@ -39,6 +30,13 @@ public class MinecraftForge { ForgeHooks.sleepHandlers.add(handler); } + /** + * Registers a new bonemeal handler. + */ + public static void registerBonemealHandler(IBonemealHandler handler) { + ForgeHooks.bonemealHandlers.add(handler); + } + /** * Registers a new destroy tool handler. */ @@ -68,6 +66,27 @@ public class MinecraftForge { return null; } + /** Register a new plant to be planted when bonemeal is used on grass. + * @param bid The block ID to plant. + * @param md The metadata to plant. + * @param prop The relative probability of the plant, where red flowers are + * 10 and yellow flowers are 30. + */ + public static void addGrassPlant(int item, int md, int prop) { + ForgeHooks.addPlantGrass(item,md,prop); + } + + /** Register a new seed to be dropped when breaking tall grass. + * @param bid The item ID of the seeds. + * @param md The metadata of the seeds. + * @param qty The quantity of seeds to drop. + * @param prop The relative probability of the seeds, where wheat seeds are + * 10. + */ + public static void addGrassSeed(int item, int md, int qty, int prop) { + ForgeHooks.addGrassSeed(item,md,qty,prop); + } + /** Register a tool as a tool class with a given harvest level. * * @param tool The custom tool to register. @@ -158,13 +177,6 @@ public class MinecraftForge { } } - /** - * This function is deprecated and will be removed eventually. - */ - public static void addPickaxeBlockEffectiveAgainst (Block block) { - setBlockHarvestLevel(block,"pickaxe",0); - } - /** * Kill minecraft with an error message. */ diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2822159b1b..43597c57b2 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -175,6 +175,55 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockCont public void playBlock(World world, int i, int j, int k, int l, int 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 +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 2011-09-26 15:46:45.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:32.000000000 -0400 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Block, World, EntityItem, +@@ -108,27 +109,16 @@ + return 6; + } + +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- { +- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- if(world.multiplayerWorld) +- { +- return; +- } +- for(int i1 = 0; i1 < 3; i1++) +- { +- if(world.rand.nextInt(15) <= l) +- { +- float f1 = 0.7F; +- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- } +- } +- ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(md==7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n=0; n<3; n++) { ++ if(world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); ++ } ++ return tr; + } + + 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 --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:45.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -198,7 +247,7 @@ 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 --- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-28 22:34:34.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-10-02 03:06:23.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -224,7 +273,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -278,24 +281,24 @@ +@@ -278,24 +281,40 @@ return 1; } @@ -257,19 +306,50 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav - return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; - } + return blockStrength(entityplayer,0); ++ } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ ++ int q=quantityDropped(md,world.rand); ++ for(int n=0; n0) { ++ tr.add(new ItemStack(id,1,damageDropped(md))); ++ } ++ } ++ return tr; } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -309,7 +312,7 @@ +@@ -309,20 +328,12 @@ { return; } - int i1 = quantityDropped(world.rand); -+ int i1 = quantityDropped(l,world.rand); - for(int j1 = 0; j1 < i1; j1++) - { +- for(int j1 = 0; j1 < i1; j1++) +- { ++ ArrayList ar=getBlockDropped(world,i,j,k,l); ++ for(ItemStack ist : ar) { if(world.rand.nextFloat() > f) -@@ -618,6 +621,86 @@ +- { + continue; +- } +- int k1 = idDropped(l, world.rand); +- if(k1 > 0) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- } ++ dropBlockAsItem_do(world, i, j, k, ist); + } +- + } + + protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) +@@ -618,6 +629,86 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -693,6 +773,45 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds if(Block.blocksList[i1].canProvidePower()) { return true; +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_work/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:39.000000000 -0400 +@@ -4,7 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; ++ + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, +@@ -79,13 +82,17 @@ + + public int idDropped(int i, Random random) + { +- if(random.nextInt(8) == 0) +- { +- return Item.seeds.shiftedIndex; +- } else +- { +- return -1; +- } ++ return -1; ++ } ++ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(world.rand.nextInt(8)!=0) ++ return tr; ++ ItemStack ist=ForgeHooks.getGrassSeed(world); ++ if(ist!=null) tr.add(ist); ++ return tr; + } + + 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 --- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:45.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 @@ -1586,8 +1705,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke 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 --- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-28 22:34:34.000000000 -0400 -@@ -35,7 +35,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-10-02 01:36:25.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.Random; + +@@ -35,13 +36,18 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { @@ -1596,6 +1723,32 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.j { return false; } + if(itemstack.getItemDamage() == 15) + { + int i1 = world.getBlockId(i, j, k); ++ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { ++ if(!world.multiplayerWorld) ++ itemstack.stackSize--; ++ return true; ++ } + if(i1 == Block.sapling.blockID) + { + if(!world.multiplayerWorld) +@@ -108,13 +114,7 @@ + world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); + continue; + } +- if(itemRand.nextInt(3) != 0) +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); +- } else +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); +- } ++ ForgeHooks.plantGrassPlant(world,k1,l1,i2); + } + + } 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_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 @@ -2136,7 +2289,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte 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-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-28 22:34:34.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 04:49:13.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2152,7 +2305,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla - 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() ); ++ loadTexture( ((IArmorTextureProvider)item).getArmorTextureFile(itemstack) ); + } + else + { @@ -2371,8 +2524,42 @@ 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/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_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-28 22:34:34.000000000 -0400 -@@ -196,7 +196,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:28:11.000000000 -0400 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, NBTTagCompound, +@@ -12,7 +13,7 @@ + // EntityPlayer + + public class TileEntityFurnace extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + public TileEntityFurnace() +@@ -28,6 +29,16 @@ + return furnaceItemStacks.length; + } + ++ public int getStartInventorySide(int side) { ++ if(side==0) return 1; ++ if(side==1) return 0; ++ return 2; ++ } ++ ++ public int getSizeInventorySide(int side) { ++ return 1; ++ } ++ + public ItemStack getStackInSlot(int i) + { + return furnaceItemStacks[i]; +@@ -196,7 +207,7 @@ { return false; } @@ -2381,7 +2568,22 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit if(itemstack == null) { return false; -@@ -222,12 +222,12 @@ +@@ -209,11 +220,9 @@ + { + return false; + } +- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) +- { +- return true; +- } +- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); ++ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; ++ return (st<=getInventoryStackLimit() && ++ st<=itemstack.getMaxStackSize()); + } + + public void smeltItem() +@@ -222,14 +231,14 @@ { return; } @@ -2394,8 +2596,20 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit - if(furnaceItemStacks[2].itemID == itemstack.itemID) + if(furnaceItemStacks[2].isItemEqual(itemstack)) { - furnaceItemStacks[2].stackSize++; +- furnaceItemStacks[2].stackSize++; ++ furnaceItemStacks[2].stackSize+=itemstack.stackSize; } + if(furnaceItemStacks[0].getItem().hasContainerItem()) + { +@@ -244,7 +253,7 @@ + } + } + +- private int getItemBurnTime(ItemStack itemstack) ++ public static int getItemBurnTime(ItemStack itemstack) + { + 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 --- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:45.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 @@ -2888,6 +3102,55 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl public void playBlock(World world, int i, int j, int k, int l, int 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:30.000000000 -0400 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Block, World, EntityItem, +@@ -103,27 +104,16 @@ + return blockIndexInTexture + j; + } + +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- { +- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- if(world.singleplayerWorld) +- { +- return; +- } +- for(int i1 = 0; i1 < 3; i1++) +- { +- if(world.rand.nextInt(15) <= l) +- { +- float f1 = 0.7F; +- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- } +- } +- ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(md==7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n=0; n<3; n++) { ++ if(world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); ++ } ++ return tr; + } + + 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-26 15:46:46.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.000000000 -0400 @@ -2911,7 +3174,7 @@ 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 --- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-28 22:34:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-10-02 03:06:26.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2920,7 +3183,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl import java.util.ArrayList; import java.util.Random; -@@ -218,24 +219,24 @@ +@@ -218,24 +219,40 @@ return 1; } @@ -2953,19 +3216,50 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl - return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; - } + return blockStrength(entityplayer,0); ++ } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ ++ int q=quantityDropped(md,world.rand); ++ for(int n=0; n0) { ++ tr.add(new ItemStack(id,1,damageDropped(md))); ++ } ++ } ++ return tr; } public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -249,7 +250,7 @@ +@@ -249,20 +266,12 @@ { return; } - int i1 = quantityDropped(world.rand); -+ int i1 = quantityDropped(l,world.rand); - for(int j1 = 0; j1 < i1; j1++) - { +- for(int j1 = 0; j1 < i1; j1++) +- { ++ ArrayList ar=getBlockDropped(world,i,j,k,l); ++ for(ItemStack ist : ar) { if(world.rand.nextFloat() > f) -@@ -529,6 +530,86 @@ +- { + continue; +- } +- int k1 = idDropped(l, world.rand); +- if(k1 > 0) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- } ++ dropBlockAsItem_do(world, i, j, k, ist); + } +- + } + + protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) +@@ -529,6 +538,86 @@ return blockMaterial.getMaterialMobility(); } @@ -3389,6 +3683,44 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl if(Block.blocksList[i1].canProvidePower()) { 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 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-09-26 15:46:46.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:35.000000000 -0400 +@@ -4,7 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; ++ + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Item, World, EntityPlayer, +@@ -41,13 +44,17 @@ + + public int idDropped(int i, Random random) + { +- if(random.nextInt(8) == 0) +- { +- return Item.seeds.shiftedIndex; +- } else +- { + return -1; +- } ++ } ++ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(world.rand.nextInt(8)!=0) ++ return tr; ++ ItemStack ist=ForgeHooks.getGrassSeed(world); ++ if(ist!=null) tr.add(ist); ++ return tr; + } + + 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 --- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-26 15:46:46.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.000000000 -0400 @@ -4045,8 +4377,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 --- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-28 22:34:34.000000000 -0400 -@@ -29,7 +29,7 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-10-02 01:36:28.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.Random; + +@@ -29,13 +30,18 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { @@ -4055,6 +4395,32 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { return false; } + if(itemstack.getItemDamage() == 15) + { + int i1 = world.getBlockId(i, j, k); ++ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { ++ if(!world.singleplayerWorld) ++ itemstack.stackSize--; ++ return true; ++ } + if(i1 == Block.sapling.blockID) + { + if(!world.singleplayerWorld) +@@ -102,13 +108,7 @@ + world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); + continue; + } +- if(itemRand.nextInt(3) != 0) +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); +- } else +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); +- } ++ ForgeHooks.plantGrassPlant(world,k1,l1,i2); + } + + } 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_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.000000000 -0400 @@ -4304,8 +4670,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl 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 --- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-28 22:34:34.000000000 -0400 -@@ -176,7 +176,7 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:22:11.000000000 -0400 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, NBTTagCompound, +@@ -12,7 +13,7 @@ + // EntityPlayer + + public class TileEntityFurnace extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + public TileEntityFurnace() +@@ -28,6 +29,16 @@ + return furnaceItemStacks.length; + } + ++ public int getStartInventorySide(int side) { ++ if(side==0) return 1; ++ if(side==1) return 0; ++ return 2; ++ } ++ ++ public int getSizeInventorySide(int side) { ++ return 1; ++ } ++ + public ItemStack getStackInSlot(int i) + { + return furnaceItemStacks[i]; +@@ -176,7 +187,7 @@ { return false; } @@ -4314,7 +4714,24 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti if(itemstack == null) { return false; -@@ -204,12 +204,12 @@ +@@ -189,13 +200,9 @@ + { + return false; + } +- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) +- { +- return true; +- } else +- { +- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); +- } ++ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; ++ return (st<=getInventoryStackLimit() && ++ st<=itemstack.getMaxStackSize()); + } + + public void smeltItem() +@@ -204,23 +211,29 @@ { return; } @@ -4326,9 +4743,29 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti } else - if(furnaceItemStacks[2].itemID == itemstack.itemID) + if(furnaceItemStacks[2].isItemEqual(itemstack)) ++ { ++ furnaceItemStacks[2].stackSize+=itemstack.stackSize; ++ } ++ if(furnaceItemStacks[0].getItem().hasContainerItem()) ++ { ++ furnaceItemStacks[0] = new ItemStack(furnaceItemStacks[0].getItem().getContainerItem()); ++ } else { - furnaceItemStacks[2].stackSize++; +- furnaceItemStacks[2].stackSize++; ++ furnaceItemStacks[0].stackSize--; } +- furnaceItemStacks[0].stackSize--; + if(furnaceItemStacks[0].stackSize <= 0) + { + furnaceItemStacks[0] = null; + } + } + +- private int getItemBurnTime(ItemStack itemstack) ++ public static int getItemBurnTime(ItemStack itemstack) + { + 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 --- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-26 15:46:46.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.000000000 -0400 @@ -4348,7 +4785,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti 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 --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-28 22:34:34.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-10-01 20:06:23.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) From 56438eb585b61b6712eb4c11d97135d6ffdc130e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sun, 2 Oct 2011 18:42:15 +0000 Subject: [PATCH 108/169] Fixed the MCP mappings. --- forge/minecraft.patch | 423 +++++++++++++++++++++--------------------- 1 file changed, 215 insertions(+), 208 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 43597c57b2..fc5496de70 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -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 ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -423,23 +423,23 @@ { return true; @@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes return true; } 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_work/minecraft/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -26,7 +26,7 @@ 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); 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_work/minecraft/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:32.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 14:29:22.000000000 -0400 @@ -5,6 +5,7 @@ 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) 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_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-10-02 03:06:23.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 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -437,8 +437,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav { try 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_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -63,6 +63,11 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -40,44 +40,44 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -46,7 +46,8 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -16,12 +16,12 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -27,7 +27,7 @@ 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; } else 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_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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; 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_work/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:39.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 14:29:22.000000000 -0400 @@ -4,7 +4,10 @@ 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) 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_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -41,24 +41,24 @@ 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; } 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_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -147,7 +147,7 @@ { j1--; @@ -955,8 +955,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap + 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 ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-30 08:25:56.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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;) { 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_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -7,6 +7,9 @@ import java.util.*; 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; } 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_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); 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) 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_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -1542,8 +1542,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla { 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 ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1579,8 +1579,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen } renderRainSnow(f); 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_work/minecraft/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -5,6 +5,7 @@ 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) { 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_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -6,6 +6,7 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -1680,8 +1680,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock return false; } 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_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -6,6 +6,8 @@ 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); 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_work/minecraft/net/minecraft/src/ItemDye.java 2011-10-02 01:36:25.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 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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 ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -1762,8 +1762,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint return false; } 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_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -21,7 +21,7 @@ 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; } 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_work/minecraft/net/minecraft/src/Item.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -76,6 +76,13 @@ return 1.0F; } @@ -1791,8 +1791,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java { return itemstack; 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_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -1803,8 +1803,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst return false; } 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_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -1815,8 +1815,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed. return false; } 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_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -5,6 +5,10 @@ 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; 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 ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -1870,8 +1870,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds return false; } 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_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1907,8 +1907,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. 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 ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1918,8 +1918,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj + 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 ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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; } else 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_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-28 22:34:34.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-10-02 14:31:02.000000000 -0400 @@ -4,6 +4,9 @@ package net.minecraft.src; @@ -1963,8 +1963,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon } Block block = Block.blocksList[i1]; - curBlockDamageMP += block.blockStrength(mc.thePlayer); -+ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - if(field_9441_h % 4F == 0.0F && block != null) ++ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + 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); @@ -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 ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,8 @@ // 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 ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; 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); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -2148,8 +2150,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng GLAllocation.generateTextureNames(singleIntBuffer); 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 ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -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 int cloudOffsetX; 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_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,10 @@ 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); 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-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 04:49:13.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 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ 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.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 ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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); 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_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-28 22:34:34.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-10-02 14:37:42.000000000 -0400 @@ -5,6 +5,7 @@ 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); - intBuffer = byteBuffer.asIntBuffer(); - floatBuffer = byteBuffer.asFloatBuffer(); -- field_35836_g = byteBuffer.asShortBuffer(); +- shortBuffer = byteBuffer.asShortBuffer(); - rawBuffer = new int[i]; - useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; - if(useVBO) @@ -2463,7 +2465,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - private ByteBuffer byteBuffer; - private IntBuffer intBuffer; - private FloatBuffer floatBuffer; -- private ShortBuffer field_35836_g; +- private ShortBuffer shortBuffer; + private static boolean useVBO = false; private int rawBuffer[]; 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 IntBuffer intBuffer; + private static FloatBuffer floatBuffer; -+ private static ShortBuffer field_35836_g; ++ private static ShortBuffer shortBuffer; + public static Tessellator instance; + + static { @@ -2512,7 +2514,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); + intBuffer = byteBuffer.asIntBuffer(); + floatBuffer = byteBuffer.asFloatBuffer(); -+ field_35836_g = byteBuffer.asShortBuffer(); ++ shortBuffer = byteBuffer.asShortBuffer(); + useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; + vboCount = 10; + 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:28:11.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 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -2611,8 +2615,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -61,6 +61,13 @@ { } @@ -2628,8 +2632,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit { 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 ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ 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 ---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-26 15:46:44.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -336,7 +336,10 @@ 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) @@ -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=(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 @@ - public int field_27172_i; + public int lightningFlash; public boolean editingBlocks; private long lockTimestamp; - 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 Random rand; 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 ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,8 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -41,36 +41,36 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -328,23 +328,23 @@ { return true; @@ -3078,8 +3083,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -26,7 +26,7 @@ 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); 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_work/minecraft_server/net/minecraft/src/BlockCrops.java 2011-10-02 03:22:30.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 14:29:22.000000000 -0400 @@ -5,6 +5,7 @@ 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) 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_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); 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 ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-10-02 03:06:26.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 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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 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_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -40,6 +40,11 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -35,44 +35,44 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -46,7 +46,8 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -16,12 +16,12 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -27,7 +27,7 @@ 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; } 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 ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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; 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_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 2011-10-02 03:45:35.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 14:29:22.000000000 -0400 @@ -4,7 +4,10 @@ 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) 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_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -36,24 +36,24 @@ 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; } 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_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -130,7 +130,7 @@ { j1--; @@ -3864,8 +3869,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl + 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 ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-30 08:25:53.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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;) { 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_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); 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) 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_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -6,6 +6,10 @@ import java.util.*; @@ -4251,8 +4256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En { 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 ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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) { 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_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -6,6 +6,7 @@ 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -62,7 +62,7 @@ { return false; @@ -4351,8 +4356,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -6,6 +6,8 @@ import java.util.Random; @@ -4376,8 +4381,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-10-02 01:36:28.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 14:29:22.000000000 -0400 @@ -3,6 +3,7 @@ // 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -46,7 +46,7 @@ { i++; @@ -4434,8 +4439,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -21,7 +21,7 @@ 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; } 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_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,7 +3,8 @@ // 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 ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -66,6 +66,13 @@ return 1.0F; } @@ -4546,8 +4551,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -50,7 +50,7 @@ return false; } @@ -4558,8 +4563,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -52,7 +52,7 @@ i++; } @@ -4570,8 +4575,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -24,7 +24,7 @@ { return false; @@ -4582,8 +4587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It 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 ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -4,6 +4,8 @@ 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; } 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_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -35,4 +35,7 @@ public int sideHit; 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; } 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_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); 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 ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-26 15:46:45.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -3,7 +3,7 @@ // 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); 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_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-10-02 04:22:11.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 14:29:22.000000000 -0400 @@ -4,6 +4,7 @@ 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) { 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_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-28 22:34:34.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-10-02 14:29:22.000000000 -0400 @@ -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; 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_work/minecraft_server/net/minecraft/src/World.java 2011-10-01 20:06:23.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-02 14:35:03.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -4825,31 +4830,31 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo - markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); } } while(true); - field_34901_P.clear(); + addedTileEntityList.clear(); @@ -1168,13 +1172,19 @@ public void addTileEntity(Collection collection) { - if(scanningTileEntities) - { -- field_34901_P.addAll(collection); +- addedTileEntityList.addAll(collection); - } else - { - loadedTileEntityList.addAll(collection); - } -+ List dest=scanningTileEntities ? field_34901_P : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } + } -+ ++ + /* FORGE: Used as a bugfix */ + public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? field_34901_P : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); } public void updateEntity(Entity entity) @@ -4874,7 +4879,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo - tileentity.xCoord = i; - tileentity.yCoord = j; - tileentity.zCoord = k; -- field_34901_P.add(tileentity); +- addedTileEntityList.add(tileentity); - } else - { - loadedTileEntityList.add(tileentity); @@ -4885,15 +4890,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo - } - } - } -+ if(tileentity==null || tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? field_34901_P : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } } public void removeBlockTileEntity(int i, int j, int k) @@ -4914,10 +4919,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo - chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); - } - } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } } public void func_35239_a(TileEntity tileentity) @@ -4973,9 +4978,11 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; 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 ---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-26 15:46:46.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 2011-09-30 08:24:14.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-10-02 14:29:22.000000000 -0400 @@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { From b3d605cd9de58873d90ce18b600a6cf614e01d7a Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 2 Oct 2011 19:14:20 +0000 Subject: [PATCH 109/169] ISidedInventory is now explicitely an inventory --- .../net/minecraft/src/forge/ISidedInventory.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java b/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java index c6d4755b12..0afb2d3065 100644 --- a/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java +++ b/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java @@ -5,12 +5,15 @@ package net.minecraft.src.forge; +import net.minecraft.src.IInventory; + /** Inventory ranges mapped by side. This class is implemented by TileEntities * that provide different inventory slot ranges to different sides. */ -public interface ISidedInventory { +public interface ISidedInventory extends IInventory { - /** Get the start of the side inventory. + /** + * Get the start of the side inventory. * @param side The global side to get the start of range. * 0: -Y (bottom side) * 1: +Y (top side) @@ -21,7 +24,8 @@ public interface ISidedInventory { */ int getStartInventorySide(int side); - /** Get the size of the side inventory. + /** + * Get the size of the side inventory. * @param side The global side. */ int getSizeInventorySide(int side); From da695e774f1ced549c1b1b5a31bbf77191d994b8 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 4 Oct 2011 21:46:00 +0000 Subject: [PATCH 110/169] Fixed another TileEntity bug. --- forge/minecraft.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index fc5496de70..99b050bddc 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -956,7 +956,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap } 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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-10-02 14:29:22.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-10-04 17:42:37.000000000 -0400 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1280,7 +1280,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav int k4 = (k2 << 11 | k3 << 7 | j) >> 1; int k5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -834,6 +811,12 @@ +@@ -830,11 +807,20 @@ + + } + ++ List invalidList=new ArrayList(); + TileEntity tileentity; for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) { tileentity = (TileEntity)iterator.next(); @@ -1288,12 +1293,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav + tileentity.yCoord>=j && tileentity.yCoord<=i1 && + (tileentity.zCoord&15)>=k && (tileentity.zCoord&15)<=j1) { + -+ tileentity.invalidate(); ++ invalidList.add(tileentity); + } } ++ for(TileEntity te : invalidList) ++ te.invalidate(); return k1; -@@ -880,7 +863,6 @@ + } +@@ -880,7 +866,6 @@ int l = field_35845_c[k]; if(l == -999) { @@ -2852,6 +2860,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; Only in ../src_work/minecraft/net/minecraft/src: World.java.orig +Only in ../src_work/minecraft/net/minecraft/src: .World.java.swp 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-10-02 14:29:21.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-10-02 14:29:22.000000000 -0400 From d00a8376351e4693e2999411a3ea72b57e6ac975 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 5 Oct 2011 22:54:20 +0000 Subject: [PATCH 111/169] Changed a field permission. --- forge/minecraft.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 99b050bddc..21ec044efc 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -2146,7 +2146,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo 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 --- ../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-10-02 14:29:22.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-10-05 18:51:03.000000000 -0400 @@ -128,6 +128,9 @@ } try @@ -2157,6 +2157,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng singleIntBuffer.clear(); GLAllocation.generateTextureNames(singleIntBuffer); int i = singleIntBuffer.get(0); +@@ -667,7 +670,7 @@ + private GameSettings options; + public boolean clampTexture; + public boolean blurTexture; +- private TexturePackList texturePack; ++ public TexturePackList texturePack; + private BufferedImage missingTextureImage; + + } 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-10-02 14:29:20.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-10-02 14:29:22.000000000 -0400 @@ -2860,7 +2869,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav public Random rand; public boolean isNewWorld; Only in ../src_work/minecraft/net/minecraft/src: World.java.orig -Only in ../src_work/minecraft/net/minecraft/src: .World.java.swp 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-10-02 14:29:21.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-10-02 14:29:22.000000000 -0400 From 141805d5bb192adb421a169c99167eeacce21971 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 9 Oct 2011 04:21:29 +0000 Subject: [PATCH 112/169] Fixed a bug in forge_client project that had a hard link to E:/MCP/jars/bin/paul.jar now points to MCP/jars/bin/minecraft.jar {has the same paulsound libraries} Major refactoring of the patches, now each modified file gets its own patch file. Rewrote all the scripts to use new multi-patch system. Added linux install.sh using new system. Added some required libraries from GNUWin32 for the windows side of the new setup.bat/update_patches.bat http://gnuwin32.sourceforge.net/ --- forge/bin/diff.exe | Bin 0 -> 150528 bytes forge/bin/find.exe | Bin 0 -> 160256 bytes forge/bin/libiconv2.dll | Bin 0 -> 898048 bytes forge/bin/libintl3.dll | Bin 0 -> 92672 bytes forge/bin/mkdir.exe | Bin 0 -> 69120 bytes forge/bin/regex2.dll | Bin 0 -> 79360 bytes forge/bin/sed.exe | Bin 0 -> 77824 bytes forge/bin/tr.exe | Bin 0 -> 43008 bytes forge/forge_client/.classpath | 2 +- forge/install/install.cmd | 34 +- forge/install/install.sh | 23 + forge/minecraft.patch | 5032 ----------------- .../net/minecraft/src/Block.java.patch | 190 + .../net/minecraft/src/BlockButton.java.patch | 119 + .../net/minecraft/src/BlockChest.java.patch | 31 + .../minecraft/src/BlockContainer.java.patch | 24 + .../net/minecraft/src/BlockCrops.java.patch | 48 + .../net/minecraft/src/BlockDoor.java.patch | 20 + .../net/minecraft/src/BlockLadder.java.patch | 84 + .../net/minecraft/src/BlockLever.java.patch | 120 + .../src/BlockPressurePlate.java.patch | 22 + .../net/minecraft/src/BlockRail.java.patch | 55 + .../src/BlockRedstoneRepeater.java.patch | 20 + .../src/BlockRedstoneWire.java.patch | 30 + .../minecraft/src/BlockTallGrass.java.patch | 38 + .../net/minecraft/src/BlockTorch.java.patch | 104 + .../minecraft/src/BlockTrapDoor.java.patch | 36 + .../net/minecraft/src/Chunk.java.patch | 354 ++ .../minecraft/src/EffectRenderer.java.patch | 148 + .../net/minecraft/src/EntityLiving.java.patch | 13 + .../net/minecraft/src/EntityPlayer.java.patch | 76 + .../minecraft/src/EntityRenderer.java.patch | 36 + .../net/minecraft/src/Explosion.java.patch | 29 + .../minecraft/src/FurnaceRecipes.java.patch | 58 + .../net/minecraft/src/Item.java.patch | 16 + .../net/minecraft/src/ItemBlock.java.patch | 11 + .../net/minecraft/src/ItemBucket.java.patch | 23 + .../net/minecraft/src/ItemDye.java.patch | 45 + .../src/ItemFlintAndSteel.java.patch | 11 + .../net/minecraft/src/ItemHoe.java.patch | 11 + .../net/minecraft/src/ItemRedstone.java.patch | 11 + .../net/minecraft/src/ItemReed.java.patch | 11 + .../net/minecraft/src/ItemRenderer.java.patch | 42 + .../net/minecraft/src/ItemSeeds.java.patch | 11 + .../net/minecraft/src/ItemTool.java.patch | 36 + .../src/MovingObjectPosition.java.patch | 10 + .../minecraft/src/PlayerController.java.patch | 18 + .../src/PlayerControllerMP.java.patch | 57 + .../src/PlayerControllerSP.java.patch | 64 + .../net/minecraft/src/RenderBlocks.java.patch | 74 + .../net/minecraft/src/RenderEngine.java.patch | 21 + .../net/minecraft/src/RenderGlobal.java.patch | 24 + .../net/minecraft/src/RenderItem.java.patch | 114 + .../net/minecraft/src/RenderPlayer.java.patch | 26 + .../net/minecraft/src/SlotCrafting.java.patch | 18 + .../net/minecraft/src/Tessellator.java.patch | 188 + .../net/minecraft/src/TileEntity.java.patch | 16 + .../src/TileEntityFurnace.java.patch | 87 + .../src/TileEntityRendererPiston.java.patch | 26 + .../net/minecraft/src/World.java.patch | 192 + .../minecraft/src/WorldRenderer.java.patch | 77 + .../net/minecraft/src/Block.java.patch | 173 + .../net/minecraft/src/BlockButton.java.patch | 119 + .../net/minecraft/src/BlockChest.java.patch | 31 + .../minecraft/src/BlockContainer.java.patch | 24 + .../net/minecraft/src/BlockCrops.java.patch | 48 + .../net/minecraft/src/BlockDoor.java.patch | 20 + .../net/minecraft/src/BlockLadder.java.patch | 84 + .../net/minecraft/src/BlockLever.java.patch | 120 + .../src/BlockPressurePlate.java.patch | 22 + .../net/minecraft/src/BlockRail.java.patch | 55 + .../src/BlockRedstoneRepeater.java.patch | 20 + .../src/BlockRedstoneWire.java.patch | 30 + .../minecraft/src/BlockTallGrass.java.patch | 37 + .../net/minecraft/src/BlockTorch.java.patch | 104 + .../minecraft/src/BlockTrapDoor.java.patch | 36 + .../net/minecraft/src/Chunk.java.patch | 295 + .../net/minecraft/src/EntityLiving.java.patch | 13 + .../net/minecraft/src/EntityPlayer.java.patch | 76 + .../net/minecraft/src/Explosion.java.patch | 28 + .../minecraft/src/FurnaceRecipes.java.patch | 58 + .../net/minecraft/src/Item.java.patch | 16 + .../net/minecraft/src/ItemBlock.java.patch | 11 + .../net/minecraft/src/ItemBucket.java.patch | 24 + .../net/minecraft/src/ItemDye.java.patch | 45 + .../src/ItemFlintAndSteel.java.patch | 11 + .../net/minecraft/src/ItemHoe.java.patch | 11 + .../src/ItemInWorldManager.java.patch | 82 + .../net/minecraft/src/ItemRedstone.java.patch | 11 + .../net/minecraft/src/ItemReed.java.patch | 11 + .../net/minecraft/src/ItemSeeds.java.patch | 11 + .../net/minecraft/src/ItemTool.java.patch | 36 + .../src/MovingObjectPosition.java.patch | 10 + .../minecraft/src/PlayerInstance.java.patch | 18 + .../net/minecraft/src/SlotCrafting.java.patch | 19 + .../net/minecraft/src/TileEntity.java.patch | 16 + .../src/TileEntityFurnace.java.patch | 97 + .../net/minecraft/src/World.java.patch | 189 + .../net/minecraft/src/WorldServer.java.patch | 32 + forge/setup.bat | 32 +- forge/setup.sh | 5 +- forge/update_patch.sh | 5 - forge/update_patches.bat | 25 + forge/update_patches.sh | 26 + 104 files changed, 5065 insertions(+), 5057 deletions(-) create mode 100644 forge/bin/diff.exe create mode 100644 forge/bin/find.exe create mode 100644 forge/bin/libiconv2.dll create mode 100644 forge/bin/libintl3.dll create mode 100644 forge/bin/mkdir.exe create mode 100644 forge/bin/regex2.dll create mode 100644 forge/bin/sed.exe create mode 100644 forge/bin/tr.exe create mode 100644 forge/install/install.sh delete mode 100644 forge/minecraft.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Block.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Chunk.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Explosion.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Item.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/World.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Block.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Item.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/World.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch delete mode 100755 forge/update_patch.sh create mode 100644 forge/update_patches.bat create mode 100644 forge/update_patches.sh diff --git a/forge/bin/diff.exe b/forge/bin/diff.exe new file mode 100644 index 0000000000000000000000000000000000000000..85f370d867509ac4040071014ae28a43fe761558 GIT binary patch literal 150528 zcmeFa3v?7k_CMZ}Ok@%#bbv&I25ELDLL>tj3~L4w9LR$J0iq;=8Z?0flHHJGGd&R8 zButzcN!tuY7hQFIz*l!yT~}Fk5l}H97;t@T#1#>I;A`!101?~}9+Lm(R(DS(0sQ(q z=YRg^{LcBKo$ji-b?erB)$OY4nz^^MagiLy8FBUXaokqi>7RrB{pmk$6b~J}eJJ-* z^gCm=8VcSSQ&d^y6zb}0m)DoA5SEtJ)YOW?k_w^TRU=f@2s!f?2rFvKD<;Io##l7e zg}EG8V2I)#Ir?{pmc;B^NOVVVCU(ao$GO$a zYxhU6esP?j!cqmQgMZphO_WA(n|VCeMQ~5i{r{tX6U2%J5pBg;KrazQeWlKX{S!E@ zbV7NVScbfA%69+;|8v*SpZf)xxIu@DzL;!MHaKa_y^ofyK^i?BLI|1BO|y?ZFusv zi?=mN+TNqMS*L07@$GoIWI8DUYHmQVGgur%7guaxkpCT}%is zFQoEUP_F!$fMTf)$)wyIiyV^dti?gf{38ae7b zVF9bi?v-nk~(F}AOq@Jwb6WLE^ZJ^s<0$Hfs7XB}mmxo<07%|(m_U!( zI&J5oPw-wSASb;mNBiF7TmJ)Q$Tg;xueoC!*YYDdP~Q6k3f(H$_arXCk zuL*@no6hz1t&v}4K#ZgEAE<=UHh&SR(UY$s2{!A%8b_6N$d?~s6{R;kouyJWx--W_ zRfcUxm26W>Cp9{6_1A5F@oLU?P{qGaB`9;Gudm^9xp8Ejr1;}Uf&(eN)QnO8Y^1M! zTr`8@Tv4w?00U@g&=@E$td!RhCH9@LWXQBK0oJFASiX~yXtXE`C=-%s*+t55>ut9$ z?vypAw7i6zpsWk6*cfn<4g(lSxj+%os&S-^c1 z5ivQ{qS)e4SL@dHLPB)sMnK6A=hO2G4^oZY(x|vXc*ENx{pL@Q!AX-jq)9y@UIvt^ zm;U$%<<|&9$2Spvafs1(P?{`Iwd%`_TanF4)-)tvXOCG9Jo4VlhX8$h$C-#HDDC+{{v+?*iaWmrZTQz&+Ne_nmUyYrVus0(a>Yrag~{M%)Z@3Tvk(KR3_ON6 zB1a5%X%*RsLbj&-CRT-hh(Lf%hX%5N;3kq;7NB)CeVICiMl+y>88Tyd$DxRnF3(Y; zlx|U87!C#1EE}59Ih^A>S#@BWk@p@!2o8PBL7Tb^bxnAUG(~=altg}p)C)v8E28@=t)DJdw%k-q?Kj`{A!A$<_Bcduxg z>u#Kk=U!N1A{t6Ll@bIWGnJP}aTgioB1;bJI8$mcOOxlPs56JHz7A#K(DyO|E$H0Mx;!ObVfP;9D0-?b@?|~ z)**8@E{=mJTj}PtcyVJ=EPzDGT|hWwQE&Yj2HGytxX;X2ng+}!5JJA@Pnr|qz2(F& zH8V?hK)iPy zf}d)q%-=Q0*`jJ0e)Cp>eHz*GR_})-8qtwBIZcB5+JH=7k95p+Oddr_;RzZ&XAJz> z-qU@3wjSF-&9dFEj(UptF0lq)`~7GcVgn-1rs5 zu!*su*Tk>A3-t6^e4DRuaBUMtIk@9^_%|-@N(VO#*JxZ;TvKt)!lic$!f7OiFB*lu zeF>C-Yl%1!xv<9@5myBjf+gxm8fZDVmvj{hs=WVe6u&7~BLzGEFQs0AH8j!ybop

*OMo(^}*aq?H_`LMQEUe_iv(l$V2Z+_$|iK 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 literal 0 HcmV?d00001 diff --git a/forge/bin/find.exe b/forge/bin/find.exe new file mode 100644 index 0000000000000000000000000000000000000000..85192fbf44aa14d832446a1cb4a72617db812f5d GIT binary patch literal 160256 zcmeFa3wRVo);Hc01{fe=1_+qdAgxX`tVu{TXaWQW5+K~8fS`a7NJ8=&l5En$MFE48 zD821yRJ<;_@Z!1`-Cfq@1w@2EFp+g#5pO77STCUuA2r7cbc1 znDXKUGfT^A)T-*rCDnyX)y0Js6_uL0s93G`SEywbYToo2>e9-h;f2@vl)v_PMm1=$E3X zGA|3T4E|XU`O*-h)G=a9jPeV&jQYRvo2C`7(9lppKHz2h>}#YG5&~6G7N!*yYK3@B zci?9s^5DNRjX&-Ge2UVTwy36tF$)Lar>bK*Ccc8ucL)t(cnT+c_dZO2yi)=C>aN?+To-vq3^m$01l&;5m&5=>*joQHI^a7@z zhjg_#qsL zN_g>zVN#x~$rv`itfFX^R#sj!tfsWEx_DT5<>JEfVxz z)m)-jGHXe(rY`nZS2L-oth#uyR$0AL@mCbDs6x27NCoq*E`+2jE-G7Gs1++^70U|C z%Zl17WNndJ?bJwq*;rMfR$8Mj_19>uX>oB;G3rGKuvJzlsZ*5H0wp!|%=npEib563 z%Bm|XL`RktR+kknDlb+$^<9NvrZlecS5;M3qYEjjhN6`f%eN*L@FOcQTxDT#ws<7tFSSTk+I~dv3+=;G+nmYEi@MSux7yMrJyc zT6?ua*}Na&=I+nq7msJciAKqpG0+>3zEyc6X(N6Ii+cT!aA1OJFzNPdUOl`^?r zMRIfZT`X_RckNNreCYJ6c+EJzhx1P#eh@F&@3o9OET-eQWAgE#NSyz+KL6WwV`{9C_`BVIMLYV-`g>nI?ygSsa>Z`WyPJ4_EzGUwus09NfeDjd90Dj(dA`vN1o_$PBo5_eEchu?@1d_pW4j z{e9ZT9Ya6#`EQ308na@9<6Pvo;D6@%*;WlMckofvrXTOJo(Dud?z#o&h%xmT>M$~Y ztY>=7N5LNI8}%l4-5?~Pnc%ErAQ|v|r|$H&y;9fcA8m*zBe9|Wh`W9(x(Eo51H!g} zUeJfGd1FaM>j!i2#(k1;2xKBi zBj|VO0|lixz2WjTnQODLC~LBqk`A)mi0VOO>pZ9kNH9-8RPG>Q zixeYHq#tmvJH{RZsC4AFDrg(X!AIfx$2b_Pk6}Ef9veB;rB6M)dW;wv!@YYDa*H7b zmd%sH#Sot#>E3(}fD!v3`~4D-gh2`K1eNIH4ri}Etfg&Y2S5~Yn>aCo#b3_7VF45g z06Hc%x__@gV16qF_$h$m9uOJJW^+Ek0peYT2PtAO z3FMN897-q^C@=@lz-09ZCBR+(-FJc~bf_TFt{}m#0HWW#m=(Mvv!_Jbvq7?Rl5S2u zh@7L4ljOYs$~H*wd?QX!&X`hN4EtujnTs-Gl+geFy{%17i6AD3H7gDe2lA7H{tGP@^7KZq5Xqk61P{p}4+(7t<2@-0J2;BT@YT zy0q;?TierIH|cR?w4rZfxrP*R=d|_ERGwF>iL(ESc&?S5iG%w8)Sfcg9H9h}@NQ9%lu49@gUH-=|{-oca8gHyZ(#^6zW zo8nD0Qhf+vZlDR|PiB52Cy#LhDd7?49SBK?r^+;-Hy#~LAUOIeDEU*MJ(JS|$@dKc zmHroJ_}q*bmXP2N7vO`%8y%+e?E63(*CDrl{N$e3(N7e}LuV98eD4C=_w5bt@-`wW z!g1Z(J~K!66yU@%FF?z4}lpQS@mt&Wo8S4fSfZ= z!j+6ZIDt@9qnHQQJCq%)aWgq$=rJ-6bdi~lO4vZZV0JG(!!Zp%Zi!#Hekw0sR$N}A zmX<9kEv}{!g?d;CXu4))jaIxA3B}cg)r(74o<>a^-=4L+va(7oD%OMsJ5s2iYH6X= z>}m>^Vonqp@&f*U z9{h$GE0->+EH7KEmX}rBC}F0Fsjym8D@y>D=#+()h^F3-m67W5VsvsDI#FI-Tv)VH zT~=08Mh%{LY%c&7V08<+cqLc@`z826#$RV&n{gaGArV7p?DA&f;oi31n}uhv&btvK z=iYvY*N0bqt9aFOT0!0JZEvlc=^cg{OVdq>o_ZXS&E3DmFXxK0x%*clI1hx5=`5%X zguV)tmT?IDAqk?9Mb`dVIi@IUzfpXOqKz|hsJdq7kjbnbka1}3euAYR6w_4bGpUrn z!3_cuqfRtV?g5H(QDvH?gb&o_2q@fjZ-8I8x68a4ha^OfOsnF;L_aEv@#n#Swoy(V7xU2V-z=)4aoicX&4f^pX!qpndW2-F^bK@1#ziwrlDG6gBXS_4w3MH?hfC|%|~m&S0+ zTo@@behUcE`c_dXGNCFDd7{}JEGv`@4r}BHdXp2ucv99z(8xVgylv-%zCyRqycpN5 z5~Ha^r4dI|>IXBv%6Pt)>8^VU`I@^EWscC}2nQO~%^cvpN1Xu6X^@!K-OwkVYFi~Ensle(1(1r z5Fkm(!a+p;uj_#+!XxVb zOxFFEj&=8A-LH$fPcb`1B4&@dX4=GQ6Go`{h1Eq;2raJk!z=_Tv>Zm4C2C1!HN@Zu z2oyvuEnKN$!=q4L_xYSEs4!7{6Azv`~ZfsGJrUe{}_IFqIX^ zTv2pMjhb3fSzcUNqE=REFb1K(xWejk$a)p#A%8h6G;B!-wvvd3TUN2S+z)wei?y<1 z3U^p_YDz2pLHGQD57wGGYl zE^LdVz(S#!kgM~Cz7ov5v~~?lBNYyJ{ZVpmAwtAbh3FUzzR?-UbyuL7O$Sj8OwaDR z<&e<`RQC$Bf}_mFTSlWLSR38z1Jo^A>a)10r>3 zv2FmYopk$~b#T+I-UfC}>N>l;$1s9~?iQ{ap-gc=DS!}`92qEWiX&J(mKU^n>rW>8 z6l_t99qLnFiTX>33Y%YeB`hR3BOP2A4GI*S-+;c??kC9$t!onnMt$R&LadUcxN?|A zeyg$Kq*3steuvjYIm35M-{t*;HPm^J^0D6gA>-$PevW{CKqnM#X=oI5P^8Ct%?lY` zg$V;%8ia7zFb4X7En_&BP@BY>YrU*}pjdKk6%B+RF|#bt#R_kOq&}=pI@(MwM=wId z$&w|a(W3hJDT})sqZW7N-YO$Uv{a78U7UbLtRI2qWOPO`2A^edw+f3p3P)-Y)JMSz zIBYvyR3<=d=9-J52%vp&*I{jX)9u#cP7+lHD9XLQG4xYRf3eC6-95#9K|;241BV)1Pyw9@=`&s z&*O1rO8cKHDr^Y7MUo)EQcx9U32WT@fm5F{7)#l~v1qQ9y%vs5AKpJet|FNhkct%Am+ZHS9;8s|hw46yl!dX&r& zC7Xed+)x_JuSafe~8exdk8k|R4xX0cX}_u!|ab7SU&(Qw3gWVMD2=xia*Zq zmBI?~g&1$xT%z_Hje%rDA|Y_Xp~d2-x_jV6jMhVD%V-RU#ghV>VX?p`iIR>;l$eg* z`a|HO@!*;&I7osv1o2)>!vv&J^;MA)AK0H5x)+p!@Hh~^^8Kb;oa@~r-09b$4hunrAkQ2 z>vb@Ozdnd&fdL?LVCQDV`qjMjENveSx7d|6VvNI2cib-wJ%Pxm^$y2_JB$;^;x8lk z13K6%HWU3#PjkCLw660(5PZOA;Y z&P{7tC_!Ra7E67&xA`^Jnb3!|4D+uDkw672odVob9(5q^@U79-9bt$MKiFaXfU*=c z7*F7U>IBkO?TY@2e?aYu0g85cZH}-6_nAZ8HtFx z%F1Y7$Ee9FqNdxq#*17YV{$xV7ev>XA~MrDS!rkffykV0OwL5?Ezz0V&ST95h`!s- z{E3K~hXo8`H_BKcIL$*y3C_p@37gvy@tmFGPLU&@ zIcn@2GxCw+FmsT5mm@l`KOv)WZc}7U6dg#aNvg4I>P2diznZI<;uXblHFyi(h>2_B$Fk zBLH*}eO3r8h9~w%<$l2wr;w`Ud~Eer@v+{k@o|TD1s-7CSy<1nVoaU4fiaqQ6qZV* z48n5WjK>sjCf5SMK6OreHoNN|f(mV{_89(naFS8bY_c+rWxUj@)m?WNgzQPQ#0qz_ zklampuQ|rS#g7jKsa9~k64bmt%BhqM)bZSP1Chq}CkKFZnyG~?f(#Dq@~%T>Xz?FH z1;{vr_dDc!f4oQDZk^cv1|2^IZ#F+R{4Qb5GFDTm%>=aR8Lb(A>U9i@IRPzHchqPD z+QT8>CbWM*a%X7Q{6s?gIMN91cl~W>w_;@oO!+SJLH=3h7*6XuymhD^m@UEsDD~?5 zjMXl|exLN#B5uc1C_=C>CW-ZbMV17A_Z@UUz&N-fUFLkEl#O+--zT6V1ehi#S3%$c zlDdQ#;AicAj=W`lmGUmp8=3{BEm9`YYvwnIUF>Fe{aB=g-)8wdloyB!KSShyglf>8 z#?IZ@Wp{_517db(ss~y?R{as#lPB$-CQ?5D0ma+hu{ywR+0dW~jFno9HA*; zQNm#k^??qqqXXQvY+oNE1#P1rwV*fb#-ks9M27Hdlvm~p=R`@!t=@%%lRBX7Qzp1* z^UY{43x%RthX}V@FRF`a1>sH|tot1uZ=&>%wV(Wv&}{HF;(=j4%(q?M=lQnFdysEi zz5DSnFC$;DQQv@cknCNW1Atc`esK7~E4oi!wRQzUwm5mu2*3QvS6YtHjdSB#tK7!fZw*GLRTjgUwX z4CDReOa`t_27dQE9fWgr4|E z^JQc(5(3}GXla3O;{^)bb!{M_-I$w7#Qx{53v+3=8M*a@(0d45iq>v097TKA)Y%Y% zu*SU%7V|a&4q9<`PQk4;h-*>)r1fmNKiIdpgxG{4;@&*a$gm zueB?#qvNIGnrdbu#1ZER3gxwfx_8BjXr&b+ehtwOwKNJFhXx|)lsO$8QMRO_vbq?qb2nC0F0W7;q`cgK9ve9YSQx{4HWGFXh7M^%FH~;}ziGY>>l`cul|~f?oj7S2H0)v>1=BHffi1oUfhn?XQry{ur|> z9-gCP!*S8%(_r)^zR~vq{UZ2wAt>_>2B`j{oH- z67m71LAfk+qB_J!FuF-#R0BqV&zkt~-4ct$Uq)LL1_i;`n0t4az+8gB+{E29GK+!(n^)$rB&KWh3gUVgN+fTq_DgO zKEv=9E~zXpuUxK_RAJGgS&wwcYkF04}e94~0@@{rZ3@F`Tt9!2=5 zm1lEQ{LdM0<@pW6SIhic5%$fH;inPypib7)i10ClDO{QnF1XgGKo3)1Lii}c{P#M- z4YOtVFyj$s*>@2>hA{Jgh_Gjl42KXdK$v+xL%7z8{~F;&gxS`&3|}wv$6SRvt#B`d z56+eG{Se-Govh~v2sh4?VHIJ|d>QsKj}`tQ!VN_-ewY%Wwh0 zo)Q_p7U5%7crLN@9{>Tb*>`a6=A`io1gpXSFe}=FR`3b{u=FgXTzD0No zXpi|FK9ofshFu6BwDP+VR;y+FK<2UfcrL;Ph>t;j6=7eE3=c(k%S0JYLs-#d_;Q3* zE1ZRJffXKw@Ifm)2H`5d%s-xamdWrmD~zU;*$6MRV3>#SLFD1T5`=C1--vLPg*TCi zpJ@Gn6CXC95#0Hf8_qR2GEr7iX1QF!93;22anwMgml;kaRHWKb_Hm4)niTAy!^KPN ze#8B&8g6Mgy--yN=PekP3d_}G)D$_bP+Wr@@%Dxm6=PE#rX!qZz%G4pc{!h2X=P1u zR3_PenKl%g>jl_rk0h>)G;7sU312ZlY5`Z121{bZ{v?hzs1UH}wIfsY_uxVSglt+5 zEJ2@7f&(m8FUI|Rr{o{O7=uNf z*mco!7z+P7IM)%HDip)57qc8sYEY3rxWNa1(sC#l12uwiNb3{WA1_ulb8l#(z5?ZB zCx7&TTW*D-ebEI_U7TJcj&Fp59Bebo0u-0&M9VO88wPj^W_LqAjikp$v{kW1?=^oc@;G;Ltxfo)@|iROh>ULa7@}a8Psj zN%PM?h7saQYHZusQ+d9@?(Z@7cfpP9Z`IlQ+sOW2u3G)&o8A0omKFVtN8{#IXt8sD z4eVb>^_QjDUlz3c%W%j3UW>*=-9{V>blu-gJ=kBS%l>}G9bWbqr-L*_1i&LiC*{iV`d*6#c?2EBgSV>8LF6yHItEemwR_Nw4)6}8`}9TV_{B% zS>=D*+_3PG@=EmT#I|wL3mB=0QNl+tZ4qX2_*K;TA!I>EpDRQ%l@rJ8Uk3Co0s0X6 z_ef5|uNbl0#ms7-Y1~I(IrH68l(`&bXj4)`-4U{JoGK1d36u81q{Ww<&TH1rUg0O# zviTv5Vxqi)@fig~rGVl1FiM%gJp8*cPFc??zyO9Q9nMeZ7|we!LJ1j%kS|3)h%rh> z&Pw?BzKVDmY7l26f(Uq9KW ze4oD;knbP;`|WAUY&%W-KU#lu{(RK=>{;sFf0p#<`WWsu1$7erTwlc-&3S{`fKXW6 zy;uz;U`)gzP$TnR9n0|>p=D$oqFH4j3{xPSg8v3(e^i1ofVEnfg!R%yJwE}1#ht1| zy;Rlbc-wjk|IlYaR=)7VczBfXy<(p}e8;oYEW-7us}S0Oq-etpNZh-p3~Gy}Rf|r+ zp<>O;NpK~= zNs~ef3VTq8+5J3l%W+EZ+L#t!ENeC9D|(g=3k9U2c`g!j<%Vn%(dGC8l7vO;2wtZ}>#lcB2HjDtCO86_w9s>Ub^YB8<8l~VK zRONGZN2*2h&AtIjv#-D9odV|u@C)W&QONx2Mv(d_Go zzfM)#`*D!x=zTh76&>s|;oSm%7Kn(xM*NSVe0qcsr-!}}-uiLif=nw2%QgD%L~fV4 z1B|M!aot`xxnq9;NGzSC&9(ZQ(O7pt+Xax6yM1uj2PYWJv$FcWz3)4R;wNV4D{Gs0 zgw~7!xIlBfK1T(2)8E`18nP}w5zlXi==okDwA*?JyEBj;4=m6z8X@90{9t>3fUgC_ zR{6rqA565)U+c0?w*>ka{1mU=DEFA4hinIsBMGBm2{@8W3T3r~|O%8u}N zZ`+Ws{~U}TFtqsxZ^#P$z1BA0f|S4;)M-5W=lU0WPYi)b;2wB^)gUHYq2soR zrO?GKz!+^nN+LR@gwiM^@j{vmU4R$r%YgV_n_qLpF5Fq>*Fvz9GtRI7zCrZ0I)IgOcA`{D32L3O^A1_CGNn?*HZ=oDZA{ z1IZ}Ge2{ZNe_ekgYCa5Y#*Dyx0J%Yz|3~IS!M$=mG|c_)rViR_H#Lx8-WpXEy%={mjWbt zM}#8W3~m3zi2aJ^15=A^V-=2ez&4LdI&j%X(MYvQ+KXTSM;`7pz>x_n>Oy!mEkYi~ zvwV4>MjICj7s|UcQWsY)ttu}o#QBku;zIa46h{s!xBEZZ=AL*9zIOCsKNg+w%(j($ zn`0r8>`5$J=fXiD{9HsokFLYgH;`Km03ScP-dZaY0jXk>L_f~`Z#YJ>W}c)$UKgy< zV7xrzz@0;vc>snY$O&peq7-)(BJD+&$3Y*IAKkgU-d>*VaeS)o2Rwhiu8S!<3_AzI zYP2F8KvC>)rC(E)TVe+M7Xm`1&;r3Fg4{CekJElZ+XV!BA0z%wh&MQ}A?Xxjg?=23 z*P`(~8v&)c01yC)3C4h@V}Z|;M#}v>n(bFN@gku>qYup_=;JLh->rE(l&|sq9O1`K z?s*dBMIlk3w^cw5zer5(APQ2vX609w?Z>Gf3;*71_!8@$a=AxO6`|u9?0e>5Am6a% zi*1Ra{w6Fj?4y=JYYcsvusLZY-VIe|2woGwGtv!hofErvN%{-9I@Ve?eRqwAlTWk% zJJ@OL{l2U3MW=^bw+uxb!U{rtopPi|{%V$OPm&Zw*z%IS@xPc!p6nd)O z^#`o=jT6x>$>xE!2KG;z1=+|^hRAM>x#iF&a?VWQJ>i z*dw^;Y%cc#3LXSBD`tXj?8QpY@IKPry7}Nguo>Nn4w(-e6N9l&`#WfPrSY~Ulnwe9@Zg%geNFI~Ks;H(6muyv*jDS4HeF?bD3mZ(<<`OQ# z;`ULBxbUD5{shQ9;qITHq&9~&j^5tT+iOv6^BcSkD&K7E_^q}Ys53i-zUg#=+ zO4Np1huyUHA*zX>!BVACg_DJvYCA@#Q^s98ZpsWqlt~AP_6Ttj*E%X|;UG2D@2;u{cHtR8f|@*yx0muH@1@gJU@uktPGj%slA=!IDAOZF9Y1l(IK1$* z0b}W!qE53xkv=L`9^t9NJi;jj$fF|)9>UK=oq1gW>VdZja|quKb=sJzV)}f zD&0}=%VPqFEUJQ6PadM-o6b56^fH~`la^LjrunM?>*6ygFuaeX506qJX{SHONWl&8~ca1%&AviGKJECkcdoQV3%R!RvGD87#;ajE3z;;^2ai=U{Q3W-^#f-I&z_mJlG*}vW$c( zrkKMJ?qttHf4bC9V1K2-QQBWS>L*o{(XUSFLO&^~tW?J1&ytm0J!%Ro$~4|`Rg9sB zO_0mbk_y~3u(&jNDDE#SDZr(yAq0pp?TTOaxhzgi08(diN6wWW2Qf3jMK* zQ4^!Ors2$^dV@?q`>6iUL@}z3L|$m(=|`2e+&mJF$M$)Jf6IJ*?9MZfY@JL$`^X-d&_1&6{L_!@nda*`qOpJ5 zd~N+8YQ7#L$t|1kedlWz^Xs4Dhk3y>V3%nxrKFYsIYFuL*E@uvuh(9$!^ zm_69c0v~J)KNPVCNqMXM1ho~Swhs1Du9#2P|3T8l#3RZ-ke zegEb`+-!8#{m}xT*f`Vv==*tsCjZ6#oBzyy-?pRw;Qof#1g1npm;deieH(#F?)PoU z6&U+>?)MGOg$8%#{l2dCxii?Clnt0%PQc3js4i5O@QWSf7xuHpfa@zh6vO^@3`Kx1 zmZG4m{jC4+ejP!d2>Z`BWgCk@SUC@{@B^Ry^spYUQyz#{vPbF%Bd%8mkz^u zEA(&|os4l)#BuK6NOL?ERKmT5mi)jzm1@ZJp3;#2YUlPF+5Q*{VyZ)w6Ycv_QU0|5 zKK<(uMu8absDJJHvTOb8F~pxn|4O3%)z-GBjr!M(e#E>Ioji;4N#wN6k6SP?Z-%PmEf6NlQ~7nQz1!y_k(_)(sH;7e*$Yx5E*SXdmS2C6 zyidw6UK-T--I8Y!`PQBuHJ`R%?6`er&!-IZMeM70oKM^zKS=(&cZ3A7)BL2qOg9Ts zISn(g*I)(Ao1(b?ZRyQ&|J#G)$R3e&(;~hfe9fWc``@8YAY6uH0_LJXYro|$!uQ*| z0w5kQ$M0tR{R)5Pa-Z@$>&bBR-;Pf4d!pW(5q?Hl2tvhK+^@6YtKY`{YY9@C3~-c0 zD7Z)HYOG<%<;ecS|ND%h!UM478O4W3<1oJ3YeB?V_Y zw5#3QV)QrgNdhzb)8!X&w428d08tI51FhicAdC2Q3;IJD5Qn3&6Yd=PDfYD!z~Q<5 zFOEUeSK*>VxZ>m4hT2;kN$xt_^Q!3IQmx8$ZyQi|NIMTi`67nYz55Sh9>4YqIgJ0$ z4M;YI=fhjVz3ot7G%k{XoDs%BDzIb-b6;gnty^yRRphNbk>;*@4@s!+kf`r-kg?OO z7xihEyLXS&4-Yj#(6JW10$_qmLl(dc-smt_z6^hKtgQ6Eg#HdsRrhXQXYmOt6MN$$ zWlb*kwi%APL;fj9JBBoAaCGnP6J=%*-DkbfjLZR7f;F-+I6vqoZ0rpEOR&;G9SUO> zu6OSSfG0#Qw7>Ubm;UC^P_OUMgV^AWy!@0`ZinWAnvFQ(gvbkIJG4YLY9nNlMBO_` z3mpgiM%)HuH8R}Wo!17AI>R3r!$m}2L|l!C&~9Yv3bL_;D_9v5T8IYS+h#k03mofS zt_`Kve$#XLl^Mq~4uD?9xOeZ%4SW+5)Q%mzr4QO%cQ7S=RL^A}>&GUq>lx|hr@;x1 zP=mnczJNI|(0Z=>_UC~g@Pw>Y!0hq9`2D)m-(z@x5`SBx;@^l0ch1lE_d2D2Y`uSK zJuhADQ<{7B3@su{=;;bwk7q}s1${+`w&Eq+x)_J^3C%rYL&HRo-s0Ya=ALn(A>zGP z=o~yj1?el>so?Uir~spA#tp~qcQYKJ$KdeV+_O*U2vBnKYK1OOU0L578m9AuN|o5W zp^>%_8^Scg-@KZe(~(avsmtNxD>s<1PmV2e_0ov^x(>%Cxo6GYU%HW@D05?1k(PXZ z=8EQhu_?!khiwNev3ZT<699{LK|`zfUx;&)8gA4n!zL|!gmFn1s=&4og!6P6#FK9mJ!Vn8Q6qhx(K_L;#x4#fA$C6mm6-x z61Rog&tg{Nuo@UKbDauLNpzGjIWEJdlU3}(vz9KAn>W3PGeNJDalz(Zdke1e_Dx=sW4H6n6#z!-{){+S0sj-c zN!AOkC33m~vr)`q@LuyL8CbjE}hX-r^J1ckAp#i!YH$Ek2bG%G{y*Ch_VCDEEOTUSyw)KheZDY+{}_D|l@iIH))K zl~q_3pr>vAe(2>q-7h6)=u7aG;I$4&)p`1$aM+mgh_L8i|3_%6VE^oa52MJtnc~?f zo&qA!3f54MD7loBLUy2E`>zsrNPAc92;W2K^v~Ffp?meo`7OB~jv$c2hk4=!AOyr= zT$itpiESAp`nC6in3gdrThXCB{QM($^0U8n z2UV~?BR`Lg24~hQMoeHIZjXE@H~ZUFUxd0z-q;WsCejm|i5{X>+)@&Hh1gi8)ZXM! z-1WENrM}Hww+2s=LGy$JN2moaGI=&ap&j@^Eir2_CAy27Hq8a-n(h?Nro^5(1dw*J z|FC_gp(MdDPmU2Q^-(AH^h8DS8o6e8E53mY9>koPxJCo=@RP)JbM6!fIC6DNPbIVn zA;Hj-BF87>`3353blid#VDwunF8i|X`AW)YM5q?0@cW=bVf+R@jO#M{T$hdux82+J zhCkMiqxy3k=Hq_=jSzkuFBYF*02>)wz`2PVa;5?xjbT_LRj+l`>12qD*TS4A%Np-rvM4%5d)> zcBB-eI>Gp_MBLm{A@-x(+Xo4l+i+o)yr9tN;of#Ia3WV*iJw~*1Wt@`*U!M7F%H_~ zvHXlIOJUw4;ETr{TYnT#UeHJIS(mYfw=6*gbea|Dnz1YvjO>B6`w4{5X$5z-{Rd9W zbk~2`Gpc%D_zB#)CYqX^AO5M)0|yD0?}Q?w)Z@Ad^ERK-=XRg+6s%zX@6V@PVd3I- zJb!|}kGjCkh3ndJRS*@n@#pUpx4qN5ozH$A)P2gw_?z`(pHhTB##i8ZEB=0qKU|+K z;>O{58~%>tulF4?Zi@9}nK=kQg1;xD;u!xYv=5yz)>zYi%l0amL9gY7O=j=s!OeaS z<|MLAYtI7SY24uCJo^}j{3z;%;TZ~$k6HZQBCOzg??w|nZ_x6~bv4B8a&{vX!FV9ZE@5Y^d5vPqpuy&`1 z!3+c!?(EOt#R&R##xr;xg6hse40;gs>`Y*=`_6Omp!g2mi1S+Jy_+HO8h0MtI!5t# z-?^oE46eT?Ylj!GDg=F^w+*|S{{9djs>SQ{K4Sf1KCmAr+i<^ht{D`e(OQZbKnQq| zTw9J8SG^rCn_iO)`SlxSO9U{X_fJUgi1YdK8eVW;y2a`yWRaHs)C2UjL*`0QVn6~G z#!sasrk+Buq@@_^n!{Q}(ayp5Fb@Dx2*zUWu%DqTNxn8OpJPm(7yihQ6l;vh4=saW z5tl87G5`khk+euXf%gE~V8%(1jGI*Idrv~9Kq~Ha*ZrN;bb}LmTbOC`oO%NL=!Sv?5; z1EiSiGG@evG5{u^O5hp%)3bvvu}gN)GxP{mXF2^1SM*(@S{w(OGb!{9z8N4j2WvvH zPej*LAVVk-bRCJ7lzB~HSwQpKd%>~}pt!h^LXUIaid$cP-ab!~cwx3zED~_lQeL=6Fs{O zju3)U>R(4%=og%nH|%pL(`HRku&%_xE4Z@qxR!84gu5?Rzez>>k_}da%L{Rj5Eg^- z<2?!#wOf>kawEQ1*b30)xz6vE;!SRNX2;=s^eRmYao zH;v$|;#1^-eZnSgiU^gT4Z)|z;0vLc#qTOg?dmDGirGI1--@Dz9HQy2vFsu~#DXlA z0&K(`f^-XV`GTc}`F9K}008aDS;cphSciKW6l1y*d0a+66eY67JV?m{>uGJ%aq~() zL~^Bo%BX_NP5`kXfai19{od-6F%w6J0nBArAbTdhH;ZjusC(jW$u(G4ex2v_Ds9~q zeeuGJX>ZqxD zjO9+_d{TC#k6blcOMxF<^@7h1-_UxOvyR7!IJ; ze34mekk#%0ZiE`nkw>O}$YnkWgoOSM0yb|&MRuE=zRM}919_QiP#sDVhvrl0829f+ z892uc-Cs?@&xIJ=OV{OjFTnTIkSWmW({h5=0KSX{u*68^dK7UgWf{R*iHxXpBTU5R zJ0j0chW*#k-ir*9E97~72zStL^u78%#0eb-=P&CU@gfu*JYAbm#fnRSJfURG`YY&h ziq}_vU_~5me>})rXvBIUzgbBQ|Mly)0xv6HzZpK*fTC*B_)C*Y5b(}a#KI(ceSrNF z!0rLY#nmCt?qZ*?h#HLi&fe$=#oh!U6_P+dj43QP-I3@+B4}A`T{dGx!tb+xKpu|3 zV}$dwjIsDSheON2PqoS~TlB~{gu^~f##l9b@2W2XjibaqAHt#VMtniznKkUmSo-%S}Ps(!tl=oFMF~Q<*r}j68 z{Y^f#zumdfY4`Z!@CR}f*zd!#->>P|d;J`VZ_A(%*egW7a+>q@uoy}(<> z@sTz8?qDr~!OBsAmPCvH8k6&k_}{Ti49XyXESgUyS3pj3Bf)I|4$U&;NYcbc*9cj% z-0K`KXOPRh>W470)#R`G6?ngxZ!>VSF79A1He@kcFufcfF223rwxPNn#227u)!Ge|rQ! zDS%Pn$HGe{o;+m8Z(qjanT4mvn2~41K1ECj{6I4>hYURfeny=RKN!~(q6n-V9m@(< zCPK*uIi-WJGJ!bHSV4hcMC8)uTNnhv6~a$|E$}N$(p@OpzLsoUonVMBcmoNz!M+j5 z6EM^CMvf+#BVZKbX|Wu zyZ7>cLj&e%(MbuQ9MOmKw{en!hywd#$=E6XDZb({gE7t?$^?te&L>-kEQ`_H@X^JE z&Xga{za#AZ)QkoP4;%bzHFs<2l^8C5qzm4hIg=RF7W zlY_@$l`IX_QAi3^;`$4%CC{s%dT}rSsmY)_ClLjG`^^Q+;P1}*9YBnEcq{O1eOB8Z zKj7E#vS8m%AdX7Dtm1Oedm<={w?}ML|==V51+l*aXtuCN;mXF30OVm;=1#9qO& zmli!iJt0%#njgxO4u-P@xjPsF-rItE(S8U+7}b1#Z|Ee}XCMHjtvY@C+lWE{)u|qX zA{ByVQXy#92M!@4)fTX`e^y^|UvOG|01J%JJlOJrQdxQz45y>AwEWDVvH_RxT6XhxIPzE5olgp_4e&a*K87(w+(Bw;9TZu6 z{S(pGE<;gke7>K)cB(#GIpj>^gEh59KGq<;X%7;FX$OsMb|T2pzz#lC0->?xqQBf4 z7qiq%1{uhK`elQ7My==0w!YE^p^xn=A|bxuk9L|R?z?wd%pd_Ec3R>}HL){4;6hg{ zJUi-Rlz$iju2nk7Kit~VS^i-!UMR=$7Jp8qqLc_l$)9F8+}kH53X^E|^Y}oh<&Ejy zJ~q+lcfr2wec`__T<^eljKlAn$9@f4nx$`IdXK@YB@CkPpNaUx3RZ~5g#}_iGE0gK zLR%W+%!d_YjB`bQ=uXY>Gasu)YNFx?N@wrP-=I|ZqiB1Gdt3J{All~c3JklBCh7y` zjyq^Arll9dY(9*8eB0-n9KXo6`Xy>d+1(9bT!$^tq zze20P0ZNz`qWu5md?qi*LRT}5{6ypWbfY>`e-Rf8L4V)-_aSH#T9u#-B0{_d2G%5q<@WvMgh{*O;JYYu@jV;}VQniMI0R{~@*j zjpZI=s@GTzKXiQBh*ufLGqGsiZ@)T0o95o$ogaTHfobYu`+HSfZpOQ} zJH%#D_Q7_Q)4jbh{1;BobGnQ5yYt{?A368ec$jIwls3;n9n*R~=2OD&TlTbnVSPi4 zcfGzz{C@hX%oeS$3jL18kbo+kQ9@o3GDzJKbnj&YWBWWUkDSLFsa~; zCbVVB$g9;gM?_TkbzwidT3!7@l>H2Z2mOUUzg@4NBIixkk=t$XK1jCE^LDWp$xrKI zFLGllHVC*F0iUAI6aehE5-vlzc{fDWuj2i)7ch3Ep+wfkm+egAs<{WKl@xlc_W*?s|r zxND?PrJo}%S+K7PlJ1@`-@%J>3GS4!zDH^EASx=v1x^SH0Ud- z7OIyFy+p04Tv{xz7~&T*ig5P{Erm73@I0-+^@5%FNmunpKGmUBR>JwTVkPVC61s+l z%E~HSN|FkX&Siz=XsaDhDjCNGo!e{I7sUAlY=6KqX>@b%!Cnz4vaZ|#GA?ihPIPzQ z4u>c>7~l8cFW{H61wX!D;yWeytHNI`{tn^~oWt{TD1$bCk{d^$M6m^iRMbH=%Vl2E z3lg>)D6M<;ir8Du!Iv1hLIKMM7Zs)j!Cxqagw%l`Wcv`q&Hh)cR!(2}S1t(RCo!M( zW_*iW?-st#UY`_{LWT|?K!gZ#&HM(N4f^=1P$j7jHKzmqP##`5{|)39xsh4qeu250 z1>ijbD_q^RpQ1d&kIT5F=YQZPS9f>aYv_LVO|cjw@0uHpu`YZa z-Fv$HUWZDaetCTXujM7G;$YqIUk9# zpULm%afewGrsZVhq*+_&clEqZMP&?Bfgy_4!x)6CDq`t^EO%33UmIJlfBiJJN1+;l zw%x&-%kdp+y~*&EV+r|L;AU4ht-l~>@Jv!)pBPNAL8wq)d6Xhjwdm_=NtC#FAj2W8e&)vob4 zw8;c@2tG%*0Z!IJ)5BmV!*ont$>irjpxStmmO$`HFc5-XF+ZVueh2`l3k?Y!17#xD z`6!7@$r-%OS}ZuYtxi-5ltNB}zi9jr0To*nlU|rm^-(zQB=f20K?Llsu%aDrIVFJ9le~2KwGB@}XZR*++jT`YCxAp`tsnK%qjyoo_;dtK! zBY*vOC@#7)qa2X1yS&2h9DQ=RyPls$MT8o99|1NCxRZ?;7)xZhv0Q)0UH`nyk{sHD zKtm9Wgx}*tzJ%=DSa;nlCPRBB62NrK^Ux{1DKr|<#w335H6e74D7aPZS7CjC_FOrj@WEkw-n$&U)c4dBtIMtuLZrJ z90cIh`*m1foJIcdq`}g{>KhkOp}hcNLdqX5FI6KKTqQ=Eil6FI(6DwnFtFt}_FM+# zoFYT|cEcuDBMM9RUXD*L=h^uY`D4te(m|g0VMwr(`wDLQbcA0d(F70!`>cCgZvSwU zJ@@;zn z6Mv+)GssF1iTvgV&Pd>#L_hqAqkRte^2=07Nj^bIExsy7VuM3$8`w?k#~Ra!W6k=Q z((nWA0Cfs=#;<)(B#)xtS~K}gdR&eM86{S&=#PLGyuxevKp>dh)TtS`b&%kCkWRND zM&{on`rhbYU;}n3s`(G}-LC$R{}bKspETI*FR?Q`feh{K8v}_VdnR_Aqb*|vW?N#! zmlMXyFDHzZUrrc{BmH9s@asrKerOPgSN7L#2B$)z@P99&4{kXV<-OX5YF+~4>7;+s zKCuqbpbQ{a@Quic4biqPSVmF}?-1?crn{*7MN{)}wP@-T{uJQnG}n!u(mrhyDu(+K zuuIVLMiMKg{sT|>XkxUiw}E{=PV4V}BCL#CkY)*dc^w@L8PdgzEH|*%r(@gckj%?o znHMA6i7>6#%(TnWE=zAuOuC{*RgyCKQ==wbUhYRAHH)v}XOWtOQ&RaOlBOz2BCIA| z$DE3qIvRO?h)^mYB1*OXu?AK|eoK4I+E3smqu_HFhw%t*@WQS_zr3S-Jn4NK4~k%; zZ*Z$uXCb=M66(~fwh;w&s) zF>+$Xc=UOz-8&-f*0Wvq5ADL~k}Vnq)Jla0_hY7VgFymH3OM;tdq(MZ*!!@sDb^YE zQL|LPdr>f|Pzwv;+w`n`vdZ?xy(tTgJbj^iq6&4hd~Q`PUXK7B@Ka{+Ac7f(c5oPQ z+-4meKLA34)f0eDgn5|UCE^OwjX9ab4mGZQV9{b!+OhMHg`J)RWtV_I(Bh-Ybl-!* z&#J{;2d5yLB7*hGQ~leXQ4oWVU8%;^zU+gyxPw7n*`NJ~XCFmvYuwNN3J(Z+%btY6 zj)kF27|8TYuURfC_VS6$EuXolTfsOUD<{sGhU%Q{vLb!l{opHzCs+*OX zxo9i=Hs;5xZ0!!&S~*(7Xug3_gof6nZ3dcM)EdyXP1?v##drr{28S_!^#J;W?Rkr) zxR`*sL#*|#x*yJe+*PrOCD(`hunJLW0&97Q69_M7oo<|DUp$98$W;ljE9AQ*nMaY z2iaa?)B6$L`{|JB7^4eb0$yF_6YTSq1fun!&{bGfA)BigQ78wNr7RS_K)69K<`R~< z5qa$)&R3c3HKv0Vhql4t*iM=w4p)mL%<51{R8qklBY$4#T{sHQOG>}IQkl0%nOC9A z)0BDD%Dj2XybG0isxq&{Hu&rTQ1W}2Pykg!^WtREfLt7YFN|6rz%mwSg&MvdFf(vh z7=;3@z1(#y&cIy_BH+^IvltI#Ur_ta{N-2R>;=xqPt>PLUzEP<`nBPt6dUmW3I<+$ zWz$~!>;R&}A6oJl{XV_}%ZhD0crToAuVeCa$SizNF%iU|TR1$4yt1VH-lcgSb3YJh z?d`6w0_B~iSR0CkUpY-;%+pBRCTk6}!tR5gTP_Z?#<}YUpT5fOEL9t5y-*t(Xr1S- z|6CGcS3tXvHFVACtLnpauEtISU|**9XZrEe62aVckFrM<(C&#&+$58=z-B{#= zap1X*dV;;*44+=KmW;vVXbR0p_}6-^7+WfO_>Qk~&P09=Jsb6rM}2S(W+yZq(r!j$ z{SkK^4qGZ_BH?2`Rx21wNB<^fCv-Dmya0>C=OHsutaeRoT5t`>ydPfl*4ivZdmUmS zhy}cP{oQB?Qw<;_21^~NfSW~*un;mYGCvvuR0)FZgSFxdt>7aA?iI!Ot%^KoW4GfO z534nf-U`dLD_E|?poBQ(aJ#Gp&OzgQbCTVD3*d)gX#XxDTC$(@DXj<&!js{_*3)Y} zFSVYRStWOR&I{LHCgot+_ z-2D75Y-#79CLNc(VC5HdhnskqL>gZ4R4WQxfcyfw!8Pm>S?~=WSAdgmr7VcNEH%1}Bki zWnpsBT@rh)kvmev+}5A7*tPVJ1g7(is#txLu!NbvmYPR18t`dkonA~0*n5V4I}~#f z%_r9%aNqeX<2cjagVyADhqKdMe5XS}9v_ZwT#3@@B0n7GV1~Uj$ow#;5uka{Pi6-} zk8GGuo%ybz=$+#$$4j+W!J2g=*lP1QfdcP145kM_j6!*iT^6549D9qpMxl5fI#@dN zMc^m}{VzwQ{1jb2TA}}X5#kmCU&NIb*gu83Sm;-%!@cbs$k_)$2Ff0L>4o~ideKgl zjlbeEMG>D23|=oh{T_WBi(xh&`ZZ=^kQsiA!BkrItFI!rsMb=leiSQeHazem_>F?PxK9K{1{$hT(>$c$qgOg(5i$Qxw zPIoR_QvX+XJ=H*CwkLa#yKV!63t}-r&Ntlk2cWgiPJo4_pD_U+|I&uF>(A)@+l^;J z$=qWYOHJ_2w%PG)CR;QkzS5V*;Q7XM4=&Yt9=o)4v54q^4}3Zr7a&{&jq85du*mi{oV- zg6YJML0r852)Jm{Z}8}Ef;y6^h8p8z9ebJO4Q2tl9Me2NrfSRv@Y+B$Il(iuDf<;I zu^k_<1otp1JbFbuEJmassWstj#q4 zTHm+^KDn_?JJ9wm;jd`#v+c8<7R+@)?jrZ^W$vq5a$S5+Rq((^b6ax7qPrzmC;~0H z@wNMXN=vR#7+P|LfCsXLO-1Z?$%b}D_%msjd&LysbnLj=DVrS|sZmZk*{TjXGh#Cv z7G5-Hj<7_sisp3qSX(VpzEXLjxun2jU0ngY@YV79)gI|D34ic2^5?Wp^x4UO1uO>l zow@6u02sz#A7*~-NX0*TQvpJlI2jp-^noILe8)y0#_!qj-*`lghv>A{Zr_FI{Dhol zBr1Fw^seY}EU!Z);`h`yvx)4(S~@C^Ylafioe}!s@OGO$VTTiWpR@Do!&yB1PIEUa zZ|FxD>P_j06n13f9eOM3WrV0aqj57!h}}FL+QNCLDSSABBWch1BfGoRdlV0}Yio%r zUU4+fUH3I8$Gxpb9XQY12#y-&u6qJcvyF3?VhM8#I^h9#9f(s1U6y35j>*sqEh3j! zFzqJ&IefwOTOP=B-VZ0-Go5x>b7B8cZix{|A)D^0gtM< z9{+cf1p-EIlpv^4fRwh9MMD4~zt5Suce4qIZGX@I_xyR-+_`h-<;*!} z&YU@OW@d!7KmVIp=GlW8|0{<=G1Y+lj|k=Eza1OnU9eBIa^t??WQ&!b?3Fp=bI@vIEq(CPNkZh1H*9*Baux<~7^4) z4DAPVAVKehzDqZ$TZjoPk!gXEDf|_#vkn=N&kzi-YQaeVcXK@|W$5xT;y^HwW+Mx(h!FlI#*{d1&}J0;ve+jGTzWRZY^ z>KPlC?%;8L%b6I?o&fkXtfvPejs}}HQqR|WXX^UL5B~=MQ z;)eiNHp;9rPZjuv`#+l7>0-fGV4p>^44|=^H0>Yw`nJevyy zeRwMB^#TezAgQr%0lDz|ix9%Wgjema9>52W-IHjv8}m#10YVEJq%n3a1_wExE>bCh zyS#*M5F3Q1qj67&qz-WQJiI7DU1_~_YHG2B1_S?6SFg`XcOai?<_Lo!}AFSR_l=rOy zEhJvW!W{or4b#$kSdSB%9`ZP=YI=Ua-{hq%eYJ_Y@0`jR{kfk-W(o3}ar=ylnSE!- zy&|svSl=NxPrsgvikUMEAAa@4rK2tyuI$Y+roagc?obsOk!Pt~BBD2DNAJk8;+>mK zQ7!YL<2hhM?(xozc9gC9TXBSYzjI^Y91_dgZf^9-?C2QO3O4d*x?h!po;lfFFSPbq z2`M{N@3sCG+UV(Zh`WWyWcB)rWB9Jj4xDX$q%w4V*X#w-M8(aGUW(^kwlyik8k-pn zWJK@G_mUulJM(UfjswAz&h-hm&^IG;SYbOkZ?zgTE_m?|3 zfobV##9)rd=il)P7)tvp+$HU$`*Y%A&H7OD_4?E|3EbaEe+@NH=T_f$1-6liP52*l z_s&AwJwZakP-Sn(CpvtO;JypZ{=t3cm}dv~^)=53?k@+olH)G`!6)YPpAL~$zhuDG|>zn zXTIUsy7z-#Uo{SA@ppW={>$IVKa#H~<@;{x8pZoWepfj0i+OhCXEmQ8Q|6>TVk{l&>%4jvnzUUC z9)n}OUaL9u@kNQxW`*Yaz|J3FN@?&w58u-491=NSWEoSwbiz1Gu^xCT@w@~;bmD)U zL^GU3b>76A!Vl0A-$WvzrxCtP1^VKkNWkvRAM!r{Z`z8eVm}n@UXfw{iEl!ZH2Vf8 zV-yRjQehnC*;!oPj@@Ko#WCx$=lpq9yjiI_fh6g>{HJ zEeG?$8*Wbztv&%EXC50`-MLksbY5pH<$q~fuNB5}Z>YJiIet4kC2N(!G!k*iXqkz%n*fjfb?sfJdMwx{!4j0d&vNg}W2#oFyClqI52 zijQhj!$n3!Tmu*EsBHmdeu8b~J%59J4J4&8IZZ%k%~e&%{LBD z&9X-OtolTK%8)p5!la9)jJx9M;S+xP(-EAvtmiA`$Y^HZqKz8k=8h|3n%N@$7vo3#iSr^(neW?M4pKHNxK=qh&tHRg1jU0y5SU z;%mzDE|jgL{Amcqdxe?@8w(%rpd?ZAh7yX;-;9&#rlbE}{09qJ?a~E*B+rkP8Q*w# znLn22|K@uT_!~artlqbBL6Z@w=I`Lw^QyqPChibyZ8Al>49(RXg1=IE-jGqC&m~9X z4x~!q8Yhowgg(tMJ8+Pf*+J!Buu^DityYs329%*ru}c%5Dt&nGTS6Z54|u!dD8oQA zgk5a&VQZrnl4JkNMmra16t$QzsMD9>RkfGdVsf$ta>|J{^+tF&`4Ta=DFMbh7p%^~ zp&TSVo*3bx;DMn=_!GoW@W9zdcng8>hk-IH5&Fbyc9I5k=5)->>JqJdjSJBo`U4(g zD2yra09r=;Z;a=#lx*7nW_+(biM8^5iTYl+CV#(f92?buH{+tv_WtMrzWA@ngd&fH z7l;%PQ;qP~puq)v4dLJcCds1-P*0IAC(zm28QO7xvWkq_ad|_72g)gLfDt}cpx2z2ECU_p zRm$KyBf%sVH?eidDP+p%i=@o{yqHFDmEZtG1fqS{21?k)0Z1}W6(FFH|%KKChtl3}J^WjL;R-D7@NrR5EI$jtcBb#)xY#iHyiO1RzJ2 z!;u`H&FJf^-<1~n)Jt3R&LoDwK2DSDW=6o^ffDn$;DK{EgZDr$Ba%n;ipNhO0LOjm z4Wx%YIUug9LmhgoBo_r|IgG}RHjtGm2o;`_F?JPaUkT2P@S~(1RamDG|F(TEZw_$4 zGtmBnKt808Sqj6O-5kz0cfs{$-0m!`X>wYr`YP-w0E3V8QHk|V&-~8z6RBC#Tq?D{ z(h>KK-R9FcVm#B@qm9V%q_YJe)xMt-P;3g&*)H8h;yQg;#v8TAOZxDMbST}2BX5H| zdjy%aJdjS=A#|XFIbXlKR0;o%bV?>T!vC^%Jo}SWp6xi-(>RT+xm zvgg5YpIJ@qSnge6xp$J4=Bo^o^DZ3J-H7DyBEyf@{v3KZoi{uc{!<8$_33{b0o^*e z2ne4{KKm_7RPyohYm_C>2zNzAYD=ugNdtJu<(iF%Gh~~xtkn?!tp0S;j>Wyu+If#2 ztBP4;)GU@{)qFL*BOT23HEQ3Eo+{lvG?-y?Dk)NNx7KuUXG9A4#7NvvILT2vbXN<& z+*~y9D_5HBMc{<>HYOvyk7M+XJVL)gvSd~C>8q(qMrd3R5KlD?G~+CqfyJ$CcN|CsbMd!0ZDit)KrpgqV|atpN%B>DM8eSQ{S@>h!QlR> zW>=sHY)}x`Cz43d?>ZI_GA}N^&^)`iUtsIVk-CuD(?pZm#<6ddA}(cd7)VNN$)`Qpek#SX#^9~g9m!d-D^x(c8^E%a(XO|31 zycZ?Ii&O1RQi$MVYhzhY|-fG!B8|-#;cXiV782pHRQHMvbRlR|Cy-btFRpMlwRw# zuOg&nuY*l@6H{gt^J=M(u~}_-v~$^h@RkkN1+F z@8GeE(iiNzmE2Nj`yDt=e9=zkzDH`g{6h`%)so_#c6=sxSSInWl3hwNP<)|%*0(N- zlNvz=QOWtE+_vI_)3U5RO1=)azQ(DF#pHg{gGUDU4>b#d`_DGd3hqD0JUzI-#5^^) zzn9s=wI>Gm=Lg=7jrCq7Ds6++6rAtv6WA#RY*6)k;NrTZryZefjsxfE#l6fSuKcYU zfE?&On(mH$`YR2WACCLAV zt%9i4a+OZmNNaDBKRUhwRoHxCgvE297+w2RCVIup0Mg{i1YkcyYcbZAZ{%5Ggm=o5 zk#mPU^Np~~iHfT^+TZN3*m^(l3|6>i3~(htkrPS`4IS{#?PPtOzb|%)cftO_J+VLz z^QlVb4VJmLAA%|E?d#Y?S$N3bXElhr7$2~gk($A|Ixkl*sw!hn&)8jFYk%UGm=m38 z)5TQHsnUTE7HVDTuA!lWKUis_RJ!tJr_yh5{@5R@@+pNI3*c)_y3&edrQ9+MZe_dO zd!iiN)sk;So+E@Ap+wD%dm0PhW4Oagm%XEex$&|8D)D^$Bfll2e4F2orTb65XMKv@ zj-OFm0m+N=NdP!v$W5?06v#M^aM3>uy>CaBjO|4epZGo>_LTV>^~ButjVG6 z9YXs$1b+QjZ{nfWcMOK4|EpIi4~2C~-{Lq6U3e0MzZ47#_CTF%5ggds0-3lg1S-VI zgdIgcHpwSA1p0Uv4f&nXQ}AY4-I~uup?SH}{-G}FXt#?x={9S2xs=_^D42=>Svpru zx8LN8P*_hM0x#3X7g`&Wc#^6c6CuoC%b(xIH4)@%k%jRZvN3jLJV?)%F>E&B2~kzy8RibR9=VrDz8d ziCUF!T3~zP85zLjt#tsiuGa%t1M`kp$^fRu<4c!SV93CWF#Z6G2Vx9d#5=aZpgf+* zTP%;)^TIrsiA>-+2^2)ROJeC3BaF;zzdnRcHQuog8j)dLkj=xlDQn*(ZSDKlXC|~BLmUfyI zYVL1N<8MFnBKn81^tjNfG&M6R&l^80vZkh7u)bL@d?>r0pXXHu0%rS@><@L#t_4NDO{+;X@I;6O^$atU#hi>2rd_{RjzaVJG+LVRzV-WbBQXui$TTLjqd%S17w=0p8Z%nv zCOhF);6Wk5#UyF`E7!4%9^!#UU1ho?tbcKY1)0l4!cHJ(IYpwb{F-!Hl{X@H5)OTt zCbHBBnGAgTLtqM&#Z)Kzyh}*pfu@qC@?(1fiA1_$tfOd*b&T+cwtt@C zjCD)x9P%mtFf5e(KhKn@SzY3{LZye*%O>Tb4bjpeEdtutPH=B)0)6 z_Bl~t(+D?0FF3J*oyn-*IZ;Mr2_X<9_Bf$S?CLZb`46|p$Y&Ng@0mr;__a@9qRu-r7KyBRek-f{ZU z9(xh-(8Dp*Ju3jsM#N#L`vZo$KQWFwJzg;NvWRPb2aQ0TJC^dp;qjQGXO<1s?r(U=7f8M^M}dm)W;aiW*aNeD~S5(SiQTcn5*?Hgp~y%Z_kJk9*4N?+Fs4|{IHJrxvn z4nF)OpM_sU@w`s6INqvwE>mg|r-{cX1VaqLR**9l$h5~3a2hAuNC0H2>TS~kZ!2)@ zrhP69gUne#a-lhZzx@IqQknv(Bj-jL;bkOK@rhZXyV8_#4BL*X{RNU~2x*F>{RL@N z))OHQ=CW#)mt5vrdp2Q|uL8Vx8q19g&2;Z!v$bL*_vZOE6;jlub*qg0$MZ&QYZ)F3f>lRFMLvSPO4V zn*9R(lM-iQYh)KSM%t5=6i_(%`&D{Wv!zul)XS#CN_lx%zu3=y2ig^)9DTUGeJRwC zhJ|TqS5#DP77Afwn#A9s<^}vcn+t|Qn3>MuZ;5#Ze|wod+wlXD`GHqsW7D+3X)$gi zX?+5AY*Lyam*Ww|;Pe~U;53EmIKT>i?q!xGjZQ_pPcu(d_*C#fO!GONZdzcMJ%v(| z8K(vQX^&F8-+Wb|QAa11yJ&xRY6{w0b@!U2eXXs%25+ho*J#s&c~BW6XkN{@yx!;` zePCOUG~x3!MY>1Ve;H%;c?ew`*E*y%|3?vXV9^sr90_DlPfTdHceSb^4Qk6(br3S>mC03A#fHF&!K z4^z;wC~rCVEjO$`fGyGiZ@GZ?iU#km3cUDVpdbFaz$6)BV+ET0M(aBPZ2dtLfQOBg^h@5r+CP2Q{&>@hcFT?lVPxoJy+sDfsyEA`W;51f#2db@sp+!PuAX} z|CW*PD}Fzg?mziHggOKKgzI{XPA>EGa^~qK1{zUhFr>hQ+PC}uuTc!;;JffcNIhvG zNk=oFVk6oPi-3U1WW>th4SjYXvWv!wjcB)MAiZH(ea#5w4Qi3neKGcP!O<5`E~Q2m zQbubo%5`i+eV;S(T}y`;iBMsIo6<7kU+q>#p4%iRTYg+4(Qc{Q$!}gI z8QNKiLOVq|2+zfz(M9y5BTKum6wyk%P*_Ns+xb;Sd_1g3izX;15!v@5#tS#7YwYMR zq;d^Kzr=|0K;-8!}6s@uTW)>$~p)73*iwb)} z6KE6T#yO{xe61~Q;h+@p6Yg|e*_zkIrFo@`hteOw;nS3&Y5W3XLt8Y6YN!xkKg2gh z>CZZZ4s{5;NK>C{ZByb2sXY+{A8(4iNcBt(SP08}2vK%Kdr{?O3?3|aC%Mps3uSMc za3TJ{4FBRW;EQ)oLTCsSP(tQov7gD^WbuM2hgplHNUTH@CwxG9*)FGx6Zeu=v9IX{ z*D;cT+dk1Qs*yrteB1t@uEG+ik7O+x0ZQcCk*r1ee47=zI}J{G8EtO_0?B@dfIIq3 zMfz#|xtBRAdcIn6ZmMFWWAy3m%y&qlu&3mC&!oaVE$~_5`DFHKflY}&knO5KgN{qQ z<_O_pWHN=%&mn?ZQwxL`BwglrNMpD@-)$&p1OKytTxV$piBdzEM?cCJeNnN56Q%0T{ zjui~_e`PFuhmzQ^SF@7mf`fnWgxpy87~$CDzG@&{2X4ra3*Z?5(}$Mk@}5aGC3GFx zAM1T zcKVN;P9x}K`aFOKaAsM5i#?K;#S7Os;xAbjYQFmJaiQkYJGPGuU}yuJA`{0wcKNzR^u%t6TBB#)kp&Y|D7_W;w@Mym9V0R^Y)%le0r$))Wphm zOJnL4WQieOd@Ox6mw4;&%=Ul!X5`590f?Nw@G1{9CZ$!8AX`Zs1#->UJkK zyvRa0gmBuc_kQ%CEg3*4ZSloMdX-N=xv_+^j0d9$p0uV{y?FEHngfFe^35D>3|5tF zFna`tRGV@Nq^#kpU5m=sII)X)Lb}KN3}4|LL4S4PL;c>!`--4HKk=GNAB8V=-jiJ& zaveRMHs%=NXQdzA;kEpQYxctP9uI7>q#mEWV`SFteRH~ZRWkY;qEDl8i6)VEw|p5O8Cbc`>|w1Qc1ANp za(=yP*T#>zLv44)>Y7f4Yy3Os{=qS)8ntI97A(W>(UbV9UHwx#mU`y!tCDA@QqTK6 zOFbW-R_gio)KbsxlS)04dX#!P^ZQHpQqOFDm+@PBY^moGp5yqf?^f!0uWPBNm|yMj zrJeys@Xev(m|T>sVnyw3ny^pU(e9>}^I zc*qes@`@$@pFD^y7yp~+O&L)?FH^ubXXo{ZaszvH-s}?ZSBRnO2v#7#t|37QnIu<{ z^Bka_K6Uz2{DX;f=CF2MUcrtG#0Z1)YEiG3s9FnK-a!5LSkI^)4E}=$0V5PbtYVs=I(-K_e`(OQd zP97sd8R@~?Psk-jRIa3EsRPO8r&bvu*!kQK8c2}yuUf1nDhMnB5-3oQNAlj0Hw_@) zBsE1TsGm{aSZq$qVyt+&@2;Ji2u6`_@Z&L1H1ZD%i}cc4}nq zaNk*yQkU-6m@@9~Dsc{Mk0|uWVvmQ405tB(Q+U~??@&EEV&?h$#XizfmysE|0=#98XNsR)RY&6f#L_9PgFf6S`ek)DSRmR+m%-?2Hh$b>j2k$t#3DbEZ=NY`Gbc-4!Po3xlKyH6K5xW2pJqz|h4)JV`Kuq8IVW zSRO$7mwM|z%ZL?sjFlPb>Ca5`W7B+0{u)QH`F=ffja$vOhNg-|a)6jpSmHnJUUeLRVLeSU3U4$XEATnx) z)8!?M%J&>EL63ov6vJ%a817Tv_|>r zKS{H<!_1PT!O0+k94OhVbbDibep1_Xtn9wT{UNZr>MNlUBpg@lJ;0u}ED6a#ilv z^MX>y64e3y)%3YreAcC$+mOL=mr@Wti?q_Go&KD^n{#^7T%fvZ{p^DMI_fb=q`NERP&jLej`f-I+%9{|U`>{JGl4)l zasF=0_mm5{Bdo?}VAJaF*Mel;nS)tvA?3VNQQ37|{yNE|+dd+CygiXI0(z?!>Du#G z#C+Won*ky6(PbP|L82$+tAigW z%ZS1KD?d}HT%;wP7C#)dfdDekq~_HC&5n8pge3}+{P(Q*f|bwkMcIKIB#`R6gf2{X ziu_G>1zki9eu=-2Hji_G&azLCuH%p$(nOCh@vksK-_t!TuW%T;teix{q^R$hRz~YD zjP|KIWGQ-ehVYxgS8G%Tx9%dEekp4FbCi)-v`m_+%!uHkL|Fb1Gg(}&B27H)2V`3N zNM4W@&~r^O68wp2qezUTST`bP5M`@nih4<3hMeFO9iz5SNkr__voZQn0KLxikISnv z%L!G%Tynk+sr=0U(}$x@&Zg5=4fNrk-N5Yf;=tbkX#f_zUx>hhlZBPb$uouHO%~oR zB*I@Tn0Zf+5;V^#bHBD{N*rhQAk0i7d>4g?FmbrTzmY1c%x#GUWHY%Sq{{58fRK@g z!`TD?qc)=ifU5?sHzGq73>)ov6sp&s5GG`!v5G*46=HH9>mXe>R*(P0(k!*br zzzyfs@wuravm|gjRb7Y95`IQLP`Pe61#Z_Mi;0H6>5fp+>GXfIOTLFN=~+SxF0ixC+|$G2Y- zDm~-0W<(2zR%(uugCW+Xe)v^N`=ic$mfquZQU-3^!twhRem82*Q@kGaz3fn2>y>PP*L*U0HN0Pusc!9jrjZqBT#v74uS*f8|(K!{JFK{TN zF*#JSq!1p)l9;wg2|q7oa7>pLJE$Q>cm*psFcdB7K8hX)4?pCzD3vMa>B@y8bemoi z%4x0`FJeHuVMw!>t-H(?DUob?bU_ilxeaf~#$g(*c!MtepuDDF#XK)b-?iq+?O5K3 zTql&>F4Rcj)9opI`d$j3CVoL#nwv{o?5l)nHMWtN_5^ul{LvhHr*4;OD9wTiHM2~R z&WpYvU9@(D$8BNwDggn>%EY6s5GhB9Y(j{%m98R0Y}qlG3ie-9`0fb`6FnXQnNHEj z(WK~Y(4yC#CIAz!2_eq8DV$)=NaX@`jzns=h{%H75#e=(9@fBM=E78=XHP;f&YOYGN?3(d%NfaQArHZand(rW+>eFPgZMJ=;NL=X*%deoIpQY7* zlHvU*vg@v#i$nFeq}F&T#oCD>OI}H552J87IZSnI(l$TOWlbe^EGF#2Y*nBKvm-X(wP8SMGM`$I8+L3 z3^d8SLC4kiA!2VtqpLTklI?G|BZjYLoJZy-)Ah`Ag%s4s8!HPt%BE(EDGVR)RI}Oic-{i z`pDD*U&0D{#!eXu<7VEJVeTZ}d`MtXZMeKMG)d@OOOxXQOcKDx9z zLklTIt3`?mhxeHV`b>f9Gw1w3pIMGfiREZ2pzz;yVH+xF*j*}Au-J67Bxvn3cZ*2+ z|0fkNh*$+Lx~SA$0_i!$MW=L%HY9S%v#RVN!Sm5cpDWZw zvc@hGyL!c(EQEc~?ik$Xo!24Mn4b7NHnJmgkcv5-gG0Ioe0c4>CyI&ptHCDHQx5}1 zI7rtMH*3zoI7ci8&*mus{ z9ZLOn^*@c;J;WGzTg3`v2ds=`z~MMhe0ks zThhS2f%TuK`3{?#r+rbo*-R#DZ)b|bZ zbfb2B8cYcq+#yxQYDZ?}vkl>F22_S?hHe>DW$^aC>&S6yEiyE9lr7p2%c=BlHWn^o z^*Uvg9p`T&F*Iwq5`$%%_+UxUDlsl5J7`E5*^fHPKCe5X5~2T(Mp>t?=n+;VhC4)C zMX!oZOZN$iY251p$ zmoj#S&2PxnI)|FctG#030yV#?vf`d5I{aMM=Dl>4s z$6dgFm{@I(2C{dkG&rye-i0q|*)lSx1isP6DNMcRQnCU}NIgQC z$jP-I#_xn~QWdbGM&bQwG?pHD zRYix%WWFNaJMouUoD=)lP(b%GXX2MbSz?G(q3u*j9r5%%kyZX(6rW?+ zd!9)Ah02`i(ZAx(^hi(8{HwJ6$QBO{ROo6L2>&e_F)`|U%HLp~=&*{_fMMIr%Q3g8 zqY_o?BWYx^PlFYxZ#G z`l(32lZ4ysw+WMZHgg%2>WVoV816&}3tWY}@JT(xgD>?8WclzkXUY<4?rJQ2l);vD z3?np61&(E@hyW}knZ1d~E_5~t-o79>*f1hOP^5ZCBXSEN3iAQc>_Hz8=T6L1Bh*dCjt~0UHB7d8)@YgVPtmq)+Di?|?&eI~_k>Xl~bthK%l*C6%f>x1# zCE4k;sUknAs(+CG4Z2ZoZ=I#4Fk#Zi@YPtm%h$pf2`OZDp^r2S`9k z+=o1NZ+VeXZ89BOGY`F$O-^_`{5AAxdgvfBAu0q>U3Yzx@0aOjKryNBK_wu}=@h2f z7ACjQo`p-{Mx?`?%)nn0ehp^6;4^A3^#t>NvDcLo67Nnf5l~ai6U3B}CY_ZYeS>`) zLnQI#iMSM&_%)rLm8D-L79)7YAEzRw5oh80h!~E4E&UU7j`bFBM>Cg(wtwH*wlbH} z9(xFQ*7kT&hY<4kxS(Wl(1kXGy{ub^oY&XA2@L_{I-_>5QJW)HExIZy84BZmw6dDX zd1s=Tom#U6%}@D$lofid&FFwiH|r2IIYC350nZd%K*O^N``+9lTt5afrwR_0B zHYtj_Vy8(LXGrACT>HV#-EbFsiiDFR*y#eH82Gf=-Cqy50%2!KrGWtmWmwT#5v{HE z?#-8rf~pvOO?$^SQfj!UUWR@0iPq!&GJh+bBS_GmCyA=_uBrb#&0=W&Uk*XnSYgfG)!b?)*Q9hS=$CW|@zrhidA z`!HnP=4uHe)Ma60l7tcLvRpPw!jMoKRqare^qN2q1`PDc0xFcoSx z%>M9XMojK#sn*_)IE>>zg2O`>0PNx4SNX0Sgq!0yr7z~p1G--iWBD*|>=Ic23iVq5 zafY{{>Tkj7t_P1Z3z%jw0$zDYIwqxyMeyxdW>=`~i;MYI75}uCO4&b{jW1%?gOW~t zFL%F-TSE`;W=pO$>JjuCfv1N3P{q31mnEUKHnAXfNg7MpO7F9W!S`+2FW8a`UUEUR z_|*2X)>CYjf6JT#z5m4T;)GaffXrb=xj-EYP+9)Xm77)Rp_SQ!mWEiV7ffdv%S-6< z_y~fG6|u4|=@OZE*I8Ie`orabX??c~y9$g)woZ*S^|fLya$B z>@jMyU#zJQ?MM&pPd9rP)`i!Yf}>2!Q2uP(Pb`g;2GVHQs3Gcm(ON6%KmNWmEA%fW z-j?K)-sF2RJ+OK){+RDTp3K-7XEZz+vS!LqxToq9*nyYCA5?-$u?=P#%f*}U$~47+ zoWlXmxgVLmzV`?st#!uoDSSUcOx#;yndc^!Gsa~45)Zrnf#OcdYy|McCo?P31UT8| zsmcCDe<_uPUNpCX1AT)6oyP~hD6C^)zCkrG@!gS}MpNP@1!l~cIcJV%yxgR2&bYzj zo|aNM^ZG!=^vaYA)03ZO+*(mFUENJO?1LBTmOQ*&>v%$<5wN=zS#DesdK zQ$D}7-dnl*=N2>f)>*mb^ULo{##c_i<@%Yq96jT?c;?Nwa?Ab9svD*U=5S9?GRf@9 znKNcyC*U2S%@ZqU0#Tq+l_8}cAr`GPX@o^`4#XR z&2J{ZDt`C#dz{~k{Ob5^;$6M;^HH8-0M|dDaDEU%o*JTT1~g_n`6H?JC%Eg2*dtDq>| z!3jCR(5G)McvniO$B`Yejei;jwVdD%Z`}@GaQjyo>uV;+NjgOqKGF}Lp+-y}9ij+f zrSE6V$&2UWMi6Sw;+{i49jsIIR=JHOli5>pc(527Pe$a1nhym&kIu`I(r%=*Rim;5 zsKmy_uSs(fb;0X%?zU%>(rH-SM?W033}W4<3_t8cS@pcv|@OV za;Ci83dM!&oM{rBl*QY`=-6!DCPydr;B88DY>xHK`Y$1bwVUYjx*Z+z5Lo4eKJFO& zVS=pMpTH(kzSU?B;TF4#3OD$7;-`uR3=`at!mm;0t*_@j zB53h_5cNH1m3`nF=HFTQxrM|3-Mt~=?)rGo(8_A%yM+9wh{Pu-Z`Z_%c9BcXAiHY@ zyUwbQtWkZ${9DZT6r%eErL8&x_M4LY@pV7PD^_+Y94n!QNx+juC(Iy@>ygCKe^^f5 zzRa|mVL3!+TPInU_z3jikZN(e4_=$IZj;weMp01N&IoKM$SS?kp9%9p$JI4SEAIqReZiOu$!XZR1zy+G8d*yXZ(m|?N%ciJ=RaH^E{ zSi2!`CXy(N>csU|X$?v}B&+1vc{+PcHpN3c(2Lk#Aj*j1igcV3u6DLE4$o4D(nEHA zQxTtvf-`dVMu%rR*Ao$Qf^%UJxz*kR$^+{7GK9Z-zoxuDDeo&ZKIHvjdH+?#t@9X{ z1G8uIw{^e6rEiG*LaSKtMFoeKFc}N-fc&EPinVu<#6FT2=D|Fl_ItSg$h(Pf4PlOY z)c!)e2YDx>$wQvA)zg<3WSSd)544hGBBjXM^&?_vdtH@XxZ#ytQexVN})KHK2{nFucITQATR3&`!@ag{8CTX^Zvj8eRM(FI=&dl zo{K@Hp2sdM^<Vgm0I3^TgHEq?`+_&ouJ_k5BR@_|39f)(yqL^)U$&h zTqT_b?hv*ZiEG?(O>_^U@J=2rRvyh|NQZ*x!01F@{=pIc_l$e~Na_XqF$Q?vFob); z5&q(aAORy8zg zj8UlY96E>^m_A*t{h1$NjteUU$%*^?DZnT}qc)30i&#avm#rNITv`U^r9zjV#woE^ z9lg^Nz0}9?j|W(M@UJ)SSxVkEIR6*L$BL2+dPw2CGKE1MM!!L!8wU)9{rJ3`b~t~8 za=>{}zFa(P3eNdeIgBZ{kXAbk+sdS^c-Nfn!p^FGbdZ33NPHL$;C;66A|U`}HhR)Z z8j~zl01NBz!71#d|j&Ln8&+IQog7uvT~4o5#~TOBxVY}?kT5LgdwbVe*!&r^=H zRdqX670pkVDT$zyHX3cR|l&DH^1cDEa~dNo6cSz|cVRvq<_$DT;VhgNVF zFP!7_TWdeoQ#n%f5Cq^@-*6L8M^>eoql(MTp>B^vY?(p#h1rnVEjVbt5xJ3C?K)wD zm(B!MPjC?W{iQ?(@9@q~Y+H+KeeN-wK8hF8$L$KUpU}z&eEhU1EiW4vqshvqn z$k1EqA|ro89c@@}I&SGlm61ng!EaB3EV{!%7F_pEq8#MpJwG5Paj>TYX*u~wUJxk6 z#wiVT<)m;KB2Of@>PuL<>Gf4GR02tv8EQxmtx6YNPkL?qrImDF>2gTL!Zm0+s>mj@ zw<|Rf&ekCcGV>clU#2Ss5({U%fPAjjBC^C09Yd`5DAp7Kc@Rv&_uxwG0&Q@0KCAo4 zMt3~XBJ#$=x~mqEoc*efb@0Vk_h`q$yYPV#5!u>ZkJwcaNkG6%vpxGdB+*?JNl8}~ zkm;&&X$%&wg7j6c#wl_T70iA>{BE?u>8y>Xj;eI)q!@KdF9$n*k;4au`!^c*JV=T* z$mruZ@*p*1nI~{7nT!`>1sQT16fI^oiEq)H+VO!ZBkBBku|t)4PasdV&2cC8D51Ur`nylc<}D^ujW?HE5ZhO*Z>1Na=Q? zTczu(mYse(nffmNO>(lV#QWrU98{@ikEiE=n@^2FRK*$VaO`0 z=p5lo5j@C5)COebIlfqt#aJ$`5C!5OQ*mBa{(5Yv0^+#yxWrscPn0ip#%@b<;D{AG zfSuhkpU#Mm#@ETXM^qw>Y)8p?OnlCDPh=(6QF5+2Y}_Wh@T1t^2c8IZwCY3O9pO>@ z3Ti0`dJJf#M{?k16AO)L+k0ENQWqsdw2XKc`||g*o(`-FCkugSZlkv&MpRZAYfdU{ z^m^px^8!5Rq@^-uz^m>gN6nHLSgM!^Ir`IP@t@H{K4@q04R)4^pdJb<(0WoPLJyL7 z{h##IN0ZOK2yxwp(gkpdCXc=o;BZ-K9Z)LL%Yy1uee!$(#X)tF<;SO>+QCFSeR6d+ z_|}Xg`lJ!wh4boBhU;put$RT=*@8fU=uFB0UB3%7n2ZjQUb?Ro39#N+s5%9tXiSp{ zyQwrLYa@(jI+8K}Kq%o;auj_cp7SP6a&^eS87`tcX$&Ok!dZ*7?j-g*D>Ki26BLXF zD#h};xu9S1Y*7%lj&gEP@ww58bA8rk?>4+7=oGQ)Q(Kfn+aCIgBpu&tZ_M{wKA9L$ zxgb|}?`U}%N8+Z*e14qwU2V`q*R3`dzR!v7Q8Nu!307~tU-#Kkb9`$1)d06IR4+2{ zNLtoiWdAS3_VHcYiS3_I&QZvgs%5zXtCeh;{w~-RkZq8fxwxZ^*0Pi|>%?jUi-t9_ z>cC?7+1L(ijgu+lO})kE=bw*OdYD9Ai0e989>{>%Ycq-Cac}a5RSUX&Cep=k) zj@A?PAf`v+*2&6{LT5A{Ts6E#V-DMMz3Cu=K> zP=F?Dyxw}qSU&kw8GGej)`P#$6I}Iq`RsoFZ#aLFD0=S+l936gh*bJ^LH^sJL`T(= zMYH+oYtGQ`;6)@WqTw=MKH6=lE?t!JzfeLOi8h0it6V((=%lZ81ZgtbNwiZaN8wQv zu2!Yo9m`W^$v@aN9P+zLxm^YiNk_Ow#&}v&O`EH&tszY1mF}E7E{h8Tl)|-5x%cUr%6G4ZL9^ZwLJ#q{AoW5UTM6ThDnvWGgkWY&9 z7=rTOa;+7je*JZsa#gyyBLkk~c`Q?Y~T{2g!r8rll zFe!Qs`RBlGUc{2GH+G{aNdgt_=F+LKYRe{Q1!pb(%{iUq9|Eu#-{71p7=;_B&}k8M>R1h@Lknuq3&j!=yW(`2OB^-{ z6*s8=ViI~Qm&wAtLIAB;EukD#*a#BxNXEKUHTLzqAP|dK7A@85D4U}Ri@1s1=Jmgi zD50Fbr_YGK_gVgqbU&mGRK;6&_sIynDO z2abaz+Cfut7rGoD?`TJQaCWt$HLiBljcJJ%HoFlv{TvbFhz&2d0BW5KN9e7r>N{_8 z#};oc{;TOk9J1Ll`Ms|`$S63JK!2j0;(W>CrW)Zp5&1`o{|03$8Q;aJaH`3rr`oKg zyq0voMainOaRk`seiPrt9U0jd7`1v42J}p^dES${8zMd>vVv9EUckp>p8l4DKuna7BDc_`|Am-6bC`hdR_y6V85KSX9fJ zREPqW{TsaFWf`$CoF|DqiEXmo=RnP(VtI9|FfR-qXkqD7+d&S!9joF#HttvseCq%! zLsxM0F&V+p9ZE!+^&_)FnEjCqQ9566;Isf<*+zMG1Rp@v1zGNaphYosa2a31`ZyL!S%f{I{dihhZr=0s2hnlq>YPP>>)S zQd3Ctx{yXng*49}dfSNnS#YD*R~_JlZ^8773sb94)g>? z1}_v)YH4sNXL{d(lF}CC-6-}jl(XDP{YI@Z$`KcCzu4vQzwAP@oe2Q??y;U4jZz0G zgK+;u6uD^UGDbZ)V}IJA2GyRLa8b!&Xb;5fd)WFQSUyk_E|vstfj^GrWH0FC6D$uB zEPqFH>De;Q2Zu}xy#D>0XZOW5@ey?@mbF!G3H8LDQEz*m5ZCIp5{; zCDA)48cTOuMR}MEeDM+K;v9q@AB!(hR8b}CzE&REio%dLM~;6I@lCp$(2XzSaD5(^ zd(3IkzUp?&J3U_W4%)9>j;QE4uap|-nY=yIyhuJn9ks5sSba86Yg4J+rqc3mnx{rB zXc5DoabK~p)B-W3_EmmL7lRYu?V*p;5-&TROXm`Cmv}Bk982RH=wadkWuFIq6<>ag zY*L5*;O}y`ml0+a1-50)J8(KTYM)Vkb(BmXU4e&@l;J<7g{n-XoT(|uQRv1U63e(g z!PZ$Ed-7T3w60V=^e%3Cs6!QoH$;=RK7t1J!_Z9o(~9`I7l0k+>uW@M0bFd}A&!-k z6}QSR!MhJJrX3@(w;mk)jE?OXy!+r(^CD?pc(;@;qErJ(S5ZC_9RacFJLq?W`s_5yfGV_$$@yMt{b{4|CQH9HxToSkTnRkIU4)uKzHFm$ik z4A&N@0U?DyxnNNS;(qoWz~I{B=o?1(O6+mLv0k5j2?5!aD1Ff$CPv9NhJ7P^rUD`( zHpR=H4oSsk(op;?N8p5-FEtj1l7<~irGws0P)j9HiKGy|vnc-kZ7KU!RuE83RX!uwPBF}TFb z72-W6n;f*&M^?W6XS=Y8RuCP1iSs}&a42Ng@Y&7o$-sm$j|ix&=9;4Gr?@>FHk-O{ z8(ryW%T(Ilrj28B)UtpW3VN~p+-5d4l5&o+K$B|kT#^@r%fzsEIi1bx%%-H{NiS;b zlxZJJVQz~AA(5|S)P7yrgPDazZbV~pzbotW-}!FeiGJh8mPoE!KNh@c6*ZVZ{b*nd z{cK|)UI?;ypXqdN3Rdn6oob(3M5`P#o z0JDG&+zZt-Rv|uPR83F&7u4ns9x_bZ%MrFNS`~ZsfI2RFA>cH7>4m?;*sDLK9d)wq z%=<5G^{Ns3&kEdcppG+H_Zs2P|Ebvv45Uuh^*WOYPFhz%+}8gPd!1}QOJQwVG*T#a z7>?8=_OKRBBlCaJVRr9tN7Zgli&|IElr`D4g8nBR<`ny%A0~}aEE(0KgW4^~kT#8+ zE`EhO{w4-Eq;h>r`mhBv}@7*pwQtG8S-&2 z!3rW4h(jaQ3isj0n8zr>>B!LV-}YNN533DQ!eK}JN~TcGQ7mdlB3`R8=HIrcon-sk zH~A3|>JstC`reD1A>z>-hMc}Pt+nr!)AvR;x8u~CC`X9+1BSBHzUSKOe~5_3*ymDM z8@604ByrdhRZ~loeWkKEcUa%szUfC=r0sipu)0$5rnJc9F5NcLoN8Ke> zR%u$SeMa~-1{P&p&_=P=S+28|cw}ptYd;9?91z^!dEQUh5Inl&Zja~g-tKIL>D%b~ zoju3&lARPl5i1JD$^+||G>&$l2-G-}3taI^m>i*^%M}@A2$0c{rYboXp^R<5qwhY& zrD>Kl>uCUXGM1au+)tidkC|KsCmoAOqCjJ}5HrVoBYXk+wjCE->7@gtW&9qQf#PaS z3eNmi3im_xoXrxusk7~QpQLT{bMrwQ2+_@nmHDTmqO+Gp&--zIb{1P|aWBihpshLJ zP9t)O&;e~l)`5FsD*|U_f-~cO4{zY8Ox!_P>U8-C(3GAd0@d~H`=OQ9OWvb!EzXXn z;j~{_{TH+OHsZ81%!9=b!7cfEfA_@(=M`Xde{PC z0ZOEcr2k;dc~jUVbPLG|#E8QmpZ$D4rhlCKm%2Pqk>5cdL(&JeiJzts9hIq}v^1Tx& zF_=;hgP+YM|_gvAEJd{bh+)4Xf3GqP#RsQC@KS%kd*0iMXonz3SB z<;H-!I+Cj>e`|D<94&rUr0K5SQG@Nj#mBHPL7L*uxcQQ&?fyZL!6HSPM&+MU=X(Njjox_m?S$5EKECzwn4jlU z4J8fmZq$f#_Mb97b`(g>x%4jCekT5j6&4q%;ao)RvYD)$o*@SdO`-E;5kHxD+0m#w z>sxG0G#m+GS?Eid~>3fU$MWpFfo-O7l;Iq^C;r3RdM~<~W;Gyh;Nd0>R zKY^eIOQlY{EUhr^6OF^D?J`VS$LXWIjZb_EAnK$T4z9^Q#{QIo1T_5Hr5#hM{Qx}0 z+9av+*Rg9`HVT3`QyK!QRugr6EV~bfk{Xc~GTT?GO6n3jNx&IZzOIRPX?}dtO5~Z- z3?p)uq|6~Dum+8YT<9D5P{C^4FK25khkPFUtAhxzt$VlH%Lt_MXE|bTHtR^aUjFpN zN754=kr54KS%2qHeary#HW`rOhZ67u;}P3nsewMdjaV3^Or$N((LCg-dK^#H->f3e zpTc>R^Hp+!Ycqm74%J+m!)?#S@T=%=c&Ibm-lKwbqtw{~=bd4OLXzh-{rGxe{6u%t=-oiVG_BfslNBR}_Do|5j66Bpt=%I_~ud}R zFSN4U;Tm=%dmDX)f}>pVXeqXTB1l+1vPpxDFE5`IXPI5rU&lC1U5SSkm#Ooag%*hi<@PlN zTu%qMw`phOdAM2X_J+Rl*+XfKvHWTpV922gnIpV#8X1ZnQmuaA=j!zL00(huF!3Z>j;pJkBM0 zLaoFKWfEUVijBcnbqa-VH`V9%QYls4XE>VPe-4M{~XLa6`=M8>xD5IffnjHC1 zBHZQ$N1V77we{WD(>QIiT}pcr<;9PSGo-co$Ntm84Ioo)*veQ2ZlqyZd%yN?syx-& zVm!CrVyWvavN5K}F4c_C%FG6ox^Lqf`aqE;@=H$1WHBxt{9L8%?512y(mnD2A*nO$ zaMnxV233!e*KFG*sT?69H(cfI-Q(X~Il#i)`Hk_M9LMa7k5zSB^~@>|@YZUQsV%im zdAN0d9v_ujzU*n1!xx}zh2R7V5c=gf$j=4lY>~xR{EL!Vd7-#| zDa|37kIorCTNflcN^4ap~U3rdo zjb#|mZKhU|_~KXV>as|gMG476SHRd8@oTBVYU1LycPOF++U(uKuw5T`LtUDjsMTyu zlR2o%%lSVYgSUGJnIpq>)>`u(W%cjq;LZmx(1|`$8yf4EbAlSr!;dE zGMD9Zure<1l-T5xys%*WAE^9rkJTtWL*`xa9bk{a;S>*AwC}urv6~n-&xgdj*}Sjz znT8IeC2G~`V&YNN0DCGZX(PQBFLvaQ+t*M;1nco`*GWI*q>nDBQq(B@Hokj1^ca{K z_#%EHsT_WxgInDebJTNiw6SN@7Vk z-c1M><&ZG3g_{lU2iLtlfxjp2DQx1VoA5kvY2S1hLMuJ}=T5KeUm3Wi|IOy~YdzBg z=B=~lcz$;MEw@(AL{pl3p=Zv`*AnB%U(HViG42yZR^|yEN^UL{Z|`9|;?pLnmgI^g z;#ec}f0?$VoR^>k1wzNXNfGQVth6K`d#;f2cl#KRIE1eO)_ilK6gW=!C_NhRf$6y1 zR%3Be<;58c8Sz4S;{cIYI*~OvwujFeE;2ZWHxJchf4}Dm^8^XJc{wGiRC}HXs3cU0 zo;kLM44d3Mbtuo9QC~AwjwA66lH6ShVN0Ve;QkeqS}{;PE??4v1N)nI&`UT!ivlV+$A+fMy*E`+Gso8AocJ0qygIctKeS3@fcRG*8#vz106w4(#`Nj_0N;xckf{6#)k132F5AJIP1 zDLED=Sxl6)5I#D_C-^UwSCTiC^za3;g^&A79;Ch~nSs@b*P>M!B4c_u2@@YKUfi!= zfBk>f&u+OcVE(LPPT!(_=k_~yK;Jo)Gx}eDOQ7Os*Y=lR)f}_ZytSg=4EH!AeIC(( z+~Ny!^{1<^ojzw~?wMz{dFAVQKaqjbJ+G*+P91Jh08+37jOM}qA2v9N>!>&xg%0K! z3rAr`z@$*dyI3X)c;)OwYY(Q(uEeGAuUJVWDtfH46Zn~_Byh|Sx@8C{;1@s51>?uE z8zvo-i=LP@k(PR@>OQTCm;SmcJ+wN_y1=^Cm-v&Q zVE}Cc2q{>wF<%v6go^~o?s5)asJRTJVYQdQ{mm*c%m{BLU@T7y#fOEO&!2Zc)4h*x zW3D!*)N=z*`7L+C3+J`QN&GLX^!wGfx5mF~wuU9mEqAnim$-ihNRPk@L!@5*E#3>AL7mhKC0^4{}UJ>f#3uQ z7&XX%V+|T1(a?ef4NpNHMnQQrT2N4^2$-AzDoWxcHK#*r+G3x!SFhf-wzOJH5mAv4 zOhBteP(i7PwdxrL6(5C&X#U^dKIbG89@XA^|NlQ9Cg+^}Tx;#M)?Rz>wf8=^sdFnO zn#P)DfRKW1QuOnd^3_O!KH~SHxhX@C5Tr5zT#rK!8u(@BzDWPXp^yM9jEGl_jC4@O zS@szzFJh_dxT0)(Y!FTR6F~e43G7{l91rqZ-`tnXCa}t!V&#(qTKddFvG*z$3kW{n z$UbmJ{MBGvr#SDNFv!sxa;#F2>qJIO4PTIh>3LqDf?^?uySQ@#atO9oa_A#o3m-ua zK|)a~6S(w%9D=_+ITS*?YQ*F7;T;|+IO!bAA;uuc^HG*98w#KXvU1g zXN^lSq%1M0yOJZ!eJVH?zW|;(iCVXv8r(UoniLZW7`JpVl%I%G%hb}&91>excGhtk zo=Odx^`xB>e@K(K%7z4)@C>H8XG#Jn@7WJwn|>k}(?HhS3lJEqqGdIYsEq zF0N=ax}Y6KH$87K$|JtO$Ebi5xdh}GjB>%Kz+jYj0*pqtVl+Cw6B`QDa#SbS46$FN zgBK{elr|^ya03y!Y9H>qK3*F=lD{#2kL<8}BYOee~E9dGX zzT>drT)_zEZqviP_6*M5%U5y>uQDOTtHu+yvjlky3EG<4ZAzCWCdRwj(>;^;7y^9f zIe_r`SWoTmLsx|9l_N{fV$wZQ8XUT%>~xo7&6vqkRrwp!w#8F~5feh#nwoBjfQYG7 z&FWQ*l!YF4>}~nm?UPa*>QaKx!-*7!#@F$@*_@@5_#=p{Gl&?Cw3$~I2NPHod6EFX zT~TnY?Yh#$v_p&Y-JFM?HSPL{N?a9L!^7p_d(As_t#)I6!^5+Ep-uwaTR3^ne_KzkRzZgm~5XFWR+)!xCKWTt!0BLPvhE=;u?RBf&m* zYq9cZrM!A8xZ?pxgyjpc1=BAeVBXSUwAum$*fIjV_ynk`YJ=(q@X|*-L#VPGNcMR& z_&h{;Su%P6N$`RbBKBK#@e<50>EhpqOO7!|P72-m1RfVdw}kHe6Hj&ZDk?S!v!pij z()f)8n(_P-4%D&N7;7Zn1Gj`|^ZZbCDlZkcb{H9|{^Fk)AR-{LFGDo0a|dFl#NW}w zGiz5S8=m$l_GQ6%glH$YU1RWP)m+j6@W@1vh3< zaxpck6MAHk85tko;dG>6&Hv;dByi_jV%^Qu!i?Yqdqz-`^f98mz#gHsr;W6G zMA>3e9Q~}THKF#ZmgwQzmz>LusN5!J1|Xa=dZwyMC7aFo|49RX`EUI7hnkXtjIo?W z-|ke=)WqK!M;Bx;u3_dBBmai;IB1sJc`7#xuy5jg%^}fin12J5K7vmre*}f?hWJ8^ zqog^Rz=TPcOf4QWa|Sz)&Kj6E@p}H|^Oq6%w=`^$DW!iG6@f9|-oN`g6uIA;PpI54 zsl#~K#RFuPDTA-5o{VfHly<078ux%~VBbC>zzx;3s`UOrSFwdz?f!{Ux*82e zxL03Kx?M)=MLydI4Bb-?qpjqP(&o{Add`Yb>iFoJPG!9r2DzI!oL(Rw<0M&)Xa-)FhY*cD&N|5h4O4Ern(dG_IyTr`NsOx09 zLkf&ysAI@Meqc+5s`^AXpdwQ37dfH2DpElR)fz%!Q_DVeJt67w-K~V4o`DT0B`-`M-hC3ANd zM)G$%pNU92^S4r?64{O1{PVTsk_S`5?gf#eSGT^Ve7AP6y12r=+x{r!S^J9~d#<{| zgX3VR<_LU|JRb`bsrd(Cl;BEgwspRz%xs<~%QVx>Tq^S^i=|Hnyg~C>ngKb8AxfWW zr6dM?>|w>dVK-AY^8$YX%s|L~l)o_!<6+Ic=1IM~F_rIX=+KR0Nvt!ytVPzTBwXCs zIXss6!Nu+9O)sFs{&MIE7Ps*8#iBe7SDIxhkKV|QNOWSMwLh!?{+bNj$V~mzVO`)S zX6=O@gAMlG0h-%01M|m#kM77=+!z>H1P?6s^^0(A?4o%fE9nk!=u;r9kU}*(&TIt) zEmIKBJSq#6%|V!Jc**wOPwCqD6Yc;_U)(s6S9*8+A-6;e>}CP@oB?Vs9UE;) zRA{VJINZ^mTTry(vq-+H(@&sNT-z1B*NqHxUf<=TgBTbjHWt6?OmW$!U3(Z#dv@1W z;q~gqUC+My-0O)q_P+kwFH5@^G?(vreV5YsJiX^bm(#85lX-iF%iDc71KGdg?Q@{) zSLf{yp^W$$T!KIFxLJ2AiknBvRBM3E=FtT6#^P}0GY1E06QTn;c9ov$1=3m_Axp*b zb6fI4)jB!P$4AiYKJO7q-?P=aHW{ZYK~xe81Yu`Pg8@8zGrWyAscNt*CLm_xfC0+kTg!j2F77?R7G*&}cd23go}%p^PKeuc5Zj z2P~?(qh9u7SCKAsmrZPGcXkC89?t%gA$S_osG^1u=V2;|n8B^PDHcIyZE2P#o zz-|VpFl+5 zYi74eT63`kj4j|4Jw*vFHXh_2KXh|zDZewmhy@oF3}LOtE^@e%ylXI$I$)>iz2Hil z9!%pycSpBt8rX6B{rWHZ=D!zxD<$RC9`8rL2yjd2r-3CsDQfv8QEn@``?m;|xx)<# zE$@_g-={Ee8d>rw9oH$8WGjrmn^IdaDEbBN8Gj`xzK1_zQ|6+iWKZ3C=*8Ok9pjS; zwwu$K7yl(g3nNfR8%^m5g5<#|5e=C zrqlTMDqRy@1Bru9SCy!)qQQP8^dM)BEX6dVgU>xFTo36be3Rlr4{l2FOr(^J zlsz5RGsPkAa#T|}GjL<;)S5|S@pn!^}zd1QK780wY;o`S6r z$#0>m_@2(|R9@qg_%nAGYz(Dke&?FILBClqu)}EQQSZ)?3%^l1(Lz^ch?%3t^v5xl6v?lhuf(QoE zGt?NByzyw%Csvl*2Ug#TL?Y8fF(%9auW)mtwih;=tBwdoP(cW0wY z8Q6I6AwBZa2?J9EmexXB!*NTzj}jBB>!P0q%WICCph*d0MD66o`D7D)&(`&t??<0@ zSsw`MoAWCl=Y{p1cn*SW*8894rA5ouCDLucqWi;^ArH=C$^Z%7n_)pKIe@6cNcmVo z;Eng3VUR#~XfZtQT6l+jXeozoG>;kjMOg>?kl1y=7qv`8rF_T*=jv~;m(s|ATh8fJ zr`g-=0XvA%&6CTCh0BA9-^yohmsxU}JLZNUmJF7TzDA{X`2j*BnU3GdP{6Ky2(Q zvMoEmsf)yfn*>Y(_r{X67h>=cOC}faY}amTR!YfuB!=6e%Ufaq%tPoXKLSd=mwoCq z$Y$Rj=JK|RcwWV)X-gi$NiN&!I4ZHf@`Va=RNU4w(&`j_A)L6o@&(!S9OW{{PGrsgeGqYZb-gzA*fb z?$3zzxes>)_#%w!%_+&_ouL<4lVjiH^4{`)N}O&VV+2H&VU6PVxxkIPg>jeIQ92SuAe)o$uI;1Q}%@m zNg~$g5qVGSwoa~7{B6M@A?tcK?gK%2!^mVP#|uh4jvAbn*LWKh1lYc@!3Mh5Vwa`b zWvO?#NSR-O-dB%K#$?5=W9faaaB}IbGCg|h^R#q4%={C)2w*VMmpEc+7uw=-6|;aeR_|FB?4cv(hugvY%iqR8msQ#Y=-JEr~6a^7US^bf_sk z@i-n+##1WY_1fqS&dhdN^-el(9OOm`k5Yp3Ie%=FS>h$fmHq$c{uYM8%?=!h7Z&kg z^CIJAk==<8cYjD#7v5bLi>Z;mN&Tlf_r6Ka6@P*LY6U4>wZPv%konoJ#<>C?-vpQV zMf!Sf71Ny0v5<~+t2mn$qX8nZE^?+ALy^u)B#h(k z?ukT%?cTn(41j21Tuv~>p$!Kl^sci6fc=mH(FHw~gN{U<|3o=P^i9+Y{yb&l%onx( zJd-q3RmWU+EJSCS8QL%+#kfU`CCIo%TxMQyizrYcoR~rzI(x1WzrZ!($PY#Y>P}xZ zBJh1)^gGvk&%UQEOyM)U?^sg!+@yR;vo$HsFYiA|^Ttu>{5b#l(ho-j-r?te>-kmc zPfoA*dKUG&EBvH(f4)F=R zL1(jKYMdAn&wIsO99a5J{obyL$FN%%7H)v?P$TOkYll9L^%%OX?3AVyeVJ^N)1HZb z(PBI0e@m=nA{4WrMnpL#0sFIpj{f;sg7x zmm6+BD)$L!oL~^>XLi)o+8cG4z?6;gtvmoXOPHHQr}%nJNolp|kGvqhneK|y1AHl= zYK{Mhk2>70a4C#`mv`q8_EBn0sXIx+LMtw>R(Cxq&YRQ#lcevvi%IVy^}be+Wq2pK z(J9-=ti_=~{KsUeJ8JbvK8&^4v+)Bg*^;t#=_vetvvf3zhqGmEQis#p^SCby@L?^T zy&zCFZ|(x`?|HKqES-HzS>U?B+_LLtFPr zBK*$f=l>J*BBiJ#8IS~tBl`!=4$KO)w{QIYZDw@}gtAB{1up#;;7&YVbM?wDhI0dQ zojr%)>a5O7uY{PhS|aznM7?MH#QpWUe?;H_-@|y0@qV=QR2E3H%DRZ$jUD@|4gshF zReIiXa;O#sGCjfI7>~Zc(SK+h9IBen8(qe^0c$jBHJ5=)Avz_uwr~LBhf&xy)9LHNA;@MH6S-}RmW%2(LC z-qVj)`2XbRm*YPt-s|G=KPmIy$*X#2^HUzZCqMt4a{jw%mr0B&n znC0({@lLud%Cq&5J34uzF~oZO?PO2HaaNNX<4 z6qsoU%px5b!IOsiut~z_l~C1>=%D#JlRd4&c%`ZcdtAkaCXIEA zi7YRrS^Wl6QyR^i=fcXBq^#;?mGy-06-TpfjCZc6&#OuQhC$QM+S^UQiFHa-@n)B{ zG!<`ksc6V+*B>GcLpO!KV-AmO69tciHQ6Co6o5opzf&MSQLNbAxP%PFC1l!J!aLrL zP`6kZsYD&SSq|kHfjsJ~&V*DeNeYEam|H3Uw&@sB>9tnm!U1uKMal<^7B!z~{IFlT zPh_;4tc#+}^k|v>)cIz#xnJn6A5c2{yx>0!KmQ!vs^2Gk9{p6< z|BIjM9Xa%H=uSV2Y!$iv{c00{Efd&(4RPLjSAla)lWYJ%MW+wB6_ z|L*Qv+XY&#-IGpcUw=!rX2rLtWQ>-I<$Yki(^%$c75*-?X>nu9*>Ht1l6dCbfqfL; zjnfr~pPLfbbv4X@R1oU!O&YFO7_FR8rS(Gf%09!(;iEk5BpXQ4o&7_mq~bff!ufrm5V-|%YU<8c3a|p_p9n@eZ_C31&_L~*xmmX z)Qq*0u^Rcw1562(bL}$*ah!Cp$;ZdK+TFBIWkN7^X)05Yu}jnK3F)y*GwcZ&u}d@U z37N4=v+N03u}ib<3EAxDvL}R{rv+CYt(0nZkp-jdB3r+=jM=D1>b!0biU+akQ)7V! zqYu}a=nq@xGa-GD`n8cc)$ZC*=Vot<*LFfCst*^y;(|xnLW^dc!ME9oTH|%&T|24aJj7(&RZcc45-S(sZ5PaKx_@euB=}%Q| z5#_QI$C~6gm>{t{f-_@1folknaxl&SR;{DBoiK3oZJK8YE^W+~{*i2k8aaj@|Q{WAZx&n;c)c&19P z0IaGF+o+52pb_N)Vt+rZ!jG5U!`(SGIsKL18ShM+d2Vp4Bb%Yh5k`fXEDdIS{5yb^ zcx8ZMCOFN4)QYn;D_so!4G_a)5TA?{?G732iLMFc3d1|D~&f)GMcV?UaOdZ z;tY)1Boy1*!^h(5IxrpqgABE)hcD}jP`Z74GEb_uG;LU7jy%XwoBq%6_3*^TSd1e= zjha;+Q-}x+DNgfTD_a|pCiXdX5mrVrrr2j@dbcRnYd^ve>m!kf4R-W*xbzUkX2-f8 z(08wZ#W!17V|_kxW9Z5-O5wz;*x(}yf*P^m&3a=BujWNYEu@cd3>j&1F@(h7Ikknq z}it0Vp6xUU=s8gp2%g9)|}eLOVRxkW8IS_Io3;n zdl(xH(p|WLNoK5~X=khKA1lfZ(j= zjPv9vx@*39%Z#f7*L-u~N>K5Ic z$tH5sUs3e0lEDbOV4Tai;hLjBC>97uZfgVK>vkU{{}K>PwlQrWTxxHNQ-}y_qV`n? zI=h#OO04uzeMzAk9}tT1523D4Q`g?eHm7%GiV*Nv9*tOtf!WgxIKO*8*kkXC;bJM+ zYO*v8ZDcRmL77jAls|#|s)Nor8jf`5q~M7&ir9i!@R#8K5`)m50dwR`xfD&NxMZ8* z5?HSwR`?Tf=jl|(*doh*&3XglHM7MUMBzHYDSQNNo@vJ^QKx#PhaUbsMK`<-N!dB{ zJ@%&831ns&Y2nO7boNcx&cC62QF&Pycbf8><}S44A9MYpQXZ}DF~^BI#y-vliX2@l zCc`qzS_nnAuJ##?4>1+sgjtP5M>)fS?s#33x&*UKP8!2OQxVjw2R zf4bTxLfc5qTWszyO%keFK_+lbb$4J;O7IU<9j!028BafQpFuW@1lcWGk7A1)JR`@( zFwd-5VO@2L{aN|X-Q2a87sb9EoP<66?clN=u^C0&``R+1$hSM8zBtpI<>-aQzef$G z`oY?Dq3YME`o?t_MANsDcC`L6!?504)XcpEVkPa zrwQ`{$TUQ#5UtKMgK+I_)TeV3We}IEj}x>rIcaO>g8win^OQ0+MpH^vmAq0|4#>$s z51S}@4u;sso*GDg-m)dqv+TbD%B-Q=IVYh?Mvwqf)5Z*?iOUg{HE4rEO~0fL@dsx~ z($IOznnI6HS$RBJ+x;`=1jsrmzq_riX9g$WoHR4IEGss@2&Z{9cFWYr9HXz}bto|j z99VXxe&+$|NbIc>9BO0lh!L<6Z$lyBd@*T!T`8%GFQSm6>`h~k1%Xh042A+wBi4g4 z=zt^n@6~}u*wzeLR>}uMccXPqZ$SmT4t26)>5*7rO?6B8?);5cyK0T?C-8PG_@~7C zUNv%Sa8D%xp3pCjS%^|RG9)zA{$ME2uM9!okD*ue*z=Q=UOsguy$7?hIUj!HruS97 zdA6Jt{^3a6Ergl=wVai6)OV!aw>ie;%7r&BT(opyxa^iPYwk@+N4x~g`8ybPX493% z84xSFDJ*bLzBdrKfA5_-l_gZgNHNf|4Wl_%tYNS+dEk(s8i@4$X`Gf$2b5uV`K4}= zwU-vf*vbVP%m^-v#4asrOzGM(5_4JgdHH_(b9$SD<)v;XtO9+Or~`t;4x6>ZS0FTM ztgjfs-GL>7Wju;5Xed&Gvy?Qpt`{MR*A#aSZys9R@2hkx6E_3sr&Jivr>hiePvnEc zZqAx>VOUS!-i-AMM=`tHiJXG!?a*ZiOjBrO4INxT9~`Q>fPRA$E_t_2h>w$@-76fE z-AcPXhIY(6^pn={HjueCda&S6tteazB(C&9W}WX=Br>~F7!;`W;OG&!rF`0P2z*Yg zw5YMOA+Xs+=c(!O0HevcUjqkylHu%RG7q5Q#Pc41+jQacs0eEJH`E^PYhFX`rXnSH zj1r9;x&+@Tf)|2`EBmothT!xOz;Dw})F}B8iRzNT{i4`Vc1D$|0kGw4&Ph21Up8^s zHH5`~EyaLg`zV3td?Vx|Gf6J^)Z9qW>0$6mZ)hhUl0RA3>c_A`@SE?0=${HYy+FrY zg@X*nue^xDW&b$4*?83y&@s2h1wsOvT;Re*R@q!DP`We_P74IWXU)<7dg0sBCyVYxjm)$R*1 zP5+dS%LVUhteK>CDup>8Dn8an#nu*R7Ad=SK_q*_)g+N*J@;cbm9n^%t8t!ze)O3Q z*4g;l)tiYocf6*v#8_2+h<>alWdvXLo{=~ZIrcZCV!^(;-0k8F3~nuySNudbEqc`&lv#3^_@HI-ao8v=abqwownl5q2ESDG?E%AzKzeWwZ zG_#gdaM2amDn@s`PMalGSKOMCXAS3Ywi@$xIux(g+%R9fE#|E;rDSA$z6t7(U;akL ztsT!Vf3-0sZ3H*F$FFe13(B7&Jg@w*#*}d49Uo&c+6_NqHzCxB{}TXB6(dxIHU_m- z_>}ua_@8()6|Ocx$5wcc8(vWUxT)|@$5eRm9!%tjcwO?VWTc}szc>l{(sHHfUr1`v=3ePb?$5zy0-J*)OdO{ zz138DtKwKs6j0dRavOSKWvEF+fo(s8_?tN4JGyza2D%L({wKuO-r)>pC9pQL z8o-S_cV5L4v)$eV+JNwNKx zKk-sqKmh@H2`c2)ak99TZv1|`O204gWbSWjr+-!d`PAQs`ZJR1kH3gC`E|$Js&ebz z)fV8^-K4s;e(%;jx_#Zf+`1$7rlZDRF8;@@zu&)K{|3a$t$#BXZ*96ua5~C+pg*{W z|DF18mJoZi{|flK>m7*GI9hHh>t`D9aDj=26Eo$ckrSJ#d4Sy5OmR$JY-T2p0{c00 z{AQ@?Eu_FcD1M*r$w#p#ALIW2%Exq=V=By1+)h3K9a%`0k1*(DBNsVft_dQkDoxTC z^PP@Nna#mR;EU+yarI8$Z%RDYxUJRu?slB|E{*4k2m2HL@5#q~-)mRv&2Fv#Z{#D= zzV3fQ05JZ)DIYF>N=kKFxzS&A828q;qrpus9LR}h-@Ei5dOZE`ujRwbf3%v|2)D*N>oWLYdpe~G~aac z&92$+1Bg(iIs=Ju#}VW+{@1n{J+w_5c=#>{R|aB#h>_mRU80N3ct(~!RB#Gdu%yy6 zhwifaRV-`CwZ2BE>eAGbbC7(-eD63a@qE6)NUK7?%SpPOxiIs+io?S#r{Zuf$5y_X zJRUkH;5D>=o}?N7`~{81kY_KC>i1$-2f34+t}%9HAbJ?*oI$*!7iw2VD)go)<}2Y# zD5}v=C&B%>KE}&I{wPl&=g>MB`Ki*(R*gFv0Bw1w~k)@1$F8hoNG&Ia$ z469AVVT!AKGjM>ziQ?%s6Hc~2Z4ZAeC0ZY>t!w$>i!Tms>$j=$?-l&B;)ga>R0IO$ zo$L2yaP;x@99f#d!KTqyI}Z4?Wc zNh51c%dFT4IN?tVJu;OglNlyoCXH0{Il(cyP=>5IG`icTxHpk(95OP{(i<_TU1QEA zb*=z-ipms`t2aXXS%4E-rO9knl@7cu5+c7kNx?vauvspY>lUJt6FZFrTEQ|51Y5RD z$)px`LzWpxn9}3`8zUDFx)R-GPU$tDNPv@q&)Vr&4vnUE1G&mD4AfU;)k~vs=h%=dJGYygW+rR}2Z^V9Z z*8|c4EgV~56rA(;UDUL(lhn!g#2BC>Ir>kbxHKR=N8?BX6fvV_c@CpKeJ7Er09a&{)+D2!x>hY$o{|?`Q zqGktf_dC?gss#>Po6qMsDw>Rpr=hKhrq6V~ScNTN?&ySD8EGnV`{0jakUcbOd0k`pw#^ z$RnhX_z-23igKt!RF!`~Sw#1T)!g4Fn2G&}s^j!V3e$XBI)x3PAhVFy@(Np7$*KjO zZsO4uCVS91d#qRi4TDqCxs>DdHUZX2&edb6pt)P|xSSh&0psPhBiSB}qWu}68>Zf3! zIfN}k;$7mo&&+K1neIJX{!$fr0n+eP?Rw_u34_YvNcM3!^zdQk6u%ZD>d?D(BhOqg7>yPv;+rcl z_?pOb2v4&DLs|%o-vM6gQ-pMS7yYSe1{q$RK1q!V{1%`rp{tr#4XPY(BYrg zq{gmEweQf>=4j5Thg85Mhc=B@&2rG3TPeY-V?>61xdyxwy@cbE6AnvGm}OtC5wPJH zsw^}KIf?-_;+(96E==~=uzgiTm2UN#e;#L3lEhOd?NTE0?$DX2P0y$YJ zsT{6a6F!-oFwdSMqN-XY)G}IY!XGN(DpO+ZN+U1!NKL^{ZyG6w^cMS3dgOrpO0;oe z=&_Q>RiVdlaJFX_*52z%(5+g%5{sIn#ML3@M@^Ha&Qz0f0GeP0(P&eN*rg}2S`kDo zC`K8Tu=1I;{FUr|bSL{~n01xzaJ858iCVKettr7(Lb&jj%^k?>x?ZAp<>QvBc7*YnVg!qe#MGEtBffn2Cn1Wy)v3VI05 zEAAgh<$7lGkN|1L!YF7_nRlb4c{g^Muc&*Q8su^TH=Jrdg3zrCih5j%b-MHQb119H zxfu5YDe211B7hM($TZbu?t3E-5{S6|Mi2LvPg|$$Oo!8rEZ!cV8B6SZ^31Y(CLWi( zBFP*%BQ79|QXwQNKzvVxibOKh`MS5Gtwb$|_iv%`G!ClVuLG0t4bA02MM58k(L8;v zF$d;z;G%jH1hGhQtMPB)0RbSOu@q#kC{4{VMo@QrJpvuJu!7I`$ z%PpjGv+8busP15C0dS(RY;@bp_!ktJg>~x*Q_W5A?q@R|Aui+?Hjk|2p zn82tD2L+~#8#8fYVAN%krWB7Eg`wPf9!|QGGcpi(;E`oiagyHF>FtvdygkXA?7eLm zC4WMfKCqbpRCU*NZxdv`h>k0Im7=$pXzL8;73JQ@*ZMl9;@7EcyVn~2iZEpPKv`zD zWhsAt-SW;zx==3+u=JcTJE)0**W41Ma(L&=RbvBMh zOU@2oKYRXyxpT|{cNyyh@V|RLLyL}GRZ}g%GwVGo3kMQAL34-dq7A{Zv7Rhk9b`?u zE3M-B0gkOr|1+`?u+fuQw7F4ui6@;oST;6egeGSnZNQt; z|2EY8A7WFVGM3M1C~60vxP<)s6C2=(^aC$405PYlaux|I_TrOX+uh}Hbw(6%F%*W{ z2tmO4A;oloT|A zC+mI?!-&hBe7a+4cSQG&v)F|626|Uk#1SQd_VW>*ereSxMu&J>!Bqyhc)IGq>ZEQa z&pFi;+ks-K-BV2eLVZYGyh7_B;%4jA7Bc=O!`+<#ab@8GHWaa8B)BP&3&Jg_{*@3-F+KVW+J-$lo7+%1i zObVupy^Fg!nmVepY#NoSs+&foyN`@ifaCrbF+jWr37kGu(-hEXB(4KOoX^jsh(@O~ z!FHaxOvV+v*1t*ZDZnzwskZy`DDg&l587IjiE6?4<%HEG2h`E#p1vGTx4@ZVr$Kf0 zgDrm((WhEC;X1^3-Wy$zjS{8ZaF>4Q^fC5ek!9MzZ~y3i04p#Q~CL6^nMLLpH`w* zDc}EYy-M$_SR(F}z_<2KMi)pC`~4Li$hwLj{Unh1r!xzNi#B&&FDq$9(B78#yEBO( z`tOg|1z`Qe_I2X?#B=M^r6x9uNwdY1JU1gldX{+KYj~R5P!hjbC#gyNNHwoWm@Bg@ z5;g0>3am6IlbiW_E-sMcz&cE>KwLK`t;6HEC0?R8T~2Pi2G;4$;kd4KUDu*?7nwI+ z;|07qcb5xaq&N_lFS3NLb-p?$CX>1Z_p+AIlJWM3huDqXall{gXYmZqM0h-Uuv|K- z=A^NgmLELW(6M|p;uo|J*YE3K3^H_u@Uss`|9&L;ZpV}zDX-vmc=-7FnWnc7U^ALC zZS7C-+Q+an>$+JGHL>1R33P(@XWT9;z$(D$i#Igfb}Ni>NDrVLWXz~;DT@Qk>GtXW zQvW8$ylgXHj&@WsCrDF2pzQ0_M0PKgnfL?uJ6*TvreOo;E}J`S;I*@@VFRzbX->eO z!x}gm3x;{Dv2@ZSEUR?>wdK~_GEHQ)(ZjX>ms2RJeH9NXeDGCx>r7OfrrQ{|Vc+Ho zzCRLfXGWZ5Xk?}$?PoA(>&T)(=|4=Ek~7zAJff{Dk33!stc(@%>_gS>nejq40RjB% z)T487u}`4qOl$)NpxwUI zfR?{iUC%xBvKs7RaK;eYMuua74j*HWA`a}t71=kY+qY?>*Er%v+hy!f)K>Y4_Kn#@ z7u&amgolDlj6<7tAMi7T??*yqM4!INX>FPt-WercH@x|uU%MPscH zbnh#?a#}uz1y=4C51e?Ml&`tJ zC*3%8djY!PJkqHnQ~GoYRjGzy6-Hj1ZgZmhvuqCJXtAzu-~Te=%FD1)E)gJV$|n(F zvoKTswmzSSt>H3AYkKvIyicYQ1Uw0jAnmY1NA8=oo0Hn!ln2-=DUXU-boi{rD4X)y z#4f>{c)byf1Mw^xB}pG%X%wWHr2QMvGY&eS$7*v^5GN6Zs&4D(j&|MYjK{kRM@>$S zk&R$TmE%Im)x^ymI9CVujW%}-RrTN{?Mio!9LP>Ksl?`M$j78!0j>CmUbmMIVCjm9 z6{_a?bx0ek`Zl$aCZjbCx6l(*cf{V)G{$WR7}7xV@qgv-&esJE6%+>LmZ!ZI)2jKE zscDDU*l~OM!3MGP0=A#n9vZBZ#Bz=MaNsX&+OZRAmuo7RzrGR5b9tJuAN@ZI3-EFKws&5xkMA zex`C?pyHyJ?awNA@A=~|QlwwSHB@9&N1y9?*0Y*Fu3x=9X^71N6q7)HUO%PN`vw>< zyCQ#UZNbm$-{B<8`VabE*6)ygyXIb|=4=+9kcQ%;Ycqe2EEef3>KE(deaH8Ev058%M%$A{hiWotLMbmMYU@L* zUre)i*as@#Z6UP&v$V8kt8=tICAuSEUtPjLhfyLksgtI2;v}!qa+FhKUtL_ENCO^s zI#k0Sz^#}AxP+;V1qF?#`8qSz47vrT5tWu1Tw2ZHs3UXMuQij@#(f!}^N7l!gn}r_ zBn3l0H%j*rI5daQd#?fW>@IpXL-#FJ-jnzOKo8XyL>u_f8AbExmj}As^2M5 z^KA018bTS`8bFpe%*=RU3KuAow?|@AC!rtR9*DoCDZm1)1xwV>`a$QXXiIfh?!7kg z-!jVxHWP(SEwjkH8~M_-jNhm{Wz@8FPPEdsrWn@xxD9}80P9W3x&j`*h;lt)kDt%G ztM%7QyyI`D;oixpW{4=1$?*-w_HPIe+2o(p#q9 zvY5}}5mU#FnLhQX{yS=po?Waa{Jbwn(`7w#I!`9kq|I~TD}}vzBYeX(IBcaWO^@A* z=R;a^sOogI7Wfp}^fq_XQJ7&{kn`mgPU=``X6)7s`@^(P%QZ7vn13*zqZh1`bnrmc z?wVJ*eHA^GzY!&(lfcJh*jHxKV2ks2>t@Hr)Q#*cW+aK@s6M#YKzArk;~gryD~Kew z3pqbyfpmSSY8Y`xyamLkFMV@FfK4Q;n2fH+Y=QipE1%PB7R6dzJ25;DODOG(*fp84 zg&Euxv?c%ZG$&MDB_Zi<*dKrm+Lsp7;a)~@&aW34Jnd%$!E{1Ip8qs~nx)dgw2LuY zG&`(Lt7V(mN4;C9s+Y=D)T{YiK#sn7A?*vapf1Z5LnK#I!%Ssh2RUi8Oeo?5ax;#mD0=PG%Lf)Y0p^K zLd`s&(UzYaGKOi$T!7C(_PDd0y;!tF82O7x{#aZ3tC5>X%Cn(|chwg5B&lVWO{auH z`?eArCVzcCl-XR8ztI&y?ng(WDMafnc}9jQUFEz?NkEzMeCXlVY75UztZ_cN2{sUO zu->F|KH@qXuZ~28lCoO$Pz-*V`yWU5JR02E=Eh;%IgW8v4ukJ#NG#qM=dG0)N#(m( zbO7UVz%yE8<$8+P;tcydwX!`}d=O8gPDUE9u)g8Sn`dKjJpC05-9|SHu#3D#|2;sf zaW~QI+T_0&ShZ5`Lo2E zpmB#d_i92OFwj6{T@4f)Y!VMvSo~@NLJuBF<%FdAcT#_v(%56CeK>zN768)-_O`TL z)~WW3`5Wuw8TLo{&)T2n*W0hyf2HqeX$g$+1-kqx`+$8oK2R!*_Fs;rjLb^mi@%S+ zd(cE{Ay(6<)J~Ml^oh=>i@$(Ut5aHWLCWh^YH01G0G_Em+mu79ePw$5SET!2f->KWezLcD*3#2pF1xGY?rq8(14?6SO+?GZd8j+XlT(d3 zV%E`Vyi|>Zogbq)-DUAr^%SmUv3>}Z^DrGZED@nzRnPo6f7{<*Z|r?0L!nD1I>M(( znrLEV?0<_AkGlNMc_iQ(0W&R0rSqQ6Gl&>!MJ|KzFi+Fnf5_ZDO(~Jf_Czl1iClzc zl?dkO35HTE*{oBA9VTh)H#mK z#;q7hQg>lCv&u}zQE9)6iFdy{>qPFHS!*5GVcr;Z1wy4UYNM+3Mfx?VFbOUWBJ9YQ zo9HPFxC)45Rm+F`0sPGkh)MxfLdg@bPhqX>KzweUuF6U9f6|AFO>XSsIyU<1M>&NY}>!6F*UvsF9J42(Pb?d?>?fo~uIUkwl zHmB*9{pRdu0%=a_GnDh`~Mj4Jxx3AK$a-71dBBNFARay4fOu{Cbk1%h=<}DJc#v>`v zG*(N#Mvt!U#S=lcdYEUe^vHi(k6wlV9Z!$mFdNX&#qQkJk(PpK_ksPgN=^GG>^mJgk2R zqJ7?e)dhYwAlsg{Bkcvhdi%rngW;cEbu<9uP6WXBfVDQWLipFF|DgWO4)zQ6@AsYD z?*+STBGr#GH?#QwjQ*+sWE}&5v9x_$T8p9SySo6?7W}}cz&x!*9<&c=KB zOElJb-K@?x(iD`LvD%MR)IJ%xkH?YPRYqZOP7F$-c8v){j^$iyqqida)VZ5g^iWl- zqfrM^Da>>&)8om=avmI3^q{_0Mk@4hbr8#cztI;r8R@Y)Qo{qUgVj7VwZzp<3Sfk- zXl8Nsb*}+{^492UbwrB-cprSO3sr9udb)!yv$4UcN?>< zxdi&rS`mA4wl|}O%$L9)vk1*g`AXXzj{+(;wW|_HNj?p1O7$$GEyI?0I2`GRn>nv# zMwMUZl&Dzm)*104U5=>)XP|>suJiWQt`5eeyKn|T9gd%c3FR!5HfVH~Dku;4K%#&C zj*Nw@#74jD^@j;)O5EqJ$0fdSpZ;HsU#6Pzi#&ugwbu>;d<_jDXd9h$y@BOVZL?QG zGlcCiz0sf}r@q!rM1I+NQoh-%tqwj*jbLgygTcpn?xxZ+*Z~|U=XBd{_G?4xtq}~E zlkewf>MZ=tfsn1`hc;|8N`FdABaA_Ex1@{mlw!SF~^#XR{%^s)bdvT6p6>%?aE|$pW#&|>308hMVH}s5|a4a@bB|j z4;xU>4;1@Ly;gr$86V`2eQ@{-CUUMK^}1s6a3K(?dR-xUU2*d82TjN|!tvL~LL~yq+I0yul=$`CbuP-&3iyHzIzaipiqsL)G;pi2q$vdCC5NsZuv^^eiGU z-`csCOzD*f$+U4{hizneB|sVmkIf+bc!IvXl!$RfVpVrU0EH z!CGxsUbR-+foJ0w1)ov1J5=={p!)V<#b>1ZF(p@gM#Arzmx1ni;Y!*_Qj%Dw5pDH? zpT?Rp@E|6z6M^OLH+I&jQ~TIFXpG7Ly?lVIIYYCfa?}k~Jw;iy_eLg?(tg#iKh_bC zzJI;Ht)T-u+je&x@Epcm#(;QbeJ4s7`sy85p{}V}<)yr?N}Uh}fn7-dL(N#++%;CU zwdT1{^(i!C5;4sbc|pY4OULcOT)9~UH%7DySmGAoTtk6Pf&Ku_Ji~71GV^KF!3Umw z9a=j!g>wYXtJ-aaMU&G-sNOYK2gWiX3bm6cwNFhDm*5r-vi`~j=jRFshN^!Aw@^q2 zHYYzp_+zw}IjTPKd(&T=l9Jl)8j`D?Q`BD7#eB7&PjlNRRP}W)-3NkaU;J!7u}EFs zn3hs;c#xG=ahMX`h6g>;)QmBPJaiZnZRA{l87Wi_79)TyRP_o(5KsL{&yt!3_sk{n z$bV9VKo+VFV1`Pkq6mwOi!jGTZ#rszlL0}{e%5Tcw?fDd&7MBe^xWm2*f^bqiKtVD{jR(p|zduk7$NWpT5vPqpkc*d32cuNI3nWT2tU_ zFiHNwM3d7|W@JPDL8mL>c2?rgt@E>3bZT;AINk(5$`TqR-ol#cL(@}z$J*&B#)dPl zyKYW@e!JEGSLx3?D*x+Lru^vfuay5i^h9#~zi7*!9Q>WO;I?9ozVhv1@L_q=o7GpN zKY-eVsj=Yobq`;fD0O#OT%z$-VT2jhRSnM1Ch>uG{(+vF^ObF!!Pvvh@#Ft|?G{s~R*Yxhzq#kWH4e&gU8xz{k24l~2zgT#ETt zFT9V+-T8i9ndR=G6{E66mYEnf{4*hZ>al=$YS+09^AE~vF2T8bqIq||(X6&kJPVr% z9v2Q-?m8>U9B3omAt3amCa2oK#m0UbYofMiLZizkdj{_?afqQ7DZlBZ{D_p9?59$p z+YFUF3W;`C0f@^bPE03)Hae>WTAqD4@j|OtE#X|m$E|2F8>oto-Q#y>(F$J4}D%Pi1>%6Y>-z_vT1J3}zI*;y z?8>11Dcc$9-_$9~nas8B%KtE}-paWo`bBiVp?iO5o=VC%@s5-IDQ&>*_r!-^74qwKCsT&S}QPoy!B4i3}h({YU>^~@r{Xu<8 zUwebatCR8;obeq&$i>8P@b{MU>NBNNb}6)N7-e-0tu0Qe+FtWw`5F?L>x%5b!qfS1 zJm!pU?Fen?BuL{kcn@D#!uFSvR{K)?FA>(r6$X_I0Px<9TssUtwmOU4?k)PJ5P-y zgMq05gG4yu4tz2dE;d4I!TQUho0ppn!S|0l7R%e=zcwr{R-3e9Iopi`OOaGaI+Io1 zro?|p#^ghk_~%G8-6&eaqkHN1%d$J)c3!a!IWaKY56G{5ut zCFDD1kuyo9oVB2Qp!W;#41@#i?b9i9OP9?&7cH1F*DCQ| zOUN>({5tEh#loj7;C;&dDll#Q1RwHCJW{Cg+Ozpivq z*`n*M@U;00=PX)U7QSF$et7A8Yn}owIKM2cT}3DUcWnMi^A{|byKv$B@|%2Wh_Yk& z73T-Smrc3i{N(u#Gx*Fy$1=sDy*&VRXjv!)m*3i^Z2sVuhibhSNQbi{GM?@*kKq(848bfGixNSd!0p08u@Zjqu_@ak9 z+S@`^a~Ls4n}ay9c`tW;i_uT4yMV9W8mhjWuP>`{^3=vrnH-F|5e=wOdUqfVt?hJL z#mGP*1lt4ng&nQ4q`nS#i0>Nf3i>M12tsV(J3a;F867U*I$7a^owCT^!8%FGr89zk zn z!wx_1pwMHc&fjz>KkfSAfuN-o>)>>yTd%io>+KP}E!Eqv^cK_Gy$3s;YG5@P{zE~w zB7e`DnZ4p8N1HKFqdJPf_(-Zz2~Xu=6#GUJgB;|pa4wXRYhq8UwsM841Fl7?*|h-L zQk%eY)T8j!%yqj7)dLhG?bd}Na43g1T`Tb>Rqac<;MTPU9Zdh3tDgO1`V_6oVdqox z5pp_V6Qnh{@m_F;E(E8w2Fry+skJpjiKtkz!?9TXFB_I|42=ywOvCBwZvY9 z{1;P*q3XW?Noym{MWU>s@_YL;!C%I3=jVyV^YR);^$x_VzCwoS#qk+mA=#9<6f5Q2 zG%726ex7Q{z910qPgYl)tG9=$chXyY8Gw_gN(9mHjia&x@xPNJI$ZpEL8$ufublmY zfr9}cD?bpwpFBr4gdzFk;+N3cUL$$OrT)J{j}0#3wPsp}>+NsEPbMAqu+cx!PZ8=r ziero-;?wHtYJzzk6-yc0Zv;5s7_8S{!QBLTwK2@qEjeH;f*Y$Sa_|qi* zGHizqG4kI_`m1(*K9+xFi>4fxv{IFyRe5*_8hU9rxAOQW9&_I9)yy$Sfy7&FHMgIi zL_F_bEDgitgJ6zb zKpRv5*7|$-w0r5*`4llnv&diQQFR878Q$>wP}_WQ{301lPx`ER>0q(`(9!DdmT#&{ z{P6KpRBCrMMdBToqNG_$mu1c7&(etBRh6H%{tN?vl7=4Zo(Z%mZoWUDZ_4+#>Y6^% zHQmsRudY9z9Era?Uf5R0GwbLp0uPw_9&auCo^?4&>3C&aV1=Z@8DakA|aO61Et~;r%WQn6$09e|6eTZPU?9S94% z?QD0i6D5?`wb{7%IbhBRXn#JyD2Cy!^C$9$^v2!{=rj^%aBOwg=^d#Qoy$I-9H)VH zbEl@)L06rxc+6N@{kw+84bIm{%t&b%yD64FL)r4@R4;1$I6oZ@gD+s7WK6)h9fqZs zjo6o@IvIKj;+GkLX#+ae1p+riB{bd*>FUU*bR>$1XUD}svipPDlc3BFr zr>1-;(%qvvEXo?IshBjCwVj-9S$|Q>P!`^lICJEraIrIGo#vNChhIBRH#nuHysz=d zc$H<~%5q*;)}T-vrOeh4gJb9}tq!#UGA{)Jrlx!=+sZ}pAvu<75A#uN- z7t_J7_>jzsZD8*r;nEK);`s{+8clIpNAHM-B-%qT?{KwT*koaeYisgO1 z(_mj{Kc0+k_IJ_385a+Q2c`x(DqByNy_#61qoBqB=c4Ct)%5Mh)PGT1{VXu7BSB&R zP}My=+3njqc|109JSU2lf6Dax$eIow2+yT#wNCQD@ZvcRxqsux6k~lpPJaWt6lqlL zkhO)yz9KHhx14vXj?>j=wax2I>tkp9+5EXgUZ z{G;gR)NeK*Urr}*N;vR^<`dvC$)8!jBodV*Utj;$uw0Gx2-C5=sgCYq<%8=wHOFnH z_}X!oW>~=*2FXwv%(Y$|>#TjCy;SY{NSx_Pty7yigKbOGSox1g{I%!P%!WG;{oOG7 zqu&stCw4jy@!}o%vJ-fxg?e)CMV6-gCJH@0xgrpe%v#(ju>JAqFZC|46f8Y1NJ-U{EjSK za)vs^iIJUF_AW~+1jbF~1Lj2ic|=mwj?{KbK!Lg|ER=76;T;#e`Xq)Z7INX38#bxAO$E zYm%|uV8X0n&dWf~^fk$zK%ig=bNbIo6q{)#(hOrc|FPFV_#2aWz4#^Zy7M!>ngYEj zDX|}WjT$S|3KVrfOkL;PViFj@pELYI_YcK14$Ko1&Pb{;`MjZg)z;u#sM=c38_I1f z%s+34veE%GtX@3-J-n>ob<>T|vs3~GMn^GR6C4cCYo61?r;LHVQ z`Wqnjj5C`sJLf4w#)sP4(`>tn4KJ#s$7!*ft?sc)G^=W4(LQ+O>0%SM8UIg#2P+qUtCFyvvU6wjv%ONi1@F4vcaNg3c-1_$V z@mP3!#ipfF#ei-3+rL`*r?xNOr>y&2UqloFr z_ochJ(xVL>qWe-44=5&eRCHf3@dJOn=jvbSba{-Wh9Ojp2__jB_KTd@5#8Idp1*%T zGJxKPv5pj+duV|fY&}nUv+G`CPzGGMyzrviowax8v>mwll5fY}v}f#rx{msFJDu%X z#P0aOjd>e?{yXq2At=U$ncq&`k#Hm4P5X>vFinJ=h~1hV-ITE-*W^vz@m3lnWQFCL zbQWTwxK{?tSDKW5eeb4yZV#l7F%Bp#;1hj6H8wIBI}QDl_>_x`TQfsVHQn%B>p*Q331OMcn zF*5KCep~n$#q)B0-{N-@zuWlHJ~S^dMjJaP+ZVCZqWi*jN;Dn@1KQ1`yvz>n;D**cnUs& zEl3(|?3CC63q|8FAfyc@o`$<%CcH4CjU5xegSp`|s==Wn@#E;eY*>)0$0n*TPQ6}o2fbKSYa0d;KM#{Dq!8zo5g9dgvEx6;Iv_rH|w&6CS-lwJaW$bw0 zE$%HgtWbe{K{O$Tf_wQYuT~+TlI@ovZiN-G;yB~DfrQzq6as@qw1sc|OrZkTsx)0{;w_i!FSUL_ zh3BinPpI%f;(K&=Z&OO`nn(q(If-0qfwQQo^$hrFe=s{Id&whJZxegYh$Y*n8sHJgDxV;3@Fn303PL zcpvgJT0^grs;i-Ya+?=Xb@I=Zitl7U6Z(!8U!Uqkb@9h}OV(Gjuf1;0-0N?cH~-r= zF1TsoqQy6J^iKJbrOR%)b;QU~qsNTBWZd{mCrq3)`Lg26ub49R%B!YLpD{Bp|NILI z27mnS6Z?*Z~#~5YS9VAVQ0%s8MN)U{Ndr za*+-X2_Q`(2@)VmfIue%OQ1-2UFUxPKJz&Fg}QFny7#WTu4mRiXMcNtd+&e$`*B|T z?DGwMn$j~GQB|Eny$)*Is?{Lj!jnh&aOHb=rl~Jm2<4tf2f9ZY` zR4Vu!>%)x4ZFTbT-g>*4aF#k{xNg}$5W}+<@k<2eGT?KM)Ug)`&lY&$xT$wWQZ98C zc>9JdUqi-&!*EoqeC5uQxr#=yh08s5sfkv%;z>$3of4s$Rb6mP?{P{3qb?mUR6S%r zAl{FlOlZoy|9nhYqn94$wW5Ivt&A==ag-~DmXwTk1>)fi|C^aiNbN#{|_@ELqvF`DzM z!QU!8??W$Im_(U_hjUESMj!cZQ5VP1702_Yr1bu4s4& z@oT8unCKMHUVU$bGzr>^?y1pIej&JJB;VIJL3#gcRgb#xBw}|(Vv63`2F?!7!;P1n zhxgs;x$jPkzWbfia6bgmeYbwqC3JNxLg&GfVJ+%R7`}+k>N4n5KH$x$lGSu2=MK7>> zz%9q=r3Xa*zJ5!;cw|z_w=g2LXV{dch=q8@bc69)!p9%cA4!Ie>y94KBj5LW-OP}s z2T5zW&?Z>Dt>XOk5RR*E!ce)#f0RVGxF@p*RBF_uB1vBh` zy|Zt28(9nm2;O0okKqn@k|fP>s=hjyAirPFu{WaVcTK;CT*&Z?O>oHW&wlmtz%s+z zeZ^)m$~Lt!>t6KGUS)=N&V-7muSIC97_MM=*3Ug{H}?<5|AK{|WOxSS8yTL$@JxoM zGCZB(X$+rY`JZ4oiSf0wPAyrszRd9EyRb*b*n=8|BW2YK;ieXVuexZaUTE{u>Qck& z7r=jZ*A&69mf=T3SKm$3bk{HcI#l!@RMLJ3OYd(-E-$>jyVUUFGD`2=HWwJKW%xY9 z7a2w?mYZAI#r0730sRNF{4cTi53%re47X+2z;Jtp!x+{vEML=vj(&ZwF?}9k_Upvr zcV)OE!<^5TQRRkr=L`4b zlg;1W-|xfA`y$H>f2>EEKi%4({=F_BG)4)|wS>UcWtgo_-6y9@M}0pHDSs;bG&F(sg^g>0SSh_7)koMZ>U;VLiib z8E(h$Lkt@jZqKk_cq9YX@V^b?=QDn57T$tkEyJML zs`mF+7JnbZpE2xaxIOEC4>4SPFjU`uL7CyzYiR#j)*I2RJU$rEZ}o@kwr$_tO}}FU z$`|!;%TbK~x#gQ1BmS+M{v!+e$H2cV;{Ew~7JoUz{aAWO_dL3D-lXpOxA!2w=#Q|g|hG!%ziI0+>G%BORohBKg8NkOBPNKOKEeGlt`sJ_ne6OBnu?;r$FBWcWD4CxP#%&UfhA znl`um7jZ?2neB$oEipp)%0g9e`*B|u z-i6`MSo`eG!V6jdaWecVi(kUbRT zVC{r5!;Tz;Cwx&={HH-{)VL$#%a#39_Ia3v_hk4Xh9m!R=Ph;r4QJukHRbAHA(+Pp z6%(Cmf}H-L(x;(Mx2bJvOAQ~=_%N^4Gda;iC$v^!x&uI)TmFl7{^B+6$>y|ivZ5@c?6|PV6TiyEQkiP`a50^4r+-ALT^HZqbUnuo^ zgte#QStsA^99L%e-955b+wG!XZ=+hjWlX={u=cCnbN97tSG(bQ3Gs3KUdh7EakZNF zdIjzGA`7S4U9`F7zla;kZ~^1Hhwu5r<}<A#**_H7Er z_vc~XX7NwE=f8RVk)%??W*kT@n!Z04ZJVCIHe;A3lhWpv|2RG=`v9IZziInv$-<+4 z-ZY#+taGYtZeIL<3+vIZ)bOW^uzyVMD75D$=S!nm{C&|= zGM~1W8uFvSpVR7&rd@ygr4HToFHHi*@y5mM-9^bKkY5{y3xfTDo$60s_hUbiG zb9S}re9OJ|h3WP;aQrY*{Y-c)|HZ}=Q>T_0ita$4vHC1MJKi>9Si|r`3~L!SFziz= zp#KXYuNeuK6X85>J(P-{$I-tzZs3=*OBvC&CfP%Z&mF0`US%$ z7>;E6w`12+T^Rlm!(AEHG5iq2k1(uZxDCT?8P+n~li?7C!x(PPa1VxCFx;MDJ;RSO z+=}7H7;eq*!wef3?#OU=hC4AF&TvbHyD{9E;SLNpV>pyyvA5~<&+pm!kvAd=b8m}^ zl;)0Qo+Ab@Je1+cCfN9~$ic&z+w||eXzS#f5<;IW57jIaBHHI~y*xWGjmhY|c;-S7 z76Iel`db}LxaF$HZR!x`mDvZpdRIs3Gcjc4*pPR~i8=3e^%wBHX~}oazV}x2EP4gb zYwt^ssU4kh_g^24yZ>j({=@5Upz00 zb|oweLE??|yOjBz{`6fP^_1;#M{k*v@4XE2qf8@YrtSTirUx@sWq3}NVVTU(c{AGe z9P&GZ{63L4k*7G%!CIqem4B;#X&vngT8V+QudnO74{m3T^O!5t6&>QOK@5~%PO0wY znjKaWTSL|6N(^Puqj_B|f4xr`l3Vy}=}S4dZ*c$cW~CXh3+dc|?)A;+{~RSO0> z4?9mc-gK4};nnZNT36x~=aL#%Y>mrU3*)qGtiq=d8c!D->?P+uU{+>Z`5xxrBbeiM zjXu7BJ-!~{imj$Z>h}ygy`aTlZ~cePo4QZ-7c}&A##T8x4y(v*i4X8Os;#dos~WGR z`9HB$ABRJmzW97crLzG`d{$)(s`OD%OqB{DnYsxm&mK)vLsxPZcnQNgq&54 zjd)&MQem!cyfo}|u3^||-HNAhmw!ZTweER(6gRo+c!$uw+fmD>|0I1XJ2V+U7^)y-=AUcG**&*or&envknW49Pcx- zv3zBs2WIVB5-XE%#g@Z9E@PD|vD#_$I1{h9Vryyge&cLUf$@rHoDC0;%Xp>WV3gnf zZ4~>H)em8Ak+HJzCX#8qS^w6s*_8{rIboJ1)v&G0SnZ7UIE`28wNbsH`xTJ5M%Va>gDUb|-iEusilaD`P!0 z(YYfsAudwrAA7LtNhb_(r{X-4@U+_RG*(qyt)pd?5j-sR;DV#B#DjgWbw@Ud2kSra zS0XK!gr*K!pbmeju0uIK^l{F z57pApHNO5(?duOU)E{bPf2fxIp{9cRLp6*>{h=n*bEK7TGeTkT&73M0X@g8H1m)>5Zs8GFs>@jM*RqDoD zgT^~lHr}dXvB#+K9;3!v?Myu88|fAM<5dAnEz3_1%x69IcRJ#9Ig=TB>Ie>NU!FT# z^Tq<*msMX@$L7&Mxts%7jHd&I3tP z&JO5Ra1b-s^G1Ai`O7*=>PM$)1|L_``tIvmK^0p64%JT}1P_p7J(_)niu&_a%|nop zqP91pOOxZhHzJhb4h-uV4rjOr!(j}EG{MSzRXv^xq=>h;Aq5qG4tTB|{54bwdK3$Pm8o`=t*H zwTBkC5%(MUC|8*uIsoh#FzIV7IAg%)M>Oz>$83gn_*NZ03Eh%*y?)i%GXNKOCE^iu zE2=(x@<8?k)qZX9BSJL_>A`W$3E5G|(GLHGV46c?YeY1HgnIkKJe@B6;(*^FlT;AM>Vm{5XO zBzsv~=XM=|$r!fw@_i9`3y{oF*Atn;{xp54SN+#WG6oez^D&}PYkKS4CmY05mBowmR;6Cda#Gu9vU zy)4#Kw=-%QUI@|cJXC)|<@apCC4AlCQ2iR$!}6uFCv`hVPAd3Yh;C;|T`c9P)brk> zsAjvvSHGmK=Mpjx)UUmbqG{c`R6bvv;}mD0TF(y=2YTvcyuBLeS(k?hQq{UFiu#n) zVzh4OfSCmsq3x&jWh%eP1s9?1r}e9RCBTXn3A07PIjFm@E*$Zxd#t#DX;4agkJF5t zWe**hr(012Kg@rQ)}q>A-S%~5L|RPl@kFAx!RYG;g2Rd#2b;s!iyP>VK|D# z-^0Q~S$H(VvlzdM;Yh}>Vc}^kybHq_j6Z;dhcWyd!wC!@X6c2na5oFrv+(UKd=?9D zVBtj!A7gkVi$9NrS2JAB@OunbGCZB7pU=W`7{0;qJ%$BKFOT8H4CgT1hv8c+{dp|h z!@@hT@LeqYAj5MQKaYinv+ye{Jf4Ny86L`TFNR|nE@bI%WOy;d%Nb5$>DgI$8pE{= zZ(=xur8kF#uV?tm+NSq|(iq;r@Oum&W4N5*9ER63oWXDc!&MC5V%WoQCBvH-KFqM4 z;aLpNVK|B5#SGUnyqw{U49{b@h~YwpUu3wN;e3W07%pb`1BUY$zQM4Y;e!nSmf`0Z zu3>mP!_yhw!|*PKM=~7E@KA=Mnqbj^&YObw|1}I3GyE3A4#RgD zzQ=I>8y5=m@H}-Z%|{yaP|AxpudnU?aE0NWc6h$CaLeZnrw(*`uJh-H-|ZE1UVi!V zH@xtBgwK1XOuzD+#+7*7uwu5D6WV<3TsM1O#GfDW`Gp4<{~*JkGJJ^P zmhAZxe;(C>g=-jY#c=e+mp-_F`D}k|kNI9FUrvc0as6(?1w8L9#Phq+Gj8QG{F~l0 zn(E69+*hV_`5Y#2_9P6fk*E`_COLI%J}J{pLB``&gL?Pmt}33wFs|7F`) zq#UoPyjNb=itx2su}kF__J&qO!LMB9cMN_B@GE>N8229hLVl|iAE^Agyr~rf;CEQ% zH>X%DV&E5s`2H;qeucjaV!ywCzaC-RA%|6*8n_z>uhR-W#J}}|dnhCx@*E@svKUeX zDTcfUaYM=>HIQ47u$Q%>2P6tI9g+sILkc15A=@FxAT^L1kkIwuLk2+NA!!ghWI1F5 zWD{gN5w^)c@R5fF=RQU2(kgP5%K|K7sL%Y2C0J7LK+}q18ffI0_g>bgp7p5L#9LK zK;}X0kbKCCkoAy_kPjexAcrB9kQ&Gp$Sp_++OHnc1JVZ)1&M|vKxRSaKr$eCkmZmf z$Oedi+XVL>NV&@Ihqf2A&kt?yf3EFy7I+8Ul4Z|G#($dKoM%tV&NNxFgh&-V17UN` zb_zlRej?zf=4Oj;1ir{%w3)5+H3l3!muaS&=Z?$Bwwa$bFGRf82v5#2X933MjS;^m zJjG$QE}UV?aG1$Uv=L*h<~Y1)Iwr?r8#8Iz1jKt>$VB3?$Tt?8z^zy@4olhD%`q0M zITbIWE=0T-pP!5hPKJmvXPE6uQouIg1(sCvglykp-SB%&#O7J-Sfx7^>wE)m6LBcN z%u9SE-EkHy3E)ps?3I3#U#RZfeXE13b$gWjV=T7$M4y&p zN`-OyNI$D(fti*EA0vhkmdV=fR!fS*ZnmLRLOkvFpOBTFZOxR+?TuX+Fok%=A3hCB z`GG&&kL9Z4SX@kEM@EMKD;Y?29Qh@fZ1z~IHQOr0c!{&;T2f6JF{IKosE{>RDv(HF ziCES=Lz>c8vqDS``YXyH-Jg>mnR8598rBvhlZs5gA8@?cltX^MBEM<#vaR-@QZGus zg*L2tKqVC~1@UwXT9b`zLoUSML}BFqNp_Z5Wfw|&D}~K4TWQ^P!tbjvHLz_GXJxUEW>8Ere@|?#)zLN?i}h9%|&wRyv*!0;0AC_@@jOxC$J5eb}`lAP+WCTE)Rs6Qts=Oiba zvldvaRBNLZoDS7x{3KwT*`935$w~I7nJtn{HVid19xX)K%;?FK*RNG&UZyJZD!6k^ z3TM4YHe0P(*~EVbZi@Oxk({0;OD}LSo1AXRNO7bi{7=%2p(JareV*m%D2lTaei=3; z{HU~La<(m9sV)jHm42zYWZyd2H#-Fry2#Exi~LNJjE1WyoD4VFe6A)r$8WIZ8Y-?* z`XabECow_tXgF?QHsAnn`zEWokvYu3F4*0<6rxT~~?q^Kc^v^L9J`kDi_ zwOU&sk#$;|E!C7oMHVk>sVkXeKI^4h(d!lIre1)0kZwiC*U636MC0fidH{C$}v}rt=5swo5y0CbvD?L510- zRr1`fwP$B!=gKkSBe)$oInuoY?p$BMZta3V1-rGmsVKNCYYDl1`i6;d*~$@iLKfD4 zz}Gi~h=-ps%aVmpbzn^!d8iTF#pDc(qCqdZZu5!njN(c8p(g0q0sd+k6EkB>(gb|S zDJCHS!J-es|1Zh2_z5iay3z<_Fks z1P*Bt^gx+JI3yaP5lX~-^(Qxz+qO!p&ww?EiRh3>b z|BzS2@A8U>&A1g#vIg^t7k!M=v2{XB#KCV!lBm1@ehK(nz+Vl%4g8tl8X*(F9|itk z@FT$Q3O>@^whjDM;Lis?9{dP!#kUZew+y}jA6HRAB#8^)mw>+o{MF#wz@G`eQFz4! z@JE3^82kwEyMo^U{(0~#!9N84F7P*lzZv{B;4cC{1^kKN4*}l`z88Ei_+Ie6;CsRU z7QbrzKE`hyem4A)B)m-wgg{@YjI92z;DF(r4L{hS2j5@V(%B z!S{mi1>XyOP+iriu8&b&>rh>E1(uW~L<9Ke!LJ1W5cs>m-wgf(nvb{uehK(nz+Vl% z4g8tlKcM*_-Ab_y{8ix32R|PC2=E_dpi1ur@Jqno0{&|7VQKG76zu*6s`NI1e;)iw z@DG8%3w#*o0S2nXW1?*ktnURr+A{{zjDDPt{(^j|D9vuH)QAwTJ z_s0Jo{m4G*^uFW%o^Wy1d-b0rpqTtY1XPgJU)g;(YgPDtlAzE)eCbf9a8(KRrw??s zX)v0D#n3G$%Ao*o9SC z1nzktH4E<4nvrsrNEg`%9W6PLA_{kjhC!mB18Ec^9zuHKz{$k9oeBJf(8dI0rbNYf zAS2GYMv7ed8-&!egaf){Be%J@r-b_yn%9v=0`g2ntSlVgmAKQzJowoVI|tlsu&pxX zaG!5Fuo=H_aI&GN9XXh!-w60Egr5WZRH;?C^iPv9m2##a)GlLNun(84G~7ccy~3e? zwjg#o(xLo_;ec*wh(Y0Y=tenH3RbX5OVS}2;xGAlFtQ}e1e=EA%*BCoo(!a!3e>dJ zBV^er-TPbX3B<{UH5SU+p%OmQ0L7JMjwDzgbONK;Bli9s!f&P0cbFjd|&B-^ISGYUEm zkrIjj!DvrU%C^)GcSbd`%_&yRLLM2a*5ucU%9oFr)Mm^mKe4Cs&l%C~}GYC26L1>E-tr0f~ zajES(P~Ucy^{^11uU3Qk(>-3QtEO>yjXkKohKshoxE8TMTFxxSB3~Li(x6Y0^h-r; zP|H{Vq4tjxWo%Z_7jdV_wv>t(R7!PRfA68uhx*%0sr!?NP4%LTA-Ms+L9jN}pcQ2{ zqo$O4GNZ<*=h@{bgUd0r0}WE5A8piQ?9gC1deIXP>~VZ-c_Pp|X#AkE+7R1cA3?uh rkEFa}=no?|wGDr521i#RddZPlX+<;wW=Puw`)R9?S{l0lTeklMp)0Lr literal 0 HcmV?d00001 diff --git a/forge/bin/libiconv2.dll b/forge/bin/libiconv2.dll new file mode 100644 index 0000000000000000000000000000000000000000..747073f1b192ee74ba8612cb7ea58d908e6e7734 GIT binary patch literal 898048 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%0DI0m1qIKnk`}jJOuz?W;@^j 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

4hSI1e4&>{2)L-9JBpSQCe{?5+- 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

Nw&OK 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 z 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 P40!s_t4cr`a#qgovK_^ox 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%0D^wd+N0L+pJ%NBCx6r0yVgFm_N}!at^KOKr1rAf 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 z�fEevJB0stE=!$EhNx^3;FiR6*=#PL(+Y>JN+4;8cb4M+zdtd{99jHIAvyNZCuy z`#FD3hx6y(Z`aeHJa8{XP`PmE`HOr zK~uyjV9r-uL>b_k<{&icss~aP>KWwBn7yzw5zb$7{z~WY_@{H1 z>dsVmuLN#0wx_KvZEb3MlTteh6PfJ|N`V^*X?sgOKa-IljHNSxLf_eoh4)2fjv)Uq zUkFIj1oaA5;gbV597a~UPIa(zEvh%A`pV%vIWvxR$ayDcs!+1pPf>bU~_4crY=npA+ETz!KH03p-ywn<_}lH^l8h$&zL{^9cRc&5#-t7SEgbZ!yEldLTZvOj!Rd!6wX5wtjecdReFAg)7$H!3 zDKDiCDdp2Pj@)Q_U)$T-1`+*12H-cG^{0A;OomAh;jgqK#H_Ck(7U;P5L4K*(T61IE7z>SDrB6o3MCRSo$3hn%^pf%^C) z7esxZV_j7P`|+hv5gZ$F?48^Vj!hKGhg~qAQ;y*tjip(TCd3BV*F%nBQ!mNg=2(xM z1vyBEA>s9_n%~sN{(Yf-Ry9}D&v443J~nlm`fw;qPBm5YlT$U-TyUyIeQf!L*g3Hc zu?w7f<sai&Nhvo6*Q1z$O)31zozjc=feu(t}))-R1RqW3`75!hgulc z04o{Z=a$APhFEl*Q_e0!J~|z7X1^V)RDpOg#f$<`fF^pG)io&G^mUANGQK{38Qs z6MGQu13n^2$WS0$MNTk~qW`==kHg4;jyYUcCUmNOs!yo?E-0-EldH_qmi%c&lx98PsP)!{sBc!~OD#t^7{LOCd;UD4Q}F>;Zp7eEJ(nd;2B zbU@PyO{Z+_sa~DtE?fJIEjh;pjB+)>C_JyimSU7}oxUH~-ewz@Xp7bvT94=l9{EUH zh>Hylz?WhDw>UNA{G)PkPk~e)xOB*tm#dFl#g%W!EiT;&#cTiKXo^t*eRi>v~{fRdX$3gg6qJ|p+Jav=rx+fW zlnQJ6RNH3+zA+Ue(1VXp>hY0M|0oqyk6B9H6Ie$dR#8;j0d1da8w&~M4k1iL+c0jo z+CI=|%$UNv#~O_mjjDQnW#10_P6!0D@v5FH?AvC{`+H2X?}!XYr)umwWFN3@mN84K zuq6eYu*bfA_8qhDlzm(5LnMXt&5+EddI2NU;{d2*P}434usF+v@D03N04o!|qfba= zm;*9_SUT!u$^pQh1_zJ^g5?BYev{0tRKBJ1Bb8r)Fwfi+^lu4ZRTMbz!U338{4H?Q ze}t&STqqOTY^-yK>R-xSQ5`B%xUb9^hhZnN+5zK1EDxkw6HKY7 zHlzxN)e@9$g>4SQ4&y_=Iox3d!$<1Iu zY?#w8PJJlnNI~5?MjjIj@|nh#a?ThkU+B2T0821{S#iIW1Aqiinx=7?b7`7_2KnUD zF-@0Tx@7BAb)fvj>vJxhaw$ktuqbGo^Ub9bE@4vnw{+Li{o&FDmjY~^(0oYq0bAH; z$23RjpPwxsTSsgiFp9XVd9Feb4vuc521oP>dN!l}qgbD10MMReOnj@R)bNrU+w?h5 z!wVVAxUr)~N3^o&`;j51{C?v04!3s|1ZGgJI~kn_>fDV&*A%n}4yWW6fnkJV*d4d( zZbGpz#Uk4BYYV$0r0(9e70?CjiyLiSD2y>pJ*vkdr5-4ipj2Ev7PO7yhPJP@4M=mT zp6g_^)N_k{e)gTS57By)eE})#NCCmxgn;@G_6DjPKqeP!_=6Cn1nL}U64nx8mOxGZ z%RYl@n{s%ntQ~6Lv8xcVB2EdvEBF!jj2fHDf`sgk8XJTwQ2(U{SdOt&ZK=YQV+F$V z7C64iah!j_aTp&zxtFT;Lhe6>HYRR><2&RA$-N@?T);=g_c^}B@ePiHO8q5Fct=x| zmS43%qBa=qpl##`fTiJovFad4L9kY%ag)Xk&&Wk%Fu$s8&k1s`IP5 z8#G;W>58UU03j}+P313_Zn$*ErF$-gxfJ2jHCt!W$J&6=E70;up`x>~%Z)u+y)wE( zuin(?SdCozPSP4CeOE@?^z*_J zr-r60oTgxsf)6_JPbZKEf6|F7od92SOTkB-yVDRqqg`G&qjNExi>uHsg`c$r>M5&H z+Hea3A*#?+$GX?n6@hIAT^YNh*n_(Jq!_GXlwxshg|vlL5muNeXZ_PQ))iLTqqY#c zwIy+(ty^sY0b-dgDVEUo4f`&%4U?Op)RVU1Ws(YGNzo1q(XrN6uDZm~gOE_RO zOMLDV=HM8xZ!7hTD9hh+5G7b3%9AL4yr%MSY@>F{80~7VK;=q6d?*teV=yIS<<~Ii%4%m#Mp$5z~>>(Cy zi!87cBQjw~cg5Tjb6+6M1=I=8sj*KDKZn1laY&70YMfKU$Kg+EU>OIL<)a4ZCfLbe zj)TenriPc}K8|2vA8~laVQ3~@L5*Q}O$~6xKa6T7_lDeSRV%658#S=1tK^2MaY1f~ z<3}7vTKrF;4%CfsdXq7QDt^Fm566*`v!waT=^ajQs9KTZXN;PuzRl?^>bF$uT0xza z2XyRF-=%(+Fg7=zS1n}UI@Ca9(Pk7rw5~W`VYJ=Omlb-Ipcf5<^nHi(Fu4PTQ8@V` zLm>?HZwZBFpg0;dc9etavp*W!oUd^n8>G$YJe9nf!uguSg`p!TLI}` zu;r)EF;|hRn$YJvEt8Dm_hpKfX*CRSW1n%s8y;F!+1{h|j)uxHfw(NezB_F{YWsnV zp(<{x;toePIRY06XZpc`8K*s*hS50Z3{aEJ4WAlgp5s*A{b(yn4=>urN={1VP6{4v zV;SE|!7I>R1m;rha%7w1us?U?-jaLIaabheH;1YfRxR8(@IsEbKQucKjGHXsYa{qg zQ4kNn+MLck3I-XVJR$a^E$q0MwjQ(v%beGCM%&Mn%Bjbuw$s`+2#k|2Dw%u9;5jCl zIHQl2oz&dXxp=HL#)napZs+*BseZ z)-gx+I09!8Qt+V>FGm2<3LL@iix7s6ReMtHb38e>xmj|fsy5{KHOK!kN~qkVG^>KK0?mf14FvH>{F2-lqh`v@P#^H)gZe-k zQBK3Z zee%C@kkbL>U{hcZBJYf>G@b`E?kZ@d#z@)xDkrL(m~tLzjC?c_)(9fHstfWEY3m7% zf$9gGpD@H=5O+akihld4!!@&y27d?I}KIT!p}<#$Ypm5(k$u09OgIdX^if+&~drhB4P0 zcCr!R#xcVTHVzo}bA_6hHm&eLo8nViHMrTLRgG3nH9F%a+90IqJEO*XYd}Ps#WuW5qs$gGekc$ylrBFZSiw_rkusdWOd-5G;}vP{nf&`q-D{Al9~r zBS*^ebL31}XB>fFxZ%htM-DlH#SA12OcGJG38PrgEpr?;-=IDigCe;Fa!ce^I097j z!s%;*BnicX>3^Jtt^T1tkieSLVNS!6Tygr6(;-d=m4kq5LE|}%VY2W56Sz=aEPx=F z%BqWH5TF?_YJp2HGy{MsN^grxB`z7NH)88vq4LWDz<{NVF|bw@jVwOYAV{AJHGu6! zZ^k*pTUDD3oL{xo@P?K-HS%*4{VV=)dyl@KxxLS}m+d*N$LfAdJ-U>zDTQlmNhTqg z2g$(jn(Qk{;Ycu=A$Y{WLoxBd6$=su2v!kRU~fW3(v)V4(f7u#)A&<5o6^~m&bD-R z6o#>uDr_Mf?s65fgg!TblRvoWao1W2DS`z;RO@1&|I91Vh zL)&$2SG5g8`l{_WN|gz0jPb`lM81}K#)}FSwpDhMeXmpioA;xhf62fzR>dzBHVG`W z?~Q$?6i%dYDupvCU>U$XUN9uD*e1afRlHI~zbamnbwL(h|5NC_02QlsDJal0PsBVG z6tF-RYyDGJh$H`~aYv09HSRfbNsTyRBwQoP5g>{yjv#FTx)^wP!jTJ(;0TP^J-Ibi zo09uRZiC!9$7AF+Iep7<7&=7g$Ub9rfq8CA(;>IYXi(O)RV%}3*fh}2e>B*j!Ir`Z z_4FgB6P&)I!8Q#xIUVQpy=tX64RsC3sHUL4Z2ZG{kj!5+1|hHEx7@g-CCcl-pP)~>!_6+OY&F94-g_CMBWRDlv)uM_+sF2S8hdEHD?^x+ zF9w~yepcfby%pA5A&R94LlrU0&qg#NFHPw{Qg*mAGFS?`)zGKYa3Rm&AvJZFBPhZt!oYjISAVl=HLZ2 z9yk(KwQr6;a{P(o4~#w-5V5C|%E_~_&BhiRn`{6+wNy92C7Wi5LE2n$xa87ek1d3j zQ?AbFbE$gR)c+X6FFsd{wN(93!-N`QL(Lg(7t*XIbdNc1A8`AS+ed1QO?}8nA0Ve- z!>(rOXIp{4`Z;9hmr>T_rZkEr!v$>_6hl~%R~RW9OKU4fv5dM0nVglY6S+FpR)JD= zN;N3eq*RSkRZ6wA-PN|E?VezuEhgS#V6HvTwyW*2wujmtX}hoOj>_&4=CJq>dp4-B zPX!+#?!ai6>@NG-^j|dUmjc4lAQix|vqD^05Be@k)%eJ8X1naF9rD|X{dK`Zyw?nSO@hqcb28>cX$tb{aTO7}DJV&legIyW`XQpVd$LTbqMTTvQ z?TC%E1%B72!9E*4TyUI)s#s~1~H(kvd0Qt7qX`+3t-u$!YLI_*oT)HWs8Qrdf+M*5afS0E zSQ{2K;Gkp5N=gEnOvt1G`xjFE5|k50@CmQf06@jE$y385kmoM=Pb3Zo94{zTCb}bz z8|3!Mh0$J+3llvd7hdm0nq6u3q}i7yfap+~BZ2IvIg#d6njaj;mw6x;xrq->BiySf zbS+LBG&ockF$o?io#iybx;nW_)oRn=Orf)J`dPIsh5k{PWt=W>+Ef?`kuDOPJJfpV z91Z+pLtNAq8@04Uu_t1`i#?^m38w)<5DXS*a6ypy**${H56SLyi6(n&9MJ^J_>v}A zoCnIO(8R}Rya{#IWM4Tr2X^U9K>;<{p~;ql@X0u#$pNErT*oJ!1L+(}=U6%?(m9pR znRM`hUg^LuBvto@W?7mQ=nH`%LPA4zfm^0D1ALv)tjwhm%>ZTqXg|2L;8LGUbD9Ct zjJY(C-oEra((_3Van_;q(3136dMDC56^!XD4Y)L<8QAG}n&sF+Xlc;mO!YTuaYTz_ zwk)>Fv^ZhwjV+TFz{VxEUfC+JRb&f0t0sLkp1PNQRGa;j#3$Ub0i&OeUspgWt zHq{`a1~>GHOx%}p-nao8f59k{LMi>{FJmZD^@qOjyplm!20+o@T!lIvzrL0M!q_M+ z-)IRrpT&(kHO#6ZR467bn`($qw@%9%Ez8_UapQrOkWemUu;j)g13xrk4E(UHawEwN zG`s$wRacEJY1QNAm>b`Wv@&E2D_Hv(H{WH5`Ju?p^tn0Wc7WR_+&<&>Ik)}vou_X| zE}-dH_Ov^~@IhqmYH5pQ)Rla)+PFaSLTSArlH zq46*K5bz@ST@mJn6t1ZdrUE!O1jRp8xS@hyVH$M-UM50?fI=;N;hufp3e%{43zdy3 zw8bdkIl;bn_N}FG%f2!D5GE|?KR1MTab(KAIThfEQe?dl%%hbjE31lWf;Ys!U?IdP zbI>5GtWfF_#5olX<_Ie-Sl}QGSDb^-Vul5!k>-s+wHVBB5a9++!}%~@j~pzjVnG%2 z8fEXnC$e%JObCeUNM2d6S~Y6)IP#+K7aJXp6sb|AMw27Y)Uc^BphkllErpGMS%D3( zPi=+o5XmYF)@;ZTyv8qfsnM6}w_tHrf28^=wGF9lN^MI}^nsDb82^Ng6Dd){p@z#5 zSWyHx_ykxy7^Pq8>`-SmlCHI>;8|40xyXH7RX+_l!ISzK~hdMrmqQZEGI-4A~ z8P%^H5Hd}U!-2Zg0l{KY2c&M7<0Xzaq&XMlOygzhfDMD)Lu6DXAe?lI1`!%0X>iMF zjB$Ziz2gO1#yC)t!CNP^9G>OsVN;xCtxHS1klMqdAmD8aKY~wXe@QXK$j#$Pu z8@CJv9rSXOFiiq9@zW&A#-(&F*ub9)Gh|mrjM3r82uTND=8ofl*)=Y$Xy$V1k7iYx zHE8xqGlyn2mw`^fV1LuB%jG>T?{XP5-5brCGy$~0@3y!M(g5TYFh*Z`Fw}J}Bar;! z@;;Z4IzgX*;Q0!dmNYY^6QspGEyAk5t@?+w2q_f!ETXiyq6vU~j25@Fz(6IWNLp+S z+3K_PuKIu_$f1mBajp6uwtBPx-PfhXB`tt?I&4j80j2`6YKP0vvB#tzmwrO}57K|6 zMT9LRPmz*Fp1Mtoe_Zo%ZI5fG^mWd)WBNLxFOR~Vs-1ByNMAejbwXcW`r4 zSGbK?;Sk#l=o={{lfH}eT~;HEGq|Mh7jC0@$Sb$QGOTeMfqalrCA|jB^E1+&>tk9U z(Ar09n0J_ZL;)8v{8VF{aLyQBwl1-=$xeaMD+Y1`2iyzj)-pRgYK&@b4-j$0`CyL^cKKkN z3JE^gp~3?nc=%w8gH^)GCh%lbAVzIWsDS_hi7nXD4?;if$SX%+8*7a5yR}_vj5$80 z&M5)&bYS-Y4o4jCQwMerzz@~aD}iF9b4-IQ4W4NLTnE(mK?4NoGwNdR!*I|m!S8CseNfYSq)54e1&Fwp~(+7_6y0SPyz+yA4l5Pe;94Lbr!sFE5&iBXopnpTi- z&uKYUqgyo^3PJ$1146mMPl8>L&vk9pC{~cfje1;Ydm)(u6;f14s%(}DPgHp110Nq8 z^8sS9XFdRWPxHYMAAk^Uau6YHje~7feC1$EKNQ47IEEweI7p)`IMQH@A;!>|NQ)z& zFW#wx{Kbqq=hOjt{y`m78^K3RISv~3TeX&)1}6p{Y(aw;8W^1ZrU3vgz%6huj>A5G z(j>)3fl-D(Ni#$s4yBSW(xmqCL1rr`qKq+HNO{nm!vN<=94%jgoZWXv#GEpczp2l*{K_ z_R}J(`p2q&!mnHWy2-B_j8O|qq^d1if{0tu>XTgv#y+W#RhVfQ>~hd03lE1Zq@4aZ z0@U%t5qzJu!s+`xBKg!zU~z6b^Df^ z-wG`^*A}Cf)Y{bGYGR;pml_WG0LZPVvM*G~@j-wOz@_xb!lO%8kArv&I5<=m)?Sy; z&kD9W0=yBS4v3mL4Jy>!q|OZuEETxgf?Y1UTK1dNfTVCigNxG z2xmw^CYA#EY*>PiLiKL>QgsWeo2S`Qb#pXZbNPa13!1?Tf2l4)m`~L$Do6#&S6u!_ zvu|4DRsUQeYy9fv*FApSRgn9>diWLI)8JP)tOu^$(N}`LV)PZKuPA*zGK6YN^q2eM zMpX^p)DTg_f`R3hb2Y51VNC(IL&k>qbhV@v?$I}`;3MLU&DH!-qXd1wvHg!7(5EMC zU(@-^+B*s=J_GZHz(ZEJ9O5$QkpjQ^`4yHEH|3IF&uQ_(wI~BZ zFX4sjv_gqll-BTlSY}rQ7!Vl~;7W6!nqIl_oXLAf^U@d}E_Y9~(6L<8p)+ zWq!qusL%qzX-T0(2=c|Rlp4V1JSuGJfyFf}k_6Wf1OBQZfW(@X-;5E5%|CAbDvah_ zL1hOQj}C+=YM!vWsW2xr_|8Fis~Jb8)B(8t;{>!5zcc`Nb{OgSNu4GL6N<+pADq}xD40!P<($yKRiJ7!r=0O~=8Q8))CM>M zHlxFk3QTa_TFM1`)>E#RjgfM3Ns$!mtH&i9u=WZ1@X`nHZIsLRs#~Lvebue2Zk5Y1 z`q-flAOzrq2m0_Z1~h-{^6RDQqJ_n;*Zdmh z*9gCcXi=pvIE805sHs6q4cZFpZP1{v9HWhVEv*LFj9AhsuKl03_kfCGjn=dax~az4 zreoFy5l|69F_H=sU_=E2269Gnjzv(wfFu=_&?qVxK|xUoMG{m5JjZjyW1!)nqM|m6 z*bUuXd-k1sXWf~9{+T;>)*6=2df&ajugcC9zGTJq#*;ccGsIWSoqG_^30+kpun(jL z_n<4!!I_6wQV!S*?Zm_DuZTHZpRHV6mC{L5B~pv)gH147R3dTe5^XN78ivb7Icf2n z=JA~7^Kiw$NbDwLsS@eHbGA^4bW(}LeuIuY91n}*UR_L7qE@Ixtx}0v$#cQxv(-Eo zii`bx{*Pb?mx@aTXawqTw)UT$nq@pI+knpu8$z2nAp!_9+u*b?oImotGXK?_xa7V&U( z?;t!W@=^)X<>7RTyEpQ-tm19KqbhbK#ryVnlCy({BZ7T&RifAM=WD41;VKw9Jf{UJ zk=SnN%yZtzbKam5WyJNxJ~nucx{K$wnVi3zR9{T0tCN~;q-G#j(}Y~)$k+8CO_q_k zz9FuQu{V%!yM@%)!I`^*qixN1H{)pAkT~81I|r(7hnqUm3)mA{C&9;Aj|gHTIKQTe%wh$OXn6 zeGL-Fqv?l|CeftD0@7k3X`xSAEG8`sxHzfQzJ28O<>WqFp1K2Xp({r{nw)DuE?-8P zE+kELI7|Jx%R|ZS8+q!XJUkV_9d6&PqTxi&H6pj$kruniIqv)gI^^=r=&*ALF_FNxQTb*3)PR`xLRbQ$yFNm~= z;;Jv>YdLWinvpouFODa&T*fhrC3hH*`%OsgFEov6#ov(k9Jt#G)^W;|Fyd$i-HC9UXE-0B89;(rh_trbBMnNN&LAYtPfrCvh1> z^MyPOUA~njccV5BS4YKpZgtJc4ZHb!mve9sF)p0CI*_zBRxw}A*TIM6Lz?X-H-wW1 z_K^!URJ1m7mza`fdsHYl?pzCU-Xi|o?OZJnj_xvYk4Y4wq#KDRB`#8%($c?V#MrW?60co>= zw6Wr^2`24Kd2_9JbNBGAJb8L+_&axTcOBquoyWs9Zmjo^3mwRX2goIsT%3D(tsZG( z%im_g-?>L6DvGmnJ-OPETipU{KfOgO&0vM zF5Gp#JTqKJdoH;~onu0gOCq=n)~Oh{lACsMO%IZ5mhd;~@vNgrT|*Uv0RApxQg=P6 zYeE{}zr`wgTKt8(Nkd)Ia1pu2lH3%@$7y8rH3^E9J)t8gwjW71$F z-^78t$$^J&wBcG3S6*9h&&9SmeK*oRgr{Z7(=z7i2k~)yoP!1*hjeLe;jK1SIT*uR ztjjYr;O@8OtzO4jw2L%w<5+s}aS)A`7f;KR>w>?%Tgc6UJVSH7=@Opd2A(BOBw|eB zj2XMNxjI@r?Ros&^GLk&W{L9~>yq=LxHtiwt|!M}n~Kpka*HK@od&*XeL^ zh${~5TxY~JbR)6b=Q?9@oe8) z;ZO^A9dfA!*UXA%w34$=i^QRYhPaZBIoCXzy9HN!!F6F4@p0mgH4eNr_MCmXTs&l0 zZzeUZRrGPz-$f)&{=D9VXN0pk;ffV2Nn@O;em$SUS$r*c239qv!COD z>-XWhEfG9}AUXD|k3risnASLE=a*W1RC1M;%&| z&Q@HTjeIwp8VHxJ#;K_G@RmmMmSW?`MsnL65|?gVwv2(oM(#D??$qGgVP}ACJX35~+{w4aPQsDAy$;;H*h#~c zYrlevQxM?rv=BVkTE;&Z#xvbdnwxSxtVpagZz*TLo(e8Yw*`m6hVksSq~0a)FSSbh zU*!M%FOEp*#w=`#*<;>4c11VgL9M=?$=-gak}2z`bPRlyq_x3HGB!a8=nN&66)Fud z*Oe4dsZ=FuR+1_HQW6eyE3vd#3FHc;lCTlVAepKRFb`R&ED@P21G`gMEO1nYcyA;` z8Tj$a{gA2*RF3kH;Iguux~)u0Ym|GbC(2Q5hcYl9ltpPjlo>I>(Tg3$VPHB3?B{V9 zb~#5exRwL-4i115$MnNN^iiA-kb;`cVc{}IOqX*&)PUvBIm}=e2V`Q7f>m%NFq#X( z>Bu}T%Pi*tyPjJK)?5)dao;n(TpD7y5;)EU>KwPX_cHevlyh-ET-*=$tGElbAL{@r zU!|{OhDuC~whG9Ws|aANO3b}2D!p=B6&5^HfDKcDj>9U@o}~g%s6xw2u^yuWk~S=R zs{)EIn3t;z!blS6X{6jjgT(JTvYG_gP6F#dLa#6SSaOIyMk?sDBrwI8uOKUAjim3- zHjwIGXTb;n!x13fFk;}l z%?S3b;|Lk}k1*+s!rajjkd{4y9=bSU=ymA`3Tm)!8`3#KOn(^xtPK6AkszHqk_GLN zjA+?NP^=p%qj!vCitI)TY44Hjhp>@pLkS~$A${a8Hg6=r4Wt@r9Vwz;j}*ga^ur@7 z#Jo`eQxI)r#i%-1Gm3@nqrQPXsxRhZM}atX6o_(13E?Wn4>13D6az0uDP$io{xu3D zDx(2@8x8E-(IPMyoeb1ymfkWNV)u;(vDavjMU1AHq|p*MHM(7KVKgXijRv}QGz_%i zcAcXsaUZH|G%zE_h+*0ou}pgmJ{H7cOfPMN>VgE10eJ#y<`^2zqu#>0wW!a=fLMeo z9wP%5b?jIH%oq!z1!M8`MK+EFi7l!p5;2w{=&^E0MV~j8h3lwQ$kVY<@oKC{{1Lqr zQRRbZ3Lk`;e1K(q2G*h4@ImH`8iXWbE|U+{1$?^Z2A_s1zC!VY57bNK1D}OKei|r` zgLh-cfn?S=0A0ic*@7GxCxe6IScn=YfurLXIE%R}$o+93el!l44)nd4|1}OoD&r-R ziR1CNb39ZmMqNE#2HVC%!~XFS@E#A6$nlIM1@mXdi=b${SbPWlL*y?ke~0=L;Z6XU zgv_15lj}~9fHC^b6JT&Js@DV%M@#_z;R!69#Q5R_8I++mAkUE=jDKJqrHKrTn~0zP zi6GNMr4TE`exgF+Gf_%MOr+W5i4r)C<(DRcqI{wZ8gQFGFxNeig?_9{Op++ZPLjc_ zNi-~+1Y)B}0GlR(lFg(zI4}t$2Pc6dYLcnx;Yn<4CYD{81b>yFGD!O*kaePdL)b}T zX7q0WGm(XeF|zqLp!fX-GB5Oz$Wi1Raus=iJV9O|pOIm#J7O}3r%nc$_GJ8=Ar{DP z#2pEn+zf|MPfi9!;bf59o=ig>#=lPnrfYHqd_&J7W2b;@))X-;oI-=q6qs!>r3-dU zVZd<;KmZbtWK01?0cz~7>iF`z)i0V{;smMHJYPW7vdoht4-Hnmf7X6k5O-c-Z-i&H^XHkFmtO{It0riym`jr;mE^*j8U z3JuEB045-FrU9itjXSUcy#=xxai1oFP}C&kG;(mZGjhY!H{}Kn0>EAeqyx>Wb+Js&t`mk z?lwaKAv2&SVFpd5%>YS0mfb{ZW>6uIXMp>Q86bK;1HS*50qw+0p!qY0Vb)AJ=*$E# znyG+|n6pLiIdcfYX38LGCP+@r1ldK*l_QOqdyd*OlVQH2D$N2IKZ^miSu)8Y^ro}k zwr`yE26oRH0M}XI7c`54_*n`z4aB5Orj+fIe=7x(V4Q zfMyRt2ZW+e5`gTK;31qxe+#L@vNqIC0f@h%Dv&X1-7rlJV7?kKE7gQxt|o(>YVC}Z z8Uq1ppol|FQ=_FhSm&A=9IH@cp$Yv9wKT;)s6W)eo>1?H(dzg@f9TZ)t{pyTdp$@&H=Fl*Gj_9@a9EM$ne%%~ktmgnY z&w=m$bA}*x4g;we=OH)d&}=1Y3zoe^{fI~rRSo>iA@ei@>{8Tqh>b=cIH3k22}q_! z2^64~BDESIYDX0zVyve?9W!?bX3Pc9L5z@1bMd=`>NOXt!{>r18GSZVG*2bJSg047j3(Acv7t$R#Zil%qCk!KPp>h?=!P3>OwKlF|hybZnfa=ou4qwqLkTDAZW+A!@E#56dU61TUTo-~xz`{om zjs7^2i(FsWGF*Y$jC3Hq3&rpYmDI)Oqia7r2X%=q2+dHpAr6SYt_*0@G(?D$=z^q1 z7Zj~n@3k&Nf6|qJ6l2~ZJQrKUg4QAtEJMG35zShoIwL_y;vx{FqZTYmhU=(R$kRmw z@Cx;vjA zgw)69f@tZ3XqkQxVTgVsvKR3}BK5%{NuQ7&L!X0nuA)9bp6G+dU;4w)gMI+vEXLnR zL}M}7>MbtlT!G#K*^Rg(VT*xDTI};P9en{(iqs;{76a$iVirE3A3{bf!RNFDDD5S3 zScZN*vJ-J#()`{Jl}6H*fFd9DCTcZm>k=`%SwchK5)lk9!DGGw?gN>RtU@**wgw>f zFrXpKU_f>VR-rvWDrqVMiHZy)xvMf05p+h$ogf#-@Z&uz6ZSr z5{{%GXOQA$AiTTmBGjS(9qC5CBTCEhxUn2)wdFg-I_Qm%O~^jPdpS@M%PnOI=rfTE z$Zez^`C~cVAwm@+fbdrU2v$I^E~*K#1v#){2)t3FR)FFt>N(^p@&I|V0?%_-u+X~# zM87a5SF-TiN=Tct5rPLL(pOZ^eYoNe8gCa zsG36iWK;Yun}T>5>Uw0SsT`b9gOEg11~N?tpa6X-Qfmso+E6=9LGslUXgSs$Nl|^1 zDclDI>iU!%Oew*4ON{qWYrz>chyqChY9=Lw0@PB9R@9)jQ6hLtN#F~`fDGeNX1$WB zW)eor3_p5iK(99g*2YW(&KL(FiAWYwh?HS@y_s0pj$VX_&3ZwBI%c&5X09F*&O=?X zng;XLAhcNx?M|zOBEQx6TY&i!s~IL2{dJ^jbr3vWErOTmKdy#rgQzNNpke$PJm*>i zqZY1V!DtQ0Hm;%iZ7}Du2I!zQ-yv=dP$w|XM{cfJ0hOpNYZUMb`GkH5Rdp>Mf7Z%q zt+gyHTMMt(Vr-2#uLU*`HDN6%GEmPWx7Jd?ptd6-M2x^%8pf`}_jnx)EJQU%HY5Aj zwSyOGByx0}5YC_$ufuyCsLfdSFVy$zX!wcBT`z%&>seZTJwg1()Pl}>nPS!Y3YqzO zJl?JsgX?+)1g{4=aXrW~F?RvEy&j|tYC9rA#0ad9f-&a!9W|FV&o>vtN^_aQ9OGT) zzrY1G*qnt#bKs|$%OMZr8|HLZ1!}W7@cuCGhfeh0%qOx^R8N3EtUzzEnTB1cZb;~6_?d{Bg%oZE>egl! zYSBO2OtEiKzv6as%#GRtFayy+jF3&pKExY|+9HOdTiV6h=!>=p;STD~;~PVtF2N1F7DwU|Y6};T7)V6P8K03w|o^fRb@L z@ZQS~u+l{}LALCW!G6?(J3tVzgQb&qK<_DxFYORX%65p@I`qHq7yuEfcn64C)Unq1 zJA*8;2C)h17Hf*IwkG}?(mmEN=w=PCgR$(8HDslu7FZ9!O>2-cD5LsaZB6AxM@3esdXB(gcZGHl6LqVzyu(?=%9jQW|B5!PD&}ReLQX2+% zI~9V7JMsK*Ck;z>iedFmV7KjrVY{6&@Y$(==$+7W1k2ANS9Ze3JE#wlzmWIHAlBjT z!uwmuTx2P-4zWR8kYMBxauT_Sl+rc9*|AhgRdj%a#Zs@K<`9# z-2;Tr9yP)j_lx)kU@m@-5YqMt|MZJUDG@}1=4+}l00|>_!KkJBwE#5!3l`v+u z3b4Z1-WEi@sIj)7cg(gI&f1Eg7|SYb8ECSV!gE`o|H1Mfi1J>%Z?u={nt`f=7$KYX zf_N{g7ZQmaMb7ON5W>C0e?xY8uNdy^6;btjiF-|Z*_!8Ar)MwNe@9i?hp#iDjx0u2 z@8b|__Ywa_Eo{Nu0mNsY2%=GsBf0xza1FI`-vB(`2kcAq9}y{{x*zzH_7lW^2h7}$ z_m}pIdRL)tKx`3DBx1h=Qc%zAXP{_54R`kg^AO{|_5=G4^(W>y2k><}&REdQ6r2y{&#v|x`QBA(?P--IM94kEc=g%giQ{3>_EI7AUoUv+e#dOI)&T* z@6jMqgSCh=4%NplIQ+&dcF+sF<=~)N?(k$)mBSa+dWT=1TOB&OUO32abvabo_c@q6 zA9R3U9LN1fM>>WzOmZBUJJZoVLfi2tEOlhRt#%ZIY;vsNSUcVq+BpvQcsep{m}7uh zv?IJY;>guM?kFug?Kmhn?OqIs(7m@pSDYM;UZD_P{&GWQo`j@SxETqnyG< zOmxC?E~hqFe2zHgkTL zYU#|j+Bo~k9h_J6dpe(Bf}NjT~|eNS%w)lwF2{#<cR|HyNCy$xYRL!x}-5(F3I9P7qNKArTG)b zwMjhI^)t+H6~cU1Vb4-m;G4O2!)8~BY_DtM1bbItd|myNLR|42$d#fpTuJdcSEjef zRk`aL<|r!QR>)l4B<+E2a!#ZhoImU)5@x!|;JjO>%uVAyC6{C)H2gL5AA-WRlWPmo!A>aq5o@Y=`o2;uKZ zd<(^V64pKCNl4FmLVK}iR@yC3RpPcMfwTdGesTbj3<|R(sjOF{iK;-QOR^eVmTm;5Pyi|#! zUXzI9Uc|r9pYAmP`Ix`ywYIhlwZV(t+2%D``FAY;H}s!-Dc~P38oqnc0)EqixWe zKUL9zj|}$ulz@j1L-_d+-$HyKp7sHYV?IV7 zPx{b$1wLSZ)8|lfxzA)#jgS4RM?ST@R-Z`PO z8^@pbH6FO;>j(FJGoaBoZ1|b)V9{&en2|lc3g)|SrbOo3y^Q0h0%QD|VY*+BP}8r$ zR@ZM;>M}nH*7`~Pw)%aA{eIf4yPq&N$PcgU{n*NMzdp$Kqr0#8LHQlO1YrDt-{SWU zI{d)?y&pF4_=$kU=O?*0pz0Dq{V z{ng=!Km0iDFV{Qo&r&!2rSt>;yLI*cV%anQ74p~q6TbEMGlTv9&G(1>-%;FvSkd@^ zju$fn#J%$aAYysIR#+3z?7KNY`f69e&G!xg)CJD~^?`r@`A|$iy(Bqc44V-!Fy>qU z^cDxqcvcdifSLenX>$NHJP)9rybS=!mjHoW5w)z| zN#Mkk^1$d1HGw;2j|0V$jzIaW?!esGzCek=ufQ0V6I3@iI!GX$9K`6&34$2?plsGS z2<$fov0xk2B5@6(tpb967DWZg>JA4rtV#_!U3W4lY^WgUo9sr=aOM3V@!7_phSt`g zVft0jORJusQM*0|$w3+fVqWlX?D*hOvKhgUsTGXZFTv2eE*Rps26K1Y1cS&q7^e6I zJ3vIR)%AqnNyMSxD#!@_O6LcgDJ}<3(z+HrL3%qF*t%et*AjdIUIc^WeXwM$IGBk3 z84Q$iNLTWRkkvoOg+SQskX4HLA+r9ZA?li|Lf+HsLkwVh$eViGkmhiwkb0qaNZ|e8 zkP=7;N$X1u!FGfYL0MslAmM7rv!kUUF#bV^Lf9N4m;4z*vE3o`EAWy*#XUs5b2FwU#h8>Sfqh=6zVC;(J)^ zJ6YHuj0k`G_oVRlcD3-=!3)Cq6-&bvdS>CxqRrtw9P4m7uC@M5n!n7_zq1PI5lcL?rDpG4gThj7U%{hy;37WG$?Xv|7C}67RPlUXh7xa3mcU9jP>$ zj%48k=JK)LjmUVYK;InMe*9VFJ$Qru3nGtXy2vPSpBTke`z9VHSuVlE&`Ngf^r9Z6A~ZAYV6I2#4+MNzQ!cGNGZjhfos6h)Li#{A1D zFzb#2;!~6|`#p*VBAN%Iq8~~pMPrj-w3xFnx*t|X)6wgqr^~lQ3l)2#f5_ahPC)cO zEs@a?Y*MsHbTYa&EhoC2E{={pdpmkiP#rDpeH7hKKaZx`I-{fReu_Rx4@Cd)lt=q& zaARDf#>UXZZ!vPvh=G2+7@_j=n103Tn1}S{m~q6Gn4hpW249<)#}FC=R*5m(+!Tz@ z!~k7{+uVtLmP0hf5(vxK9A26?IMOu7i_ zoWb|;aV3MZ;>@nkiGwt~IOda4+q6AU<+z zbG)4XGyd_Y*YR@r6u(;9A5U>5@p2J2!Aj0g5T2i!K*UW;7_iVt=%RHK1S(4tSb7q=%N=$mtbtj;IFUNba7pP>_m>QWNs$pq|GD62R@&fG~z zi(nF7W;7+($^J-yJ#Q1FQ$8dtHx(!335OGm0y&AX%(z4`e@3DN79mhpNuS4Sq$stJ3Z-Q(&y!Np5 zVPem&!@#&6hVB5&#UGYt963y!PCd**?qQ&>9WH=7hhcBs;ri*#Sl)413hxfTKlA1A zPrRYW18x#OV^mTMJvE6HX(f$k^^$sMqoe{@pA_+HTav)mHtB|+OH$`7-y~pTl7w(9 zsaW_8+=rLxz_(DN~w zVg{2%Zu5>WHW%`3TjOexwj`k0{{Ukrnd0M?kOPh!mb3 z0pjHmY^ysG*42Lm`(Paf`>{vmF!LzTI!A3LEtlD zN)nE~P)<4OAWg$qh?E@V5Vvq!=BOyNM^2x z<}thvgBTy<#hIaQI|e0o$M}TPF|`!eV^UE7=HiizV-afE$NHfVec3VWOm{4vs6F-% zJjM9UF#*wi4Ev598`v;(OgT=5xlzZVe)4fxp>aI^=Yr!btU8X@2FIb%2G!-bZ=Bb0 z?9X<5iahZ+!%ID`T66NaBp5KQQ-CDr95FN$x=EQD9SP>BtiR(@)Tp_6ed} z=fn`T;zT2?IRT>WCzg)ed7}3Hek?zDf~gBdO*+AdPo7Zv=j@5^a2Y8(QB?cjL?hF9 zA`N~&;rI0QiMRdlPaIbIbOI#O6BfWtJF;y=TIZe#X&+-|rcudSX@kF(r1dCF(>fzI zq`{v%)0pvgX^P!mX%r_gO}8&Ptq+c-f%t41#1^G}gF9(5x*<&gf20Yc-=M=^$N_J_}6KXWg|(XNGLjJ9O>R8NO%wObAY=*T$wRL2^0` zr_-@Bak@sz#dP-Q&2;;357MhEo6e^0kN@^?D+O-r{b{hkgYA|vYeks0`!WQ4`f z$%tbYWayPH$xvxnnIQvJg(H8wp19L{AV4ishp zeLI7$VKU~ik1`?N18zIWcrqWi0|n4!m6;wgV-O=CN=y2YQeY^i~)CNZ0(M~ygnENbG( zA+g#?(VK-Qa|4&29C9^1S@_xFBn3N9(%^DZN$Pd-eRJ?hDa4=Ly(U+KBZ2?o{EztVSM@&+jHU6Z|rsSRi~maG@c@) zk57THxi%PF9SPt|h(_osRqG$x+zqGz36R5$lD%Ug6BR<1hTT(Ryn!|XVn z9J=pxTbSGF-QvL01KBaB<7*C|R)rI%)uK+F29pb?_eWei{i*%#>0YMcbdi1AX?aq| z=}z&x(*vUKr(^HSPlw&*Wy9;=vT2bl&iB@c$z&i_OI*|5M_($uh~{h2D7_lkd6Hy&d@Wb zo$(}QosqKh&(N^)%tR}*Gy1jb&U}R(XFy)cyXg(cb-*DaX9-!;B}UUh_k$U`fR4;$XQ-)`dJ9iJv)OaIQyBtewLbj_bj`t z?(6`xpB2(?&W`@$pR;)4dA5U5oVD4ed@dbEpQBBuo@51n&}Rm#~G&dcGz_?$`X^qhWbZqB$Not$LB(i~MV$$=>wa%%ZjIoSM= zBUZTQj0681L2XzL!yL}35oYAnJk81Zlz%Bl2xU1Bs%vs$VxHv4;bl&E=RY|#r!VIa z4Ce3>hI3dLkz3F;HW%z?=E^y9bK}11joU{^tU`cTmtj3JUOhe_jZa&)bimeVzr~^YrYM z=lfyZd4Al6^DwacJRh9TOO(9NcR}cR@rn5JJ$}c}f9yYbUIc~bC6Zg`?PIIYV;kdn z#h8xscpi9OoFzVA55wm{GU5U#Pq-ilwF}U{@B$D^FYE#80?=D8{D6HICK7fRK<0CS zf#?g(aO6T6apJ--n_OAlQc&uxDrh2p`&@P0+%PfGP-GyHZ@IHZ1&k?CFZ`(StxhAl4&Xq$`d zTgQv-3g3$oMfAlFl9Y=oY{tb;dN~*SwF@uGk6yo+Bdoai85%G4NS<9xD|vl!kp6g4 zLI1iav*%orOU7Li)3Y!A4ht?(u<{ZJ)?cE*=8{z5aEY$*xfCObywnzR_|lAL$1jQ8 z&s++Cis9{s>2h*7%S3;fF;VCH2LdfsIaEW0chuD(qF z*m4=PZ7)Nz>tzrIU1rzDTn6#+%hadr%VXfeW%<{emqD-cGMsI`oD9#gPWNR9`gVCX z3}41Rc13c%Nkyi$Gl~?jphy6~PpzB9Cw0MapqLMcCejq!xi9 zx2SAnVNn-*qX?L)qF(Az5r=qEq+j_*5!7@QO(S}+-arw&Ac_~y;1$P-_{HMyGm4pM zn#BaAQ!D|)V!grj#RJs#;(lg-F~K+&_b`6NR`ST=iIEA#EMyeN{LC#55f>M;g7RW{ zK2!Wl^t71i`@6W;`(3ddeiTCoaitH&USZgoS7^|=BI#IpMRsw`74WgT67_oD6&ZM4 zQB;Io5e*)?BKetqSpu7PMH`n}f_0=H{Y2tuED4YJd()v29Ce-SCa zhHVO{h7i#}CCFw6z@;cDJUFUVpxX!|Y>)03hx&$^{2ma3M1RTKF2Z_1Ph>u+# z#Z9{oO#XEd+`wEl>eK7M>$qME-57trK6}0N`k^kx^$r+y1N({~I*8E?pf=nfU^{w8 zB;W?f=^NV0hi*(}PhgyX14K7at8ajP%Z-1a1AXs}Qz>6>B>en|o_mvqi8p~W>n8T2 zxk<5xHzjIoZsNTNjQ8DS!0RS35jTH862_-*DoJy({x$TKHy?27QUACJ4V|dpZh}a0 zQ;Ah6fzK04a12BVpVlp@g%#*6N<^@$q`BFlL=@vw@>v{F0(45rkRYohRxT`I^{$mL z-z!RhdRSsAZ7*r@{<}mx_@U%J43vBaq7-0UY0ux&Q5TdBNtcz1yUoyVD+QT-X@k(S zlz;&AaixiHtaJpCS~?6lrNCS*6;TzX{Uvp!1W{MY!ZX~a3+XQvfTC3RkasHZ$%REx4y%PTOi59+>KiTcyP@eG9D}~V_L=6~lAOn?S!@OqrA)mspfb+HK08i0#Ys;b6JwRd~4=lFRvi8RdG? zobrgF%jM$vrRCUvs{DkwrJU}4SsoqMQx2c{%WHrwhn`V)z<%1DMWA_SfL?M(Dl@$U zL!0lkcka2`S$<>_ZWrlJ&+jRgL(^$ zci$7SuJ?K&=-xMb`X1YV^xpU0Q}?1w3hs%a=#xE@jEIxgiWO!oGM|vPo-*{U*#u=t^|HcB}<*E z#6Aa=4sY|Y?u|;|-Kz{Gs?oPr4$SJPtW|VXQd2)xvUxu%pSjB``^CH}f$_Mil{cnV z8G&Zi6jr}#1(;Ng0n4geqpYgrb$hD#`Hofl-g#9ibV90x`EgY&q*eX?>~s|f3ae`2 zMpf8^J5{W>p~|f0Nfq9Us)C5#DjY9RB}!JRz5-*aMaQOAGn8hv-^4}LzreT}tSzhm zY2Q&D+jF4WUg%j(yN6Vh_oAxHAfj7OVp!PAXewM7x+Z{m1+fg>d5n?4IYu^A#P})784%Vp@V=ci=&s-EfbOaTwNG_we|$r)s3ZE7>S2gqFPJd7UTyO9dKTu_i{cj7W1pV- zI(_qcvzMFdX^u^OE!fp#6MFs1{(yQ>No>8eIi()QW7nsz$*KPY#r228x9VYAW&N}` zroQUwqk1^Xr7(>or)iK_Z#d@Z0m54OXi(8wf(PAr2Nb z{2aBsL7HUR&`xb^xcAkjp|{7rVgCV-2C6f-p$`%oN~jYJ3dn0%(RHZ-3U4*2LuEr> zd_%(k^Q-~J{oU{rJ~Z4={?dT$F%9c}avGtZ-zZu;t&ug=Y^)mAZ|oeisxfWa>P8}N zO(Vo?YZMIcYt&P6Y-B}#jXDt3nAVlpD2B{NS}ttl$6aj1bB@L(araOkHPVU~jcX6T zLH`B)a3jb@JX|dw|1hd+`a|f~dI)6(55)(lhq27&hvE|3hb-mx5ZZ$u$|2z)ElYn0 z7P$|x{r(~S;U4OvhYWN)9Dw)8z{6fpY697~CZW-cruVdVlYGUJCiyJmCN^wC({=$Jh9R3~I?Az`q5Yb7d<$=8?GHB- zklIX*I^B%@aho03lIGN`3iQp*)W_dZyPIi=xOoT^&9G4Q5ndBKYHw3}1Z}#HSTKIn z-){b>reWKo3b1=rLwi5^0pXAEIQOWpJ?jy)pMOL{=_3ih@=;Aq^CPL~`6GzwekAGq z_DD?09^t*v$9Rl;4D`ImAYA?!`wc$s__7_<@i9&NJ&x>&K!4;h#AKruJ)XwidJJVX zkB8vtV^?_j7{tAg>EWM`*}sSzO;o~x)Qx*i@WmHmN@aQ7TD+9vSPp&bFnQAO-U`-Z>8np&%733 zuD3{a?zBkXGcC`R9<~s~!t1a-|*Cd}$-FC2I(>~_aE?CJA_*r%;<>?zRao*w&n0du#XiVoB~og{tuR51D} z#&4buyy|@li+?(i}tXJKohY8#-*_HUwz?Hh*w3vp-p)i@XZ`ILm8mLX$*y`dE>JZ$Qd$*>*;u7&zOCx7<#5%- z&u6QiS}Ln%|GHf@==0O6QU5+vUA6qFdfOxjYQ8qQI?~v!Ix=ujbtE#bI#MyKI`V6I zbyHn$b+`*s?Kp{5hd&ysBXeBUk^KeL%_HSa_w8u9e!M!P@nX~Y&FZ5cpH+{He_j14 z^1aD!SreJnwWi+Lw`OU0NKGU>zNP}6S<^PWs3y_~)kG}3nzVeZro|~)O;aqdCNd|d z=1Y8jO^ZlblfAu$)oNc&c+$z5s88o>A{DhYf6^Y-#6;fIe5?FkbMRz~+UCuoYEMOC zYVSVnUHh?MNbSSM#M(y2tlFo?m)3?O)Y@Nfk=maYdF_tB#@e!fnYAA*`L#c1t*$kH z-da28_kr5TpL4aAe>JsDIfB}z_+9P8M}KPn{cT+r`PZ|~ERC&uU>RFyuuQM}@_Aw1 z!w9LaEW)V^H%jZi#%SyMJIr;1ELnAbEy21sk#%(yr?%G3DcWCWiJYtRhO6olD{t2^ z9z1LMudj6nzJ}`}jWPAw_kHSrPK&Sq`!KQo?Z4Ue?8wUc@(5g?7va}G`6#RZ_}f$; ziOH-FUkud$)|J)&2ydyM5;<5OIeDS}S)`_Z!n?cmk)oINKegZL>m$t@DkGhm7|`&G zGPL2}(FqM~L*L@wTRMVUta28hK49n{eEU%=v%X?)+b~8PFlp9B2V_jKmG@7wH=r6lop- z!b1lq4917~5n}jYGbl_BQ^M3RGtzBvVz~R@3E_W{iD59@Cek)CDLgsMh$Ka(gr|nP z13iFg;pySdKo?*}cxJdA&>ol-o*ixjv<2pb=Y~4~F~Gd={BTF06R;q>Fbs$3VMdr4 zP71Tay$AOh+<)+Z!2^JSz@)+B2S-I(McPGX4Bpr*3b>k3nXoruPr{9aRzq73y_j$z zVNJs7gyRXv64s4x89RIMzsQ`(zsR!i^6;uKF1#YVGRzKh!rXBCNK8{`<7czo&HBdm zj|_|qhzR4*I8NNaIAR<(4hi$Z{IDP_49|=k5jQe!L)_rFL2)PJY9>@q7!@}*Zc^OD zxVb~;51lu(?NEPgAl4U~7aNQ%j4g@{#U{iJiEC2EL^?%gMxrAdnso)%He1)MWn^$9 zDz!IO}k;7-U&n3*s!VRS-#LjQ#Pgk}jX5(*MJBy>*bp3pl% zk|0fxC&&`;39N*a1a88Ugr^D56P_icCMXh=37sQdB3&chBHbfBB0VF$BE2JhBAi%m zEE3C$<;MzQg|TR?C^k7Z7Kj6e0P#QqFccUD3(L=q$8BNHMMBabJ>rkbiwZ>LM-@Z`qY9%!QAJV3 zQ6*8OQDsr(Q58|Eqt-;Ni&`JGA?m-VjZvGTHb?D_+7q=mYG2g;r~^?4qYgzKjye)` zH0oH?@u(9~C!B=$_~mDoG6Ph#K1eu@1P2P6(m9F#aXF*Y$SaY$l(VnX83#9@iU z6GtT8ZgIKAl@=FUTy62cpZov6qZtmyHOEEa7T}U_PMimK1UH8uAczT%2+fGii6z7y zqLa|uzzKg0#3%cQ5ILDaXj9`G<& z3F8?A28r>D(TN$yoXSjP-cNd-^f~EE($}PLlXx%8YR~S*UWIhQb;iZu#^3!xGT7;xO2D#gn0y%AR$Nz7@?5xgV3sJkEAxl zMq*Pn4zVX`8fhtM3270DMM@`KC0!w1C%vPMfJeb2;W048=)#O=PG`!P-;#{12&+50 z2m36$4Kf*7f#8sFf=of7V7=h5;JM(FunjsK9V|w~dhu0po%n83zqyH+SUyrQSusPg zL;))pifxK)WglEmTn}7#TyNYA+$tQ1!{MIeZsF>1^|%JyP25x5Gu&<51Kc9QLP8e7 zP1r{GP549jMQBG{O{^fcB();-A`Kut#4RT+BXLO_l8huJ9VLAvJtKW3y(4`fy(YaP z{U!Y(eJ8yoy&%0IeIb1&eIh+4y(cx2?o#ehdctGjL|6rDU^2tOn8|#V^fKv1QVUiT zOUW{^nzMVed$G^6+aV+bLWl?f*&ui!7>kZZN1~(9F(^-bUEBrhj7`PnVRNzB*iJ>d zGD~?+^+MHKJxD!VJwgqr6V>C@6V%yivu20pq~?R>uJ(!ct9H8ngkEL1Y8Z$cgd^fe zxMW-rZawZl+y-0(*B0ypwgY>BF<@t~3)l(#g8PAM#C^hj#r?xI2it?o2ulcy2}=ng zLMkDLu#3=(*oD}Y*pb+ixQ^I{6iXURl9N(NZJ|z32dEv?8EOu-hoYe_Pz=-tih?>q zt)Q;ZBgzBHeaZwXKpjpULmf>WM;$@!1NViez*FILSO+^`GpvX0unnd%XpBsTi;=;| zV*FwBWa^m@l3KAeEETI0yC3^DyMf&i>43x_oe>_wKxoKh!E3=Q!8^fw!586IVOw+- zIuT7oC!w)ozSt=4i6voF493_P2g74zjEga_RTvJF%h`$~MVjWfL23GBnrv}fj$4{r zqpTgQU9A(W7HgI@+v>4CwY{-@wf(hqu=leMvPdzxMBoavQ4x9|aU=p|#q=PF7D+sFy zYQh1+K|%sCo;ZRyk~o~WmAIL>g}9A4grp>?NdurU&_HN5G!()?!=S~`0%!uX6q*n9 zgGNBhp=r;37B(=fLaX0PKc0z)1`ygU(|5+>?3?WC?9c4C>|g9R?5;=`BpoS4 zf`}E-AX$h6aU&)q4bdY?BoC1xAw-H4AOXaWIFV_B8G@;T&w_74Hi|<*6ps>6CQ3nB z=rVLM%0Wpe6%~jp#q%*1R)pCw7nX%(U?o@zX25)y9P?lzEQsY{X3T*pury4CIWY~E zgXLo(%#LZ~Cb?OzlOqbQf}=R6IHL$EN2^Dvr>Li@?V698r`pr{Q~Hy7jiJ#*wgjyK zYne4U#k1H$_LO<}Ir5ynIa_nD=MGkA>z9< zY$5C@Y$og^>>+F?Y%PpI+oKXR8!bRn(Na{2YSB!z3@t=us2sJRS!f#SL)B<88bD2G z3aUVdh=pQQY!P?E`e9G8SJ+o@Ic%+lGC_?qLnsBdkE4E6u6~~Wvi_3ZV9*=>7{VsV;<02~ zT3U}-H(1wNcU#w3w^}z__gS}CcUqs@!nPRuUVE9n$iCfv++JZnY~O9)X5V1nX+LCN zXWwN%VLxccIa8ejh$7e3+#B9HZ?$*7?~re|?||>3zuK=Yuom5(> z6G4J-jBv1Um~fnMkZ`y#Q5Y}$DU6`C=x4MJtwP_S2hg49cl0&-5j}@iqx;Z1=yUWC zT8TbDzoNU)+vpSYK3apOh#g|5c)z$td{aCKyNtD$jF*g*%#$QYI!F>F10}sAGbFPl zvn7)y{UqP9X_8@*sgeRR=P{olUD*Qs?HrzTV5(p=J9(45tr z*EHAu*8I}6)wb7$HGeg&wfD3wblr6wbTPWc`epj1`X&0q`Xl;keU1LA-eRyBB8Gnk zv#Eu-rMa28t+};1+T6-K)skyDX^FOWw#HbySSMQ>tk11?tY@v~tkG4I9IvEE?ZVzRvUKAF8DuSGkkaaaQtU57T+G<2j3h275o5>!H>j; z!BP0OcoShgVFO_;;X2_O;R4|*fkI>wAtHmAL>x)7kSa)Jq=%$eP-k*;@)Yu4=sENS zYDNA7btk`u-b0U}w&V}c8|VczjNDXt4s{|&QKPA6sCCq<)U(vKv`#P;ronW$3%xhJ zKYb9rAH5s>9Xyymgg%0vK<_|rOBXX}%w3GVj022)j2(>qjKhpWjA$l-NoL}i@0tIY zjm$U9SIke$AI#=S-w0dXIXq`ndX-`mp+p`j9$XvrBVDb6s;o zGeSE^J6Jnh`&tX=hUup22Iwa0rsxuMV|0UcgLLC{WIbNb(X;gwJxiaYr|RkYXZol5 zm->hL7y8%wTl#c^%W&J!%Gkx2Wr{WTGPgIkGY>Y$nY)`in|ql1n){n$%ze!L%+oDw zOTOj2<+P=hwYRm0wU4!zb(VFG^|Q5w?US{o?Y;GzwUzCc^{cgw?Vq)s?XUHt^}X$# zt(m>EeWZPqeYkzJ{iuDEgXn-9%N!3=X*dJkjA!DP;1}Rm z;_3KhcmZC6$KlC%HC~0+;z4{TybLeFGYJKRPlObrj95dwO}s^{Cw3-vBK0B7Aey6)q;HkcH%hWEPoAUO-+>P9#&vAel@aN9L2KlE;#n;MJnM!U$ZBK1W zeMoIdYe#EEdqjOk{X=a*n?(Cb{Y@PVBk*MUJo+-ake))HOP@(c=ydvG`f|FQaglMJ zagK3@aguR?(U#eU*_z2=GMP!t)=90BIwti?>X{Um)Fo*|Qum}jN%2X;l6oaQNt()< z%$mTO!aB%0#5%y*&pN@H#Gb;YvN3itTg)zGH_0*CA@&;fYIZ5x!db`3;;iOu;#}qI zXd zAVI01M6gXzDYz=QCb%I;64Hfyp-3ncvV^~dH;MgFn`ozKttcScFS3XNMEq9#PCN?Bl^m0NmE4x>kvx`MlRT3&O8!V% zN-s*TN_I-BB|9V!B)=txBtIqJCFdnIlD^XYk~@;Ol3S8DlFyP4l2?)ol5>(Rl6R7m zk{6QS^0uk%Qvb<6%4aFe3Y((8vY)c2vYWDxGE>=7)lLNGW)yP7H5+1i=f$=a#f=~}UFfexn==tX*ozEPiN zC@>5*4mb8Qjy4W8_Aw4Ljy2|)3QYy3#pVU(RP$K#H1kaJTr*&vU|wh*XP$2!Z%#DN zvXonjE!QkJEH#$?*5%g4)^WC;wjs7rwh=bK7H?}|pJbn6pKPCI&vleLLJpl{tt03- z?%3+cbGRJ=N0wu?L+da)Ob(}Gql4^BVPABfavpG=bMALGrKg;`ojaYEog`Pe%jMeY z%5w!>Ij(G1Aj_LI(mlXE#GT+ybdPZla`$t`xtDq9p3R5s;xux;aYWqDoQ~Wd zoVMI%+^*a~$TDOd&%>+ao#MUbUFKcjUFX&Cp7N@Ak9iHe_q-204euN84eu_G$iKt; z&0`6K0z|+Q_ys<}PJvV?7pjCBp-ku(8iZ*=tuQQ%2nV49&_AMj(Ie3<(M?gyAv@uqq}i6O zB-LcqMAbM|Kh;pxa8-hOs9LN}Q9n`NRXK zrjzMn3~dbU4J{4L3?W0IA!vARcxqT?q!$#4_W}A~V@M z$}BZ2%v`h3jF{zSr8%8kXQ{Wew-T)xR-0LuLkGk8 z(0SYW-dX3o>wM;{az1cUU8h}VT)SP4tYFp*H^)tOv)nV?^W2b|;l{fcyC=G*yC=IT zZm!4f+37jv+3Pv(Iqf;>Ipx{sIp{gyIq5m%apz>@*m7><+|Rk1b0?=d=UUF)oC`UP zxxaG%=9YTL`X>1jeN%noeUp7H{NH_T{b3)^FYs6TyXW=D8PDB50hw)}c|b-5k49lsyH2fr789)AMA4Sx`S6u%RH5pN-CiDu$M z;tS$4;uGRi;yBVn@+)#J`33m~`5yTqxtjcx{EYmOe24s)e4c!P{G5E5+?Cpm%Ayfy zG#Zsgr$IC^Z6!@YTTVl0MA`}(3ZJH5reC9&Zv5H& zf&7vDG5lHl(fm&Q{`~Iz82)5_Pkt|cD?TQu5bP2Z3bTZnLYFWoOc#cPIl?G3KUtDY zPu3=LlA&aEGLURfUY;yU7ALckNy++TXL3?9FPV|NM63{>5}y>;ivNk%N_R?Yr3a*E zq&{hx^rG~x;RyoN=corAS$LP7b)i`XDekYx{9n~t5~XesyQlH#ZWO-8nsT{O!GX7-vH zW~n9Fl44O|l6n$>Adx2D?UHl0miliHLvu}yC?*o3y0_9b?Ex;A}QdSbdd zU6?LTUzU!gGty_KPfF*e^U{;kCFzUPSx%;t?fmWRmf0q=b!M~7u(Q$GA~PzpRc5

=ep&(?|SUI;;MJmxJt90W{KSjx6&ob&AQob{aXocBD=d6@Gm=VQ*-oIg2la-QY9$k~${ zkW#2B)D(6ObqRF~wF`9(bqM_peGB~yg+qIbb{Fj{dR+Xv)L!1PqFcq_ikJ8g z_~-Zr{CoTzd_BGrUyc8azkz>^M+jdD4x*iyNZL*clbcccQF>ASk-Jk`QQA^sC><$3 z$vr89C~YX6DL=@)sXeJ`S{ltk3((v&JuQP~rv0NOz;SRqoB}7qkLfSyujx1G4fI>| zr*t*r0plg(G2=Po1>+Ut3F8^#AtQ!~Fw>JVlNc->i_D_3AXY7_fz^(^m@Q`?W-sB+ z;jZ9nxd@lXWpn9V8duF7iDdF=e2BlEuj8}%20nq0@+a~od?Q~WSR=S8Xb`LwZW5LW zOOrPx7bKrf-jQ6Jd^Ncw`C#(V85$Cd8$d*nza@! zS9@Alq1&k2tJ|zwr_0rQ^*Q>nhD5^_!)C*K!$-p!V}UW-s5TZF%Z&L(uknyE)0l2N zY&vc_VLEEwWiB-zH=i)CHeWICGw(6)HXkvsHJ>!^Hy<)@H`kainzxzdmPeMymWLLW zm2S3h;k)32r!D#YLWHL_1pE!_0RRn)i>*->p!>0 zUG84z&T+4C2i)u3TihGmo7^F{-(Bq9=uYwEcs!n3PqnAUBhD$xDaiSo)7{(E+r!(< zyUxq;(R@rF&jsR@8dDgs)yii^+&zKj;E6v-KXUg;E zttr@4u(@De!G?nM1x3NqU`g;=uqN27&{UXF_@l5_sCQ^*Xm?Y3xn)s@qP9h+i*^?8 zDt=KsuVjA7x6&V_UrUdb&!|{l5lv`DXvBZV|Hii~)5v?SakWD;G(EMgAPP5eaM zLmEq&L77GwPnkoRNEtyPQE(J0MMarR8Akz{CaMZrIc+bkl(vJmnf4z|0=H!}(%Un> z(>pNQFg`HeF2^xl(Qt zm&~Sj4i83-IlsLbyF%uQKG;psmf$kw#uPOQ(09O^E;+_8s-{i8KxL!7!wGnLnBv&9}_&%=gW&%umgC%n!`3&E@9X<}c>oX0=6Y*=c!g8EP%D zmDjLGPh(IsO@Mr=m+jCW1Ki%5E_411<3QM|g*NM|%5v2YM5{$v&x1cv;7YL z`Mjff2lL+KZOeO>cRFux-m$!zyo-6C^7iCyFW6lWUD&Fybz$2=PGL@AcA>X0HZ&^K zKeRX0uBcm4*P`A<_lv5E9v0m#sxGQ8swui%bg=kC@yFs}C5uWHmS{_4C9TTZmPM6q zEr{31_8DO_`nor-)N%DbrFGrXVTY zlocsUQYNLaQ_qD2)T-2) z)Jv)LsfSZQCsVY?Eswb)r>KOGz%~Z{F%}dR5&1!AAwnDo> z`$~65_fGdx_n&^10cTijSZP>cIAXYM>|(lXd}h3Bd~AGed||9NHJI9^bxCWJ)-P>H z+Q75{X>HRwr|B(wET1f&Egvkyt$S^oZJTV3wl;Q}9kwsefHRh6h%%C!`a~?tkYuD} zureH(6`AFkYcq2)xvr5}xKJ|`>p%4yIJ-<_e=K&ci7!LyG8a- z_j~tO_Ye19x7Z``1U%n73v&~5C+5!2ot8T(cZPSIcdB=Sca!%&uiB^b>3j;G$!G9Q z^ym2p2POx813dy`1APKV3pNHf1-At2gB=UI6!t8P zDeP9*sgO~~EEE=o3W3nn(2UTO(3sG)P<*I!(eR>yMg59mi~1J5FM3k+x#&>wvEs(! z_r=3Y{3SighLjC08(!A6tY6u!^1AYziqeXagh7N@!g#`WVlKr>@li4;nG`Rjo>oh% zrrn?cjFF6ZhJi7KDPkT=I+Aoe=}?lGwUT|DeVKcPdy)HsdzCvLnTXurU*X^4KjMGl zzu>>)f95~ozvtTp4#90Zpylpw3NaWU&`tfrg(?=j<^kWOV-qB zOZG^1SN2TyR`yY5mA#Wamc5qM%Rb0H$zG;DO#P7hBK3Ld`_y---%=l?PEssZ$dwA^ zX4Nj$f2vKY#hUq=m6|u2z1l6>UD|EhjoR(nkJ_KQKe}(akGkgijruKms^O%ewJF9F zHvTkrFg-FpGTk#hFg-CnG~G7cH;ql3owhh_O4|6e1!<$wW~C*jElQi0HZg5l+S0U1 zX>-!Xr7g64wfwcDS`}8gRc2LMFWAo7j@ZuFPT5Y{j@vHVPS{@A+S*g?TQbr!(lSaj z{2BQfJ2Of$GBY-1xHC}asm$uky_q$c7c#eI9?d+Gc`5U1=8UY#SqrnKX3fglmen!4 zS9YK5e%bA^2WJn+j?V6!J{ z<+CeRR6HRSP1o8^;fD^sa9@OomBNuQ#3RUQFB~- zQhQW;OxsbvL(erJ29DvJ;k;p#X_#rGX`pF{Dc1DT1f`MFSZVY$ZW=KSPFrgEZE3V< zts3ifTcxd?y)t8S#`TP%&iF6mW9GZeFPV=romqRbzGV&1o|Zj2dsH^w z(=rFn<>d-<`MK=erfwIx%eRU~OP;U`JqEU{@d%C=L_` z>IxbPstW20o&@g&ZwK!N9|YqI*A@O(xV`Xq;i?cAS{cHHNTDO4*+p}TW)+Ps+ECQ7 z_;izmu2l(Gf-6~7a;4;Q$-k0IC8tUVWl3e6vPb1TDn?gKAZ(yKpgp8Lp?zogD&Dca zaDQ@taKCe#2|5WL3GWM^r`%7ulTw?~Pd-RKT;5kcK;A>%Ti!|$qo66)Ds)PN^0?}X z>ZvMI?Nm3pE1HYiKKk8yu_4(o+cd{C)ildA#WdF>PLrhR(~{Ft(lRW{v;&sImP3|X zw$~Z=Gu~v>XEb%X$@rPknAy@58_Zsu4QIE> zX_sTlRpe&oYI3n$L#`?p^5VSPy>4H&Z?}Jk|8bx?@Gx*Ta4B#va6ixxcoMiCxD|L7 zxEXjAxL2?*_%t}Oa9AO?@LpkKAuB`+F+#^ei;9*N^(^jF98>bDD`*+)4>c}APdSimqdelRX4{o?-N_7-#(^bx!e4nyCi z%$5W4@$$|Jqq0(kXat&}`jPt4`ce9eh98ENrUj-|rjMpirX5~$nkmhmwz8??)E%49 z-k9+_ql@!TMk{A~XKQCWXLnZ*7eDJr)~_siHkK{SmSwZE#o3*5Vsf%_ZMhk__S}8` ztNz~kQThJ@j|+gpb0K08p=eXlsA8aaO7W!PZly7$`ttqdugb?&uq${K+=?lLsf5#% zQ|M~ zKr3bvW)Ln>u23#hER4FOnj{=M!i^WS6LZA`IZbX=K2y2XQVpirtLK>5rZlVB`p~Ax zl4bpEl4|wL>6PQp4dimYOZ^M;3HikQS%tF;&la986o;CEw8g86Yl{1pEGtbcon1Pk zw6^SK*~AL0BBdg~;u@tPsTndvFiJ2|@J`rSd`ES~z&G(s0#hI@n3kXR#5UDA$C>DI zXZw6!A1|Mi&(9YX%0kQ{dNHGzT3lOPS6p2Tl~PM7rO(SM%DtXh%1ntmmSR3+WY04@~7m_FI-x< zCHK7FoS&9&%GZ|aN`IC^9!q}T^5Ke<;>41Eoz;a*(uo74W-~bT70|bBwkN^lE0~CM?&;S^q0}Ox(Bmpdd4RC-amkrmR<*a7SW zb^*JAJ-}XIAFv-d02~Ak0f&Jjz)|2Ba2z-RoCHn*r-3uTS>POS9=HHp1TF!Wfh)jO z;2LlpxB*lGRX{aR1JnX_Kt0d^+yrg`w}CsrUEm&YA9w&f1Rep8fhWLI;2H27cmccw zUIDLxH^5uq9q=Cb0DJ^K0iS^{z*pcK@E!O8bdT;4-8{Nybg$^%(S4%(M)!;EA3Y>G zJ~|J1CAb{i zO-hG9Ql^sK371Leh#QLw;LhMK<1XPsgug_LbeJ@l8U>GrJ2N9mj|F?h*TmhiIf_Kw zOx!EnJ=|;DW88h*9b5-uf6_`)9CZk_7d#HOG13`bnKPIwrji-Wva;-~%j~uY9_fKi z#ui|6uo>76#jd7++9AE$IxyG~>6 zp&PL+u`}^MVjO7@X%)#$Y7IT6Jfw`Jj-*bc&V;S73C@6xa2l+IEii@AgPFiIF%3*3 zGmZH$NzF=UwP5#UtJwAII(8+SiLekp!bOA#g1`s|p(6t1qu_&JHaZQRiq1f%qjS)i z=mfMkwiqK~Obo=9V-U6iTZyI0S&Ds%{fb=WNVP?yHV`a2yUA{~o9!0+DrZ_&k+0Af z@|F1VeR09~;NakpAO)NOBH%KR1oFYzAPN#eHaHKYfn&f4;2e+(dI^UK{fPsKvBd4f z9mKXI9!WvUC3%}(yeZH~2!a+teW3nO0@NFt1%c2!XgCxPErC8zUQ(V@=1~_>S5lWz zS5S%6R`6W-KR5)hh6~|bcrEOMz3@hO4V=r!V+?1GWacovOcyhonZ?Xwx|vR9fLXwN zl+=#Zk(JHLVtH6DRt~ErdjMO<*05{X)$A(vd-f~#2liL?WA-!lQ}!SBNA^#4BfA;r z8+$t9Ks-n;;zjb2Oe7UCA_hc`*bo<@Ma+l-Q6W)VCdSgSY|M+LVlpflE5;;PCRTuzVnR%b2{0p;i>c%WIZts? zaa?g$aY1ofaYS)mQJ^eT29){AJmqxtGa%<88TMSe z-yX2L?GAgoUFW&%J?X9Rt?_N}mHRgOR{Mb9@Zh-MnBW9l2sD8ipc%A+nV<$#fmvWW zs0CMogiB913cATA~*5|0tvk=m1H zlJZFTq)f;H*&sh;hg^^tGC*mN0Ky;@B!qGx8N`J+Pzd5dD8z?;QhrlpR0UN+6;o5G za;k=ErK+h$s*>$KbPY1H2nP4xfTA!TaEg zFv1Wp0*nI2Lgo_Y4(591YUY0CPUa@&Hf9BL9dkQ#EprQVBeRUTfq8(ri}@e37pps~ z4{JC(jy;4O&xY7`b{gBve!zat9>W>R>BAY%Y0sI+X~*fsnZW7G8ORyUiQ~j@I&;Qy zx^cR2I&j)@`g6J?vykn`KBO8sfowqzAXktb$X;Y8aunH&>_QG9vjm$2M+I$#e+ALP zuEI9LMnROYy)Z`DQut5MMc7&RL)Z?@Kru8I%|kV)5e=bEG#yo;Ij9FUpcSYeEkYfr z8MUE0RFCGP31X`_P5eMS01II6u(#L;>^61)tHZWqFR_DI6?O(Yf}O=KVDGUnSPga` z+lRTaGR%rSz)m$SOxLlC*e>ihR*AjFsIfXDefq)DXJCgm1~sSmH#Q%DpxDFDa(}iRj*WY)N|Fd)gE<7y;Jj5^I7vr z^Ih{x`&av0+o=7c{i&U=pQAso*BOk4MuXb)&os&EweGO4vmUbUw{Eu%wy(CIvTwB) z+e7ve`+oaI`wsgtd%69HeV=`keT{vy{fvFR{jB|feXU*YlsP3%sgvTV@m}@TdarvM zy!GCj-aWp3zMa0kzFod)!CAqX!Rf&T!Rz38uom0{UIwp%r@=b#9(Wr(3ho8(f)~LC z@CbMcJPf`A7ZR5dPZ7@$XOT>#LQ;@aL<*6PKx?4w&<3ayIt#@(4njMi2Iv5E9=ZUn zhUCyOXf1RCQa}%&UC@4NIkkeip6a0%Qp>0%)O>1)>ZKM@H&BbI1=Me}7?=bzI|yOUw(*8_b8yU(DZ0v8*`O5Y}K;JZl$gJ!>tigtd;ffz_Hl zmQ7(h*;6>vI1op{VR065NSq~{WgG@)C1);YK8MYT=PcyVI6{t;Gap%iR3b6F_Pp;% zM_v@~E%F=b#OuKOh5SI8@w)N4^Zp<`c#X&>WS(GwV2j|SV6re)I9@nO*k3qQ7$=+{ z93`AC93Y%1oF*JA?1XkkPorPZOXv~w9(ol0h2BC>p$F0P=v(v|`VifZUPt$$KhYoP z2lOd=20e`4KwqMt&^_p1^aA=Gy@u{UU!Zrxj3VIfOgI-04i|yic@d0sz_?GyQ zcrX@=4VO%mjFAkI%#_TLbd|J|+`%SDq9uJK(gJfPgK+^2l2JgK~>JfS?Ryr4X!ysCVs`k)%CUZP&A z-l*Q9)@#mb+GwM+(b|^UcG{nsM$I41OYJLdD_s{|S6xe8XI&>ma+deQpGT5Y{#J!7r1p0_@=-nQPeUa{6&FIy|EH?1$M*R2s-tUcd;+a9+6 zwzqb?vNv3wi`~BuA0klbcgpP_I$P)9R@;)Fadj)Z^4+)I-z*)RWYU)GF#> z>S=06csbmM-jhCtK9=5t-ih9e-i|(yK7o!gHZry|wlSiZ6eh%c$BZyPFh4VYGMgp+ zW{zMDXKiBbU~OS-V@+TKY?PhEp>t5qJkDBFacrD2j)POcDd7}yGC8H3TuvWk zG4ciJ%%ku|^A_?J@h0;Y@SgFe@mBDb^Jel!@aFL*@@PDW2lK}8mhdL<=sW^%Dv!#W z%UjA@E?6wMAUG>HCpaTmE@TUr2noWjXg73_sIO?5XuN2GXohHo2o&`cC5rlsCW%Ig z#)!s=aH55xiJ}3buA=Uup`ziUv7%L?>7oSDV9{vtIPn;9qIjZMBDPyy;uqp);#cCQ z;wR#l;snef;Ys)sjU-0GmE=ii5=0`A$RvJAj^v}nB5_Js5>&#G6iVb0lY}j?OG1)y z5|JcZk|wcA(j`454vA4>mZ&8@$vt_kyjp%=epNor@Y?hJ>bojd%}}$|yVR%EN7d)lr_?9a2h>N@Zp~%Q0Bt{QXKgoa zSM3mO7i|x1A8lW4oOYOYh;FnlPB%$6PB&aPRyRr)s~e%4pc|=6)IoZN9@I1SBt212 z(7)Bc(?8OG(7)He(cjZQ(BIcP4OxZ^L$<+Va2qlWw+x+)(Z+7Zmc~xTHpX_wj>fje zuEune-{dxVOfFN7DZ@0-Jiy$=+|k_I+|%66JjmSD+{xU*%(QSVEDOhyWMNo>mORT@ z%NfflOHb=;>on^h>lf>9>vwB&Tcfp^t+{=iJ;6S~F~+gb(Z@k>BseIJIgWXbp^pBJ zILCYk&e6{?($U5-)3M6Y(-H3&?3m&h=NREw;#lNZ=^!}CAQ(J2RXcoJGzx&W+9jXULiBEOYvt`OXEdg)WIp?b5guE~_im zWpT+|4p*8>&XPIYc=ZrJVRKJg&roljBqH zTs#ZU!ISVS@JVW~f%=sCh5DTOzqq=u zxF*m4Z{W7IwXJq&t({t1S8eO4{_N7$y;lGUAt8Z~1TrLpgzQ1cCIgZHA>&TW24gUa zq9`IF<~9i+Xw;~2prD{QaDdytN6*1?b{$=Z*XwnC$NMvw(Ub8h>}AI1uv;1Lz{bIb zG6pgpWPAb}4a>^Rfy3bG@O(H5{ug`^yZ{b?XTx#u?eH`>7M=lL2}iX_&T@_ z{vUiZ{BQUsI2BHSuZ5?;q3{*(EO;S;j5vm9L1bo4L5@XEMt+N&iX4ah8TkovCUOSy zGvs{a1mra256HR5|4{!!?LqBBHKO*S>QR4W|CMdcuF7^~m*$k`$a9)=LOF+W&g8^% zPUZCGT*$ecb24X7&ZV3KInkV>ImdH4a$0g0U~rgHObJGSIfAicf*1f}!UQln3LB(H>Ao(;iVjr@f@Up?*O7f;NiwlsZfuOM930DNR_& zE94i73MbRQqK~1Er+-cVnEoOCP2p$sDRd=$nEsUhgg%<_4&xPl3}Y1IIsGO54SgJA zEaNf#Lk6}8Q`A{>y699{t>Je z{3e(!ST0yA_)oA@utBg`@Us9TsubBofXFI}iejP;QJ1J&1d2|HBBCFPrxbrzyta5{ z@w(!##WTd;h`$rh5&t0mO*}>XqxehlEb(OVPvY?Q5uyxWr^yX>VoR*+XCCH(%(v_l>V(*tjW?KH3E%S zBhd1+9Bq@fRokdNsy(Jn=&tB4>yoSl0FCSO_WBL8^+vN|+AD2HY ze^eeXzf(R~K2Q$T!}M@{nm%1WsDG><(m&Ea)%WV3>2K@r=tuPZ`g?kArMyyE$*(G? zB3032wh#Mk-XdpTW0Kr3S5CfzHqJU(l#8W1ujZgEW z`QKh&lkQCqrnAylLtW{{bY*&3`u=orx;x#F?nxJAD z9Q`I|G}^#PnhMG50aYF#z@vCW^U+8OEH&Jj6V~ps`mm&6vxWB&H3M zz?{LfVn9qgCWbkQd4M^Oxqw-K%f}IMSX>qkkHg_KH~?qI)#18ur*Zte?RmVs;yhX& zCy$s{nD|B#Si1ZAbd`Egzv$RA++N^Bv1+a z@Z$;h@nQT#!c%+~{uTZuz8^o9@G;>lLMQ$t{xbdw{wDr0z8n7mA&wuwe@U1@0P%m5 z7L%5emXIn)CX$&{NjgG$Kzc}e^tP1zvS1B)E%^uXda{zdg#0ggH9433D|sn-IT=Z& zlfNe~ByS`yBd3rTliwrHC8NlAauyj){+;|YIfqOmlgNLQed7!I)P>DcW9itLS1;Ptnby%SBgv)@ZTX@TOFy3mOi*M)G@SS{^fFi&M(gaXJzJMs$Dku-5BZ)~mCFdkhBoWC+($AzgbiEv1`F|1QleT~?Y=3M*Yzy1F#A zbX{pm>4wrxrCUq0HDXP%=8&dY6Vfzl_G_ftVy#M>(4NtDXhH2cZBlzmdscfvds2H| zdqR6(H==v4d#1aoyQk~ZJ<;9L_3MUpcXUI#LEU5BfNoCt|H|i;f1v+OKU)8${AKxv z`e)@Y%HPqC(vQ)kTysZvJY|+(h3PdjzJDV_CR8g2&4gW5OO|+ zo61h*rSemcr(a5MPwz^PrAN~*r?;fX)7#Pq(vPN}PS>WNNA5E`Lzp|5&#@D*A7Q6rr(+jlS7Lv_eu@1W`#1Ja>`&Nf*m2mI*!kF> zvCFZGu=B7VW52~N!_L6Y!j8q>!hDCFi~SM%DVBmW;LhOWd78Y+yz)GCUTK~=uOg3~ zH#I+xkWKiDu!WFIpb?f5RuhPXzX>Y{8H7v%m#~hop0J3pov@JbF9An*fM*l_M<5WE z5h#RJ1SSDSSWaLNHW3yRHWL0MWD&L!QV0tOsf2k19$^V#4QVxLC20j|9cekqO8Vsa z3(`x{Gtvm@DalGcM?Og|Be#$pWFxtPyo0=l+(-_SPm_<3kCE-<2>AdxMD8H_$fwAA z$<5^B>&R~MTG}>RDh)%+p)IE&X}PpQ8k zp=m2i)sLT#a@P+wSHs4HATUqN3?|A)SezJb1;zKXGd zv5}F=NMU3!mNB+6AdD@H6^u2E&5Uh~9>yESYsM?a!O!M z&x)QFea?JQG+cDI=t_rBgDDlLh+CJC^1u< zFQ$lBiP7T8CF@I8l`Jb+QL?&ZNV-%Cl`^FqX_-_j#Yt17%cOE?zI48Hvs563OEaYm zDP4+`j*+3He@g$6{!hx4u9UK+3#6;1v!xd#8>RE4E2MLz*;1y89Xm#2$tyXK)R%pw$2JHjw zHSM5wNPAD)r5(`T&|cTx(mvGQ(LUCGQ1(XmPT8ok_shnVeOUHx+1Rqw@}=dg%Ga0w zTmHHJ6a8oU@%l;niTbhnPxWLyMZeCFYM5{M$B<`OXuugz28m&=VS{0fp}?@+u+@-b z$Tv_7e;CjPs^NFTHUq{0F%%lM7}5-z3{b-YgQL<`X|J?a8mf#{`YKaZXVvqnS5;4| zo>b9IEEC&QX!@-Blj={acU2EpKdatt-fIq-_nU*3fCXW_ZM$o`Wh=J7vfqTnA?G3e zkVlY9klT>UkY30c$ROkagx`hVfj@#@hhKwVf)B#4z%Rou!297>;Vi^8#0>-{s{~n$6d>hD zE>etSAxn`eq!KAa@{w932Ps0rP?@MSR07qFI*;l^B~fQl7f`2Ban!2pmD!Z+hV0+a zKcknUQD_>Pj!s3Vp$pO5(Zy&6dK;RHMxb%%#b_cLjfSFU=g!LgHTPHSW-J1W#4@l< zY$2A86<~|7c~~EI3$_G{!e(JNV$-lWSO`{xU5ed~C1EqMI4lcG$L+v5^LFGp^4`xM zo&Qt*9zp{lLfAp*BvcVXgk6Ltf}UU|=m>s-mQYJ*ChR60CA1Na5Ilr9p^*?JSO}*G z^#mhfC&5Xu6D|-;gmOYFVL!o32opAtHj_4z>?8+i2kAJejr5w-Nq#~eBELtOL3v94 zlk$Q*m-5lugwAg$-%@5#zNRduOrYE)e@yv_<-y_eVEThb)ETJr-+#!#ld`ekK zd7tu%JWT$Z@;&7x`5(#;lusyAC?8UOq$p_RG!?CwCZm{XM5Q@*t^&+wufEKDdng+Rh&vr1;@xS zag-bbr=0UEcLR4mcOLg=?o4hCH^AM+y~kDZY`jvQo>$JR;%Rvro|UKL$#~T~X{wp$ z;g#?X^N;eI_=os@!2v<5z%AG*I3{QjoDcwlPC=U>EQkr(1-k`}f+|6iz#;Gn>IAg{ zrywGri>`}qi26iVMAM6r#aYEFv0N+>E5ur{MywWpSz?lUq)w?rdPv$SZI$kl)=2}> zM(IB3F=>Z%r_>_dBkhs`Qor=D)FrKug3@-WRaz_EEv=EBlU7R`q^G1ir01n^>1pXD zX-KMa%7@D5%Gb(!%9qMvPo+4wYRs zpt_^#R|QJVrRq{cX<2Di>AxDhhM+mCIi)$TsnUL=dsp{H`-$$A_G8_9x-q&Bbnok4 zYe(ru>pm|VU-oI)CuP(0-|MI9f71V;pRE5@KVAQ${yRNaU#REk>3XlhV_+Jr2CiX; zp~A4!pf&gm7DK?mF_;V@gWGV=pfi*hDh)1!z@RiZ4W$OTL1Qo*{05;xVW>3#2DM?1 z!CvL8dQ$~62~1p*&?GSxn@UVPlhh!iyJp&=t^4&_&SY&<)V_&^1sP6b@YmT?qXb`Wy5==wHxZp#MO>%?Q8% z*dEvpm>aemwhQKkIbm<1Klo$#EBFX}82%pODg0f;Gx$4*F^KmOpCR(I%t#Z`fixgp zNF%ZmxdUlKI*}Hn9Z5hTQ8}nA)FZ(q)D=_@YJK+JY&BYf=AieWLueOTg|?!N=-ucb z+JQEpccPtWEjkZfkDilD#!|6W*d16I)`YcT%dl!}DOQ7ZV;xvLb`Q21%fxYU92^g~ z7gvwlpBKuj&D)!IAa7^h?z~aN4~Sn8`v^}7UlNB1y@aX6H-tgLb;5VV$;8)$S;U8g zdxVL^5yCCPGUA8Cn}ipHPlzuGcL*O5M-#s$&LDn9945>pjv+oKOd_U`yd*ctMe>o} z**ydM zZ70n}^V8~S)rFQq7(JDaqG!`{=tw$(j;6!une<$`f}vuRGUN;~L%@(Rlng$D!}zdh zOp&l?26GDY8|Gx@_snU`Z<#+czhl~%0MpL2GPSHSmWrihb+8Y!PqEwC-Rw?woPCmg zoZZHbuq_-XX9vf|adE61Ch2ePUhY0_J@)`F#%t#7;&t+N^BQ?k-hSQ*{z-m2KgJ&s zToT+C+!CA@^a$P)J{Q~+3=4(?4+QrFR|QPbE>TDn6x|iw5#1IIif)SfMcCr}Vz<~K zwu>vpF0ol`5>G1GT9Q_hS^_EAQj$_KUA9>EnQWA7w(L{cN3u_3Kgd3o&60gDdm;T* z_FVd*Y@F<|^cUGf>6fw*=^g1K=}YMZ*=^~7bdv0~^k>;**<9JXvRBe6vSI1(vYE15 z(tha!>3!)l>DRKUviY*HvTtPbWVv#v0;9kxSc)D6T>(>UQy>(n3bX>QNKv2^1qz}9 zqS&IyRv;A=#dZZ(K~`ibaEh%8o}x&RtH@Un6maGHs&T4`syOS403(>k?Q?Nr?~-3;Ay-CW(5y6<$8bmMj3=w|9>=_cwX z=)Tr{q5EFJZ)MZVzApQ=Y--uGvPorMmC?(o<&^ULa#Hy`{jd7j`d{=5^fUEy z^)kI&U#b`DOY~BGvA)Z2+|XudFa!+_zu;j*FKaNp2s=r=?SCk>s3 zn}!aV4CPrgu$nQ>jU3 zQkuFov7fPj=J?$4eaaUpU!{DTGCt)>%Ky@O(x}iJC>ctJ=0P#g z0%#!=1!Y0M&-gCmB6k6=~UjCl-Hg&E&qSSJmPv{K5+pNPyCOFBo+{vL zO#vxQlupV?3X0N3IYO~hqLdoSXsVY|M>#~r zVqInru>07z*;m*%*q7Kn?Cb2i?5pf+Y!7D@cO7>vw}E?*yPvy*qb=#d)`R*Lg|a9bSTWm3NvS=bz_y@w@pGgg*+u5{?u8Ae<`vLinlhd*PSD zZ-qYz#|l3aP7;11oG6?joGx4`;)(bou4s?wzUY_Y*~Qz7_lSMsI&q_Tzc?TciFb+j ziT8>Ri2dS+;`EZYSXl{FwpvD#ZI-3U&@z~8nQV;=D_bthm93Jc$kxg*vj1cV8BMlD zMwS)H(q;Lw9GOOzCqv4%$#AmmGK?H2$I7jWGKEQDR2URWg;-Igs8(B-V7r9GwnrEf~_m%b>~YYdul%@fT%&5-7S=8LcOPI;Va zgleE#s2nPVN}xh$2~-3XL(jqDuv4(pusMhshy{pgh~E&i5Hk_;5OWbc#1P^k;sA0x ziim2?KAe3Vy&v6#zJ_pt-m8`wM8UTi;Bj4Q@9;4b1$=V^&mL^07z zR1qCSE73``6BR@wQAeyKN{BT?4^dAP5q(4pQAX4d4MYSfNcw1dJEfNLm=dSlpd=}G zDYqy$DOV^DDVHhNDgBfl+7PXu_K?;~dqBHRqtnTB3f;um%Lp*a89Nz4#vX>3v77OE z(fFbXMV}Q(i&iq%G1oKKGCj-z=6+UywU>2()xg@v+QX`0Jzzazzhb}3dBJ|ke#m~G z^NjtPJ(?5X)Nr!62riTh<8I@^xy{@b?lJEB{LlCgd87DmcrSRL@*nfY@*nZu<$uI~ zkN*z;Deo2U1O5Zv5btyT$NYZ&9N`k-3gJTGy6V4#zX;b0mkHMjXA3t8=L;7L{}8Sc z{v%v15{ZN&f#|X5q3E~b!{Rn^yErO7AqK@w;sG(D1YVL=B9Rr#%4B|7rEG^xEpy9w zGLOt6v&&dAzDy-^%D6JNEJLP~RmtQst;{R~WMY|1Rw7f%WHOG7DXW&1%N#PiyjihR z5mcN|gcQ3Jjf(w>CPkehqByQ-RkSM(D0VB_6j8-KMT6p~;-KP);)-IgVv%a0YKiJU z)pAv;>QB`QRZz8CRi}EWdZe17{#rdrJzo93daU{<^=Ik{>Mzw})Ssw7RDYoUUj2po zTlH2ARa2;;X(*aXO@-!}hN9h~+pJ5|L3EpRYjrEjmX*oMh2?+gEqa&UsyFK$dZ!-H z@6bDq660h=7Hf^wZnau{R;Sf#^;qRrmvx7Aw{;<~9LNX$ z0OkVofZu_?fcd~`USj0u&jQKwm}QMc+dYp>Lxfpzom1p$E`! zu%mIWuurk?;NHW%#8%)g;V$M~%1h*(AT|<@5POJW;vr%K@ckWGx=L^n6&PSZjITJYJIYG`YPB!;@ z{%rm?{HgpO_;dJ^`7`-H^MB&c;Lqo02_ZtL5F>;MbA{Q$6k(1qLzpJqFRB-fh@Ogy zio3<9#a-g;5>&}PSyte+o9w78ChL@)l%0_6ku}Ip%cjc@$_~hy zWd!*x#ZAR^#U;fZ#cf5O;;Q12qE``DBo${AcNGc64TVQ>UU5P3j`FdhUvXKHrrN05 zs@kMlqk^bXRO?m0sAs9CsTZo}s~4%)s^_VfsQ**{uAZU(Q$17thkCAhx_YttU-dug z6`CTASyQbsXrgbuDl>ySEvZkujR+1j#oWgE+W z*8ihltp876qxb6l`rZ1S`u#?Y(O^7av>E}U%IG)hj602Xqt94rR2t1jhf! z8a>7u<36L?=rx|MJX6_SSzmR&>S9$Z@@iG0>T=aI(@&-urd_5wQ;jKL@|bp-TqdvS zyy=4JoGD>?Zh};&RHs%StX^(jV*bbcnPsfyBg-e2(U$R+k1g+8##lbEv{;gs53QrE z?^|bE7g;x0H(57YL2KB0+fHYt$umL~-8-Yv!3Ty&0 zfK*@`kPW~9IH0p@>{spYI7T@pIc7M1b^PL(?fBWT$&v2(U&^ACs??FxeQ5z`5bA^a zp*x|wpci46VV7VNGXF*Vhgga@j-;ZFX1_p>!F`VV1oshc9PU$`6n6!88FwY`7V#Rf zo!CvhK#UQu5|hL(;vM2CVh8aGF^3c)jobbWbry9hbrSVg>W|c)sMDyksb5j2Q@^MF zLLFE5ap9Q4cMIPy^cMOGJ%#QZt8E4v`;k@d?i%FfFMWe;UfWeM3;*$r7z)-8J=yD7UbyCSM`%cuzU37*Twr9H$(s{6P6q@uBjK;$!8z%3Kv(g-~Uv(5fsIOodcss+6h&ss`1t z3Zh=8-k@HlPE$kG+teG?>FN~q3U#VFL%mYN(l9j^%?H{s+K;rmv^%vyZ9rR~W9#TT zqK=~D=~{KEWhrG_%OGWGW&6sO>6hw5`k?-b5j37Mwi+)QyNu6_gT{8_1!Jx8rZH-a z8}Au!7|$BpjGe|7<7wk9qoDF)<)zA=s@bMrO~09bHqA8En+}*7OqWepOjk`=)tS}E z>Wu26)kmriS2tI$Gp{wTH2chc^S72SEi){WEz>RES$?uiwal_ivrMskZ<%OmwT!iX zZ2i-TJ^9x1P5ST9eib);{Z5YmfD!l?8}_Qa}nQ0UA&Y zumL%s1~h;GAOQ@Z2%rK4KnBnO9#8^M01hAm6aXHmu&<&ad_cTS>?b}W z4iWDW?-Q3$7g6U?|D^tp`a5+6^)KpD>Oa)KsmrK~sSBygsb3UMEUYOM(E0R3i~w^d zvzd99+0N=@onm#c9s z3*{swMwO>(RE?-|)I>E>jaOsTICZ|dKwYPm>y$dFF0%|;mQj{o1}lS?Y0FpYm+KGc z_v`oS>-A$RzNmO%oLcc&#l(uAulTv*n~F~=o)||}j2OpMd|EN7VnW4p<3|-w zjUQLMF}^g8s~9$pulS(iO69f6tCe$2^GuDV!=_iJ*QT86+-gj9cJ;C9)@q1(i#gN0 z$-L2=W?o?VpXGPUZ4$azHNf-sdbrc zjO|m~2ez+l6Kx;a9Do_{003YBs)2IA3hV$X02{CqFab`$0=R%0zz(>9qd+ZC1^56z zV76QB7JHw)*M7@>(>~uZ*MV^4I8Y9xBh#UG{FCzc+lSGVdK`KL+6-NXSc`}uPa%g; zuh8G&-X*;xzDIgW97S45T}9nMT}NF{T}@p>om}{B;Wvds`d39nW*2J?=XcIL&NhA; z{~^Crs1PcJYN1@H6>b(Ce!Gl#S^Ty97x_&25Atd9@8#dfXUXTvf0R#^&z4V-&yden zPF8-WoT{9z{9gI1a)Yu!MNpAdB-L{jN6l8RR&&)n_2=4&+TB{6PNPGWA%A8T>4MCLh6v^B?nv_X+XGPOwkrM6O6 zp|j`=x^i8W&ZNsJ%Pm{0-&6sq*if;tVr#|Piq#eCD%Mx5saR^dVIo!&s$ugJHt89PU7TT8Eme~HZ{m-_* z_OI;^+a=&Ma0R#s#DFd!33LNjfdSwGkO0mBPk^()WuU?Sz`n?_(6PX=!a;IWI$Vx_ zQ_QLTuv@Ug%*}`da-MQ)_B*-n<&Mssjhlh1!rjRmPntmbj1(mysBr2}g(Y+`T|%ca zzkAQyQF3@W4vOlyxvVY+C-tm{?PsbmQ zm5!|rnuF>fJ1CAb&<^MpL_yXZ+}*r;d0&vSsc0&annRsdc!|-+ILrErbAZ#pA@WT^ zm8hU(rTj1DpUOqbjmipjrP{7@=yvD;U9SXBO@(Ot3Dn{^k()B>phpBCHl#g=XP3agTV7e64()oTK8Z_$r?2 zjjCF0R(o|Gom)q)D5#)R&?@K^>rI8#*=D?rY%8#hwSQv&-2Rz;f_=Q*X@6q>$g$SJ zcJLfr2gflbBaceqFH!E*`gF(jj0$!Iv!bXX$HK7DZ8TevZKC}P`>_3EhsS}Z;;18h zqWnMQzsjXbyV|Cy)kSn0P4sF;b$d11957=od6s<3bnBP)uk7m_V{)gEW)*Id*XT+r ziYvqw1Pk6W*ZPfpcHu_3LoKP`*bdl>m?R6=HrY;~5~&`$(6Qc8?f8FzUH{)mR_eS?7_h$DN_f|K=o#IY) zr@6Pe)7?;ah8yP2bi>^Uca|IJM!B=yIc~K3EiUTDx^eD2cfK3%Cb)@il6$+mz)f~j z+*CKsUFfE}>%l$XUT`0{A8Y^*fCs@w@DO+yYyyvf&EQe61w00}g2%x&@B|nJLGUCP z0i$3HYzI5QQ(za^4W0(ifN}6Fcn&-dCcq2eMeq`s1TTYEz^mXjum`*j-T-^SKJX@Z z3+x9wL8uev^g4Y`zq7`<+PTTO(YebRaE6?%&JC_(&W)}{*CE$oSCi|AtJ!tb)#5tl zYIO}eA3H~!Pn=Jk&zvuu&z*7SC1=0$mh+YKrL))B=Nxq2b>4U0bKYZ` zRpes0=&nK+&E;`Y}*Ft^(I~ z7s*9*F^$VGcOG!=bJn;llSEKWw^O5s`^PzLdxy-r3 zxzf4U=?T-Eh0X#e*;(XdIyp|Rli(yeSG(Re*qyb`ozCN~HrEMP*af;yx+1QqE9UZs zePMsNCR`id84iSZg@fU`@a}LZyeGUjTp!*S-XCrV9|#`|H--;|4~Lt=N5akFqv4kD zv2bhnc(^TmA{-8b;gjJ=I2w+H+ru5<&hV*lSGYTTI(#M^51$R63!e`s!WY69!_rnjuL*a+vN8!ieC*k4n zNZ1v2ho6R@g`bCCgkOeVg%k4+MsO3j8QcPH1tDMx zm2rvsof+#Q>%mLA0E{FlKAP&p}^FcgF0Er+8+zu9iWRL<< zK^j;H(m@7T1inR0KsNXm@c?-s9~6K>&mFBwRyzSiTTIN~dS?O6FfqJ%i zGCb*?H4(RGYh-i8<#Bpec$a&Zc~^R0d#-tVyvJ)`9*+kS@p>?k+rB-qOpnjA%8QLG zi>&e>JZmFa9=~U`cdd7g_qz9nx2>irxZJZmvf6|4AU(a_6E$_Ajq&3Rdy;#TYdp1{ zaLroJx=6NXr)QTZB@*-mJbhlU=48$4K#r%*bJN@Jz2&{*i_}DG)&$lDjs)wI=Z4pL zLZ028)W{ys0nc7fy=Pk_EwbO!;MwQd;N9rm$y(8WM@1Dq0@BT<*q#;rtx$PbFKJ(u51|mb=``!oM z!;yoL-I2TAU6DK9eUSr^U?eZP!vENpA06_o@;~!E^&z4!eIve{C_ajfKKH%y-Se&W zBcn%RgT9siyS^vBVP9?(6@B4*r*0jYg*PM)nW6{{fn&#NvSWB$C=0vQ$28=-i8v@rl`a9MKQUb`p zy^g_-TOAt%cROx$WCkDsSl~*>?T(&~ZGr0@mpc%FErE={=D^jC-i|vR>4DV1%?@~A zprfy2YalC-7T6S67r5VXK6otH9XuE8>N?dG?>gJn7VHRK40Z-1U0^WUl?pB~Z2cyBxuJc_dyCT6v*Xdw;S4;4Cur+w0t1EaScp-Qx zc%~~6ywugvmF(*7y4ZEP>tqlU&xqHDvf{b%y`l7YLnt$z8s8U!#v4P;q5ODC{7@(_ zzCQ$u?+K;Fx5kliNPJ5i9?yxR;|D^B1S-Bco*h3H!p2)do8sHzxOh|OaOhy@NN9H` z6gpXtN@OHX)MqEs6R<>EeP#lzM<&t|sfkE^v_4!Pt4~Q}CE$r|iR1OqM6{u;;XtyZ z;YhM28Eya@4kb@C98bm?+LA|;?G5{qk%s-r=44ayVDe-`L$b5saI!Vom^_wjXsmDC z*ZAz((6zmdyBi-~+tc{u+Q_xn*Ir$FdabVU!L?nDkFFhP9KQDaTBtGD`10C|Yx^4? zUwe9Zuy>&M+2N7H4|?zR-s~Md{QU5(-Y17&9lqUrr}xF-mxqUX@AcmA-P!!K-{1VC zzqUEhJltQ?JktNTpV@L`kkxW{uxaqnVB=u(U{TA#`;GVedk@@aw`3o`Gc-7KzAe#q z>`BX$?I%blx<=M}(4I!mK~I`D)%()>!u!hm+`GZQ-oMd*t>$V?PYo)N>AKPdceRGH zTnJZA0_i%~h;nW49P+&OUa#5cIpR6&Y4R-dZSwcl+^FfRxg6Zpyd|>Do9}JiW*!8X(T{nWgT|HgB z!Rx`EU|$zLj!v9NF6()HxUTtG|0WOI(-!KeZ){uK4A#VB-LccLuGqbr z+cg6dEpVyz6`|k#s-Qzs;ZFr$njIp_;R?2Q?2nwg(<{ zkOG7NF>tpF43Xo}P(i$JPb73Q6t6#1f4cs3!`X&&4e^FE4J&(A^*rfa-SoJ3PxH}1 zPRqTa^frv=xCa_(^PKP?y(sT`A1!(=c0N`RxYyMliiI$V+yulE_GEiILMtQNBRSsI z$VT4=-?0eHe>+HtpKn;*)71F9|J5VVlZZX;=n8d)PK8oDSWky5>WO$xdNAHxZ$adE z{ZSz5V89umgt1s0D^=0{lQC>9P&yOPfNPm%^>i0$k z(QH53?}_65>?p&}^k?}C{LCobkM)!N6hAAv-B0wB{4~Eait-ow-O)Th#?OuB`h8KH zpWx5&yP}-vo!ITz*4n$V`?22Gt=PR7q_!v47aNGJ@7!3sx${-c&DiUjO|`3Qm)Bm8 zt*TvLn_7D#mW-{ey&St5TT{EP_EPLxETwjHZGSASc0=uz*xK3^waaP;V_Rz1b-w7> z*!il19jFN~0{(y?;0Y84UUsbPbO*L}dIOxm>dqCNtibaQUtmKgKd`B@Hb4&u1H8bp zPG?|E=h{wgz!hKyiUO}YR&{RaT-E&|IMg-V^*Fe!?s3=s;IrWC;ES&3!B@f8T~C5f zx>j_r>>dd&?|u|qS@*PSD7dEkS=Xzs;oyq8=Up#@%evQgJL9XnSJgcTzU+F`^)&df zYozNz*YY}6yf@^JUk_ak@#B|5uK3LmGtP^1;}3&9A#c1UPLKE3*T!#!E`-j7gz+;W zU;JWdXPgoD#4m@6;_SE}ekGI)^@nbR&WBF#NrX7@zRE$l9!+)@)Gn!L87Oglek(*QJd^BexY=-} zA(`xNIF;;7wkNM7lMRVvNAhaJx#Y!$)5#0TOUbLr8x67K<%X_gqM^6pV)9x;Ps6Q- zOAXns3k~t)^@hvIj>eOX={+eu8+%$Cn;WH}$kP zZs^(CbG&g~Po(i!V@u=ap46Ub6sB^{s76YueVdp=m|mrlx1TsZDG8);F!| zTi3L*Z*||srsaLldq;XniC4YDy)S!T^giv~+O(w!()7A_Z}YOg)dR2ko10e*G&CP- zUOv#+yubNibA9uX=9L4l`mawq*}`vW8HBVp-9L2y==~%258rRTpL6`-(4!$}+vA}JLr;c=hEiHz zKU)4cvu)X9SX)LLyzRu3@RN&e7uqhhwLM7;pC2wbK{-J_abfu63E$J96W*uyp01Aw zynJuA59I?RNMAU@@z+LcqAWkx?~k(m4`M^HZM8cC>$=x>udZ8Dw<|snx)Tb-Z-@Aa zhxG#uw;Otrry4sO*Y~X(SUW&^mhZ`okRy~xt}o9QiC}#g-^mEhhxX<8q7k3p?HBlW zMgvi&KN#it>!Q1&Lch!J^?Uq$|L$mJ?duq#7GAro9afuB`y}=__AoXQ8;(7Sy^Otz zJ&!$&L2F;cvTB#NKZ^wd>9xB8+dAQ$djqgeRA+i;W+$Q(*_qJ^?M&%R?Fx5nGzb#Z56XQDRoyxx^~QU9#olNheANw^cdEcF_rQA4J!cy8d){&|O&j|%nxIXa z`%?S1^riG=HF=v6O&j_keekBOeVh7VO`8X{4r~}W*1Tz;rFqN1@n*5+#g@SZM@-=E$2vi?>5 z!(^h7(392&kA$Kt+H*QHyEoN68%nkjJVGxulJCR&khLSBi;b5WFEkQ8-JUa^(;h@5 z?s0l)5toI8vmXsx^`uIc5O~Asutee5ZE6$5ZD($cjngC2R7GjsoPrD5r193 zFYz?=wBd4NvXR(>Y-($6xqopuK0FDPgzW2zoQ||dXg;d1z(?|R zM(X_`e?zn}dN8`vzt_Lpzdu?Zt@GFVclq~44@VC~gZ@4Keg3`CL(zagzm`(FwS8SX zwKlDNRr|*FyxP_6*xF6)kakRMO8bWP&FzJ?gxYQGsqN(2?X~OMNwsU+*R&IB@wK$t zf?8bdmiER#OMudOFp%Gg>7;k&b{-CF?`#en3p53&oks)EI%X%fGq1Ctlh#?(S=jk@ zNWK%_c|1VuBy=)54+U_Yt$`zfth(H8L|sldq%OTKyF05J-JMd0=-yVBT8HUQtIMc^ z)xqmB>yX{3Zftiv{w&m*I1|4aU$&<={yOwLbT@uEel5Oo&+Y$X=sMKWR>SbERqLpu z>$G-TwXLh}y}cKeO&}5zgJCa~83-njU=m3rNHBm1;_P$0hwuNt@val$_V11n9rUcOl0|kwd~o!RCYGIl%2_rXXmm# zxdHo^+~?f4+>czJ{ZsB^t~d8R_chm-`a>@b~&(){g5( z^~}xb4cXA%j;khAlPXfBRwskAnmG-swQBdZh;~lj6IsyD>pw;O#$NMaqH@w|X@|=v zZE)^jBYWi3yHl4x{nLTjphi6xT-3~K7Bov5OnacUhiqC$=yT*tWKqAYU)3+^*Yqp; zV`IR0WDFV)jYEm0*hpeH@!Q;I?l=E3|1l4khs=ZKPD}OV>ZHT+%F=G>vb0&qG?DIr z6KN{l1)ro}!JTk2{fg~iJ6Y+Vbg-GdIJi96$|?ti1Nk6-P&^p2$J4|1LHi$jZ{gUP zzN9bz`1<@)s%1^cIGPwXzp=cwbX&UN*KjIbJ_tIeRX>81YCd=pT+yuSyVx03N<{{p zAy>$*O{d?$-K@bqtJ0~`s)e9d?bf=q4y{xBHL|JS(tnF==wrs^SkxFcMvQ;WBj&Nh zsQGW=r}_Hio#nmdt)+6XogJ}{+6Qt*x3}yovwq!eSCCfCsg{C^!BtHvm=01w`uVKs z4f#WdAz#R^b%#75kJhUVgpNZ#Z7?(v`4#Dn?C1w0zau{)qml8*aHKz?)(=HA`hm!w z$oEKJWGtf9>-0Y(e~pNyxOpNmlbAJsu>5DKpWK~1oP4zWJNaU1 zBEMNaS$$xHI~K z%e0(6Pb+CD&7~{p({v%tq_5Kd!Nv4jmQBBfv*~y6Svr>%(iiCu>?igO`;P5lKe8{; zO!_~z1%1uFXZ6|LtTt=TsLl(>q=7w`)_L1E0+^^ht z?r-j|eIoZKH<}yE4dn(3LxujrVBu$Br0}OOTKHY)D-0L@7Je0&OVDj{18%e1U!J{s zx@xJl*82UyI_D47xtrO*On|)!2B^loYE8ogLm@=hXIW4g)Oxi}9nj93KeLOfCDpQu zQ6-FE>;t@_>J1vzfO!FJTdOYc4L+p6oX?) z<9uQ+v1nc}|FX1^1D4;GeoGJBN`8W`)1TpL`Xl^}{lT`P-`TJ17Z%Po4(bOt2T*n| zdwnpIo61etr*o6`aeM7xqA*q%FHAnS=v{Z_GEhD&PZs`Nt*T7wO-&}ap#k-6XhvmL zlg2ObN^muJ8a&psmJ&Bx}n~+vjoz*;)I1ZpJ=uU&u|_pG}MkGll8GY+FEg4An4LVKbWg6U8yM1``!v!F_o)F!k$8i#&4;?%Pt zKE#DqB1|Z)rL=S?6Uv52?P(|%a_faqN_!R(LoU5Xe;xuO+mX$PIiio`jb6PWVv2}H zAmY;>>ksuik@bi=64mcU&W)N#&KT6|BGH&+T#JPC7sjyuNFUK_BdZZ(#IN6os3KdD zfZi2z$3n5KL^xJ5#$x`MVmyo;#e%VdamO5pd15Lv9@{i;B#vY2312J{yEJZ@tHy0} zJhquA8a3uCW5rlDs?CX*)+`&nu|LkXnnz@|`qV`bd@K2dTFV!N1{$^fz+D zG6qkugFm93^jrER{S)m$XW=IL9o>sg!*9^n z^gP^3|4aXco9Qn4HToYq40qG-&=L3t>dQ{EBdj+&&Q7vp?057p+lLa_Z|DnbhV^H^ zprh;r`|sc_I>ZjMP1tAjEBXnYVvn=IY%IHBC$sHX8y3&5+XLBF>?HdVYrzs(LvGbR z2`95V_HcI1zHL9uhO$T5X!aGhVsFM)b9i>kuChn6oA#C5W-jJj&g~TRIh|c&k2p2C z?HpiVE*R`vxy6Dyr^{{RjCQqssStH)bI+x2SLICho!okEEf;ngbE}23%eZs9uvy4n zCY)P^^#bhXFINg{1;m|n?zssk>fR{ePP}|n&R-sv#mi6L+~xV@zFWAIF5~4$IaUsq zL*-~WTpsrQ^^N*Qd;|W@+An`omG?*LXa4y>C_p!uMy7$?ovGG?duokFt5Iuo8b(WN zEfHKF(}M|<#cWxCXW4#q0G($S*#$P0rLrAZIt%2?_7kVo{n>lq&Z?vk6iMjgdP09~ zBx1?fZerIAS{C8=w4mBliK>kts@_+_YD8_+6oSQ|K_dpwgK|&`UIg`;T<|iO4`#Kp z_Ci|;DWQ5u(%yu4?R6-pEr&`WQCkb0Ym<6TdlkxuGTM^%GE@znX$9>?s1TAviZ-vk z)D}ZUEvr4%7PMKtGlE7=^=18D1dG@su86F+Mc~MV-WqX7XuTsM>IMCNB&AR5DSb&V z>Cf~h`hy6sC-r%KMSl`I*CP=|&+0k-rC!k&^*Mb(pV8NhOsomGHQpOv08;G9Xh~Si zFM(8ykNq=pu}n;ik!79blFV&}2C z(PMTdTxPc!PWTi1<{|Ph;ZC55U;<0n%^Rd6;WQ)WaKe?anym>Wv7b0F2NIEl&1_HD z5fn9L78$Vw zEoqOyf6``n8eL~C>^^H?$59(QimtM2>@Rc-Rk4%k6sl$+*2?}x|DZeU z28*#eR?lv-Fl%HH*2E5?ban(CLJ!zo7GSs74;aW!pjuYL4x_)(Qg)9uv)gPT%Vcxe z%j|m$faPpA)`eYVGueymX*QpIixsoK=xSEX{)b^X&|b-wvmY^2Zr5(k@!7L1n-#KL z_B#6pv)JEZJyogWJPSSbm)D>**l#_E} zZf!wRICEy5>Vm3Zcbf~06DT;`UblRCdFgU1mxasXrQ7XuUtBuf9`{$Tsqn@7(|c0> z;qCRN%E|IKZ=yWrBg<5oD1Y}hS6i!X)s|{|b=>!|`lj~B|GL&)>#F_s5Bj5Z!JqYK zZ_aMSn{Z$uz&3=N(?&E930w#Cx8>V&)hrDb08Jxwr7deKT2JIk-v;Dk7qNCAmhhVc z=4c{m!7W;nvXGY8^K&|}#4U?-)B?g57=jn*WqKE$qnGG;dIq(#pRih1bo%X%T)=*4 zcjcTpcg|ASEtD@ymwtD^{i>Q%tV>6z}SWYcElC?0F z4SJJyvR|<;*wrOn?yPoH-`0KxJAs1gKyB8TG@xczQwl1<+fY^e5V{ZDg&spSeJ~P; z#3B#+JAEi}7>P!1^)C#^5r5>LJ{)Q2BawUkqdp$NBS(=NeO>>gFURV!cff1lGIkaF z0CWMB*c;$Ia2@LgZewqO{{SUcjorjbv0|(dtHt8xpgCg3&152EP9|dJu$f9k%>c<; zjHHR=ETZKkVIa-qnMF?umaIifKOatE3`Su!t)s2*0qlg2SPgB5cjztJ0jua0)Wt5M zOXvdXXML=jT|>RB4L)Q&>@qr!uA%|<2X>onWN)(Hu^_!Cq!WZWX+AN7q-62J9{8ADZ z4c3FOrW~vVpF&UCf1#J*M{Rq!IoukqYj3pA3%vG)t|@%4ZPL96w}tPtE#U`kP5V## z*>DnhX?SgTV`wvcF}yOIMm`u)kq(0t$w&A|I`YYI9(iwgYsf{!NG6huFp*BfJ41_s zi?9(g@}D6ap&~toi%6@X+dxNz$VWrFq04X<`HuepMuAUwH~tIg#J>Zr_#p5f{x8;q zx8M)4_xJ$b547Q5@TXWG-jDyrzu{f@2Yd+l3Jd@fz$f4f@Dl$E{04gQ7x*|Z40PaQ zz&rdE{s;Jhf5d+Rzwmba8}Jo>i}wLN_-EiTHUfy|Uf>P>8gIsb;-B#z;4&ebl|(kd zn~P>9Ats6mI#ElI=IcZ$QBJVt3v(_ZB`S%0LP(q@*o2%oPf%vYTupEZ$t;+2=1X(N zoHrK|1#{Y*GG`Ke;>>)NxJaBO&dpgfZ9X;oNti^)1M-**kWSJ;Di#kJCwIvN=_5%p zNM2fw$h_szQnlPz>J|$bBTvW(nIzpLL=vQzlr0TQn58a}3v zXn;P3PiQ;sq{DQGHqc3!gdzHX_RuG=mG;vqIzp#uGhJmhXobzNXDrQLvSF5BWwyqi zvN$WSc{a(OvvD@Xrdb_YWD9JBEwN?xiUm*=Y9&uti6z-B)PgE3h#JulyMspAU6f^m ztRBs>3D$rz>?WFqMb<^f*b7#T=GbkNXH6)@Ub9;CkTav5!YkpY&?bBlHqbt-S?Cqo zg&yG#){A`?UI^cWDeS#4AWUE#!cVMA_$mxzEy5T!fV~!83Xj>(!U)zcJY@&555f@E zD!dcAg*QS!)+bD2Z-rmNzwAfhH#Uy_#hQdq!YK9&`%m~Gkhw%In#<<6T-2V+o#fK? zOfH^da-_YKE9Tf-EGOj7a|wGom&}E7F*{|?=Ti1?PRX6+q}+*J%*i?0p0uCl@LV|; z$z9~)b}E<3;r57~$PxCiy^y=i(Ya8;TW}U`oJD8FdFhN4QU%%RFGLG`E>^g5vW2?y z*6A+PoSDLDfp{*}U?Evx3Us0DRGi_$aUoDh7aC5gaP6!*;{{j2Q}7kY0$wON4+|%S zqXO=3RgT^D%O)k{ex*EKHZD7q>&t(a33rRqsXSc<-7l2dW!&Aa++9Z850|%>g!}$7 z?2fr#DmRyHO0)9Yn=g-eN4>wiQdumYmxsJuStt*B`SP&$kC!cH%enIV>YM84>Zj_* z>f7q9?_G7q7j=KAPW!%8|Es>Po|UJ3-PKREo?1_J#Q(MSt@g3@rS_qgsDG~I{W(8g zC+e|!ye|23H`2{w;QU5t;DNJ7wgKFJI=sHUx~<;UZf$pp%BuNlC`A6?&p>+OCUKj1 zvZTnn1VyGvnq=q&Ymlr7Yb#uQBm~=-RhURSK(P;AH7nI;B&wzPP(hA z%gA56nP?*ZC7u#5i5J8Rs0liQMf#l1(M?=4_kw$3|FI}KCNy$4xq9w4moG?#2j@kB za=%vO^7m@~=33=dd(^##f#7D)rfCE_!kyut1|>2NjN#*W#auJD5ZC4_bJfg~&5#IZ zVF8xtS*)ho3i{Nl;Guda7*PAwExPUCZSXPpFZd!9&>U(Wf*#FX@G0okI5bX;UvnR{ zYg%d=GyOcZc8WK7_k;l$Cfup}s{0gvrR&hWjJ^%O(|ym!-!$XFl<;bv`426caew4q+!nR80m~I04s*y zhK}g#=xyX}^hI>sP>YNiHVm_dYGeUlHmn<(qHWPl!;)dt&}aB#xQX-|-b5>ra^xv; z6o2k?1(5m*B{2os>jP52r3fRH*fEHN6w}2UZ8`uG6 zaSgr#Y~tO-lldjsLwqMb6P?6sqK#-LI>CGMC!&vN1#iqRz&AuQ_?Gxew16YTE8@}o zV15O*5<|o{Vwe~pJ`lf%AH*Q>o9F;P5_jfXa}(GO_7iR3d*UTDO1vYwh=1lTuwni} z^b&(mmdug=LGPe;NF)XFJ9I(zK=))j)dDrh3ONj&k&omb=nM24dIMdO|HvEiEz|+E zQcvUy>OJ%oYNllJfh?0P)K91l`T^C*DtS$QfJ&r7zJl^(8`TM2kt5JANFw{7UT6rq zB?qAYh&!?$YNA@9I{6tYke{HBP&d>C<>{AHk$j|ILrusxs0828kFZP^;XK^IDDV}0 z3D@D*Obc^G-@`Tdi9UxrnU~B3+@Kq95A%u1!LOJ*_<>gF68!{M={x$Get=t$GJQc8 z=prq{xAZOCjNH>7m@YX1P!ABbd)ukRQ5*V^d(HV#ANr2_#{J>ix%ZqM{munZH~NNi zp{?8pZkYQA?_!_0ap4O$#2un)bASQ3^6NI(TdSj7&6 zO-zeT3-`GdVHpE3J+_9ag?Yh%X@%!66Pv^I!j>>As46_Fny^v)47wKQ_z4T7%mD;6} z{kqWM`saKh7Yj|UM&Xs~rK?_et2`8%<@-XRa9e1R+vF!_tK8!1bhW$w71~^P1*K3e zJQZ49&8|o13)fZQDR)^Y7nN3q`-AdT`K-`x#+`M4Q~py< z-Jg^m<+~!dS@)UyqjK)%+&OpJ{Y81FG|DsHTKT3t<*k;l%cb&7p7BK>#Gh{SA0LJi@rJEaCONy?|Tkitp2M0t`1e}<=*Oo?@x84+F$Lh z{q^_P#{46-zS@u4&)TorVC_$Bxc0p^>i=CEs*TnLYRURZJzb~kR6SKE>jnREpm=j} zQ@D|DRsy-kc>}zy1x(KXwfVMw`}uJ2aOZCPZu>5Nm$<8|jxu; zE%KH5#e8A9k$&bU)5mloznLG*H>L~eWd@kn$RB2!TjEx@EsjCQIO5sXBZY2rF?55Q z;5NB&?i5|-aCC<|L1#D`UFW8_MQ)ax zOW4Ppf>*!g!zR%Y*_juO-p~Jaj9k>k|w1IX-t}t8uk%sN~+s`OM}vl z{g*T=jY^&JdsmPALGE&O$lda5`IX$``s8YtKgsXqx2|s2JNb?LpX)#Qwd;-Rt^Cf_ zC4ZDZxIW8Y%M!{F!P`aYMMjG znnB$k-EUog*kCXkzDF_Kfn$ITKLG5w4cI2Oh)v=H*h~GSrl22GAN3zH4ZTOkn7_;j zGs=uJ8cxmWIUT3v4zQqbEMVA?FelARclNLHH+i@GSu>Hd-E$i5C#l`;bGnH@Q`je{3qNOb>h9zKT(rm*Dx3zi2jQHh=PWnQM2K9 zv_I;_9e@)E;4a*cyKy_3-}rA0ab*a_y~RiHN-HrLl}r()DSgDO)@LY z2=$wqVCJDYXn^`dEkLu-4Af7JQqQrB%tvIAnPWa73(OQV!^|_YOb@cmd_Z{A!~vXv z6VNPb=8RlOuwiHDE(dZ^AuQb6?N~%ulpgF0(x$W_tx2oWlC&(XNbAy;)F=Otd*#or z@A81$FaMPPD1*wCyXyX}ta$&Gm%W?5E#HKHvNlm;>*br(z(ph9C^U}Mhxk`;5&BC7 z)!N{bsx>qo{u>?(kAz2bqv46@o?$FH9Q_*|iXw*5C}gl0V8eKHBRwtOdJpx0T5OKd8W6bL?74-S_l)d zOV|jA_zB|pH}D6zOifT@)HpRq%~R9V8ni&oQd86lG)XN%tI!O!LVX99p(SdOT8B27 zEv6sQGJ0m4`G#m1HS--AKz<=Q<_ogHtT8*xD$|FoGb+Zwd_{gDKagJJGg3fN?gF)O z7S7H=+#cuPFwV*ya0mx;PA-S;b25647ST&Ik4k7vaAFQDDLmR;m}O*{bIhSZZ$JK-QUAQ#u`Qu)>bd$(crRJ4CPg{N^R;UYGnEy&1t zIS=RNNP!Ykf)_JMfHW#Ui}YQy%9Jv#%qSg|SCw_|QkAPm)Q7+}mh z@N{@SYBd}f(C1M*4n%<%aEh~d1n?0f;3#N>g2W^^4u*&TF$Vqx2f<_Fi0~5=;2|*t z4nH@dEoz%GLF?2erJ{DI4N4CgpnYZx`HSo_Bgh^zj=; z(r_;+3(BH$=YCz;^1i8Tc;8kwz1@{}mClORw_MfvruvY&8t8^e?(z5ct z@*Mb4tKU%Sh3GUmi%?uv=yJ@<|5avdDYeaz0(d+PPyh);h#7DeoC9|uEd@dcj0KuQ zQrsR2%J;=^D8H}+pF2=)n83*HL=8+6{#-+JaF3YjpJ^Ir6gwhoFEHf>|A)`a7j+-z2mLJF1>a* zq<4-Dc}w1u7v)uXMP8DJT*IzG*Rs4OugfE@7oHvE(Y>bpb2oXO+}p~!^5EW5R+UX< zL+PnJFXrBD?~eClWv#0BtyEX5^R=bgLT#~jRxkUD4fwVZxV^o*9Xh1dS-{7L9HXAn zISm(h0bd6F%mUJGZT6^?_3Cmhquz?HM%Sa8(T(U@)MXHWDz4x%eubX{IiP}<@e*Fd zFY#+!1lBr_#{!DlD|_xKb3fL{U%aECwQ2zX7@i5dZcWnvcu!9DO99s{d{ zLX?OrqCy-}M^u3FQ%-0Dp_nwoFzd)Fl48~nnpr`b_y%{+{o}q_AGrtamb>G=SYPm; ztv{^atzWHAT!;8dY!TB~yVxeu*iQ!`^*O#fdL7>!KOCSu?Xt+ba;rG&nsH6Krd)`! zr*wK?WnY05i_%{)cy(UAS5wtiO+LW4Q&ZKpYqvLdH=O!aXile&9vT7$P4q>)4E)0@ zz&?0O+z^ih3O0xb;*Pi{j;Rpkf`XJA+D5jJO(es#@V(Zb)|Y%U-zjD=2I~^L#Q{gZ z1Cf&wDV<2L49WZQo;>G5l`fA}IZ%vVz`Nj21bB5*{E4uF*xtdO3SpTYGlManBrC5d0ucK5J!cfGb#k})CB_~ zGLvVr)GktBKJkC7ANfIR4?korU<2Y$v0s$2BGxDJ(wQ{o5TvX$upN@a@{xQjue&x} zLHV=igXfFqqvw<7KTnTm&xr~-u`7ZeUrP!gh{G;{(9RE|2Q;*dm@sRSfamy|*gkW8hZC`3YeDgqU$67|4T z83?&!ZkQ6&U|^)o6q#{rjjK5C4Pz!hhy}@!$BL{FrsrI>ZlKfAh0q3HvK9JLbhJY*}nzgW`ht zOI#9%#DCZWwkS@E3RcHz*fn;C{TA=B8Sw_Y#OA~@R>5wu5ph`jBaVxs;)M8wt%y}@ zQk)XU#78VIO*>W`3yyPX*0JcQNaKzRY2HzkBx%mEX^+HDSe)}^3^lyIaLNcy`H4<$208Vlph{a8T6bftddarJ>NVdp0x7YLnuEzyz_~0s3 z-LGOkw7Odbt9w;Tb>D|nf!d~j!*8mAHFIstU#wr$3-x?mu2=n+^(%jKgAAksr3Mu^ zxP5WgeE09R>2CZmrg;FSh!Ds?kIWOp%YQvt#pcDT2i0xAQh(XF4RnNph6Ua0cz^PH zvM<@241+(DKay9}KjuYdl>f_5TBocd{1`vXPgq~rrmd^uy5maPaOhovd?sh*b464H z#a2D=*{dy$y8w2JYr=+*;cfg8coYAXjDS^YAbASascWi6WuWHF%S=;d&N{)5^OO9n zb;eqiYSO0TS`uZ0Yo)SWvH2WThtKZYt(EH6{0(2LYRYKGquw;g7eBlK&R>2+73nmV8gP@0FtlGTeW zTH9CZOF}xIB(#?k#bt}4s@S1K_w;W#9B@DR16pa~@2GT$ncB4R)GQ z1>dC3q1IG;>Q(Apsyo%0dYyWo%0UIFE%i2)ha{*g)sYgR3+NbmpLv@JA)T2mK8U=@ zbY%ia7n6WqUAC_9 z8`dbY&d>9!)-CI{wcGZ}_S&Wq)uLAHw5h}{n?clzIP^ZbW(;sXH?dAwmsLn$LmFEoQ5{!!T(Y* zBlujX~U+N$C|*gErV`Hp;7{#CyH`3t#`8#3%dTvtj(sVX~_?TWt|sQRjE|9%av zwKd8O+ig~}q1*5XnlGvEnWn?eP*>=6NYuOubw68_?1b0CTj6Kh6Ww}vHM|nu2yf~( z!++!Z(NhBwMWY#mJ<1!Ps5^QXl?=Y9XgG+vqMj%m6%4Eai=G?uhOB`xIHT5RAX+fw z3}*&M^b)j1Im3lvFY1l@qrXf)On*!RrkVJByw@}q|77Yn{WcAnw&P3j9@AF*tLd}p zKhsovGd>qzjH}~Arj7Vd({fxDUx=^7*W(lMo%mXOJU$)oGkr6CFnuw7G!2_3ZYOWRD!7y^ftF+$TuJ^+^`{0? zE2&4Q3iYO*pnuRvYAUsm`jr|@z1Uky&8F_5TWB)%H}xY`h6Yk!Qw``28cO|6)u6f5 z74#>yni@}yr7F+^bPat=^`)j$i>ao)@2TO`MCt}wPR*p|Q*~%O)1OHp8yRiJkRg$g z%uZ%Bvy>5#xeSlYXL>WL%muQQS;zpH>C7LR$`HuU%y!0@8O)p^yP28HL?(gcko8O+Sb(EAUK{ zMXYChl8^B=9^;=+=DgPG=S{qqNBIn|vF`C8Px5BI-QF80}QF(}5wggBR<&kyH^^1t%118^+n7xH?(FaJB=o1e}P zy}kh_a*#YefP__lZ}x0U|MsH?O1vFLKWFFwgF#aG4V;-}(= z;=AI33v)SL_wwhW!}Yq@ReV$YPmM4?@Jveo#$Pt zxn%I%DgPBaOYNn)(o<4-)Sia&s`RncReDmio*hqj>7VkcbgR59y(!%*k4o5kqv$<; z@1{rNIri>V^c7XbP=PDf3R($ygI;6hpkl6QD!PicVyZwDbp@zcDo0+h67cR;eBMJZ zSw$*dU$mO22CI?kN!9J6t3)+aWva=l&*%50s^O~3=kXm@W7Xqox=K}#s(95|3;5zy ztzYlg_QQEyx~ZW>JBs$suvy=%K`zdO2f z+`SFSh7prBi6&p{Ht(&c)>1NJwW8Jo>xsCT|5E%`{8}`6K9{hH`tDp4jE17e(W7Y5 zppR?gn)s+`%=Fi!i~EzFq$}C9>rJ-p+LPgAH0emb+>IrJNn6sL3?&bfzT~UjNYa@+ zN**NJcUyJ?$>SuJY~5|%?cP(Ty7qJ_W9rpj+umkMpVFpODIjG^fvMfpMyhphJGGTE zr`q>+QXP9Odz#eiz0N&D>I!i^lY&Y}o_Ay{nM-6pQ%10iHB&{32$VrG6=W~t%-Az% z<{)FsD98n0;?H@R$E?qQvejjES{2@7^;$)~!uzZatKE9Z`>g_>+pJe0TPEqPPkkoP)t`7zs8-tExlT@E0x&mZLByg9#@w>gY?XMQ`s zlgILQhb!-NxbwUDw78!K^VU3)*W?czjy&d2S-s4Kd8}s@qc!jI-)u8XRdgwc^ zhI~>rQ;k(Fs%-VhCsuRSvueI7RI}A%U!ZnaJFc1ipg&kUs`+cpH?22KH~0RRH+TM9 zf5YE$^S<%6@uu)ffw-14Dhm&{DCQo;|yPU=l z$CL4-JJWvSzLhlNCS%-^db8)vcrw>W!0O5S9DYZ@^%%%&fVg5X$4&7GQzDs8cI;Bg zlVm1IB$LU`-8Z|Z$=AC~GLcgHZWlK3y zXv&#-yN9I?Qb@|3vZvtGe(L?6Cv}5FGr>$abC?Nae3?)tk~z*CWok$r!81{7mA~b$ z`5J%67-wZY%;L2KAr=MSwB>y0>XYd&u}e-IaKFU}j{tvG3$wmpe; zan?3tyA%J3kK&x|UW{d?Y~Fk@f9QzjLykb+myhHFj&T0SaqRHtgN{)CFn^Rk&M(-e zi|fUZYpJ+WJa)|#7mCZpLs!tXR-7x&7gvk3#l_;0Yqm5~LOn~R1JAx^u7r8!OADpt zlGQ_1=t{CeR!%CZO1iRGA}UeeWwl(rs>;=3wN$NCW4?$l>{F_RYN)pB57#yn7eA&`g>FsRnY-$Gz3+j_&i`r@eUQ79lc; z%mW{{zC3R`Z#{20kLBZeJRfm|T{h23X|1$cN_cD4>uRKC@jv-LHa;}IAF6a1pT#{~FzQYTb-!*0dY9#HURkcmLaczx!qP-R{?2Hu-7y!|vzZp53>*eS2T`BB`Hy z{d?c`zVC%nU-rVO-o0Sz$6m{R+kQIJx_^f}A?MbPGbZy7VKZFj<^EYl$cUL#hRU30 zn)kCAKJ#M#0cqdQWKJ`5rfL5Xxkp}|@m9u4T60#)N?5a2&U$7|Sx>D=>xuQ<+3T~` zv(7WY`u$X+frfu7{WYgMqY+JU@bIL(DXa|*N96~;m4?Dy>n3qbI%F}r!pK_e$&+_N_jDv8gi^ig^xLE{>TSaX#>PosyMchTZPF!G7UyQr9 zi;Qchs48Y$X;;D#bL|#SU8KugOt>gl>bXs-N~Y5DQM%;zs7uC@-J>n}Jv${`2`p)f z`qFmE;n^xVJ-a2B$6WGyHcK9lrgU17E4fO(lBp!UOoj52-a;i?;VS19w(>u1X9Cs4 z{pkBZf}ntapn`xbCJ2f$NwC^#3o0t^8;T18?zn>@h-}*0YFlmXzS(NxhLAuYkcI5a zBtb+_(4Yi~8f7#gVHmOz!o2DKzW4s`-Fwen-Z>A>mzhj{Gn_0WWM;mfPv0Ok_;#>M zJ}_t;d^Knqd_CwKYF8{q*4v&c^n>=H#|p=gd#FqCL}43BMV25VL!(1uL$0Bv$RmYT z(W&TAbPRKq4~HKQcMdlxyM`YPw-57_jmjs(93@*hrc4Fb+1A=N*f!c0gIn!8?bYBm zd!~JdeY<_BLkBK#q&gNm#y~eHbI2X3s z^I#g1=D1t+qH_mpH#CJaBy%1QtiA~b&6TY+{Mafz3P0~`Bz33hGCjL(JM)X$nN(A-46q);t{gCLj$RKJma*Z4# z�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 literal 0 HcmV?d00001 diff --git a/forge/bin/libintl3.dll b/forge/bin/libintl3.dll new file mode 100644 index 0000000000000000000000000000000000000000..2efd2117cd8100501c24e97f7c0e32fbbb87a39c GIT binary patch literal 92672 zcmeFa4RjPm)<4{n3}gZWJ!pU+QKJqTG(e&ei9|Oc2?R+Xk_3a41H*>WVDM^wQuA@Ve0(kQ;T|EE$ha1uTFWuZt;|oa8PF{1@CTu>5^1G@{a0i2JP#GNB;To4CkMl zcyo*lMcu&z$%cs0Kf)m?wcf0q6w z>ShLki~d4qj9Lg57djoxh-8rR47{~0XN+gN9R>McyNVHA_%;(?C<)>Z_$mCN>C*~4 zU&U#)&LpkEnd0kEdbxigxe|O|D^bnRwM^7fKhC>8|83Z#qk zi_pLyDx>@_UC98G9yQJBFL03j;AIAPyc^Jqef2fHwV}QbT?bi^RwViMyPR4s3fiUg z(G=$xtvA}~0z|Grk@*7;m+G#Ljt=!C@(b>~!Xo)+SUmLu$n+=R^VO?OviBs4Rg0ZA zf4)Plby`_xKO?`Ey@@DOnLit$$xdMo=y_M^xptG^s!cLSFhC* zSp~BpUl$FB?CM2!uB%zmdw`&2cIVer#H#mN!jQ(l^YvRzl@vF5+Pn$*d&I7*) zJd`GY2xX+FEz)(d(9H8~YN9jPh-R zZZX{baI4@RfqMdOJ>0W!@(X+Qr7W#2dH<>7YJ*SW5ft<`zB6mM%f$0y|Z&9i93EN46_K0tG5{ivQ&Z?VbVxtIk8 zGnmDQd=6_4-`6PBDSK^*F!dS|rYP5g>=cxr@7X4lIwfl&(vkWfur9#6E{HeuO^SAd z?<822;@SfmlGsU6w=&YPsjr~Jij2zCX67*vJxbj{KCq@=UW}ST380d}4*{cMvHsl1 zUTnDMjkrXi;eq@72BfsIgIWgV8fVT4SxQ7C*Ba^RTB>--;4ax zS?E+Fo zb%+#0U%wOquTcFm^e;we3W!PscM?FD9r+}2zzUC6i=bmTlqo8>gqAGC&_4zZVFzPU zpk{1fiZvLG5gk~~u7TQQOs9OiWM5xoPOZl-0;a}8Ro{j*@kSGCvFapaoI>Bd*P+gj z2^Pf(t~%9N&`^xQw~yN9*`8+Tf?CYuFsgw{N)1HJF0_0`G&t5AdIyBXA@f*&v2BQo zp<@X00zHk&UyxUve^M+W3(-^{+#tC8IV6lkmMn}7oQ*tfh_(j59*UN(wj;|jZ3M-U z^i8s=^ErDNqZSCodY%}gz`#?;&k$oz@uVTm&|{S3BfZ90%pj*zcNEa>CXUAtxhz2F)B5K#6djr(eUg-260fo!A~bb z6Fm)K14e=pYs@$624rW*8?z;Eecd+2ns%e>Sd&FE$&-Ee{a_4(qab8Ls8G4~i$r(y zjWgql8CMK}1BX5_^xSmHrV@jY*1Hha5f#pUlbqOOznWoIXg*03Bh-mT{opM z7m5-5OVO4vJL>mf0fO{NXOIih=;HtcpQ8F~3aWUeHYtu*ICQA}C@K1T?T9aBd~h;A5^yRmfMo+Irm+|iWenmt{C5b zWR1aW0(2Qzk|O2o!_q0{rr?w1}VD)J@ zWNSETYxp!axZM6)Ky-Wd#;h3VIspHVQFm|$rE*RnW2bug*@jJjKWbH!(Z zVBMzfX*d$Q;&b8q%ohDlgYJm_B>K(qU`aaYRkZ9eO!_AEbgokwn_*MpDSErHoZ&DF zo+>D%67>`Fq!$NaX0$vF9sdX!>`G_q=}7H4hp_z&vu~wxPDU8G?G)U;I3D7XeA3fs zHTn~(T8NypkaIe6&Rw5`c(yX;Z;P}1xy~7$pw$l~RLz0mARj@wNMr|&4PjPoRvOaH zK=1Atm|OKlX}avILrKBvLF@@pu3X>A`-;b-2&ejO!)LbPcv#heW+|fcJPu6gwhNJs zQ*8ugPm@Od4oGiuNAlO|P4ucGm;_3%7R*T}#cH0Ur=piZMYh5a_9`D+MVGjksKE$i z8~QWky-*t{a(I7ui~pXp>a}2%CUR3_whn(oJ?i-^((}bxzx^V$U$>ItwrXSjn1r#U zT4#F53l>`0i8WWe1yYQRb5QAEXdt?Bb~=Ym*|&o9WOKpLv6Tlt!5 zU6<*BTtUlHw)7p;cg(F_%S#ykftJ-`)lynmuzm

KXkOyv+Wl6~$_~?N-a1YO8*M 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 z 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 literal 0 HcmV?d00001 diff --git a/forge/bin/regex2.dll b/forge/bin/regex2.dll new file mode 100644 index 0000000000000000000000000000000000000000..f84a847a0de92fc59fa2ff8494ff700e62b87326 GIT binary patch literal 79360 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%0D_;! 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 literal 0 HcmV?d00001 diff --git a/forge/bin/tr.exe b/forge/bin/tr.exe new file mode 100644 index 0000000000000000000000000000000000000000..48e4c3c8f7c7140ef24d29e7885f8029e3f60c5d GIT binary patch literal 43008 zcmeIb4R}=5weWu?j1XerL=6}<%AkXS222ntfq(-fdgyW}&nmws5UTgo)_aPVEcL8wsPRu2HY~&I zpe`%Xv{KgzTGfwM&x+S}K-1GsbfrzvzD>&MTdqS-zI?y^H1UT(|g=r7nJvocz(N2i>xJRzF*L_e5ZLh zkuQ4ZOJAv%S3|4pH2EfBDXi^;*ZX=K-eK<>UDW2FhO=e%}iLEhka+FuFtd zeRt${*J&DQ+I>FF8d1jIjzvd%N{$Lfv(%eqmU}ZhDn8+s-c#&#y8(#2-KJ^xuO!sg zWnBHg8db@?)YrD#7-0fr{Zp2i>y11Nm^DH&!k-;5&alpuB4#D|3-ZlOZ^TN`5sqZ5}Tgq-gBm=4~pi53QJo z$TA1*No`$v>$Mc8kYvOjOTwZc#{=1R*!V#t8==Iun1`o-SIGX!^euAxadbL`Hz)t9 z>gq%5w5qzswN=`xx~lqXwCZ{zP^Z<@uBkON#*xOgT3thvKcF=RYU>THF;rh|Xu-y+ zYQGk0Y$Sby4VsKJDco|hPrHfh7Ova5?&P|c>jAEZxE|%|Z~Q)C!iD^=ZV328Mr~bi z{NxE2O~@aQZNE@1BQT*_tMwFl7O$8+Z{}r7kL92?xT1P(RbWMRT~#o+Vx528Du2K; zwsHK7(1gD9JWp`^jG%!~#%Zx(@v7CmV%g>N?_8_WJISi^=C|!P2KNj~gJf$_rWHyz zUpTTWeE7?uheD_Jl%&H?uNBgIN-|aGa<^IGwl=x9O02Ed_?9&!eAKPqyp;02-nOo6 zpSHPWq)&T|fNz9PlkjFPtPR-B-;aJ}PH2hVxg;HgA|!KBx>b^1u-jUmNpHg@J`g(hIhEauWBatZc%3JG4n7C zjj-mXhmQ`{ThF8KgpX$Etw)5v<>^)^bM(ivLn{jQ_t`_ea}QR_Z7oR`V>01PO>6B6 zoj?1A&!r`=dyD>*Ug4%!(gP3B)O55#a2N64z$h*B*?`x-ZZ1zZ|FHebQD!Jp?}Qnw zjI|WJu%Y3J`lDZb+1ne3KSWsS z`Q!H9QRb%1=qJR5z$;P-^gv+rpTMo;H%J)}M~chhQlwapYJv)P^xp-|Ac@6Z->i2+ zb)`2a8YUGnSxd65rY!S?p@)n)PCM=y{qpS4$ux`V=|o1rCm@xyC!I89i2jH$1mk?d0?Yw<(Qyn{CKex z=Xq8)1n_|ae*9sA>#7Xw#)J%QLG3!vBL7A|Hg1ik`lvQ{afPQ3wGlYBZ%PNN2v)7} zPxVm4RZGgs=Py~je8PkYo~0$_1)i(;J8^l&z~$ndv^-E%AFQM2(uZwBm*=UfuelI1 zZTshuZeCSwVB$Qh0}bmu^z-_fsz41KG=_}4jHW=X0o5L(p)ac;WRN!@Bg5kvU!CU} zKbvcOpK0~*TU{Fn8Za0)w~A(guMt?MZUJ==3$$3 zTl-YFrZ$KOHc}O2i%v>&d;A+}jR7?!UfvnvJRZAgJ@I&w8Ydy@vv(N~67*D|@WDoZ zb?xd}q*N6|Q$*8)LTQ5C-~^9nQ3Far8wC78hG2;FuM7I?*877KGUnH#gJg)D<87ue zPZc$*T)cR(O{@Jkfz@t{hH9g#&a=L%F68$JQ%8o zY8JeQ0`*eHNX=N=5U9PjpOs1>@!KL zSC`Zzc9&N$A}|{aEw2hz`|E3@+cyMi`~hgXO7hNMo~X<23KR3_;*GU_)zSjt3Dsjk zQx&x!QT(!!vXYtQg2WE>E1VZkwwtYXwOAaufeh8-@&(aUDY(7Hr_7fPm!PEL>O zil?9QQ#-?i7%#?%TC9h%Np?5DT1q#|h!3EQdeF=9j0Hi}AZu#Z`{^%e-l_&n zvy50OCI;G5#SEq@Fd<{S;aP`GW~nR`#Jn}s*KPDPt)*OiOrt@uj;aiJSvsQk0hny^ z#nKjdR&8{KFj0Y8gORC9hS~TSF1EMcU+oVDs{$LrsFiGxNFP8j!x=mj+qG-z@l|R7 zTp}c0H8rkE!p~Jx{&uG0o=Cu?{d|3p^s!FRY%-$bdc9HkH3x{ zVS5cCzj#R+3TD(W&WN)bThfO^nmvv}xpEno`5PMotb2wS-)NwsF~J#lctr7l98b}= zram;GA+SbEb*41&rBJp&pdp|I{8fz0DwyEr*uWaUv7#P*@Qe*&YZq6PmX7mGpY9o7 z;Aw6~uJ%-Qg_^3O%A=2yQ*gX8o7dF_tLjh#nl-7tZ3nSW9cTnb^bj+1NC{MV8km@i z$i@VZZIM(SlwLK|BX#8w#JhprYg89dj-RxKn0UO8r1r6$wcrG8OfW-(Qt`Lqb@z|k z?IsjC?zz1_Ro*0StL==e3(-|jxTMNepG{C8EcIzeqV`mdQe$6(KS>oQsA0RJpv(Ld zbLJb~|24A*W{}}`4l$LCyjI6L%nJT=RJ5CSR5IJLM#>~H>r^#Kl&OX};y@=;#SE4a zB*$at%;wfRqH((dvm+bq$f4Ch7roE4D`~z$$t*#}J#(c@K$-6?0)?HSt++~8h+^29!x!B_%?IOK*gd*TfsoHeQBAq+ZMm=O}If?9HYKd^WM`qSQMV8tS z2Tn^sC=S9s9<$koD6kh`qS|f8^Sj#0nwk1n{5cqlYr0H_)@}dpqvg0PgO#W&BlZ z#G+E{cd@>rw`~B0r2wQ~xEqPx(F~x#9B$CGmgiJ4y)|F>6sn(KZ-(yOrh4x$(X1h*{sq#l?YkovC}SLZ5V)I zb^=Aq?wM|Q_@A#urTsGe`Q5S@!L_cRY+fmL7;;hL%Unb zelGp?k5-3}TCl%oX1XdiQ?1T9%gXIPD0{-E#n+GiTCl(687W4!JE%6E{^xilmSSF1 z5C6QT$9|hiPJFK?`g?y<* z?L-KvQWLlY3R}h+VP<3{loTE^I!L~?kHVhF6rr%0!ufFuMS*T#1%+3O$lTt$lEH_@ z!Qga~KJv5Vr7j~Hys!;%VRPHTvHKL5|Q#7}Gw3uDn7lp@}W zZP`Qw;qX+1F%ZW7UHoO%LZ46@AI|)=pZ++iX{q+@cy6W8=cwsyTM=g4+SgV?R!3;7 zIms*IMr2DAfntblWi`8Hb+v^wt3v?Io#9W@^etUsg^|#Xf?W@~^tMZodfSVkVRkyb z>lIiHf9f(;lbT`OA@#F=^qu*}T-GP`)~lo|f8J}H*nY3#Jw$$j_Zegg?~77-KjCbI z^i$-b<_k_up+}>Il(pJa4PBwl$fZ-sdBoQ3XuwpLFtbG7j|RNStq|kd26`-r2ES70axs$IATZMRw{n_heGkM*YwAKS0DZdkBdJo z_7d9WfkS&xjcZF>FOf#%vlVEMYK7=`z^QkhDW>Q+HmGE)*oL0>`Z~33gIf0+IR#xU zTW#C2MVThw^j@f6|7TlSdQ$WwPKc$FjE3I&OL!5>a3#bPyjb|x;21~}Yv35v(1@8NX6c>ZQHf70 zNfl;KISB&S`CB{|&&Pcb~3eB?(YJWr%Ml*;WcJvu}ldkEg1oyZ~D0xfM9{E)DNw?ObtSd6sB0pK9!qT-O z|A7@`q;31&(G)n9cLQ+IO_Jd_3T1ONt-I}VNXH2kXTjDytMq$rbGF+Y)N#*Rk%CVd zOy$v`G#2AETRao2J0w#^*f+pyb<|0W{FjNfJg1QAZSNlG?Tu=GBPZAEsIHjyHFzzI z?a$hkyJ9~ly91q+t>uL(PjCGuMQu;T74;Lg?ht>;wad!ANo+(-zGAxUY@cR!+nts1 zCo|qpU{Pd)DNT>euS6;FSK1bSqIhqiOkelzCT2O#pikh1iOWS)xqxqO>kXX`vX@fI zfH^)+sv6$A3h)m;hREi7zmR6`zEA<|qtw??_b_E!rYk?e7`9bAhZ1gYRNR5BD~ZJZ z>iC7NFFKxK+X3YHs4M!0i1jd=kvUeS*TcTuB7O9@v;q(G>7O9@e>>3E9MY4 z+Ym`}i2gYIHbl}KqCdoJ8zN~A(H~;8Lx(4>K5?~4%&B^76t@G1gwxs>5}oSGm%QZ2k0=cQ0^ zjzFY?Rk;7Qf(V@;h+KLnf7M2CDrxDlH}6+U1 zJcA@5D8>X$^jZN=mbOZ*Q%I89P8G-!{PT~&pB0@xAbw#ndU`+n;RET>;R9la8Z8>b z%S)x+75yV=DFRf)vf5%5kFM5R zn+1r#ZPGC$r!suB(x~N+ew#SsG7WxO-8YnmBl+Q@Lz;?PqWSHm-V5|?rPI1s-rTIQ1b&x9~M3u&|6oLMBw@iNy-Qxt&i=I&`?=2X)PgB zVkd@=u8%zt?>96u&_p1r_d&vt>VpR<$H zP{%m{SwT(cklNeRD#zqs)Nl-9XPI+MaBAP?NHtj4Z=e=u{Wrd%n%D|YY(!|a_3WqA zChfC3MWHTPU*oH~i4B-U9SKyPl~+xlzWls_DU6rzgSIKGuUhA);MA!UOxEX$Wd*%* zVyV(9_ck)pG+G(vOEj|2nwKtf$eR|Tr%C&(EO->1dX?V#+F)EXeC&H@_>Kk_NBQc! zMJ>%Ew5fXQohmOhg6>uXJc-lw)_+!s#(3)Rbu^{TFMNgZY>3M|6g)kdo+-Imdh5l5 zG|gA|Lf|8Si#p1^WngL)P3tK2&h0R~^Td^dNZVt{!ym&CO3%3qgIloMr?>qbvJ^L2 z9Zjx+7h8%(j@Mgj$ZdU*)imyw;q~dAxfjzPE>4@Wuf5zmLBDZ7rBG(IO15+wlgum9 zrN2yYT-+W_x_EopP{u{WTIz1wt+(DwiaE;-IwRaO$ebgGry4sN(hy(aZ-OV;G(@|x zuQr#3zYVTH)Kd4U@v0)sikvE_(JJ*CJz#~#OR2)hw$V4vRkbco$MudqMfXeJ0vpl| zokfgaUF_2$DDtAM|eS1-ql;>Hl_9K;t=6pqynyPQyk@$&cM{jaP&5 zA}ui*N54f0AxeN@Qh)_-F7VL;@&+g(D=kQ0+D4DJO=)3D+cYQIW|?Y!gNBv%K_Sc| zv`qBxGX7Q4jjnOG6iv|dHj9MET+vo;j0WDh4q_B$9$HGjJm zPBgcE6}<2#Nt%cPeZa%=XMhkMeZL!e!n;WKH5wL}U&KoV1| z+Z2^Es0Mn`I$ava{14;$))$Rw{h9_>A@lscW+_r~ znuDCuw9tjpEPu3{W#ea{qv;XbB(?K{xou(&4wV~emS_zQ<{=vE`&Y-29I%2n9eA=3ZbyX5<;6#Lf;PJhG z{p$RHeSqSadcnzQJvnG$pS$3ALV^-G!mv`EXTULHn|Gx;>2RK=@Y|;g)n2;o9~qoF zOyPlDNzX;;QM@953NG1Si_$jCfGhF9;JfBrx^oMcj4~!&TLst4eIK zr!tTzJm8rTZL><2{dI-J-m?BWT*>}TqW%Gk4#Y=63jZ?SxZ(Xgdbah5*T>DIzkHwm z;_OHn%fEQahu(HHdp!kR+r$KX{4hs$(Rfz=?X~_+QEX@aFGH9_1YOwWY96r}-*mPX(#1`_;dyC$+wo%Q>?;xM znv3u93iWtqepNj`0W7*71p#v9S3+JdkT;0&e8Lw0<)RI(YLylnO4(?=J=h)iN<0?} zo-+i`!d&xnhOS)muj96#w#R&dK_u6lnPpy?9d9l?mJQj~yqxIUjJ-}`?87(#i*wYN zEIiKoDjt6|hZ+}vq2jp~w0O#x5+@}^sj1!6PRQO_B=f>Vv^G%Y*2`+rRA?!3f?$fkT4nsKU z;;bj98wyg`L0*ZOmE~`Jlw*)#*@e-X|rKxw#X zK&#B=-I1SoWQn4eK60{o2-dP0Gv#@Zouc0WChd9bjNHA%p*m%Y>M$oNZq6X*={ zu-=(nh@a)j4VtJbN>APSratwFRCzRrbF>2tS`?9)gOU{bjduKq8)=jqDz) ztk)`6X_banS*2C3)+*O)l>x0%+l)L_$0$OY<)ULUI&@UHOja&e=D}34H@EOFW{(~= zr9BTrZW%Oy|?E&(`N7J8vm<(f{gnmls`Wa6@#*K9+V^Yd` z=4z=dK090u<#@uA+u2#@;9_ZJv}W!Tf3C4#Cs<*=E<7*1|4q7xM(<<);<{9ksUgNRxIjaK*sHzB@M3TX6y={9{ZK0(=b^o zjl~jI6a~oa_-0zm#NM?_~@5S!)U7Pj?DaN6gKXpoLB(5iaT-x<{1?}FyHsJn^uQ?=pM7}KP==4dvR^l zeyI{j8Xm%KlJLi0<_7WU=M91{w98q@7`A|gj2cQB4GlPd^&EVSALr$)aXrg*#=yR@ zEYYba_0%HZ1UU(;9_I7RnC?kRSI?5D4EjgBeHk_4a^!9wyvyjBl_P@fp5@W3T6g!X zvk8vY+CI=*w~&m~3Jw>rX2~OZChgCTOid}WIlO_tpK_hG$fq@N-N&V#GcAybSr$V< zw(FylJ~j84uM`q)Iyo@7ko2Yu&Rhh}4}bpU`Z37)k%eD1U~Z9xYt~V$b#82VHZ--# z4y)2rgXB6Ijpxc5vinr4WT@U*kv?UYexvNY>zyCzoiB|0>rC^v<|{n#7Oj%vjDQ9E zyM3cw@%fJ4`Ld{x{Xlc1p6zL-`GdpVuJG%L(@y(&^iDkxcorzs1A!w17lUH=?6Y0b zbRtr-dMt3tzEHo?A4sL$J`dXp=!1n1Tap$2Olv|Lwe>?e+48ztK0|W(y|Z%6f6k3Q z>FCYNbcH0nIe@?-dGlG|YT{3@K=oyLJZOd|I58gK=})vFU+YUDJ6}sWml}8Ho#(mL z0FZ|~ixVDihje|GF@@H7+13?V=IhXmm~v^xTqtJStm#}DwV3-^P?%nPLJFl(6e4mX z?xT4)+^aPW4S%WWH=Q9^>5CVKzeJ%*ltTUDiN!qP`REd#_5y)o?tkTyIFES_W$oxZ z6h(9ti;+Xy=Z@<>?e)l==SuTRrcW6QSykGQEo&GR?jB8&SU)(6^#ij+7BYO+71>r< zmbpCJtjLOQU?Fy!QPbcL)}P1xwT>w=b7l4s)`aAN z=>eY~OD;cNZ9Dwe%S-J6*$7}R{k0W497z44`hdT>VNHGQwX8;@Fq4riiUiNef#a4} z%w%Xu{0&4J5AS)#R1YW_yOyN#E5|SM{HFyxKzX(a6B~&(fwgsY{xv-J;_&X!Bt_%y z!Ld0BIf<)~g0XDL()m}EUb$lSlFKeDnO)w`KB)0q8HrLl;aUtubIXjW)^az8?)1)= z=8t{@!!QqVprp7l8Y|TTYtd4U^ghY>@X{&8?Egr$r5m@BpY9CXv-8v z-v5yJa;_3K`R+&Xjt`eEd zHIkQsqD}#{(Uj?MG22y~0F_y4u{AR@x=BXj#!NiSg6KCT-0Ypl3kfb$?N)x%7cJMi z#v7{{dpu}{y)FxZ#nx0TcozDl#9sQtFZ68%@k1~^G&0i~CCfWzrg~FIBnygQl4#^# zXWGOGDUF%3n~r~@MgL~IoGVjnkv3I_Z>)*o?E~Q53bNS0*;1#$i^Jb?bN2Ob@WC4M z%1t9ktLfO7hMHNE!n{x*x=&avhsE8Y3mJ^0U9yu1+K_2(N=II6TQ;%1dB;xPDbP{e zIW@Y>rtZEz>K56WU3u#lHi5KqrZq!|bl4W>`!pf%&bYp^kwEX9AVQN)QFL$1^~iR# zEN+$4$G4pZHK1`vPNo>G-u94a7|_Mg+hvp`m#P%^ypNhqGN2}!W6}@xZNu%Okl}7Q z?-g$iP86ezksEyquNa(5eOkv-msufihoClAjS!HuHW^N9L!LB)Iz(pU3h%JFbQGI2 zNLuV?o2^i`-g(v>Iw-mYJL+u=Y?aaGGo`{s*)4@yXi#s7@YebV>6V|f;q*HROj)M4 zK2G&^@11H4F%Lx#vdT}#1td%kWeuIOyqv-@l(GHv2<9#;jgyg3O~<9ehLzh+KZv~v z3G-0%)1^6^Y0gW)xlI%;wtd@FxjhY&z66s~I=F++-&Y@v<-AgGMdjb;lHksl& zW<4rL-EE4e>22aJVHWa1E+!?lw--&57fiS#vpAqH0NVk;vUtR@jBML&z8cz1>9NYFRC@Eo z8qNcRw0t>_djVl(OMWEPuxe#p>Bin((ydc3FViH z{p*yD{X(th3EAQ6q<^dVi{18gacTQ2v3{CW)GqJxkd-iSOBX-I>EZEwNG}5W$*Nh@qU79vJ&fcKv>f;r2 zA@vkljNSL(8iGsBo*#7&ZV%tU}hMK#ilOxkD!|(qkN<;i;mu? zJDx!Mi~0!^vh+qj!*nq`PAjLQ*!D2MAd0ZQE5h0+xi%kXV2k6X&&c@sCHl6V(G^FT zzE6#PlG<6syqCj`ZJAGxOH0fFG|OnpIbK<#6ti`)wLBNnr-0(Eggn#;as2-F)-;IU zlpcKxDO2uq%Eh|-iF-LPj<|icxJO);uvsWWGX!S-&{B_oDYJEPc&BZ))MH8Mk!BDe zZbqfgt&t4V37(ItX$KJzZF)~ow?9mfRR|)L9(>$_Wq(Rk`=wQK8EcWsv^3|sCDNrHi|6%rH zqYF9k{FJKi%fmpHc&3$j@!tsJ2}EB|cTcoM@+v%5i5CxTJ!{UVBztKeQJ!%`oU%>x z=|(ksS5MqG*_~av>1-vx?3-JrjyDFIJ7aH~hw%h7`>u8;~pH$*quEkYAuC|*3OAu4TN0{$yh$kd?glD{h5Znh!%@vV~@ppWdRu- zEZ|Qts}<*2w#;llIQm;oVE21}P5Avh`>Zj66bdZqzCG9RBOlSnv$R^rC#8a|Ib~m@o~=-F$g_3$bs_zEIsk{F8C8QM5iZN zmwIT|eCtGzDw&k2^WCtWRro3i+1FibP4X6gbX|~Urho`38=H^~f*dSTr8jfjuL@(= zZ7euk_?Jx=Aj+(9QA($an@miEobLLo>mw`oHhl3ptO~ntGjqS+d~jSH$l#ELlC10G zxL8hM>tjN3@h_zX66sg?4LEi1-eWZYbCMvboNcFkHIV4pqCGciAZvS&`f@AoWiSZ#1N z*6*3q5aM-1vH+3inO|Qm&w6{tjtP!qs+^%M<9T^rg&=P|7{e=K23X2aZzN^@x>}G1 z9i-D(Gv%!VY^?_yLV;?(dMgv}DcLBy`)st=@J1uH>Up6+`C30TP=4`}49Jl;9BiDX z-s`}r$$C|8QORYzL}GFI%vtkG=a*k8Zv&V!zkG4Y(xsj`OD^-w^pwrKtbG3Lic(&F zQdV&pv*!{hO`%+!I8Y3vB4Gyyk-gwa6Y#6(vpSACA3o z&R=6)>4Evy5W2M3Iq9lJ9UN`zGETOOnY(6NJP=As=o6X8*J33ZwZ!JgUWPh%{P;>t za5*PHCwU{kzKBlw`B44lNdWeG?|G-%r)Adow3E0V<9d$kMXuj*y~Xtb*QZ=3_!(rD zP?#RO4SezS3g?g+^E9xF+ZlNXAnR)PLgw>VyEj~I&FCJI(K}d%Wov{7b1$ahT!E=~ zFKYY1taoo1YYp#q*)a0V%>mFmXmO4mn-%?dB8-6q02Xev$WlE$W1 zw#lnL_}|YTlC#}jX9Bw*uOr~u9zCJ`Wov<_<)CXChl$x2+*0g4C-M$cRQ#y94{dEi zKcm<1Cq6_t^F|Jh6CTa(jps!EGy$_Q#cdpj>{p?Y zA^nEWwFAA^uOIS^++sb9^lI0Bd8+;%|NWwMwW}`Nz#%!Kp^le~rc&7#%l8ybmoscY ztym@RqdNE8lqk6ueM9T>r+GgL941bb$xPjB#l4|jo=_8p@ZY`q&2w=IopVfWJhq)j zRPP*Ve%!vrdkUaQ>y>(^on-Ir^AMQc8e_SZW=K2$Wg-z;cGzsab5MJ$LJ)hQk@S zV{V{9BUHI%e0Y;e8B5M}3R6O1f5gWAtim3CARI8Vlbdd1H@NYiecC72__U+7_O-aq zzMtCImnM1Ve$$SB=-ef3`MOk?F9WG@fvKzaX)_v*O^??n_j%Nx)vvyPr2b?a5>BrF z^`PBvvb z35j6Ziu5*#gT&KB91LyDR~@m2yF>*NF>@JYhJe~N@6d|+~&Q~TMk4i3G&vufLC+)MnplhHu zdbFS`dIvbrrUQ`fXzu$2ZOv7Qt=@M?h-)quD@k)DM=|SIJmEGn*F$2fcdz7a@xI9| zuDKGXuGj3GUEGxBN*v9VT&1~E@;I6+v?VlGBGEnagvKq3Ml@G&qM33-a}RJ!Zs9E| zg?y>;xa}+*`2_&_n%ZtkTP7-})%$AzKqR+g1Tbe5dCnN?nEgLvD?E(K-lj3EI(q}| z!WV*P*cz)ISaVEOLD$e-QI~MUlC|>cD!pD9QI$%wIu+B)^q)n{T?M<%;jRdE34s2y zm@7i#=Tb12nHVoDzuUW2F`_Ke^8{@kRAQ_5SrX#yih)bC>n$oLg)R2WA`NH3YpeHB z!MMfy1h;s*N|?GHv2z~errK5Fw5#N*c9oLHX;+~w(XJASelCl^HYIQ^I1#tp5Qos8 z+OCp9zSQ^??ON&G;OKZOfFg@>Qi{FJaVZQUIX+BPdYe;3AgWz=CXDhp4;eB<|D*@H-u>yFFVLo&om z$NZWhUf%zH%n(0ZzwsHSZiO%CH~yTv4E2J_T7+BDk-Z>#4T;+%<(UZ5F`rQ0Nc1EY z*TY9^^|o{ZE!U>a(%ZgdnR=@T5FHUmH2MJv)~V5V<>t7xwg93axf+O0xQZQ$wqjPLCCk(C(6*mEwX2{Iy=N%iw_F0 zAWNI4Zx#Da!(<)#YvJC&nVfg{*{k9+zh@JXPF6besGaPZd=j~AB!Xf6AX7?8A(QFe zb2g+rQL7*~1Nw2~JV2fGe&*u^yH!0DlVy4jpktX<=2!-X;p4(Xfqawm1Rr7KQ9*a) zDuvP9uC}$Zd13)jH7mFG57_p6FVZt23BRmeWH~g+);~daWW+!mY^GSW-}BHi_q5lG z#iAWQTU+(^-31SKT@T+B(3j}dS=ui(qU9ljz|tfvV~;U)4xLg zxmZ}YAf0C;O%?y1Y!Ixce7t_IfKFGS<_?U9hX}L4AV(775_>=L_9;Ry+x@==g-^q5e$3>5d+0gU zHDaCioV<<~&<3jNv>>mBcm9sAs%xs+7}TmY`+XFAkH!A(fpbr3&#VnTEr;tYt_!%v zb4}u!#ufj$2&8d|X>fDNR6rc1v$gZIm2pLP_KWQGj3WEBW%R)u;G{3+%bnMx5zLcd zH!nlbWa;L7p37Z1xTylITiNTq;~naqu+hH8-00IZ!V9@qI2RVS90Q#b9D>lwx(A&t zbqIliP_XCU0tTr?5(_>6dnGFhZ>DoJtj=4>f-E7HW-ic-Vnm)te=0(4@;ZvfO#`&) z!Y{yk1r3q!ikW{Xe327lvdC4=$=IBrEH0KoK~A?jy|R}(`@zk)pq-V|S+C&PgzNO1 z_ah(dcS(0rQ1D2Q2>!i>uY$P<%M-nDu-eeJ?*(C zDOLYf^iif?k5@SZo73MD^>?@LiQV=1s@Pv1H>5|qLVuzYW{KH=^cs*=!kkRc%5lGB z`&DLz_De7@g(l0J+nLA2pRswoKK9h(>tpvnzB+c#`M&ExKcK&EtLRYo1dR+Z?j#bB4eoxN( zx^Nty+|A#yLOzgqF6k#8XT za&Sn?&is_|kls+ZL%->7veMAk6~ydQxII_5y8@Jm)jvUtmWnFcFAOW>YM(xEeTYMm%ca(V<-3jy z|2@VG9&OZH=TelXo%Gf(L8tWAn5;ip>YbVpJ!h8kmFU%*z|PS?GQ+bR=M2RxBhoY``>X%y|W5G z({Egih@(UKBg47~RMW$wh|)Bsq+~d+}8tAF|fW2cJj*Fmx2X*Cu z!d}?2{T_J~)#^@=li^iWVYOV4YM6;%8rq9_4esk`up)9taQlajNvrNt~f4Qv{ELa;{Synd|Ldr*!^~_^_LQhUP}x1+YhwoU-HaYdgK5e zvXu{+Ueq+Q>LbN?mbsIsgXZ%Zs1vOPZgU~uiA*;ardta#&4roPf-G}kmbD<;T$pVw z$T1h@SPOE^g}Lk}nhQOV+r;J0rrJET$H`~Sg^7(itDERgno3JJ?4V5{F;dQsa)b(e^?A_bnPHXGx zFw)$djvUGG9X{wXckPLU54Z|;?m1Yn&m3t{hyvl~)7A6L9glAj`gX_ZV?UXxh2WLb zrem3`EQ)MBS>!}=wsi`0O(8RWSWMO~?LpX{_^IZZ!jzh?U*145C5^F48k|;Q5BC|x z?;{C*ZGT^$FPj%BlX|i^LlC2($Lg)JS`?WkiBrtKsOnFou}IXAl5Ba)WI}XUj<97Z zcYw)z#Cym}4W4N;#Q*%i^lAqaM-NrZ{@YXx$#yhlz;hG&2DDP|;^+9Z|5FO~wI=k^6J*vMv4B;_72-{n{T{ie;xv{R85DK=lXpro13M2OO zFURt?C5b;)8XW%M6h3VJ;6d?M=kN!=&}s80y#Dw2!v=Tof~x^}WV!O!!c-EQPpEB} zL^pxOD{*R*SWNYYkLCASC9W^vAWPcR;n#p)I%GN|zzFiaV28;JZi=LEa`^Z ziP=Yyh)I)(vy^FKdafoMxsrMkRrHRLPX%q39;|-7V>a}Q%g1y2^3^e`iu!Bn8=80% z!A3}0=X|tEj$mn<IgFqzG7?W}+l^f0BxsS5Q#g4SCO~h! zNP66vU1Bg)N}MMpyKb;1WcLRpJ3O<|m^+7j$A-CUIua~AK2)Q(iC_@33pe*OY$a{=^`eBddwc>ggc9n7mA1fNm+U$?ah|17-?<8JSM&=3d+AW>!^O-;?-z*` z?$lf5wYtbdJu7lE_(aRDCN277jGT1*0HruTh(2Ie(&PRv)1!9RO#aSdmh@4_%-+=F zZkv0@JeZ>Y6;H{l=x_K`{+fRZj^rJsmMgqH-F2g;#nS_S?mIMBVg70V!M^Bb;<)hl zx6<`-b$5r{eAsA-Wcha({ zn|-OM4D!#=B$`u0=bbIRsi zYQBZErfXU32xr|8m3w%oHeT+r=(z2K%>(AIt#r%h?ma*WMc-I+`6oO9CLi$*9p$A7 zJjJ)^3%=@YcK4J-&_bSyd0%ekqIW`Ng?rbZZ@yseJ960UF%K8KXl{yF6fcRGi{7^= zUh%%QNr_AG&)K+P>d;idiv_!n{FRqi?B#x#Ckjj65e%`e!hP#A3VLImw$;_2+YvrA z$}Bk$8d12XX-GkDVd$N}UB9IBYO(JkU#sN6QywDYwwsIIGjhRJc!Xn~Ww;D|tu1 zNrsdq>irP53GW@VB}G4b$K2U3es@YdKHtJ5FwM+h43s%QvFV~y@NnRU;Y^_Cxr`xl z^ImsqL=CP8sIJaQ~WsBB*nuSb%Y4>)UqlCUL1=+#n@M&j08g7a&SZlE>U3 z?+)Zl24+WXHzkj+(BiXS)z2$jwD2@)eMxVX*AQTd#7;@Yk;|o4EUeynlGHkcY<=5j z9Sys%lkE=x!6Fki-bIKmM7^@iG*604_+QXE1|suyh{%j&u%O9@&cnMk_Kdtui`9En zJWX>b;W1;J6qG}0;@Qc=O4<6)x?$I&|Lllsdq>f5^DlfOeh^->ILD{pNAdiRH;~bE z8jrbof~TnOJE@f%5l3_sl_P%-qlY&p@1ZHCp-vP=V7u5{!9RH*>*TOAHAWPNtI7JdtIw?{pcm+sN_i7Yfr2ke~VD!Rf*FWR8D z9Uv`C`=-%sWSkQHtpG9G*E{D5kep7RCr+sVKS-X$F~C~%2Sh|OPz8Xqq5&yrzgv0} z@0QM87Cy)aA9hCbNRQi}=Mj0If7mR{zSicS-e)05v@MHVM-TmTk_A8&=FTbc?{EB|@ z*ZP(JqF>z858m4^{z*Uhyngw){o*;%nQ%mjvtte~l~pKfnJo5@_z~t5-gg(zuf(BV>ou+eToJBMxU}ar zEt4yoE0=35*CZ|U4xrfSm8(^jm20(sXw@3ISO`NY?)T2UPetXNmI0k?>Fd0Jl6=BBMy&r}NB z!Zaj=1SGsNtv1-?5EDpSm#Aw)8mp7ljUs04S_#XWN%>u$mZ(B&Pec3;akr)c;2a{{ zoEGFO^Bg?n_uaH$qQISLJRDfPR+?1%7ZqODDB*h~j3gV#`Jsg6J+=JqmvDWx0(v5i zrwSXIls^1|uzI~eFi)qg?_;`)1m|)z^`Z$i9DU@MO}bnQOD=OnQ5N2_PqOb^lq5g5zb%W&>j zaF=OdJ9lncADm11eZB$Ghq@U91(;tl{3kBP%;UhnV1uW?1Fqe79QeKDMRqZkr#l6? zZGMBk+85OxAinv8z65yEJX}65mu44if!2Y4Eq2W z>eU{5yH~sQwO;L-?p|%))?RJQLrg*By8TTI;8U8m>U)~DfYEAVnfBU2;Cq0782HWt z5%^xh}!T5ko?oR2hld)fC2kmeYqc^dGCfPWkK*MRQ^ekG@+^w{r2;0^reSuHy;lqmMq) z-hKC7ZQs6q+AFWTqV3qRL+kA9)E;{1A?@CK@6~R<{dVo9n{Lvsz4ltIzP?^twQ7}i z`Q?{u3l=QUX3UtOO`JGUJNMjkwbM^OT^l}pxOV9CUhRSV?xP>K&|j!mx)SxP8-Ilq zSwfKc>wn^>N`3|W*W}xj9KZa3g`{L`Ut9ib=o9%Q<2xq&HTl|yy&rxB0$b$A1E7Hv z{r2tHs*~~uKq0w_@+y#w;X^w+j-S|vsoAK5f)V|YP;Ux=Q<|H~x1&i2BtwcT`EmbH z!20rS+{9J+UIi+3#D4%w8C6IXRHXFf14oKVRP{?FUREJfq|6k2l^+U9yIudY_ zNA!R0F20q=W3R%AhvUMJnFKkPYfH5i{4LQgBQ#%IqAeyqpTBbm%kMe&hm1BZe7F;| z&78T3-!CE0!{z1@zbg56ND{$kXaTKOtJl_mtyZhk{9vxvR%;F9${w1=tauVvp}Ln4 zX01g#8GN&WS%+^|1^h;+sUqf=0@_?+71Ug$HK~6Sz+SI~v_8fhCz3vsVjRC!c-jVfvL zxr$svm9FLPQBXCkJqTSM=x@*jdNp{YK7j~9TMZ>7-+(r$Sug~E7Al2?zMMGcbAhN= zP*up(gXa>$=cxl{HL+B#rzzeA@4(W!kTMNOW20&v;rK$N(nxFq^cc_~A^Fv7=OEK~ zI~G&FJiI6E+X!4OSn3sAIcZZB)goJweI0jOF193uW6=dWt(tm7##Lamc^BVP)4rjd zm{i~8ir-*TJ(Hp9BCdR{0yO9%O33eAG}NW^%*Iv^=DH*elD3jx3*|&d{O~IfqH!Vz z;b@KGUDJL79}}q|Uz<#54tchAELAPjryY_fx*@G8yxP+EY8@@tMyAv+a;s9>u#S5` z!y8j{+O7UmEe{HWMxmiX)xndLnw>5@{S@eLutMdc-`YG#&lAq#Z6-0h7YY0X@ND3c z-y|)Aa%H57j)qiAB=@;v>(yvuX`j?G{afjHZ4}VPQFbZv_ET4_qH-4XijAm&p17uq zrI5a{jGTH}cp~864Rw@>RSW#)WxU~B$9qY)-O4=>l*CYD+%ux3`${H#( J|3CQi{{b(OYv=#~ literal 0 HcmV?d00001 diff --git a/forge/forge_client/.classpath b/forge/forge_client/.classpath index 34ef34d1b6..fae6017a3b 100755 --- a/forge/forge_client/.classpath +++ b/forge/forge_client/.classpath @@ -7,6 +7,6 @@ - + diff --git a/forge/install/install.cmd b/forge/install/install.cmd index 8e13411ba4..b2485d3fd1 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -1,8 +1,28 @@ -set HOME=%~dps0 -set MCP=%HOME%.. -xcopy /Y /E src\* ..\src +echo off -cd %MCP%\src -%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch -%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch -pause +echo MinecraftForge Windows Setup Program +echo: + +pushd .. >nul + +cmd /C cleanup.bat +cmd /C decompile.bat + +pushd src >nul + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch + ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch + ..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch + + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do ( + pushd "%%a" 2>nul + if errorlevel 1 ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" + ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" + ) else popd + ) +popd >nul + +xcopy /Y /E forge\src\* src + +cmd /C updatemd5.bat \ No newline at end of file diff --git a/forge/install/install.sh b/forge/install/install.sh new file mode 100644 index 0000000000..e5de30f20f --- /dev/null +++ b/forge/install/install.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "MinecraftForge Linux Setup Program" +echo + +pushd .. > /dev/null + +./cleanup.sh +./decompile.sh + +pushd src > /dev/null + find . -name *.java -exec sed -i 's/\r//g' \{\} \; + patch -p2 -i ../forge/modLoaderMP.patch + patch -p1 -i ../forge/mlprop.patch + for i in `find ../forge/patches/ -type f` + do + patch -p2 -i $i + done +popd > /dev/null + +cp -r forge/src/* src + +./updatemd5.sh diff --git a/forge/minecraft.patch b/forge/minecraft.patch deleted file mode 100644 index 21ec044efc..0000000000 --- a/forge/minecraft.patch +++ /dev/null @@ -1,5032 +0,0 @@ -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-10-02 14:29:22.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-10-02 14:29:22.000000000 -0400 -@@ -423,23 +423,23 @@ - { - return true; - } -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - return true; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 2011-10-02 14:29:22.000000000 -0400 -@@ -26,7 +26,7 @@ - public void onBlockAdded(World world, int i, int j, int k) - { - super.onBlockAdded(world, i, j, k); -- world.setBlockTileEntity(i, j, k, getBlockEntity()); -+ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); - } - - public void onBlockRemoval(World world, int i, int j, int k) -@@ -37,6 +37,12 @@ - - public abstract TileEntity getBlockEntity(); - -+ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. -+ */ -+ public TileEntity getBlockEntity(int md) { -+ return getBlockEntity(); -+ } -+ - public void playBlock(World world, int i, int j, int k, int l, int 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 ---- ../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 14:29:22.000000000 -0400 -@@ -5,6 +5,7 @@ - package net.minecraft.src; - - import java.util.Random; -+import java.util.ArrayList; - - // Referenced classes of package net.minecraft.src: - // BlockFlower, Block, World, EntityItem, -@@ -108,27 +109,16 @@ - return 6; - } - -- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) -- { -- super.dropBlockAsItemWithChance(world, i, j, k, l, f); -- if(world.multiplayerWorld) -- { -- return; -- } -- for(int i1 = 0; i1 < 3; i1++) -- { -- if(world.rand.nextInt(15) <= l) -- { -- float f1 = 0.7F; -- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); -- entityitem.delayBeforeCanPickup = 10; -- world.entityJoinedWorld(entityitem); -- } -- } -- -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(md==7) tr.add(new ItemStack(Item.wheat)); -+ -+ for(int n=0; n<3; n++) { -+ if(world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); -+ } -+ return tr; - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -178,7 +178,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -242,7 +242,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooks; - import java.util.ArrayList; - import java.util.Random; - -@@ -151,12 +152,14 @@ - - public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k) - { -- return iblockaccess.getBrightness(i, j, k, lightValue[blockID]); -+ return iblockaccess.getBrightness(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); - } - - public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k) - { -- return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]); -+ return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); - } - - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -278,24 +281,40 @@ - return 1; - } - -+ /* FORGE: Metadata-sensitive version. -+ */ -+ public int quantityDropped(int i, Random random) -+ { -+ return quantityDropped(random); -+ } -+ - public int idDropped(int i, Random random) - { - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); -+ } -+ -+ /* FORGE: This function returns the complete list of drops for a block. -+ */ -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); -+ } -+ } -+ return tr; - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -309,20 +328,12 @@ - { - return; - } -- int i1 = quantityDropped(world.rand); -- for(int j1 = 0; j1 < i1; j1++) -- { -+ ArrayList ar=getBlockDropped(world,i,j,k,l); -+ for(ItemStack ist : ar) { - if(world.rand.nextFloat() > f) -- { - continue; -- } -- int k1 = idDropped(l, world.rand); -- if(k1 > 0) -- { -- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); -- } -+ dropBlockAsItem_do(world, i, j, k, ist); - } -- - } - - protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -618,6 +629,86 @@ - return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; - } - -+ /* FORGE: Allow a block to set illumination on a coordinate basis. -+ */ -+ public int getLightValue(IBlockAccess iba, int i, int j, int k) { -+ return lightValue[blockID]; -+ } -+ -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - try -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-10-02 14:29:22.000000000 -0400 -@@ -63,6 +63,11 @@ - return super.getSelectedBoundingBoxFromPool(world, i, j, k); - } - -+ /* FORGE: Implemented base method, see Block.isLadder */ -+ public boolean isLadder() { -+ return true; -+ } -+ - public boolean isOpaqueCube() - { - return false; -@@ -80,37 +85,37 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) - { - int i1 = world.getBlockMetadata(i, j, k); -- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) -+ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 2; - } -- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) -+ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) -+ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 4; - } -- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) -+ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 5; - } -@@ -121,19 +126,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k); - boolean flag = false; -- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - flag = true; - } -- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - flag = true; - } -- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - flag = true; - } -- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - flag = true; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-10-02 14:29:22.000000000 -0400 -@@ -40,44 +40,44 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) -+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return true; - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -86,23 +86,23 @@ - int j1 = i1 & 8; - i1 &= 7; - i1 = -1; -- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) -+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) - { - i1 = 5 + world.rand.nextInt(2); - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } -@@ -124,27 +124,27 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) - { - flag = true; - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-10-02 14:29:22.000000000 -0400 -@@ -46,7 +46,8 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j - 1, k,1) -+ || world.getBlockId(i, j - 1, k) == Block.fence.blockID; - } - - public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +57,8 @@ - public void onNeighborBlockChange(World world, int i, int j, int k, int l) - { - boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) -+ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) - { - flag = true; - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-10-02 14:29:22.000000000 -0400 -@@ -16,12 +16,12 @@ - public static final boolean isRailBlockAt(World world, int i, int j, int k) - { - int l = world.getBlockId(i, j, k); -- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; -+ return Block.blocksList[l] instanceof BlockRail; - } - - public static final boolean isRailBlock(int i) - { -- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; -+ return Block.blocksList[i] instanceof BlockRail; - } - - protected BlockRail(int i, int j, boolean flag) -@@ -97,7 +97,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); - } - - public void onBlockAdded(World world, int i, int j, int k) -@@ -121,23 +121,23 @@ - j1 &= 7; - } - boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - flag = true; - } -- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) -+ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) - { - flag = true; - } -- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) -+ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) - { - flag = true; - } -- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) -+ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) - { - flag = true; - } -- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) -+ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) - { - flag = true; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-10-02 14:29:22.000000000 -0400 -@@ -27,7 +27,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return false; - } else -@@ -38,7 +38,7 @@ - - public boolean canBlockStay(World world, int i, int j, int k) - { -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return false; - } else -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import java.util.*; - -@@ -53,7 +54,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k, 1); - } - - private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -451,6 +452,10 @@ - { - return false; - } -+ if (Block.blocksList[i1] instanceof IConnectRedstone) { -+ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1]; -+ return icr.canConnectRedstone(iblockaccess, i, j, k, l); -+ } - if(Block.blocksList[i1].canProvidePower()) - { - return true; -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 2011-10-02 14:29:22.000000000 -0400 -@@ -4,7 +4,10 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooks; -+ - import java.util.Random; -+import java.util.ArrayList; - - // Referenced classes of package net.minecraft.src: - // BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, -@@ -79,13 +82,17 @@ - - public int idDropped(int i, Random random) - { -- if(random.nextInt(8) == 0) -- { -- return Item.seeds.shiftedIndex; -- } else -- { -- return -1; -- } -+ return -1; -+ } -+ -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(world.rand.nextInt(8)!=0) -+ return tr; -+ ItemStack ist=ForgeHooks.getGrassSeed(world); -+ if(ist!=null) tr.add(ist); -+ return tr; - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -41,24 +41,24 @@ - - private boolean func_31032_h(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -@@ -72,19 +72,19 @@ - { - i1 = 5; - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } -@@ -102,19 +102,19 @@ - - public void onBlockAdded(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - world.setBlockMetadataWithNotify(i, j, k, 1); - } else -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - world.setBlockMetadataWithNotify(i, j, k, 2); - } else -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - world.setBlockMetadataWithNotify(i, j, k, 3); - } else -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - world.setBlockMetadataWithNotify(i, j, k, 4); - } else -@@ -131,19 +131,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k); - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-10-02 14:29:22.000000000 -0400 -@@ -147,7 +147,7 @@ - { - j1--; - } -- if(!world.isBlockNormalCube(j1, j, k1)) -+ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) - { - world.setBlockWithNotify(i, j, k, 0); - dropBlockAsItem(world, i, j, k, i1); -@@ -189,6 +189,7 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -+ if(disableValidation) return true; - if(l == 0) - { - return false; -@@ -213,11 +214,15 @@ - { - i--; - } -- return world.isBlockNormalCube(i, j, k); -+ return world.isBlockSolidOnSide(i, j, k, l); - } - - public static boolean isTrapdoorOpen(int i) - { - return (i & 4) != 0; - } -+ -+ /* FORGE: Set this to allow trapdoors to remain free-floating -+ */ -+ 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 ---- ../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-10-04 17:42:37.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import java.io.PrintStream; - import java.util.*; -@@ -26,7 +27,6 @@ - hasEntities = false; - lastSaveTime = 0L; - field_35846_u = false; -- world.getClass(); - entities = new List[128 / 16]; - worldObj = world; - xPosition = i; -@@ -44,11 +44,8 @@ - { - this(world, i, j); - blocks = abyte0; -- world.getClass(); - data = new NibbleArray(abyte0.length, 7); -- world.getClass(); - skylightMap = new NibbleArray(abyte0.length, 7); -- world.getClass(); - blocklightMap = new NibbleArray(abyte0.length, 7); - } - -@@ -68,16 +65,12 @@ - - public void generateHeightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int k = 0; k < 16; k++) - { -- worldObj.getClass(); - int l = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - for(int i1 = j << 11 | k << 7; l > 0 && Block.lightOpacity[blocks[(i1 + l) - 1] & 0xff] == 0; l--) { } - heightMap[k << 4 | j] = (byte)l; - if(l < i) -@@ -94,16 +87,12 @@ - - public void generateSkylightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int l = 0; l < 16; l++) - { -- worldObj.getClass(); - int j1 = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - int k1; - for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } - heightMap[l << 4 | j] = (byte)j1; -@@ -116,7 +105,6 @@ - continue; - } - int l1 = 15; -- worldObj.getClass(); - int i2 = 128 - 1; - do - { -@@ -154,7 +142,6 @@ - - private void func_35839_k() - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) - { - for(int i = 0; i < 16; i++) -@@ -216,7 +203,6 @@ - { - if(l > k) - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) - { - for(int i1 = k; i1 < l; i1++) -@@ -237,8 +223,6 @@ - { - i1 = j; - } -- worldObj.getClass(); -- worldObj.getClass(); - for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } - if(i1 == l) - { -@@ -251,7 +235,6 @@ - lowestBlockHeight = i1; - } else - { -- worldObj.getClass(); - int k1 = 128 - 1; - for(int i2 = 0; i2 < 16; i2++) - { -@@ -320,8 +303,6 @@ - - public int getBlockID(int i, int j, int k) - { -- worldObj.getClass(); -- worldObj.getClass(); - return blocks[i << 11 | k << 7 | j] & 0xff; - } - -@@ -334,8 +315,6 @@ - field_35845_c[j1] = -999; - } - int k1 = heightMap[k << 4 | i] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int l1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(l1 == l && data.getNibble(i, j, k) == i1) - { -@@ -343,12 +322,18 @@ - } - int i2 = xPosition * 16 + i; - int j2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ -+ if (Block.blocksList[l1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; -+ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(l1 != 0 && !worldObj.multiplayerWorld) -- { -- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ if(l1 != 0) { -+ if(!worldObj.multiplayerWorld) -+ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, i1); - if(!worldObj.worldProvider.hasNoSky) -@@ -380,7 +365,7 @@ - TileEntity tileentity = getChunkBlockTileEntity(i, j, k); - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); - worldObj.setBlockTileEntity(i, j, k, tileentity); - } - if(tileentity != null) -@@ -388,14 +373,6 @@ - tileentity.func_35144_b(); - } - } -- } else -- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) -- { -- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); -- if(tileentity1 != null) -- { -- tileentity1.func_35144_b(); -- } - } - isModified = true; - return true; -@@ -410,8 +387,6 @@ - field_35845_c[i1] = -999; - } - int j1 = heightMap[i1] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int k1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(k1 == l) - { -@@ -419,12 +394,18 @@ - } - int l1 = xPosition * 16 + i; - int i2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ -+ if (Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; -+ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(k1 != 0) -- { -- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if(k1 != 0) { -+ if(!worldObj.multiplayerWorld) -+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, 0); - if(Block.lightOpacity[byte0 & 0xff] != 0) -@@ -452,7 +433,7 @@ - TileEntity tileentity = getChunkBlockTileEntity(i, j, k); - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); - worldObj.setBlockTileEntity(i, j, k, tileentity); - } - if(tileentity != null) -@@ -460,14 +441,6 @@ - tileentity.func_35144_b(); - } - } -- } else -- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) -- { -- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); -- if(tileentity1 != null) -- { -- tileentity1.func_35144_b(); -- } - } - isModified = true; - return true; -@@ -594,6 +567,11 @@ - { - ChunkPosition chunkposition = new ChunkPosition(i, j, k); - TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity != null && tileentity.isInvalid()) -+ { -+ chunkTileEntityMap.remove(chunkposition); -+ tileentity=null; -+ } - if(tileentity == null) - { - int l = getBlockID(i, j, k); -@@ -603,18 +581,23 @@ - } - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); - worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); - } - tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); - } -- if(tileentity != null && tileentity.isInvalid()) -- { -- chunkTileEntityMap.remove(chunkposition); -- return null; -- } else -+ return tileentity; -+ } -+ -+ /* FORGE: Used to remove only invalid TileEntities */ -+ public void cleanChunkBlockTileEntity(int i, int j, int k) -+ { -+ ChunkPosition chunkposition = new ChunkPosition(i, j, k); -+ if(isChunkLoaded) - { -- return tileentity; -+ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity!=null && tileentity.isInvalid()) -+ chunkTileEntityMap.remove(chunkposition); - } - } - -@@ -626,7 +609,7 @@ - setChunkBlockTileEntity(i, j, k, tileentity); - if(isChunkLoaded) - { -- worldObj.loadedTileEntityList.add(tileentity); -+ worldObj.addTileEntity(tileentity); - } - } - -@@ -643,6 +626,8 @@ - return; - } else - { -+ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(old!=null) old.invalidate(); - tileentity.validate(); - chunkTileEntityMap.put(chunkposition, tileentity); - return; -@@ -777,8 +762,6 @@ - { - for(int l2 = k; l2 < j1; l2++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int l3 = l1 << 11 | l2 << 7 | j; - int l4 = i1 - j; - System.arraycopy(abyte0, k1, blocks, l3, l4); -@@ -792,8 +775,6 @@ - { - for(int i3 = k; i3 < j1; i3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int i4 = (i2 << 11 | i3 << 7 | j) >> 1; - int i5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, data.data, i4, i5); -@@ -806,8 +787,6 @@ - { - for(int j3 = k; j3 < j1; j3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int j4 = (j2 << 11 | j3 << 7 | j) >> 1; - int j5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); -@@ -820,8 +799,6 @@ - { - for(int k3 = k; k3 < j1; k3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int k4 = (k2 << 11 | k3 << 7 | j) >> 1; - int k5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -830,11 +807,20 @@ - - } - -+ List invalidList=new ArrayList(); - TileEntity tileentity; - for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) - { - tileentity = (TileEntity)iterator.next(); -+ if( (tileentity.xCoord&15)>=i && (tileentity.xCoord&15)<=l && -+ tileentity.yCoord>=j && tileentity.yCoord<=i1 && -+ (tileentity.zCoord&15)>=k && (tileentity.zCoord&15)<=j1) { -+ -+ invalidList.add(tileentity); -+ } - } -+ for(TileEntity te : invalidList) -+ te.invalidate(); - - return k1; - } -@@ -880,7 +866,6 @@ - int l = field_35845_c[k]; - if(l == -999) - { -- worldObj.getClass(); - int i1 = 128 - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -7,6 +7,9 @@ - import java.util.*; - import org.lwjgl.opengl.GL11; - -+import net.minecraft.src.forge.BlockTextureParticles; -+import net.minecraft.src.forge.ITextureProvider; -+ - // Referenced classes of package net.minecraft.src: - // EntityFX, Entity, MathHelper, RenderEngine, - // Tessellator, Block, EntityDiggingFX, World -@@ -16,6 +19,7 @@ - - public EffectRenderer(World world, RenderEngine renderengine) - { -+ effectList = new ArrayList(); - fxLayers = new List[4]; - rand = new Random(); - if(world != null) -@@ -55,7 +59,18 @@ - } - - } -- -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ for (int y = 0; y < entry.effects.size(); y++) { -+ EntityFX entityfx = (EntityFX) entry.effects.get(y); -+ if (entityfx.isDead) { -+ entry.effects.remove(y--); -+ } -+ } -+ if (effectList.size() == 0) -+ effectList.remove(x--); -+ } - } - - public void renderParticles(Entity entity, float f) -@@ -94,6 +109,7 @@ - for(int k = 0; k < fxLayers[i].size(); k++) - { - EntityFX entityfx = (EntityFX)fxLayers[i].get(k); -+ if(entityfx instanceof EntityDiggingFX) continue; - tessellator.setBrightness(entityfx.func_35115_a(f)); - entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); - } -@@ -101,6 +117,21 @@ - tessellator.draw(); - } - -+ Tessellator tessellator = Tessellator.instance; -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, -+ renderer.getTexture(entry.texture)); -+ tessellator.startDrawingQuads(); -+ for (int y = 0; y < entry.effects.size(); y++) { -+ EntityFX entityfx = (EntityFX) entry.effects.get(y); -+ tessellator.setBrightness(entityfx.func_35115_a(f)); -+ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); -+ } -+ tessellator.draw(); -+ } -+ - } - - public void func_1187_b(Entity entity, float f) -@@ -132,7 +163,12 @@ - { - fxLayers[i].clear(); - } -- -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ entry.effects.clear(); -+ } -+ effectList.clear(); - } - - public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) -@@ -153,7 +189,12 @@ - double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; - double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; - int j2 = rand.nextInt(6); -- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, -+ d, d1, d2, d - (double) i - 0.5D, d1 - (double) j -+ - 0.5D, d2 - (double) k - 0.5D, block, j2, -+ i1); -+ dig_effect.func_4041_a(i, j, k); -+ addDigParticleEffect(dig_effect, block); - } - - } -@@ -198,16 +239,48 @@ - { - d = (double)i + block.maxX + (double)f; - } -- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, -+ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); -+ dig_effect.func_4041_a(i, j, k); -+ dig_effect.func_407_b(0.2F); -+ dig_effect.func_405_d(0.6F); -+ addDigParticleEffect(dig_effect, block); - } - - public String getStatistics() - { - return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); - } -+ -+ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { -+ boolean added = false; -+ String comp; -+ -+ if (block instanceof ITextureProvider) { -+ comp = ((ITextureProvider) block).getTextureFile(); -+ } else { -+ comp = "/terrain.png"; -+ } -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ if (entry.texture.equals(comp)) { -+ entry.effects.add(dig_effect); -+ added = true; -+ } -+ } -+ if (!added) { -+ BlockTextureParticles entry = new BlockTextureParticles(); -+ entry.texture = comp; -+ entry.effects.add(dig_effect); -+ effectList.add(entry); -+ } -+ addEffect(dig_effect); -+ } - - protected World worldObj; - private List fxLayers[]; -+ private List effectList; - private RenderEngine renderer; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -624,7 +624,9 @@ - int i = MathHelper.floor_double(posX); - int j = MathHelper.floor_double(boundingBox.minY); - int k = MathHelper.floor_double(posZ); -- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; -+ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; -+ if(block==null) return false; -+ return block.isLadder(); - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,10 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ArmorProperties; -+import net.minecraft.src.forge.ISpecialArmor; -+import net.minecraft.src.forge.ForgeHooks; -+ - import java.util.*; - - // Referenced classes of package net.minecraft.src: -@@ -485,6 +489,8 @@ - worldObj.entityJoinedWorld(entityitem); - } - -+ /* FORGE: This isn't called anymore -+ */ - public float getCurrentPlayerStrVsBlock(Block block) - { - float f = inventory.getStrVsBlock(block); -@@ -507,6 +513,32 @@ - return f; - } - -+ /* FORGE: Extended to allow metadata. -+ */ -+ public float getCurrentPlayerStrVsBlock(Block block, int md) -+ { -+ float f = 1.0F; -+ ItemStack ist=inventory.getCurrentItem(); -+ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); -+ if(isInsideOfMaterial(Material.water)) -+ { -+ f /= 5F; -+ } -+ if(!onGround) -+ { -+ f /= 5F; -+ } -+ if(isPotionActive(Potion.potionDigSpeed)) -+ { -+ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; -+ } -+ if(isPotionActive(Potion.potionDigSlow)) -+ { -+ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; -+ } -+ return f; -+ } -+ - public boolean canHarvestBlock(Block block) - { - return inventory.canHarvestBlock(block); -@@ -720,7 +752,9 @@ - - public void destroyCurrentEquippedItem() - { -+ ItemStack orig=inventory.getCurrentItem(); - inventory.setInventorySlotContents(inventory.currentItem, null); -+ ForgeHooks.onDestroyCurrentItem(this,orig); - } - - public double getYOffset() -@@ -815,6 +849,10 @@ - - public EnumStatus sleepInBedAt(int i, int j, int k) - { -+ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); -+ if (customSleep != null) { -+ return customSleep; -+ } - if(!worldObj.multiplayerWorld) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; - import java.awt.image.BufferedImage; - import java.nio.FloatBuffer; - import java.util.Random; -@@ -803,8 +804,12 @@ - { - EntityPlayer entityplayer = (EntityPlayer)entityliving; - GL11.glDisable(3008 /*GL_ALPHA_TEST*/); -+ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, -+ mc.objectMouseOver,0, -+ entityplayer.inventory.getCurrentItem(),f)) { - renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); - renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); -+ } - GL11.glEnable(3008 /*GL_ALPHA_TEST*/); - } - } -@@ -853,8 +858,12 @@ - { - EntityPlayer entityplayer1 = (EntityPlayer)entityliving; - GL11.glDisable(3008 /*GL_ALPHA_TEST*/); -+ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer1, -+ mc.objectMouseOver,0, -+ entityplayer1.inventory.getCurrentItem(),f)) { - renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); - renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); -+ } - GL11.glEnable(3008 /*GL_ALPHA_TEST*/); - } - renderRainSnow(f); -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-10-02 14:29:22.000000000 -0400 -@@ -5,6 +5,7 @@ - package net.minecraft.src; - - import java.util.*; -+import net.minecraft.src.forge.ISpecialResistance; - - // Referenced classes of package net.minecraft.src: - // World, MathHelper, Block, ChunkPosition, -@@ -66,7 +67,17 @@ - int i5 = worldObj.getBlockId(j4, k4, l4); - if(i5 > 0) - { -- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ if (Block.blocksList[i5] instanceof ISpecialResistance) { -+ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5]; -+ f1 -= (isr.getSpecialExplosionResistance( -+ worldObj, j4, k4, l4, explosionX, -+ explosionY, explosionZ, exploder) + 0.3F) -+ * f2; -+ } else { -+ f1 -= (Block.blocksList[i5] -+ .getExplosionResistance(exploder) + 0.3F) -+ * f2; -+ } - } - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -6,6 +6,7 @@ - - import java.util.HashMap; - import java.util.Map; -+import java.util.Arrays; - - // Referenced classes of package net.minecraft.src: - // Block, ItemStack, Item -@@ -21,6 +22,7 @@ - private FurnaceRecipes() - { - smeltingList = new HashMap(); -+ metaSmeltingList = new HashMap(); - addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); - addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); - addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); -@@ -40,11 +42,32 @@ - smeltingList.put(Integer.valueOf(i), itemstack); - } - -+ /* FORGE: Add a metadata-sensitive furnace recipe. -+ */ -+ public void addSmelting(int i, int meta, ItemStack itemstack) -+ { -+ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); -+ } -+ -+ /* FORGE: Not used anymore. -+ */ - public ItemStack getSmeltingResult(int i) - { - return (ItemStack)smeltingList.get(Integer.valueOf(i)); - } - -+ /* FORGE: Added to allow metadata-sensitive smelting. -+ */ -+ public ItemStack getSmeltingResult(ItemStack src) { -+ ItemStack tr; -+ -+ if(src==null) return null; -+ tr=(ItemStack)metaSmeltingList.get( -+ Arrays.asList(src.itemID,src.getItemDamage())); -+ if(tr!=null) return tr; -+ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); -+ } -+ - public Map getSmeltingList() - { - return smeltingList; -@@ -52,5 +75,6 @@ - - private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); - private Map smeltingList; -+ private Map metaSmeltingList; - - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:22.000000000 -0400 -@@ -62,7 +62,7 @@ - { - return false; - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-10-02 14:29:22.000000000 -0400 -@@ -6,6 +6,8 @@ - - import java.util.Random; - -+import net.minecraft.src.forge.MinecraftForge; -+ - // Referenced classes of package net.minecraft.src: - // Item, EntityPlayer, Vec3D, MathHelper, - // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -60,6 +62,11 @@ - { - return itemstack; - } -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); -+ if (customBucket != null) { -+ return customBucket; -+ } - if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(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 ---- ../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 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.Random; - -@@ -35,13 +36,18 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } - if(itemstack.getItemDamage() == 15) - { - int i1 = world.getBlockId(i, j, k); -+ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { -+ if(!world.multiplayerWorld) -+ itemstack.stackSize--; -+ return true; -+ } - if(i1 == Block.sapling.blockID) - { - if(!world.multiplayerWorld) -@@ -108,13 +114,7 @@ - world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); - continue; - } -- if(itemRand.nextInt(3) != 0) -- { -- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); -- } else -- { -- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); -- } -+ ForgeHooks.plantGrassPlant(world,k1,l1,i2); - } - - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:22.000000000 -0400 -@@ -46,7 +46,7 @@ - { - i++; - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-10-02 14:29:22.000000000 -0400 -@@ -21,7 +21,7 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-10-02 14:29:22.000000000 -0400 -@@ -76,6 +76,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - return itemstack; -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-10-02 14:29:22.000000000 -0400 -@@ -50,7 +50,7 @@ - return false; - } - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-10-02 14:29:22.000000000 -0400 -@@ -52,7 +52,7 @@ - i++; - } - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-10-02 14:29:22.000000000 -0400 -@@ -5,6 +5,10 @@ - package net.minecraft.src; - - import net.minecraft.client.Minecraft; -+import net.minecraft.src.forge.ForgeHooksClient; -+import net.minecraft.src.forge.ICustomItemRenderer; -+import net.minecraft.src.forge.MinecraftForgeClient; -+ - import org.lwjgl.opengl.GL11; - import org.lwjgl.opengl.GL13; - -@@ -32,18 +36,27 @@ - public void renderItem(EntityLiving entityliving, ItemStack itemstack) - { - GL11.glPushMatrix(); -- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) -+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); -+ -+ if (customRenderer != null) { -+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (itemstack.getItem()); -+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); -+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); - renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); - } else - { - if(itemstack.itemID < 256) - { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); - } else - { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]); - } - Tessellator tessellator = Tessellator.instance; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -24,7 +24,7 @@ - { - return false; - } -- if(!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k)) -+ if(entityplayer!=null && (!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k))) - { - return false; - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,8 @@ - - package net.minecraft.src; - -+import java.util.Arrays; -+import net.minecraft.src.forge.ForgeHooks; - - // Referenced classes of package net.minecraft.src: - // Item, EnumToolMaterial, ItemStack, Block, -@@ -37,6 +39,14 @@ - return 1.0F; - } - -+ /* FORGE: Overridden to allow custom tool effectiveness -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { -+ if(ForgeHooks.isToolEffective(itemstack,block,md)) -+ return efficiencyOnProperMaterial; -+ return getStrVsBlock(itemstack,block); -+ } -+ - public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) - { - itemstack.damageItem(2, entityliving1); -@@ -60,7 +70,7 @@ - } - - private Block blocksEffectiveAgainst[]; -- private float efficiencyOnProperMaterial; -- private int damageVsEntity; -+ public float efficiencyOnProperMaterial; -+ public int damageVsEntity; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -35,4 +35,7 @@ - public int sideHit; - public Vec3D hitVec; - public Entity entityHit; -+ -+ // Added for RedPower subblocks. -+ 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import net.minecraft.client.Minecraft; - -@@ -64,6 +65,7 @@ - if(itemstack1.stackSize == 0) - { - entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; -+ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); - } - return true; - } else -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-10-02 14:31:02.000000000 -0400 -@@ -4,6 +4,9 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.IUseItemFirst; -+import net.minecraft.src.forge.ForgeHooks; -+ - import net.minecraft.client.Minecraft; - - // Referenced classes of package net.minecraft.src: -@@ -91,7 +94,7 @@ - { - Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); - } -- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) -+ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) - { - sendBlockRemoved(i, j, k, l); - } else -@@ -137,7 +140,7 @@ - return; - } - Block block = Block.blocksList[i1]; -- curBlockDamageMP += block.blockStrength(mc.thePlayer); -+ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - 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); -@@ -204,6 +207,13 @@ - { - syncCurrentPlayItem(); - netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); -+ -+ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); -+ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { -+ return true; -+ } -+ } - int i1 = world.getBlockId(i, j, k); - if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) - { -@@ -223,7 +233,11 @@ - return flag; - } else - { -- return itemstack.useItem(entityplayer, world, i, j, k, l); -+ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) -+ return false; -+ if(itemstack.stackSize == 0) -+ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); -+ return true; - } - } - -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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,8 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.IUseItemFirst; -+import net.minecraft.src.forge.ForgeHooks; - - import net.minecraft.client.Minecraft; - -@@ -42,7 +44,7 @@ - int j1 = mc.theWorld.getBlockMetadata(i, j, k); - boolean flag = super.sendBlockRemoved(i, j, k, l); - ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); -- boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); -+ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); - if(itemstack != null) - { - itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -71,7 +73,7 @@ - { - Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); - } -- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) -+ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) - { - sendBlockRemoved(i, j, k, l); - } -@@ -102,7 +104,7 @@ - return; - } - Block block = Block.blocksList[i1]; -- curBlockDamage += block.blockStrength(mc.thePlayer); -+ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - if(field_1069_h % 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); -@@ -165,6 +167,12 @@ - - public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) - { -+ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); -+ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { -+ return true; -+ } -+ } - int i1 = world.getBlockId(i, j, k); - if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) - { -@@ -175,7 +183,11 @@ - return false; - } else - { -- return itemstack.useItem(entityplayer, world, i, j, k, l); -+ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) -+ return false; -+ if(itemstack.stackSize == 0) -+ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); -+ return true; - } - } - -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-10-02 14:29:22.000000000 -0400 -@@ -2980,7 +2980,7 @@ - colorBlueTopRight *= f27; - int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); - renderEastFace(block, i, j, k, j2); -- if(cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) - { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -3085,7 +3085,7 @@ - colorBlueTopRight *= f28; - int k2 = block.getBlockTexture(blockAccess, i, j, k, 3); - renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); -- if(cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) - { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -3190,7 +3190,7 @@ - colorBlueTopRight *= f29; - int l2 = block.getBlockTexture(blockAccess, i, j, k, 4); - renderNorthFace(block, i, j, k, l2); -- if(cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) - { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -3295,7 +3295,7 @@ - colorBlueTopRight *= f30; - int i3 = block.getBlockTexture(blockAccess, i, j, k, 5); - renderSouthFace(block, i, j, k, i3); -- if(cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) - { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -3388,7 +3388,7 @@ - tessellator.setColorOpaque_F(f11, f14, f17); - int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); - renderEastFace(block, i, j, k, i1); -- if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); - renderEastFace(block, i, j, k, 38); -@@ -3401,7 +3401,7 @@ - tessellator.setColorOpaque_F(f11, f14, f17); - int j1 = block.getBlockTexture(blockAccess, i, j, k, 3); - renderWestFace(block, i, j, k, j1); -- if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); - renderWestFace(block, i, j, k, 38); -@@ -3414,7 +3414,7 @@ - tessellator.setColorOpaque_F(f12, f15, f18); - int k1 = block.getBlockTexture(blockAccess, i, j, k, 4); - renderNorthFace(block, i, j, k, k1); -- if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); - renderNorthFace(block, i, j, k, 38); -@@ -3427,7 +3427,7 @@ - tessellator.setColorOpaque_F(f12, f15, f18); - int l1 = block.getBlockTexture(blockAccess, i, j, k, 5); - renderSouthFace(block, i, j, k, l1); -- if(cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) - { - tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); - 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 ---- ../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-10-05 18:51:03.000000000 -0400 -@@ -128,6 +128,9 @@ - } - try - { -+ if(Tessellator.renderingWorldRenderer) { -+ System.out.printf("Warning: Texture %s not preloaded, will cause render glitches!\n",s); -+ } - singleIntBuffer.clear(); - GLAllocation.generateTextureNames(singleIntBuffer); - int i = singleIntBuffer.get(0); -@@ -667,7 +670,7 @@ - private GameSettings options; - public boolean clampTexture; - public boolean blurTexture; -- private TexturePackList texturePack; -+ public TexturePackList texturePack; - private BufferedImage missingTextureImage; - - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-10-02 14:29:22.000000000 -0400 -@@ -1635,8 +1635,8 @@ - } - - public List tileEntities; -- private World worldObj; -- private RenderEngine renderEngine; -+ public World worldObj; -+ public RenderEngine renderEngine; - private List worldRenderersToUpdate; - private WorldRenderer sortedWorldRenderers[]; - private WorldRenderer worldRenderers[]; -@@ -1644,8 +1644,8 @@ - private int renderChunksTall; - private int renderChunksDeep; - private int glRenderListBase; -- private Minecraft mc; -- private RenderBlocks globalRenderBlocks; -+ public Minecraft mc; -+ public RenderBlocks globalRenderBlocks; - private IntBuffer glOcclusionQueryBase; - private boolean occlusionEnabled; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,10 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; -+import net.minecraft.src.forge.ICustomItemRenderer; -+import net.minecraft.src.forge.MinecraftForgeClient; -+ - import java.util.Random; - import org.lwjgl.opengl.GL11; - -@@ -47,10 +51,36 @@ - } - GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); - GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); -- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) -+ -+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); -+ -+ if (customRenderer != null) { -+ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); -+ loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(itemstack.getItem()); -+ float f4 = 0.25F; -+ f4 = 0.5F; -+ GL11.glScalef(f4, f4, f4); -+ for(int j = 0; j < byte0; j++) -+ { -+ GL11.glPushMatrix(); -+ if(j > 0) -+ { -+ float f5 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; -+ float f7 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; -+ float f9 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; -+ GL11.glTranslatef(f5, f7, f9); -+ } -+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, -+ itemstack.itemID, itemstack.getItemDamage(), -+ entityitem.getEntityBrightness(f1)); -+ GL11.glPopMatrix(); -+ } -+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - { - GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); - float f4 = 0.25F; - int j = Block.blocksList[itemstack.itemID].getRenderType(); - if(j == 1 || j == 19 || j == 12 || j == 2) -@@ -80,9 +110,11 @@ - if(itemstack.itemID < 256) - { - loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); - } else - { - loadTexture("/gui/items.png"); -+ ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); - } - Tessellator tessellator = Tessellator.instance; - float f5 = (float)((i % 16) * 16 + 0) / 256F; -@@ -129,10 +161,37 @@ - - public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) - { -- if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) -+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i); -+ if (customRenderer != null) { -+ int j1 = i; -+ renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ Item item = Item.itemsList[i]; -+ ForgeHooksClient.overrideTexture (Item.itemsList [i]); -+ GL11.glPushMatrix(); -+ GL11.glTranslatef(l - 2, i1 + 3, -3F); -+ GL11.glScalef(10F, 10F, 10F); -+ GL11.glTranslatef(1.0F, 0.5F, 1.0F); -+ GL11.glScalef(1.0F, 1.0F, -1F); -+ GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F); -+ GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); -+ int l1 = Item.itemsList[i].getColorFromDamage(j); -+ float f2 = (float)(l1 >> 16 & 0xff) / 255F; -+ float f4 = (float)(l1 >> 8 & 0xff) / 255F; -+ float f5 = (float)(l1 & 0xff) / 255F; -+ if(field_27004_a) -+ { -+ GL11.glColor4f(f2, f4, f5, 1.0F); -+ } -+ GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); -+ renderBlocks.useInventoryTint = field_27004_a; -+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, i, j, 1.0F); -+ renderBlocks.useInventoryTint = true; -+ GL11.glPopMatrix(); -+ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) - { - int j1 = i; - renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[i]); - Block block = Block.blocksList[j1]; - GL11.glPushMatrix(); - GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -161,9 +220,11 @@ - if(i < 256) - { - renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[i]); - } else - { - renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture(Item.itemsList[i]); - } - int k1 = Item.itemsList[i].getColorFromDamage(j); - 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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.IArmorTextureProvider; - 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(itemstack) ); -+ } -+ 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - - // Referenced classes of package net.minecraft.src: -@@ -60,6 +61,7 @@ - thePlayer.addStat(AchievementList.buildSword, 1); - } - ModLoader.TakenFromCrafting(thePlayer, itemstack, craftMatrix); -+ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); - for(int i = 0; i < craftMatrix.getSizeInventory(); 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 ---- ../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-10-02 14:37:42.000000000 -0400 -@@ -5,6 +5,7 @@ - package net.minecraft.src; - - import java.nio.*; -+import java.util.*; - import org.lwjgl.opengl.*; - - // Referenced classes of package net.minecraft.src: -@@ -13,8 +14,7 @@ - public class Tessellator - { - -- private Tessellator(int i) -- { -+ public Tessellator() { - vertexCount = 0; - hasColor = false; - hasTexture = false; -@@ -24,21 +24,10 @@ - addedVertices = 0; - isColorDisabled = false; - isDrawing = false; -- useVBO = false; - vboIndex = 0; -- vboCount = 10; -- bufferSize = i; -- byteBuffer = GLAllocation.createDirectByteBuffer(i * 4); -- intBuffer = byteBuffer.asIntBuffer(); -- floatBuffer = byteBuffer.asFloatBuffer(); -- shortBuffer = byteBuffer.asShortBuffer(); -- rawBuffer = new int[i]; -- useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; -- if(useVBO) -- { -- vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); -- ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); -- } -+ -+ rawBuffer=null; -+ rawBufferSize=0; - } - - public void draw() -@@ -48,12 +37,20 @@ - throw new IllegalStateException("Not tesselating!"); - } - isDrawing = false; -- if(vertexCount > 0) -- { -+ int offs=0; -+ while(offs < vertexCount) { -+ int vtc; -+ if(drawMode == 7 && convertQuadsToTriangles) { -+ vtc=Math.min(vertexCount-offs,trivertsInBuffer); -+ } else { -+ vtc=Math.min(vertexCount-offs,nativeBufferSize>>5); -+ } -+ - intBuffer.clear(); -- intBuffer.put(rawBuffer, 0, rawBufferIndex); -+ intBuffer.put(rawBuffer, offs*8, vtc*8); - byteBuffer.position(0); -- byteBuffer.limit(rawBufferIndex * 4); -+ byteBuffer.limit(vtc*32); -+ offs+=vtc; - if(useVBO) - { - vboIndex = (vboIndex + 1) % vboCount; -@@ -121,10 +118,10 @@ - GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); - if(drawMode == 7 && convertQuadsToTriangles) - { -- GL11.glDrawArrays(4, 0, vertexCount); -+ GL11.glDrawArrays(4, 0, vtc); - } else - { -- GL11.glDrawArrays(drawMode, 0, vertexCount); -+ GL11.glDrawArrays(drawMode, 0, vtc); - } - GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); - if(hasTexture) -@@ -146,6 +143,10 @@ - GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); - } - } -+ if(rawBufferSize>0x20000 && rawBufferIndex<(rawBufferSize<<3)) { -+ rawBufferSize=0; -+ rawBuffer=null; -+ } - reset(); - } - -@@ -265,6 +266,15 @@ - - public void addVertex(double d, double d1, double d2) - { -+ if(rawBufferIndex >= rawBufferSize-32) { -+ if(rawBufferSize==0) { -+ rawBufferSize=0x10000; -+ rawBuffer=new int[rawBufferSize]; -+ } else { -+ rawBufferSize*=2; -+ rawBuffer=Arrays.copyOf(rawBuffer,rawBufferSize); -+ } -+ } - addedVertices++; - if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) - { -@@ -314,11 +324,6 @@ - rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); - rawBufferIndex += 8; - vertexCount++; -- if(vertexCount % 4 == 0 && rawBufferIndex >= bufferSize - 32) -- { -- draw(); -- isDrawing = true; -- } - } - - public void setColorOpaque_I(int i) -@@ -367,10 +372,7 @@ - - private static boolean convertQuadsToTriangles = false; - private static boolean tryVBO = false; -- private ByteBuffer byteBuffer; -- private IntBuffer intBuffer; -- private FloatBuffer floatBuffer; -- private ShortBuffer shortBuffer; -+ private static boolean useVBO = false; - private int rawBuffer[]; - private int vertexCount; - private double textureU; -@@ -384,17 +386,43 @@ - private int rawBufferIndex; - private int addedVertices; - private boolean isColorDisabled; -- private int drawMode; -- private double xOffset; -- private double yOffset; -- private double zOffset; -+ public int drawMode; -+ public double xOffset; -+ public double yOffset; -+ public double zOffset; - private int normal; -- public static final Tessellator instance = new Tessellator(0x200000); -- private boolean isDrawing; -- private boolean useVBO; -- private IntBuffer vertexBuffers; -+ public boolean isDrawing; - private int vboIndex; -- private int vboCount; -- private int bufferSize; - -+ public static boolean renderingWorldRenderer=false; -+ public boolean defaultTexture=false; -+ private int rawBufferSize; -+ private static int vboCount; -+ private static IntBuffer vertexBuffers; -+ private static int nativeBufferSize; -+ private static int trivertsInBuffer; -+ private static ByteBuffer byteBuffer; -+ private static IntBuffer intBuffer; -+ private static FloatBuffer floatBuffer; -+ private static ShortBuffer shortBuffer; -+ public static Tessellator instance; -+ -+ static { -+ instance=new Tessellator(); -+ instance.defaultTexture=true; -+ -+ nativeBufferSize = 0x200000; -+ trivertsInBuffer = (nativeBufferSize/48)*6; -+ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); -+ intBuffer = byteBuffer.asIntBuffer(); -+ floatBuffer = byteBuffer.asFloatBuffer(); -+ shortBuffer = byteBuffer.asShortBuffer(); -+ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; -+ vboCount = 10; -+ if(useVBO) -+ { -+ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); -+ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); -+ } -+ } - } -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 ---- ../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 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ISidedInventory; - - // Referenced classes of package net.minecraft.src: - // TileEntity, IInventory, ItemStack, NBTTagCompound, -@@ -12,7 +13,7 @@ - // EntityPlayer - - public class TileEntityFurnace extends TileEntity -- implements IInventory -+ implements IInventory, ISidedInventory - { - - public TileEntityFurnace() -@@ -28,6 +29,16 @@ - return furnaceItemStacks.length; - } - -+ public int getStartInventorySide(int side) { -+ if(side==0) return 1; -+ if(side==1) return 0; -+ return 2; -+ } -+ -+ public int getSizeInventorySide(int side) { -+ return 1; -+ } -+ - public ItemStack getStackInSlot(int i) - { - return furnaceItemStacks[i]; -@@ -196,7 +207,7 @@ - { - return false; - } -- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); -+ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); - if(itemstack == null) - { - return false; -@@ -209,11 +220,9 @@ - { - return false; - } -- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) -- { -- return true; -- } -- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); -+ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; -+ return (st<=getInventoryStackLimit() && -+ st<=itemstack.getMaxStackSize()); - } - - public void smeltItem() -@@ -222,14 +231,14 @@ - { - return; - } -- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); -+ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); - if(furnaceItemStacks[2] == null) - { - furnaceItemStacks[2] = itemstack.copy(); - } else -- if(furnaceItemStacks[2].itemID == itemstack.itemID) -+ if(furnaceItemStacks[2].isItemEqual(itemstack)) - { -- furnaceItemStacks[2].stackSize++; -+ furnaceItemStacks[2].stackSize+=itemstack.stackSize; - } - if(furnaceItemStacks[0].getItem().hasContainerItem()) - { -@@ -244,7 +253,7 @@ - } - } - -- private int getItemBurnTime(ItemStack itemstack) -+ public static int getItemBurnTime(ItemStack itemstack) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -61,6 +61,13 @@ - { - } - -+ /* FORGE: Return false if this TileEntity does not require updateEntity() -+ * calls. -+ */ -+ public boolean canUpdate() { -+ return true; -+ } -+ - public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; - import net.minecraft.client.Minecraft; - import org.lwjgl.opengl.GL11; - -@@ -38,6 +39,7 @@ - { - GL11.glShadeModel(7424 /*GL_FLAT*/); - } -+ ForgeHooksClient.beforeBlockRender(block,field_31071_b); - tessellator.startDrawingQuads(); - tessellator.setTranslationD(((float)d - (float)tileentitypiston.xCoord) + tileentitypiston.func_31017_b(f), ((float)d1 - (float)tileentitypiston.yCoord) + tileentitypiston.func_31014_c(f), ((float)d2 - (float)tileentitypiston.zCoord) + tileentitypiston.func_31013_d(f)); - tessellator.setColorOpaque(1, 1, 1); -@@ -58,6 +60,7 @@ - } - tessellator.setTranslationD(0.0D, 0.0D, 0.0D); - tessellator.draw(); -+ ForgeHooksClient.afterBlockRender(block,field_31071_b); - RenderHelper.enableStandardItemLighting(); - } - } -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-10-02 14:29:20.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-10-02 14:29:22.000000000 -0400 -@@ -336,7 +336,10 @@ - - public boolean isAirBlock(int i, int j, int k) - { -- return getBlockId(i, j, k) == 0; -+ int iBlockID = getBlockId( i, j, k ); -+ if ( iBlockID == 0 ) -+ return true; -+ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); - } - - public boolean blockExists(int i, int j, int k) -@@ -1476,7 +1479,7 @@ - Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); - if(chunk != null) - { -- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); -+ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); - } - } - } -@@ -1503,16 +1506,16 @@ - { - loadedTileEntityList.add(tileentity1); - } -+ } else { - if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) - { - Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); - if(chunk1 != null) - { -- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); -+ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); - } - } -- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); -- } -+ } - } while(true); - addedTileEntityList.clear(); - } -@@ -1520,13 +1523,19 @@ - - public void addTileEntity(Collection collection) - { -- if(scanningTileEntities) -- { -- addedTileEntityList.addAll(collection); -- } else -- { -- loadedTileEntityList.addAll(collection); -- } -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } -+ } -+ -+ /* FORGE: Used as a bugfix */ -+ public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); - } - - public void updateEntity(Entity entity) -@@ -1684,7 +1693,10 @@ - if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) - { - return true; -- } -+ } else { -+ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) -+ return true; -+ } - } - - } -@@ -1917,44 +1929,23 @@ - - public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) - { -- if(tileentity != null && !tileentity.isInvalid()) -- { -- if(scanningTileEntities) -- { -- tileentity.xCoord = i; -- tileentity.yCoord = j; -- tileentity.zCoord = k; -- addedTileEntityList.add(tileentity); -- } else -- { -- loadedTileEntityList.add(tileentity); -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -- } -- } -- } -+ if(tileentity==null || tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } - } - - public void removeBlockTileEntity(int i, int j, int k) - { -- TileEntity tileentity = getBlockTileEntity(i, j, k); -- if(tileentity != null && scanningTileEntities) -- { -- tileentity.invalidate(); -- } else -- { -- if(tileentity != null) -- { -- loadedTileEntityList.remove(tileentity); -- } -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -- } -- } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } - } - - public void func_35455_a(TileEntity tileentity) -@@ -1977,13 +1968,18 @@ - public boolean isBlockNormalCube(int i, int j, int k) - { - Block block = Block.blocksList[getBlockId(i, j, k)]; -- if(block == null) -- { -- return false; -- } else -- { -- return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); -- } -+ if(block == null) return false; -+ return block.isBlockNormalCube(this,i,j,k); -+ } -+ -+ /* FORGE: Determine if the given block is considered solid on the -+ * specified side. Used by placement logic. -+ */ -+ public boolean isBlockSolidOnSide(int i, int j, int k, int side) -+ { -+ Block block = Block.blocksList[getBlockId(i, j, k)]; -+ if(block == null) return false; -+ return block.isBlockSolidOnSide(this,i,j,k,side); - } - - public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2308,7 +2304,7 @@ - - private int computeBlockLightValue(int i, int j, int k, int l, int i1, int j1) - { -- int k1 = Block.lightValue[i1]; -+ int k1=(i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); - int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; - int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; - int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2679,6 +2675,7 @@ - { - block = null; - } -+ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; - return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); - } - -@@ -3193,7 +3190,7 @@ - public int lightningFlash; - public boolean editingBlocks; - private long lockTimestamp; -- protected int autosavePeriod; -+ public int autosavePeriod; - public int difficultySetting; - public Random rand; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,8 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; -+ - import java.util.*; - import org.lwjgl.opengl.GL11; - -@@ -125,8 +127,9 @@ - GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); - GL11.glScalef(f, f, f); - GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); -- tessellator.startDrawingQuads(); -- tessellator.setTranslationD(-posX, -posY, -posZ); -+ ForgeHooksClient.beforeRenderPass(i2); -+ Tessellator.instance.startDrawingQuads(); -+ Tessellator.instance.setTranslationD(-posX, -posY, -posZ); - } - if(i2 == 0 && Block.isBlockContainer[i3]) - { -@@ -142,15 +145,13 @@ - { - flag1 = true; - } -- if(j3 != i2) -- { -- flag = true; -- continue; -- } -- if(j3 == i2) -- { -- flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); -- } -+ if(j3>i2) flag=true; -+ if(!ForgeHooksClient.canRenderInPass(block,i2)) -+ continue; -+ -+ ForgeHooksClient.beforeBlockRender(block, renderblocks); -+ flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); -+ ForgeHooksClient.afterBlockRender(block, renderblocks); - } - - } -@@ -159,10 +160,11 @@ - - if(flag2) - { -- tessellator.draw(); -+ ForgeHooksClient.afterRenderPass(i2); -+ Tessellator.instance.draw(); - GL11.glPopMatrix(); - GL11.glEndList(); -- tessellator.setTranslationD(0.0D, 0.0D, 0.0D); -+ Tessellator.instance.setTranslationD(0.0D, 0.0D, 0.0D); - } else - { - flag1 = false; -@@ -255,7 +257,6 @@ - - public World worldObj; - private int glRenderList; -- private static Tessellator tessellator; - public static int chunksUpdated = 0; - public int posX; - public int posY; -@@ -286,8 +287,4 @@ - public List tileEntityRenderers; - private List tileEntities; - -- static -- { -- tessellator = Tessellator.instance; -- } - } -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-10-02 14:29:22.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-10-02 14:29:22.000000000 -0400 -@@ -41,36 +41,36 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -78,19 +78,19 @@ - int i1 = world.getBlockMetadata(i, j, k); - int j1 = i1 & 8; - i1 &= 7; -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } else -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } else -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } else -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } else -@@ -102,19 +102,19 @@ - - private int getOrientation(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return 1; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return 2; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return 3; - } -- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; -+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; - } - - public void onNeighborBlockChange(World world, int i, int j, int k, int l) -@@ -123,19 +123,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -328,23 +328,23 @@ - { - return true; - } -- if(world.isBlockNormalCube(i, j + 1, k)) -+ if(world.isBlockSolidOnSide(i, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) -+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) -+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) - { - return true; - } -- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) -+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) - { - return true; - } -- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) -+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -26,7 +26,7 @@ - public void onBlockAdded(World world, int i, int j, int k) - { - super.onBlockAdded(world, i, j, k); -- world.setBlockTileEntity(i, j, k, getBlockEntity()); -+ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); - } - - public void onBlockRemoval(World world, int i, int j, int k) -@@ -37,6 +37,12 @@ - - public abstract TileEntity getBlockEntity(); - -+ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. -+ */ -+ public TileEntity getBlockEntity(int md) { -+ return getBlockEntity(); -+ } -+ - public void playBlock(World world, int i, int j, int k, int l, int 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 ---- ../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 14:29:22.000000000 -0400 -@@ -5,6 +5,7 @@ - package net.minecraft.src; - - import java.util.Random; -+import java.util.ArrayList; - - // Referenced classes of package net.minecraft.src: - // BlockFlower, Block, World, EntityItem, -@@ -103,27 +104,16 @@ - return blockIndexInTexture + j; - } - -- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) -- { -- super.dropBlockAsItemWithChance(world, i, j, k, l, f); -- if(world.singleplayerWorld) -- { -- return; -- } -- for(int i1 = 0; i1 < 3; i1++) -- { -- if(world.rand.nextInt(15) <= l) -- { -- float f1 = 0.7F; -- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; -- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); -- entityitem.delayBeforeCanPickup = 10; -- world.entityJoinedWorld(entityitem); -- } -- } -- -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(md==7) tr.add(new ItemStack(Item.wheat)); -+ -+ for(int n=0; n<3; n++) { -+ if(world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); -+ } -+ return tr; - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -167,7 +167,7 @@ - world.setBlockWithNotify(i, j, k, 0); - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - world.setBlockWithNotify(i, j, k, 0); - flag = true; -@@ -231,7 +231,7 @@ - return false; - } else - { -- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); - } - } - -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.ArrayList; - import java.util.Random; -@@ -218,24 +219,40 @@ - return 1; - } - -+ /* FORGE: Metadata-sensitive version. -+ */ -+ public int quantityDropped(int i, Random random) -+ { -+ return quantityDropped(random); -+ } -+ - public int idDropped(int i, Random random) - { - return blockID; - } - -+ /* FORGE: This function isn't called by Minecraft anymore. Use -+ * blockStrength(EntityPlayer,int) instead. -+ */ - public float blockStrength(EntityPlayer entityplayer) - { -- if(blockHardness < 0.0F) -- { -- return 0.0F; -- } -- if(!entityplayer.canHarvestBlock(this)) -- { -- return 1.0F / blockHardness / 100F; -- } else -- { -- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; -- } -+ return blockStrength(entityplayer,0); -+ } -+ -+ /* FORGE: This function returns the complete list of drops for a block. -+ */ -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); -+ } -+ } -+ return tr; - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -249,20 +266,12 @@ - { - return; - } -- int i1 = quantityDropped(world.rand); -- for(int j1 = 0; j1 < i1; j1++) -- { -+ ArrayList ar=getBlockDropped(world,i,j,k,l); -+ for(ItemStack ist : ar) { - if(world.rand.nextFloat() > f) -- { - continue; -- } -- int k1 = idDropped(l, world.rand); -- if(k1 > 0) -- { -- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); -- } -+ dropBlockAsItem_do(world, i, j, k, ist); - } -- - } - - protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -529,6 +538,86 @@ - return blockMaterial.getMaterialMobility(); - } - -+ /* FORGE: Allow a block to set illumination on a coordinate basis. -+ */ -+ public int getLightValue(IBlockAccess iba, int i, int j, int k) { -+ return lightValue[blockID]; -+ } -+ -+ /* FORGE: Implement and return true if you wish this block to behave -+ * like a ladder when the player is inside. -+ */ -+ public boolean isLadder() { -+ return false; -+ } -+ -+ /* FORGE: Return true if the block is a normal, solid cube. This -+ * determines indirect power state, entity ejection from blocks, and a few -+ * others. -+ */ -+ public boolean isBlockNormalCube(World world, int i, int j, int k) { -+ return blockMaterial.getIsOpaque() && isACube(); -+ } -+ -+ /* FORGE: Return true if the block is solid on the given side. This -+ * is used by placement logic. */ -+ public boolean isBlockSolidOnSide( World world, int i, int j, int k, -+ int side ) { -+ return isBlockNormalCube(world,i,j,k); -+ } -+ -+ /* FORGE: Return true if the player can place a new block in the block -+ * occupied by this one, like water, lava, fire, etc. -+ */ -+ public boolean isBlockReplaceable( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should set fire and deal fire damage -+ * to entities coming into contact with it, false otherwise. -+ */ -+ public boolean isBlockBurning( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return true if this block should be treated as an air block -+ * by the rest of the code, false otherwise. This method is primarily -+ * useful for creating pure logic-blocks that will be invisible -+ * to the player and otherwise interact as air would. -+ */ -+ public boolean isAirBlock( World world, int i, int j, int k ) { -+ return false; -+ } -+ -+ /* FORGE: Return the block hardness with metadata 'md'. -+ */ -+ public float getHardness(int md) { -+ return blockHardness; -+ } -+ -+ /* FORGE: Return the block strength of the block at i,j,k against the -+ * player. -+ */ -+ public float blockStrength(World world, EntityPlayer player, -+ int i, int j, int k) { -+ int md=world.getBlockMetadata(i,j,k); -+ return blockStrength(player,md); -+ } -+ -+ /* FORGE: Return the block strength of a prototypical block with metadata -+ * 'md' against the player. -+ */ -+ public float blockStrength(EntityPlayer player, int md) { -+ return ForgeHooks.blockStrength(this,player,md); -+ } -+ -+ /* FORGE: Return true if the player can harvest a prototypical block with -+ * metadata 'md'. -+ */ -+ public boolean canHarvestBlock(EntityPlayer player, int md) { -+ return ForgeHooks.canHarvestBlock(this,player,md); -+ } -+ - static Class _mthclass$(String s) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -40,6 +40,11 @@ - return super.getCollisionBoundingBoxFromPool(world, i, j, k); - } - -+ /* FORGE: Implemented base method, see Block.isLadder */ -+ public boolean isLadder() { -+ return true; -+ } -+ - public boolean isOpaqueCube() - { - return false; -@@ -52,37 +57,37 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- return world.isBlockNormalCube(i, j, k + 1); -+ return world.isBlockSolidOnSide(i, j, k + 1,2); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) - { - int i1 = world.getBlockMetadata(i, j, k); -- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) -+ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 2; - } -- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) -+ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) -+ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 4; - } -- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) -+ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 5; - } -@@ -93,19 +98,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k); - boolean flag = false; -- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - flag = true; - } -- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - flag = true; - } -- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - flag = true; - } -- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -35,44 +35,44 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) -+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return true; - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- return l == 5 && world.isBlockNormalCube(i - 1, j, k); -+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); - } - - public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -81,23 +81,23 @@ - int j1 = i1 & 8; - i1 &= 7; - i1 = -1; -- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) -+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) - { - i1 = 5 + world.rand.nextInt(2); - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } -@@ -119,27 +119,27 @@ - { - int i1 = world.getBlockMetadata(i, j, k) & 7; - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -46,7 +46,8 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j - 1, k,1) || -+ world.getBlockId(i, j - 1, k) == Block.fence.blockID; - } - - public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +57,8 @@ - public void onNeighborBlockChange(World world, int i, int j, int k, int l) - { - boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) -+ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -16,12 +16,12 @@ - public static final boolean isRailBlockAt(World world, int i, int j, int k) - { - int l = world.getBlockId(i, j, k); -- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; -+ return Block.blocksList[l] instanceof BlockRail; - } - - public static final boolean isRailBlock(int i) - { -- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; -+ return Block.blocksList[i] instanceof BlockRail; - } - - protected BlockRail(int i, int j, boolean flag) -@@ -92,7 +92,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k,1); - } - - public void onBlockAdded(World world, int i, int j, int k) -@@ -116,23 +116,23 @@ - j1 &= 7; - } - boolean flag = false; -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - flag = true; - } -- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) -+ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) - { - flag = true; - } -- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) -+ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) - { - flag = true; - } -- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) -+ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) - { - flag = true; - } -- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) -+ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -27,7 +27,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return false; - } else -@@ -38,7 +38,7 @@ - - public boolean canBlockStay(World world, int i, int j, int k) - { -- if(!world.isBlockNormalCube(i, j - 1, k)) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) - { - return false; - } 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import java.util.*; - -@@ -43,7 +44,7 @@ - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j - 1, k); -+ return world.isBlockSolidOnSide(i, j - 1, k, 1); - } - - private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -413,6 +414,10 @@ - { - return false; - } -+ if(Block.blocksList[i1] instanceof IConnectRedstone) { -+ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; -+ return icr.canConnectRedstone(iblockaccess,i,j,k,l); -+ } - if(Block.blocksList[i1].canProvidePower()) - { - 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 ---- ../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 14:29:22.000000000 -0400 -@@ -4,7 +4,10 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooks; -+ - import java.util.Random; -+import java.util.ArrayList; - - // Referenced classes of package net.minecraft.src: - // BlockFlower, Item, World, EntityPlayer, -@@ -41,13 +44,17 @@ - - public int idDropped(int i, Random random) - { -- if(random.nextInt(8) == 0) -- { -- return Item.seeds.shiftedIndex; -- } else -- { - return -1; -- } -+ } -+ -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(world.rand.nextInt(8)!=0) -+ return tr; -+ ItemStack ist=ForgeHooks.getGrassSeed(world); -+ if(ist!=null) tr.add(ist); -+ return tr; - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -36,24 +36,24 @@ - - private boolean canPlaceTorchOn(World world, int i, int j, int k) - { -- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; - } - - public boolean canPlaceBlockAt(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - return true; - } -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - return true; - } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - return true; - } -@@ -67,19 +67,19 @@ - { - i1 = 5; - } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) - { - i1 = 4; - } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) - { - i1 = 3; - } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) -+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) - { - i1 = 2; - } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) -+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) - { - i1 = 1; - } -@@ -97,19 +97,19 @@ - - public void onBlockAdded(World world, int i, int j, int k) - { -- if(world.isBlockNormalCube(i - 1, j, k)) -+ if(world.isBlockSolidOnSide(i - 1, j, k,5)) - { - world.setBlockMetadataWithNotify(i, j, k, 1); - } else -- if(world.isBlockNormalCube(i + 1, j, k)) -+ if(world.isBlockSolidOnSide(i + 1, j, k,4)) - { - world.setBlockMetadataWithNotify(i, j, k, 2); - } else -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) - { - world.setBlockMetadataWithNotify(i, j, k, 3); - } else -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) - { - world.setBlockMetadataWithNotify(i, j, k, 4); - } else -@@ -126,19 +126,19 @@ - { - int i1 = world.getBlockMetadata(i, j, k); - boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) -+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) - { - flag = true; - } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) -+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) - { - flag = true; - } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -130,7 +130,7 @@ - { - j1--; - } -- if(!world.isBlockNormalCube(j1, j, k1)) -+ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) - { - world.setBlockWithNotify(i, j, k, 0); - dropBlockAsItem(world, i, j, k, i1); -@@ -172,6 +172,7 @@ - - public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) - { -+ if(disableValidation) return true; - if(l == 0) - { - return false; -@@ -196,11 +197,15 @@ - { - i--; - } -- return world.isBlockNormalCube(i, j, k); -+ return world.isBlockSolidOnSide(i, j, k, l); - } - - public static boolean isTrapdoorOpen(int i) - { - return (i & 4) != 0; - } -+ -+ /* FORGE: Set this to allow trapdoors to remain free-floating -+ */ -+ 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; - - import java.io.PrintStream; - import java.util.*; -@@ -68,16 +69,12 @@ - - public void generateSkylightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int l = 0; l < 16; l++) - { -- worldObj.getClass(); - int j1 = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - int k1; - for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } - heightMap[l << 4 | j] = (byte)j1; -@@ -90,7 +87,6 @@ - continue; - } - int l1 = 15; -- worldObj.getClass(); - int i2 = 128 - 1; - do - { -@@ -128,7 +124,6 @@ - - private void func_35633_i() - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) - { - for(int i = 0; i < 16; i++) -@@ -190,7 +185,6 @@ - { - if(l > k) - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) - { - for(int i1 = k; i1 < l; i1++) -@@ -211,8 +205,6 @@ - { - i1 = j; - } -- worldObj.getClass(); -- worldObj.getClass(); - for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } - if(i1 == l) - { -@@ -225,7 +217,6 @@ - lowestBlockHeight = i1; - } else - { -- worldObj.getClass(); - int k1 = 128 - 1; - for(int i2 = 0; i2 < 16; i2++) - { -@@ -294,8 +285,6 @@ - - public int getBlockID(int i, int j, int k) - { -- worldObj.getClass(); -- worldObj.getClass(); - return blocks[i << 11 | k << 7 | j] & 0xff; - } - -@@ -308,8 +297,6 @@ - field_35637_c[j1] = -999; - } - int k1 = heightMap[k << 4 | i] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int l1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(l1 == l && data.getNibble(i, j, k) == i1) - { -@@ -317,12 +304,17 @@ - } - int i2 = xPosition * 16 + i; - int j2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ if (Block.blocksList[l1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; -+ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(l1 != 0 && !worldObj.singleplayerWorld) -- { -- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ if(l1 != 0) { -+ if(!worldObj.singleplayerWorld) -+ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, i1); - if(!worldObj.worldProvider.hasNoSky) -@@ -354,7 +346,7 @@ - TileEntity tileentity = getChunkBlockTileEntity(i, j, k); - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); - worldObj.setBlockTileEntity(i, j, k, tileentity); - } - if(tileentity != null) -@@ -362,14 +354,6 @@ - tileentity.func_35164_g(); - } - } -- } else -- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) -- { -- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); -- if(tileentity1 != null) -- { -- tileentity1.func_35164_g(); -- } - } - isModified = true; - return true; -@@ -384,8 +368,6 @@ - field_35637_c[i1] = -999; - } - int j1 = heightMap[i1] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int k1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(k1 == l) - { -@@ -393,12 +375,18 @@ - } - int l1 = xPosition * 16 + i; - int i2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ -+ if (Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; -+ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(k1 != 0) -- { -- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if(k1 != 0) { -+ if(!worldObj.singleplayerWorld) -+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, 0); - if(Block.lightOpacity[byte0 & 0xff] != 0) -@@ -426,7 +414,7 @@ - TileEntity tileentity = getChunkBlockTileEntity(i, j, k); - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); - worldObj.setBlockTileEntity(i, j, k, tileentity); - } - if(tileentity != null) -@@ -434,14 +422,6 @@ - tileentity.func_35164_g(); - } - } -- } else -- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) -- { -- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); -- if(tileentity1 != null) -- { -- tileentity1.func_35164_g(); -- } - } - isModified = true; - return true; -@@ -568,6 +548,11 @@ - { - ChunkPosition chunkposition = new ChunkPosition(i, j, k); - TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity != null && tileentity.isInvalid()) -+ { -+ chunkTileEntityMap.remove(chunkposition); -+ tileentity=null; -+ } - if(tileentity == null) - { - int l = getBlockID(i, j, k); -@@ -577,18 +562,23 @@ - } - if(tileentity == null) - { -- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); -+ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); - worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); - } - tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); - } -- if(tileentity != null && tileentity.isInvalid()) -- { -- chunkTileEntityMap.remove(chunkposition); -- return null; -- } else -+ return tileentity; -+ } -+ -+ /* FORGE: Used to remove only invalid TileEntities */ -+ public void cleanChunkBlockTileEntity(int i, int j, int k) -+ { -+ ChunkPosition chunkposition = new ChunkPosition(i, j, k); -+ if(isChunkLoaded) - { -- return tileentity; -+ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity!=null && tileentity.isInvalid()) -+ chunkTileEntityMap.remove(chunkposition); - } - } - -@@ -600,7 +590,7 @@ - setChunkBlockTileEntity(i, j, k, tileentity); - if(isChunkLoaded) - { -- worldObj.loadedTileEntityList.add(tileentity); -+ worldObj.addTileEntity(tileentity); - } - } - -@@ -617,6 +607,8 @@ - return; - } else - { -+ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(old!=null) old.invalidate(); - tileentity.validate(); - chunkTileEntityMap.put(chunkposition, tileentity); - return; -@@ -766,8 +758,6 @@ - { - for(int k3 = k; k3 < j1; k3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int k4 = k2 << 11 | k3 << 7 | j; - int k5 = i1 - j; - System.arraycopy(blocks, k4, abyte0, k1, k5); -@@ -780,8 +770,6 @@ - { - for(int l3 = k; l3 < j1; l3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int l4 = (l2 << 11 | l3 << 7 | j) >> 1; - int l5 = (i1 - j) / 2; - System.arraycopy(data.data, l4, abyte0, k1, l5); -@@ -794,8 +782,6 @@ - { - for(int i4 = k; i4 < j1; i4++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int i5 = (i3 << 11 | i4 << 7 | j) >> 1; - int i6 = (i1 - j) / 2; - System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); -@@ -808,8 +794,6 @@ - { - for(int j4 = k; j4 < j1; j4++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int j5 = (j3 << 11 | j4 << 7 | j) >> 1; - int j6 = (i1 - j) / 2; - System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); -@@ -857,7 +841,6 @@ - int l = field_35637_c[k]; - if(l == -999) - { -- worldObj.getClass(); - int i1 = 128 - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -600,7 +600,9 @@ - int i = MathHelper.floor_double(posX); - int j = MathHelper.floor_double(boundingBox.minY); - int k = MathHelper.floor_double(posZ); -- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; -+ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; -+ if(block==null) return false; -+ return block.isLadder(); - } - - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -6,6 +6,10 @@ - - import java.util.*; - -+import net.minecraft.src.forge.ArmorProperties; -+import net.minecraft.src.forge.ISpecialArmor; -+import net.minecraft.src.forge.ForgeHooks; -+ - // Referenced classes of package net.minecraft.src: - // EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, - // ContainerPlayer, World, ChunkCoordinates, DataWatcher, -@@ -433,6 +437,8 @@ - worldObj.entityJoinedWorld(entityitem); - } - -+ /* FORGE: This isn't called anymore -+ */ - public float getCurrentPlayerStrVsBlock(Block block) - { - float f = inventory.getStrVsBlock(block); -@@ -455,6 +461,32 @@ - return f; - } - -+ /* FORGE: Extended to allow metadata. -+ */ -+ public float getCurrentPlayerStrVsBlock(Block block, int md) -+ { -+ float f = 1.0F; -+ ItemStack ist=inventory.getCurrentItem(); -+ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); -+ if(isInsideOfMaterial(Material.water)) -+ { -+ f /= 5F; -+ } -+ if(!onGround) -+ { -+ f /= 5F; -+ } -+ if(func_35184_a(Potion.digSpeed)) -+ { -+ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).func_35652_c() + 1) * 0.2F; -+ } -+ if(func_35184_a(Potion.digSlowdown)) -+ { -+ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).func_35652_c() + 1) * 0.2F; -+ } -+ return f; -+ } -+ - public boolean canHarvestBlock(Block block) - { - return inventory.canHarvestBlock(block); -@@ -668,7 +700,9 @@ - - public void destroyCurrentEquippedItem() - { -+ ItemStack orig=inventory.getCurrentItem(); - inventory.setInventorySlotContents(inventory.currentItem, null); -+ ForgeHooks.onDestroyCurrentItem(this,orig); - } - - public double getYOffset() -@@ -757,6 +791,10 @@ - - public EnumStatus sleepInBedAt(int i, int j, int k) - { -+ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); -+ if (customSleep != null) { -+ return customSleep; -+ } - if(!worldObj.singleplayerWorld) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ISpecialResistance; - - import java.util.*; - -@@ -66,7 +67,16 @@ - int i5 = worldObj.getBlockId(j4, k4, l4); - if(i5 > 0) - { -- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ if(Block.blocksList[i5] instanceof ISpecialResistance) { -+ ISpecialResistance isr=(ISpecialResistance) -+ Block.blocksList[i5]; -+ f1-=(isr.getSpecialExplosionResistance( -+ worldObj,j4,k4,l4, -+ explosionX,explosionY,explosionZ, -+ exploder) + 0.3F) * f2; -+ } else { -+ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ } - } - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -6,6 +6,7 @@ - - import java.util.HashMap; - import java.util.Map; -+import java.util.Arrays; - - // Referenced classes of package net.minecraft.src: - // Block, ItemStack, Item -@@ -21,6 +22,7 @@ - private FurnaceRecipes() - { - smeltingList = new HashMap(); -+ metaSmeltingList = new HashMap(); - addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); - addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); - addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); -@@ -40,11 +42,32 @@ - smeltingList.put(Integer.valueOf(i), itemstack); - } - -+ /* FORGE: Add a metadata-sensitive furnace recipe. -+ */ -+ public void addSmelting(int i, int meta, ItemStack itemstack) -+ { -+ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); -+ } -+ -+ /* FORGE: Not used anymore. -+ */ - public ItemStack getSmeltingResult(int i) - { - return (ItemStack)smeltingList.get(Integer.valueOf(i)); - } - -+ /* FORGE: Added to allow metadata-sensitive smelting. -+ */ -+ public ItemStack getSmeltingResult(ItemStack src) { -+ ItemStack tr; -+ -+ if(src==null) return null; -+ tr=(ItemStack)metaSmeltingList.get( -+ Arrays.asList(src.itemID,src.getItemDamage())); -+ if(tr!=null) return tr; -+ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); -+ } -+ - public Map getSmeltingList() - { - return smeltingList; -@@ -52,5 +75,6 @@ - - private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); - private Map smeltingList; -+ private Map metaSmeltingList; - - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-10-02 14:29:22.000000000 -0400 -@@ -62,7 +62,7 @@ - { - return false; - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -6,6 +6,8 @@ - - import java.util.Random; - -+import net.minecraft.src.forge.MinecraftForge; -+ - // Referenced classes of package net.minecraft.src: - // Item, EntityPlayer, Vec3D, MathHelper, - // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -56,6 +58,12 @@ - } - if(isFull == 0) - { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); -+ if (customBucket != null) { -+ return customBucket; -+ } -+ - if(!entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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 14:29:22.000000000 -0400 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.ForgeHooks; - - import java.util.Random; - -@@ -29,13 +30,18 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } - if(itemstack.getItemDamage() == 15) - { - int i1 = world.getBlockId(i, j, k); -+ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { -+ if(!world.singleplayerWorld) -+ itemstack.stackSize--; -+ return true; -+ } - if(i1 == Block.sapling.blockID) - { - if(!world.singleplayerWorld) -@@ -102,13 +108,7 @@ - world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); - continue; - } -- if(itemRand.nextInt(3) != 0) -- { -- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); -- } else -- { -- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); -- } -+ ForgeHooks.plantGrassPlant(world,k1,l1,i2); - } - - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-10-02 14:29:22.000000000 -0400 -@@ -46,7 +46,7 @@ - { - i++; - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -21,7 +21,7 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -3,7 +3,8 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -- -+import net.minecraft.src.forge.ForgeHooks; -+import net.minecraft.src.forge.IUseItemFirst; - - // Referenced classes of package net.minecraft.src: - // EntityPlayer, PlayerCapabilities, World, Block, -@@ -66,7 +67,8 @@ - if(j != 0) - { - Block block = Block.blocksList[j]; -- float f = block.blockStrength(thisPlayer) * (float)(i + 1); -+ float f = block.blockStrength(thisWorld,thisPlayer, -+ field_22049_l,field_22048_m,field_22047_n) * (float)(i + 1); - if(f >= 1.0F) - { - field_22050_k = false; -@@ -93,7 +95,7 @@ - { - Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); - } -- if(i1 > 0 && Block.blocksList[i1].blockStrength(thisPlayer) >= 1.0F) -+ if(i1 > 0 && Block.blocksList[i1].blockStrength(thisWorld,thisPlayer,i,j,k) >= 1.0F) - { - blockHarvessted(i, j, k); - } else -@@ -113,7 +115,7 @@ - if(i1 != 0) - { - Block block = Block.blocksList[i1]; -- float f = block.blockStrength(thisPlayer) * (float)(l + 1); -+ float f = block.blockStrength(thisWorld,thisPlayer,i,j,k) * (float)(l + 1); - if(f >= 0.7F) - { - blockHarvessted(i, j, k); -@@ -164,7 +166,7 @@ - thisPlayer.destroyCurrentEquippedItem(); - } - } -- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) -+ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) - { - Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); - } -@@ -188,6 +190,7 @@ - if(itemstack1.stackSize == 0) - { - entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; -+ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); - } - return true; - } else -@@ -198,6 +201,11 @@ - - public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) - { -+ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); -+ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) -+ return true; -+ } - int i1 = world.getBlockId(i, j, k); - if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) - { -@@ -217,7 +225,11 @@ - return flag; - } else - { -- return itemstack.useItem(entityplayer, world, i, j, k, l); -+ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) -+ return false; -+ if(itemstack.stackSize == 0) -+ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); -+ return true; - } - } - -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-10-02 14:29:22.000000000 -0400 -@@ -66,6 +66,13 @@ - return 1.0F; - } - -+ /* FORGE: Metadata-sensitive version of getStrVsBlock -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) -+ { -+ return getStrVsBlock(itemstack,block); -+ } -+ - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -50,7 +50,7 @@ - return false; - } - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -52,7 +52,7 @@ - i++; - } - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -24,7 +24,7 @@ - { - return false; - } -- if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)) -+ if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -4,6 +4,8 @@ - - package net.minecraft.src; - -+import java.util.Arrays; -+import net.minecraft.src.forge.ForgeHooks; - - // Referenced classes of package net.minecraft.src: - // Item, EnumToolMaterial, ItemStack, Block, -@@ -37,6 +39,14 @@ - return 1.0F; - } - -+ /* FORGE: Overridden to allow custom tool effectiveness -+ */ -+ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { -+ if(ForgeHooks.isToolEffective(itemstack,block,md)) -+ return efficiencyOnProperMaterial; -+ return getStrVsBlock(itemstack,block); -+ } -+ - public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) - { - itemstack.damageItem(2, entityliving1); -@@ -55,7 +65,7 @@ - } - - private Block blocksEffectiveAgainst[]; -- private float efficiencyOnProperMaterial; -- private int damageVsEntity; -+ public float efficiencyOnProperMaterial; -+ public int damageVsEntity; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -35,4 +35,7 @@ - public int sideHit; - public Vec3D hitVec; - public Entity entityHit; -+ -+ // Added for RedPower subblocks. -+ 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -168,12 +168,11 @@ - sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); - for(int k = 0; k < numBlocksToUpdate; k++) - { -- int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); -- int i2 = numBlocksToUpdate & 0xff; -- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); -+ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); -+ int i2 = blocksToUpdate[k] & 0xff; -+ int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); - if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) - { -- System.out.println("Sending!"); - updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); - } - } -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-10-02 14:29:21.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-10-02 14:29:22.000000000 -0400 -@@ -3,7 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -- -+import net.minecraft.src.forge.ForgeHooks; - - // Referenced classes of package net.minecraft.src: - // Slot, EntityPlayer, ItemStack, Block, -@@ -60,6 +60,7 @@ - thePlayer.addStat(AchievementList.buildSword, 1); - } - ModLoader.TakenFromCrafting(thePlayer, itemstack); -+ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); - for(int i = 0; i < craftMatrix.getSizeInventory(); 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 ---- ../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 14:29:22.000000000 -0400 -@@ -4,6 +4,7 @@ - - package net.minecraft.src; - -+import net.minecraft.src.forge.ISidedInventory; - - // Referenced classes of package net.minecraft.src: - // TileEntity, IInventory, ItemStack, NBTTagCompound, -@@ -12,7 +13,7 @@ - // EntityPlayer - - public class TileEntityFurnace extends TileEntity -- implements IInventory -+ implements IInventory, ISidedInventory - { - - public TileEntityFurnace() -@@ -28,6 +29,16 @@ - return furnaceItemStacks.length; - } - -+ public int getStartInventorySide(int side) { -+ if(side==0) return 1; -+ if(side==1) return 0; -+ return 2; -+ } -+ -+ public int getSizeInventorySide(int side) { -+ return 1; -+ } -+ - public ItemStack getStackInSlot(int i) - { - return furnaceItemStacks[i]; -@@ -176,7 +187,7 @@ - { - return false; - } -- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); -+ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); - if(itemstack == null) - { - return false; -@@ -189,13 +200,9 @@ - { - return false; - } -- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) -- { -- return true; -- } else -- { -- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); -- } -+ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; -+ return (st<=getInventoryStackLimit() && -+ st<=itemstack.getMaxStackSize()); - } - - public void smeltItem() -@@ -204,23 +211,29 @@ - { - return; - } -- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); -+ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); - if(furnaceItemStacks[2] == null) - { - furnaceItemStacks[2] = itemstack.copy(); - } else -- if(furnaceItemStacks[2].itemID == itemstack.itemID) -+ if(furnaceItemStacks[2].isItemEqual(itemstack)) -+ { -+ furnaceItemStacks[2].stackSize+=itemstack.stackSize; -+ } -+ if(furnaceItemStacks[0].getItem().hasContainerItem()) -+ { -+ furnaceItemStacks[0] = new ItemStack(furnaceItemStacks[0].getItem().getContainerItem()); -+ } else - { -- furnaceItemStacks[2].stackSize++; -+ furnaceItemStacks[0].stackSize--; - } -- furnaceItemStacks[0].stackSize--; - if(furnaceItemStacks[0].stackSize <= 0) - { - furnaceItemStacks[0] = null; - } - } - -- private int getItemBurnTime(ItemStack itemstack) -+ public static int getItemBurnTime(ItemStack itemstack) - { - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -61,6 +61,13 @@ - { - } - -+ /* FORGE: Return false if this TileEntity does not require updateEntity() -+ * calls. -+ */ -+ public boolean canUpdate() { -+ return true; -+ } -+ - public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) - { - 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 ---- ../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-02 14:35:03.000000000 -0400 -@@ -183,7 +183,11 @@ - - public boolean isAirBlock(int i, int j, int k) - { -- return getBlockId(i, j, k) == 0; -+ int iBlockID = getBlockId( i, j, k ); -+ -+ if ( iBlockID == 0 ) -+ return true; -+ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); - } - - public boolean blockExists(int i, int j, int k) -@@ -1124,7 +1128,7 @@ - Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); - if(chunk != null) - { -- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); -+ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); - } - } - } -@@ -1151,15 +1155,15 @@ - { - loadedTileEntityList.add(tileentity1); - } -+ } else { - if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) - { - Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); - if(chunk1 != null) - { -- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); -+ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); - } - } -- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); - } - } while(true); - addedTileEntityList.clear(); -@@ -1168,13 +1172,19 @@ - - public void addTileEntity(Collection collection) - { -- if(scanningTileEntities) -- { -- addedTileEntityList.addAll(collection); -- } else -- { -- loadedTileEntityList.addAll(collection); -- } -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } -+ } -+ -+ /* FORGE: Used as a bugfix */ -+ public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); - } - - public void updateEntity(Entity entity) -@@ -1372,6 +1382,9 @@ - if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) - { - return true; -+ } else { -+ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) -+ return true; - } - } - -@@ -1590,44 +1603,23 @@ - - public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) - { -- if(tileentity != null && !tileentity.isInvalid()) -- { -- if(scanningTileEntities) -- { -- tileentity.xCoord = i; -- tileentity.yCoord = j; -- tileentity.zCoord = k; -- addedTileEntityList.add(tileentity); -- } else -- { -- loadedTileEntityList.add(tileentity); -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -- } -- } -- } -+ if(tileentity==null || tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } - } - - public void removeBlockTileEntity(int i, int j, int k) - { -- TileEntity tileentity = getBlockTileEntity(i, j, k); -- if(tileentity != null && scanningTileEntities) -- { -- tileentity.invalidate(); -- } else -- { -- if(tileentity != null) -- { -- loadedTileEntityList.remove(tileentity); -- } -- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -- if(chunk != null) -- { -- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -- } -- } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } - } - - public void func_35239_a(TileEntity tileentity) -@@ -1650,13 +1642,18 @@ - public boolean isBlockNormalCube(int i, int j, int k) - { - Block block = Block.blocksList[getBlockId(i, j, k)]; -- if(block == null) -- { -- return false; -- } else -- { -- return block.blockMaterial.getIsOpaque() && block.isACube(); -- } -+ if(block == null) return false; -+ return block.isBlockNormalCube(this,i,j,k); -+ } -+ -+ /* FORGE: Determine if the given block is considered solid on the -+ * specified side. Used by placement logic. -+ */ -+ public boolean isBlockSolidOnSide(int i, int j, int k, int side) -+ { -+ Block block = Block.blocksList[getBlockId(i, j, k)]; -+ if(block == null) return false; -+ return block.isBlockSolidOnSide(this,i,j,k,side); - } - - public void calculateInitialSkylight() -@@ -1976,7 +1973,7 @@ - - private int func_35241_e(int i, int j, int k, int l, int i1, int j1) - { -- int k1 = Block.lightValue[i1]; -+ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); - int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; - int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; - int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2315,6 +2312,7 @@ - { - block = null; - } -+ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; - return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); - } - -@@ -2759,7 +2757,7 @@ - public int field_27080_i; - public boolean editingBlocks; - private long lockTimestamp; -- protected int autosavePeriod; -+ public int autosavePeriod; - public int difficultySetting; - public Random rand; - 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 ---- ../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-10-02 14:29:22.000000000 -0400 -@@ -54,15 +54,20 @@ - public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) - { - ArrayList arraylist = new ArrayList(); -- for(int k1 = 0; k1 < loadedTileEntityList.size(); k1++) -- { -- TileEntity tileentity = (TileEntity)loadedTileEntityList.get(k1); -- if(tileentity.xCoord >= i && tileentity.yCoord >= j && tileentity.zCoord >= k && tileentity.xCoord < l && tileentity.yCoord < i1 && tileentity.zCoord < j1) -- { -- arraylist.add(tileentity); -- } -- } -- -+ for(int x=(i>>4); x<=(l>>4); x++) -+ for(int z=(k>>4); z<=(j1>>4); z++) { -+ Chunk ch=getChunkFromChunkCoords(x,z); -+ if(ch==null) continue; -+ for(Object ob : ch.chunkTileEntityMap.values()) { -+ TileEntity te=(TileEntity)ob; -+ if(te.isInvalid()) continue; -+ if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k -+ && te.xCoord getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ ++ int q=quantityDropped(md,world.rand); ++ for(int n=0; n0) { ++ tr.add(new ItemStack(id,1,damageDropped(md))); ++ } ++ } ++ return tr; + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -309,20 +328,12 @@ + { + return; + } +- int i1 = quantityDropped(world.rand); +- for(int j1 = 0; j1 < i1; j1++) +- { ++ ArrayList ar=getBlockDropped(world,i,j,k,l); ++ for(ItemStack ist : ar) { + if(world.rand.nextFloat() > f) +- { + continue; +- } +- int k1 = idDropped(l, world.rand); +- if(k1 > 0) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- } ++ dropBlockAsItem_do(world, i, j, k, ist); + } +- + } + + protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) +@@ -618,6 +629,86 @@ + return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; + } + ++ /* FORGE: Allow a block to set illumination on a coordinate basis. ++ */ ++ public int getLightValue(IBlockAccess iba, int i, int j, int k) { ++ return lightValue[blockID]; ++ } ++ ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && renderAsNormalBlock(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata md. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * md against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata md. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + try diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch new file mode 100644 index 0000000000..cc54d7ee6b --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch @@ -0,0 +1,119 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch new file mode 100644 index 0000000000..8c69a81af3 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -0,0 +1,31 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +@@ -423,23 +423,23 @@ + { + return true; + } +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch new file mode 100644 index 0000000000..1871f24c98 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -0,0 +1,24 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -26,7 +26,7 @@ + public void onBlockAdded(World world, int i, int j, int k) + { + super.onBlockAdded(world, i, j, k); +- world.setBlockTileEntity(i, j, k, getBlockEntity()); ++ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); + } + + public void onBlockRemoval(World world, int i, int j, int k) +@@ -37,6 +37,12 @@ + + public abstract TileEntity getBlockEntity(); + ++ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. ++ */ ++ public TileEntity getBlockEntity(int md) { ++ return getBlockEntity(); ++ } ++ + public void playBlock(World world, int i, int j, int k, int l, int i1) + { + super.playBlock(world, i, j, k, l, i1); diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch new file mode 100644 index 0000000000..2706d14e6d --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -0,0 +1,48 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Block, World, EntityItem, +@@ -108,27 +109,16 @@ + return 6; + } + +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- { +- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- if(world.multiplayerWorld) +- { +- return; +- } +- for(int i1 = 0; i1 < 3; i1++) +- { +- if(world.rand.nextInt(15) <= l) +- { +- float f1 = 0.7F; +- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- } +- } +- ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(md==7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n=0; n<3; n++) { ++ if(world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); ++ } ++ return tr; + } + + public int idDropped(int i, Random random) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch new file mode 100644 index 0000000000..e6ba89fe80 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -178,7 +178,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -242,7 +242,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch new file mode 100644 index 0000000000..78010cb2ad --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch @@ -0,0 +1,84 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +@@ -63,6 +63,11 @@ + return super.getSelectedBoundingBoxFromPool(world, i, j, k); + } + ++ /* FORGE: Implemented base method, see Block.isLadder */ ++ public boolean isLadder() { ++ return true; ++ } ++ + public boolean isOpaqueCube() + { + return false; +@@ -80,37 +85,37 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) + { + int i1 = world.getBlockMetadata(i, j, k); +- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) ++ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 2; + } +- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) ++ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) ++ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 4; + } +- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) ++ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 5; + } +@@ -121,19 +126,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + flag = true; + } +- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + flag = true; + } +- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + flag = true; + } +- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch new file mode 100644 index 0000000000..f2937b1c37 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch @@ -0,0 +1,120 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +@@ -40,44 +40,44 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return true; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -86,23 +86,23 @@ + int j1 = i1 & 8; + i1 &= 7; + i1 = -1; +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + i1 = 5 + world.rand.nextInt(2); + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -124,27 +124,27 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch new file mode 100644 index 0000000000..16abd9ba82 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -0,0 +1,22 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +@@ -46,7 +46,8 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j - 1, k,1) ++ || world.getBlockId(i, j - 1, k) == Block.fence.blockID; + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -56,7 +57,8 @@ + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) ++ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch new file mode 100644 index 0000000000..2e26b4bb34 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -0,0 +1,55 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +@@ -16,12 +16,12 @@ + public static final boolean isRailBlockAt(World world, int i, int j, int k) + { + int l = world.getBlockId(i, j, k); +- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; ++ return Block.blocksList[l] instanceof BlockRail; + } + + public static final boolean isRailBlock(int i) + { +- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; ++ return Block.blocksList[i] instanceof BlockRail; + } + + protected BlockRail(int i, int j, boolean flag) +@@ -97,7 +97,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -121,23 +121,23 @@ + j1 &= 7; + } + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + flag = true; + } +- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) ++ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) + { + flag = true; + } +- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) ++ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) + { + flag = true; + } +- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) ++ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) + { + flag = true; + } +- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) ++ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch new file mode 100644 index 0000000000..488e9ef02c --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +@@ -27,7 +27,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else +@@ -38,7 +38,7 @@ + + public boolean canBlockStay(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch new file mode 100644 index 0000000000..f0c5c3468a --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -0,0 +1,30 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -53,7 +54,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 1); + } + + private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) +@@ -451,6 +452,10 @@ + { + return false; + } ++ if (Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess, i, j, k, l); ++ } + if(Block.blocksList[i1].canProvidePower()) + { + return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch new file mode 100644 index 0000000000..d4750f5201 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -0,0 +1,38 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,7 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; ++ + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, +@@ -79,13 +82,17 @@ + + public int idDropped(int i, Random random) + { +- if(random.nextInt(8) == 0) +- { +- return Item.seeds.shiftedIndex; +- } else +- { +- return -1; +- } ++ return -1; ++ } ++ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(world.rand.nextInt(8)!=0) ++ return tr; ++ ItemStack ist=ForgeHooks.getGrassSeed(world); ++ if(ist!=null) tr.add(ist); ++ return tr; + } + + public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch new file mode 100644 index 0000000000..c3f031031c --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -0,0 +1,104 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +@@ -41,24 +41,24 @@ + + private boolean func_31032_h(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +@@ -72,19 +72,19 @@ + { + i1 = 5; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -102,19 +102,19 @@ + + public void onBlockAdded(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + world.setBlockMetadataWithNotify(i, j, k, 1); + } else +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + world.setBlockMetadataWithNotify(i, j, k, 2); + } else +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + world.setBlockMetadataWithNotify(i, j, k, 3); + } else +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + world.setBlockMetadataWithNotify(i, j, k, 4); + } else +@@ -131,19 +131,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch new file mode 100644 index 0000000000..e3106e78e0 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -0,0 +1,36 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -147,7 +147,7 @@ + { + j1--; + } +- if(!world.isBlockNormalCube(j1, j, k1)) ++ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) + { + world.setBlockWithNotify(i, j, k, 0); + dropBlockAsItem(world, i, j, k, i1); +@@ -189,6 +189,7 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { ++ if(disableValidation) return true; + if(l == 0) + { + return false; +@@ -213,11 +214,15 @@ + { + i--; + } +- return world.isBlockNormalCube(i, j, k); ++ return world.isBlockSolidOnSide(i, j, k, l); + } + + public static boolean isTrapdoorOpen(int i) + { + return (i & 4) != 0; + } ++ ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ public static boolean disableValidation=false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch new file mode 100644 index 0000000000..20285d71da --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -0,0 +1,354 @@ +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.io.PrintStream; + import java.util.*; +@@ -26,7 +27,6 @@ + hasEntities = false; + lastSaveTime = 0L; + field_35846_u = false; +- world.getClass(); + entities = new List[128 / 16]; + worldObj = world; + xPosition = i; +@@ -44,11 +44,8 @@ + { + this(world, i, j); + blocks = abyte0; +- world.getClass(); + data = new NibbleArray(abyte0.length, 7); +- world.getClass(); + skylightMap = new NibbleArray(abyte0.length, 7); +- world.getClass(); + blocklightMap = new NibbleArray(abyte0.length, 7); + } + +@@ -68,16 +65,12 @@ + + public void generateHeightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int k = 0; k < 16; k++) + { +- worldObj.getClass(); + int l = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + for(int i1 = j << 11 | k << 7; l > 0 && Block.lightOpacity[blocks[(i1 + l) - 1] & 0xff] == 0; l--) { } + heightMap[k << 4 | j] = (byte)l; + if(l < i) +@@ -94,16 +87,12 @@ + + public void generateSkylightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int l = 0; l < 16; l++) + { +- worldObj.getClass(); + int j1 = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + int k1; + for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } + heightMap[l << 4 | j] = (byte)j1; +@@ -116,7 +105,6 @@ + continue; + } + int l1 = 15; +- worldObj.getClass(); + int i2 = 128 - 1; + do + { +@@ -154,7 +142,6 @@ + + private void func_35839_k() + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) + { + for(int i = 0; i < 16; i++) +@@ -216,7 +203,6 @@ + { + if(l > k) + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) + { + for(int i1 = k; i1 < l; i1++) +@@ -237,8 +223,6 @@ + { + i1 = j; + } +- worldObj.getClass(); +- worldObj.getClass(); + for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } + if(i1 == l) + { +@@ -251,7 +235,6 @@ + lowestBlockHeight = i1; + } else + { +- worldObj.getClass(); + int k1 = 128 - 1; + for(int i2 = 0; i2 < 16; i2++) + { +@@ -320,8 +303,6 @@ + + public int getBlockID(int i, int j, int k) + { +- worldObj.getClass(); +- worldObj.getClass(); + return blocks[i << 11 | k << 7 | j] & 0xff; + } + +@@ -334,8 +315,6 @@ + field_35845_c[j1] = -999; + } + int k1 = heightMap[k << 4 | i] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int l1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(l1 == l && data.getNibble(i, j, k) == i1) + { +@@ -343,12 +322,18 @@ + } + int i2 = xPosition * 16 + i; + int j2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ ++ if (Block.blocksList[l1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; ++ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); +- if(l1 != 0 && !worldObj.multiplayerWorld) +- { +- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ if(l1 != 0) { ++ if(!worldObj.multiplayerWorld) ++ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, i1); + if(!worldObj.worldProvider.hasNoSky) +@@ -380,7 +365,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -388,14 +373,6 @@ + tileentity.func_35144_b(); + } + } +- } else +- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35144_b(); +- } + } + isModified = true; + return true; +@@ -410,8 +387,6 @@ + field_35845_c[i1] = -999; + } + int j1 = heightMap[i1] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int k1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(k1 == l) + { +@@ -419,12 +394,18 @@ + } + int l1 = xPosition * 16 + i; + int i2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ ++ if (Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; ++ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); +- if(k1 != 0) +- { +- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ if(k1 != 0) { ++ if(!worldObj.multiplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, 0); + if(Block.lightOpacity[byte0 & 0xff] != 0) +@@ -452,7 +433,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -460,14 +441,6 @@ + tileentity.func_35144_b(); + } + } +- } else +- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35144_b(); +- } + } + isModified = true; + return true; +@@ -594,6 +567,11 @@ + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity != null && tileentity.isInvalid()) ++ { ++ chunkTileEntityMap.remove(chunkposition); ++ tileentity=null; ++ } + if(tileentity == null) + { + int l = getBlockID(i, j, k); +@@ -603,18 +581,23 @@ + } + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); + worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); + } + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + } +- if(tileentity != null && tileentity.isInvalid()) +- { +- chunkTileEntityMap.remove(chunkposition); +- return null; +- } else ++ return tileentity; ++ } ++ ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) + { +- return tileentity; ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); + } + } + +@@ -626,7 +609,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -643,6 +626,8 @@ + return; + } else + { ++ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(old!=null) old.invalidate(); + tileentity.validate(); + chunkTileEntityMap.put(chunkposition, tileentity); + return; +@@ -777,8 +762,6 @@ + { + for(int l2 = k; l2 < j1; l2++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int l3 = l1 << 11 | l2 << 7 | j; + int l4 = i1 - j; + System.arraycopy(abyte0, k1, blocks, l3, l4); +@@ -792,8 +775,6 @@ + { + for(int i3 = k; i3 < j1; i3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int i4 = (i2 << 11 | i3 << 7 | j) >> 1; + int i5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, data.data, i4, i5); +@@ -806,8 +787,6 @@ + { + for(int j3 = k; j3 < j1; j3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int j4 = (j2 << 11 | j3 << 7 | j) >> 1; + int j5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); +@@ -820,8 +799,6 @@ + { + for(int k3 = k; k3 < j1; k3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int k4 = (k2 << 11 | k3 << 7 | j) >> 1; + int k5 = (i1 - j) / 2; + System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); +@@ -830,11 +807,20 @@ + + } + ++ List invalidList=new ArrayList(); + TileEntity tileentity; + for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) + { + tileentity = (TileEntity)iterator.next(); ++ if( (tileentity.xCoord&15)>=i && (tileentity.xCoord&15)<=l && ++ tileentity.yCoord>=j && tileentity.yCoord<=i1 && ++ (tileentity.zCoord&15)>=k && (tileentity.zCoord&15)<=j1) { ++ ++ invalidList.add(tileentity); ++ } + } ++ for(TileEntity te : invalidList) ++ te.invalidate(); + + return k1; + } +@@ -880,7 +866,6 @@ + int l = field_35845_c[k]; + if(l == -999) + { +- worldObj.getClass(); + int i1 = 128 - 1; + for(l = -1; i1 > 0 && l == -1;) + { diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch new file mode 100644 index 0000000000..d02350e5e8 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -0,0 +1,148 @@ +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -7,6 +7,9 @@ + import java.util.*; + import org.lwjgl.opengl.GL11; + ++import net.minecraft.src.forge.BlockTextureParticles; ++import net.minecraft.src.forge.ITextureProvider; ++ + // Referenced classes of package net.minecraft.src: + // EntityFX, Entity, MathHelper, RenderEngine, + // Tessellator, Block, EntityDiggingFX, World +@@ -16,6 +19,7 @@ + + public EffectRenderer(World world, RenderEngine renderengine) + { ++ effectList = new ArrayList(); + fxLayers = new List[4]; + rand = new Random(); + if(world != null) +@@ -55,7 +59,18 @@ + } + + } +- ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ if (entityfx.isDead) { ++ entry.effects.remove(y--); ++ } ++ } ++ if (effectList.size() == 0) ++ effectList.remove(x--); ++ } + } + + public void renderParticles(Entity entity, float f) +@@ -94,6 +109,7 @@ + for(int k = 0; k < fxLayers[i].size(); k++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(k); ++ if(entityfx instanceof EntityDiggingFX) continue; + tessellator.setBrightness(entityfx.func_35115_a(f)); + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } +@@ -101,6 +117,21 @@ + tessellator.draw(); + } + ++ Tessellator tessellator = Tessellator.instance; ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ++ renderer.getTexture(entry.texture)); ++ tessellator.startDrawingQuads(); ++ for (int y = 0; y < entry.effects.size(); y++) { ++ EntityFX entityfx = (EntityFX) entry.effects.get(y); ++ tessellator.setBrightness(entityfx.func_35115_a(f)); ++ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); ++ } ++ tessellator.draw(); ++ } ++ + } + + public void func_1187_b(Entity entity, float f) +@@ -132,7 +163,12 @@ + { + fxLayers[i].clear(); + } +- ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ entry.effects.clear(); ++ } ++ effectList.clear(); + } + + public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) +@@ -153,7 +189,12 @@ + double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; + double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; + int j2 = rand.nextInt(6); +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, ++ d, d1, d2, d - (double) i - 0.5D, d1 - (double) j ++ - 0.5D, d2 - (double) k - 0.5D, block, j2, ++ i1); ++ dig_effect.func_4041_a(i, j, k); ++ addDigParticleEffect(dig_effect, block); + } + + } +@@ -198,16 +239,48 @@ + { + d = (double)i + block.maxX + (double)f; + } +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, ++ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); ++ dig_effect.func_4041_a(i, j, k); ++ dig_effect.func_407_b(0.2F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, block); + } + + public String getStatistics() + { + return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); + } ++ ++ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { ++ boolean added = false; ++ String comp; ++ ++ if (block instanceof ITextureProvider) { ++ comp = ((ITextureProvider) block).getTextureFile(); ++ } else { ++ comp = "/terrain.png"; ++ } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ if (entry.texture.equals(comp)) { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if (!added) { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ addEffect(dig_effect); ++ } + + protected World worldObj; + private List fxLayers[]; ++ private List effectList; + private RenderEngine renderer; + private Random rand; + } diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch new file mode 100644 index 0000000000..6e09fb3851 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -0,0 +1,13 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +@@ -624,7 +624,9 @@ + int i = MathHelper.floor_double(posX); + int j = MathHelper.floor_double(boundingBox.minY); + int k = MathHelper.floor_double(posZ); +- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; ++ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; ++ if(block==null) return false; ++ return block.isLadder(); + } + + public void writeEntityToNBT(NBTTagCompound nbttagcompound) diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch new file mode 100644 index 0000000000..f10cc7362e --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -0,0 +1,76 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ArmorProperties; ++import net.minecraft.src.forge.ISpecialArmor; ++import net.minecraft.src.forge.ForgeHooks; ++ + import java.util.*; + + // Referenced classes of package net.minecraft.src: +@@ -485,6 +489,8 @@ + worldObj.entityJoinedWorld(entityitem); + } + ++ /* FORGE: This isnt called anymore ++ */ + public float getCurrentPlayerStrVsBlock(Block block) + { + float f = inventory.getStrVsBlock(block); +@@ -507,6 +513,32 @@ + return f; + } + ++ /* FORGE: Extended to allow metadata. ++ */ ++ public float getCurrentPlayerStrVsBlock(Block block, int md) ++ { ++ float f = 1.0F; ++ ItemStack ist=inventory.getCurrentItem(); ++ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); ++ if(isInsideOfMaterial(Material.water)) ++ { ++ f /= 5F; ++ } ++ if(!onGround) ++ { ++ f /= 5F; ++ } ++ if(isPotionActive(Potion.potionDigSpeed)) ++ { ++ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; ++ } ++ if(isPotionActive(Potion.potionDigSlow)) ++ { ++ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; ++ } ++ return f; ++ } ++ + public boolean canHarvestBlock(Block block) + { + return inventory.canHarvestBlock(block); +@@ -720,7 +752,9 @@ + + public void destroyCurrentEquippedItem() + { ++ ItemStack orig=inventory.getCurrentItem(); + inventory.setInventorySlotContents(inventory.currentItem, null); ++ ForgeHooks.onDestroyCurrentItem(this,orig); + } + + public double getYOffset() +@@ -815,6 +849,10 @@ + + public EnumStatus sleepInBedAt(int i, int j, int k) + { ++ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); ++ if (customSleep != null) { ++ return customSleep; ++ } + if(!worldObj.multiplayerWorld) + { + if(isPlayerSleeping() || !isEntityAlive()) diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch new file mode 100644 index 0000000000..852e814076 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -0,0 +1,36 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; + import java.awt.image.BufferedImage; + import java.nio.FloatBuffer; + import java.util.Random; +@@ -803,8 +804,12 @@ + { + EntityPlayer entityplayer = (EntityPlayer)entityliving; + GL11.glDisable(3008 /*GL_ALPHA_TEST*/); ++ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, ++ mc.objectMouseOver,0, ++ entityplayer.inventory.getCurrentItem(),f)) { + renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); + renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ } + GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + } + } +@@ -853,8 +858,12 @@ + { + EntityPlayer entityplayer1 = (EntityPlayer)entityliving; + GL11.glDisable(3008 /*GL_ALPHA_TEST*/); ++ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer1, ++ mc.objectMouseOver,0, ++ entityplayer1.inventory.getCurrentItem(),f)) { + renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); + renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); ++ } + GL11.glEnable(3008 /*GL_ALPHA_TEST*/); + } + renderRainSnow(f); diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch new file mode 100644 index 0000000000..bb54fe9488 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -0,0 +1,29 @@ +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.util.*; ++import net.minecraft.src.forge.ISpecialResistance; + + // Referenced classes of package net.minecraft.src: + // World, MathHelper, Block, ChunkPosition, +@@ -66,7 +67,17 @@ + int i5 = worldObj.getBlockId(j4, k4, l4); + if(i5 > 0) + { +- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ if (Block.blocksList[i5] instanceof ISpecialResistance) { ++ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5]; ++ f1 -= (isr.getSpecialExplosionResistance( ++ worldObj, j4, k4, l4, explosionX, ++ explosionY, explosionZ, exploder) + 0.3F) ++ * f2; ++ } else { ++ f1 -= (Block.blocksList[i5] ++ .getExplosionResistance(exploder) + 0.3F) ++ * f2; ++ } + } + if(f1 > 0.0F) + { diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch new file mode 100644 index 0000000000..b8a98fc45e --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -0,0 +1,58 @@ +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +@@ -6,6 +6,7 @@ + + import java.util.HashMap; + import java.util.Map; ++import java.util.Arrays; + + // Referenced classes of package net.minecraft.src: + // Block, ItemStack, Item +@@ -21,6 +22,7 @@ + private FurnaceRecipes() + { + smeltingList = new HashMap(); ++ metaSmeltingList = new HashMap(); + addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); + addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); + addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); +@@ -40,11 +42,32 @@ + smeltingList.put(Integer.valueOf(i), itemstack); + } + ++ /* FORGE: Add a metadata-sensitive furnace recipe. ++ */ ++ public void addSmelting(int i, int meta, ItemStack itemstack) ++ { ++ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); ++ } ++ ++ /* FORGE: Not used anymore. ++ */ + public ItemStack getSmeltingResult(int i) + { + return (ItemStack)smeltingList.get(Integer.valueOf(i)); + } + ++ /* FORGE: Added to allow metadata-sensitive smelting. ++ */ ++ public ItemStack getSmeltingResult(ItemStack src) { ++ ItemStack tr; ++ ++ if(src==null) return null; ++ tr=(ItemStack)metaSmeltingList.get( ++ Arrays.asList(src.itemID,src.getItemDamage())); ++ if(tr!=null) return tr; ++ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); ++ } ++ + public Map getSmeltingList() + { + return smeltingList; +@@ -52,5 +75,6 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + } diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch new file mode 100644 index 0000000000..664d382446 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +@@ -76,6 +76,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch new file mode 100644 index 0000000000..f9cf25b4da --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +@@ -62,7 +62,7 @@ + { + return false; + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch new file mode 100644 index 0000000000..251d86ec24 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -0,0 +1,23 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // Item, EntityPlayer, Vec3D, MathHelper, + // World, MovingObjectPosition, EnumMovingObjectType, Material, +@@ -60,6 +62,11 @@ + { + return itemstack; + } ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); ++ if (customBucket != null) { ++ return customBucket; ++ } + if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) + { + world.setBlockWithNotify(i, j, k, 0); diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch new file mode 100644 index 0000000000..66e7f77eee --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -0,0 +1,45 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.Random; + +@@ -35,13 +36,18 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } + if(itemstack.getItemDamage() == 15) + { + int i1 = world.getBlockId(i, j, k); ++ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { ++ if(!world.multiplayerWorld) ++ itemstack.stackSize--; ++ return true; ++ } + if(i1 == Block.sapling.blockID) + { + if(!world.multiplayerWorld) +@@ -108,13 +114,7 @@ + world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); + continue; + } +- if(itemRand.nextInt(3) != 0) +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); +- } else +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); +- } ++ ForgeHooks.plantGrassPlant(world,k1,l1,i2); + } + + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch new file mode 100644 index 0000000000..41c66ac63a --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +@@ -46,7 +46,7 @@ + { + i++; + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch new file mode 100644 index 0000000000..a82f7de402 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +@@ -21,7 +21,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch new file mode 100644 index 0000000000..d22e6a1b48 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +@@ -50,7 +50,7 @@ + return false; + } + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch new file mode 100644 index 0000000000..15778ccf7d --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +@@ -52,7 +52,7 @@ + i++; + } + } +- if(!entityplayer.func_35190_e(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch new file mode 100644 index 0000000000..3bcb926ab0 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -0,0 +1,42 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,10 @@ + package net.minecraft.src; + + import net.minecraft.client.Minecraft; ++import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import org.lwjgl.opengl.GL11; + import org.lwjgl.opengl.GL13; + +@@ -32,18 +36,27 @@ + public void renderItem(EntityLiving entityliving, ItemStack itemstack) + { + GL11.glPushMatrix(); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); + renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); + } else + { + if(itemstack.itemID < 256) + { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); + } else + { + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); ++ ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]); + } + Tessellator tessellator = Tessellator.instance; + int i = entityliving.getItemIcon(itemstack); diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch new file mode 100644 index 0000000000..9e754e8583 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +@@ -24,7 +24,7 @@ + { + return false; + } +- if(!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k)) ++ if(entityplayer!=null && (!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k))) + { + return false; + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch new file mode 100644 index 0000000000..ba4765bcb3 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -0,0 +1,36 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import java.util.Arrays; ++import net.minecraft.src.forge.ForgeHooks; + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, ItemStack, Block, +@@ -37,6 +39,14 @@ + return 1.0F; + } + ++ /* FORGE: Overridden to allow custom tool effectiveness ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { ++ if(ForgeHooks.isToolEffective(itemstack,block,md)) ++ return efficiencyOnProperMaterial; ++ return getStrVsBlock(itemstack,block); ++ } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) + { + itemstack.damageItem(2, entityliving1); +@@ -60,7 +70,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + } diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch new file mode 100644 index 0000000000..49a2ac24df --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +@@ -35,4 +35,7 @@ + public int sideHit; + public Vec3D hitVec; + public Entity entityHit; ++ ++ // Added for RedPower subblocks. ++ public int subHit=-1; + } diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch new file mode 100644 index 0000000000..7509b615f1 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -0,0 +1,18 @@ +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import net.minecraft.client.Minecraft; + +@@ -64,6 +65,7 @@ + if(itemstack1.stackSize == 0) + { + entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); + } + return true; + } else diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch new file mode 100644 index 0000000000..c78999f827 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -0,0 +1,57 @@ +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,9 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; ++ + import net.minecraft.client.Minecraft; + + // Referenced classes of package net.minecraft.src: +@@ -91,7 +94,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } else +@@ -137,7 +140,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamageMP += block.blockStrength(mc.thePlayer); ++ curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + 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); +@@ -204,6 +207,13 @@ + { + syncCurrentPlayItem(); + netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); ++ ++ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); ++ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { +@@ -223,7 +233,11 @@ + return flag; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); ++ return true; + } + } + diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch new file mode 100644 index 0000000000..2bbbf8121e --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -0,0 +1,64 @@ +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; + + import net.minecraft.client.Minecraft; + +@@ -42,7 +44,7 @@ + int j1 = mc.theWorld.getBlockMetadata(i, j, k); + boolean flag = super.sendBlockRemoved(i, j, k, l); + ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); +- boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); ++ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); + if(itemstack != null) + { + itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); +@@ -71,7 +73,7 @@ + { + Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) + { + sendBlockRemoved(i, j, k, l); + } +@@ -102,7 +104,7 @@ + return; + } + Block block = Block.blocksList[i1]; +- curBlockDamage += block.blockStrength(mc.thePlayer); ++ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); + if(field_1069_h % 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); +@@ -165,6 +167,12 @@ + + public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + { ++ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); ++ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { +@@ -175,7 +183,11 @@ + return false; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); ++ return true; + } + } + diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch new file mode 100644 index 0000000000..f7f78623c3 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -0,0 +1,74 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +@@ -2980,7 +2980,7 @@ + colorBlueTopRight *= f27; + int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, j2); +- if(cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3085,7 +3085,7 @@ + colorBlueTopRight *= f28; + int k2 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); +- if(cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3190,7 +3190,7 @@ + colorBlueTopRight *= f29; + int l2 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, l2); +- if(cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3295,7 +3295,7 @@ + colorBlueTopRight *= f30; + int i3 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, i3); +- if(cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3388,7 +3388,7 @@ + tessellator.setColorOpaque_F(f11, f14, f17); + int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, i1); +- if(cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && i1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); + renderEastFace(block, i, j, k, 38); +@@ -3401,7 +3401,7 @@ + tessellator.setColorOpaque_F(f11, f14, f17); + int j1 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, j1); +- if(cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); + renderWestFace(block, i, j, k, 38); +@@ -3414,7 +3414,7 @@ + tessellator.setColorOpaque_F(f12, f15, f18); + int k1 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, k1); +- if(cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && k1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); + renderNorthFace(block, i, j, k, 38); +@@ -3427,7 +3427,7 @@ + tessellator.setColorOpaque_F(f12, f15, f18); + int l1 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, l1); +- if(cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && l1 == 3 && overrideBlockTexture < 0) + { + tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); + renderSouthFace(block, i, j, k, 38); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch new file mode 100644 index 0000000000..eb2044e7c0 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -0,0 +1,21 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 +@@ -128,6 +128,9 @@ + } + try + { ++ if(Tessellator.renderingWorldRenderer) { ++ System.out.printf("Warning: Texture %s not preloaded, will cause render glitches!\n",s); ++ } + singleIntBuffer.clear(); + GLAllocation.generateTextureNames(singleIntBuffer); + int i = singleIntBuffer.get(0); +@@ -667,7 +670,7 @@ + private GameSettings options; + public boolean clampTexture; + public boolean blurTexture; +- private TexturePackList texturePack; ++ public TexturePackList texturePack; + private BufferedImage missingTextureImage; + + } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch new file mode 100644 index 0000000000..dfade4d45a --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -0,0 +1,24 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 +@@ -1635,8 +1635,8 @@ + } + + public List tileEntities; +- private World worldObj; +- private RenderEngine renderEngine; ++ public World worldObj; ++ public RenderEngine renderEngine; + private List worldRenderersToUpdate; + private WorldRenderer sortedWorldRenderers[]; + private WorldRenderer worldRenderers[]; +@@ -1644,8 +1644,8 @@ + private int renderChunksTall; + private int renderChunksDeep; + private int glRenderListBase; +- private Minecraft mc; +- private RenderBlocks globalRenderBlocks; ++ public Minecraft mc; ++ public RenderBlocks globalRenderBlocks; + private IntBuffer glOcclusionQueryBase; + private boolean occlusionEnabled; + private int cloudOffsetX; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch new file mode 100644 index 0000000000..f0d2249f2b --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -0,0 +1,114 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import java.util.Random; + import org.lwjgl.opengl.GL11; + +@@ -47,10 +51,36 @@ + } + GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); + GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); ++ loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(itemstack.getItem()); ++ float f4 = 0.25F; ++ f4 = 0.5F; ++ GL11.glScalef(f4, f4, f4); ++ for(int j = 0; j < byte0; j++) ++ { ++ GL11.glPushMatrix(); ++ if(j > 0) ++ { ++ float f5 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f7 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f9 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ GL11.glTranslatef(f5, f7, f9); ++ } ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, ++ itemstack.itemID, itemstack.getItemDamage(), ++ entityitem.getEntityBrightness(f1)); ++ GL11.glPopMatrix(); ++ } ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + { + GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); + loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); + float f4 = 0.25F; + int j = Block.blocksList[itemstack.itemID].getRenderType(); + if(j == 1 || j == 19 || j == 12 || j == 2) +@@ -80,9 +110,11 @@ + if(itemstack.itemID < 256) + { + loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); + } else + { + loadTexture("/gui/items.png"); ++ ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); + } + Tessellator tessellator = Tessellator.instance; + float f5 = (float)((i % 16) * 16 + 0) / 256F; +@@ -129,10 +161,37 @@ + + public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) + { +- if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i); ++ if (customRenderer != null) { ++ int j1 = i; ++ renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ Item item = Item.itemsList[i]; ++ ForgeHooksClient.overrideTexture (Item.itemsList [i]); ++ GL11.glPushMatrix(); ++ GL11.glTranslatef(l - 2, i1 + 3, -3F); ++ GL11.glScalef(10F, 10F, 10F); ++ GL11.glTranslatef(1.0F, 0.5F, 1.0F); ++ GL11.glScalef(1.0F, 1.0F, -1F); ++ GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F); ++ GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); ++ int l1 = Item.itemsList[i].getColorFromDamage(j); ++ float f2 = (float)(l1 >> 16 & 0xff) / 255F; ++ float f4 = (float)(l1 >> 8 & 0xff) / 255F; ++ float f5 = (float)(l1 & 0xff) / 255F; ++ if(field_27004_a) ++ { ++ GL11.glColor4f(f2, f4, f5, 1.0F); ++ } ++ GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); ++ renderBlocks.useInventoryTint = field_27004_a; ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, i, j, 1.0F); ++ renderBlocks.useInventoryTint = true; ++ GL11.glPopMatrix(); ++ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) + { + int j1 = i; + renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[i]); + Block block = Block.blocksList[j1]; + GL11.glPushMatrix(); + GL11.glTranslatef(l - 2, i1 + 3, -3F); +@@ -161,9 +220,11 @@ + if(i < 256) + { + renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (Block.blocksList[i]); + } else + { + renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); ++ ForgeHooksClient.overrideTexture(Item.itemsList[i]); + } + int k1 = Item.itemsList[i].getColorFromDamage(j); + float f = (float)(k1 >> 16 & 0xff) / 255F; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch new file mode 100644 index 0000000000..50669f71cc --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -0,0 +1,26 @@ +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IArmorTextureProvider; + 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(itemstack) ); ++ } ++ 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 --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch new file mode 100644 index 0000000000..fabc12a24f --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -0,0 +1,18 @@ +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + + // Referenced classes of package net.minecraft.src: +@@ -60,6 +61,7 @@ + thePlayer.addStat(AchievementList.buildSword, 1); + } + ModLoader.TakenFromCrafting(thePlayer, itemstack, craftMatrix); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); + for(int i = 0; i < craftMatrix.getSizeInventory(); i++) + { + ItemStack itemstack1 = craftMatrix.getStackInSlot(i); diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch new file mode 100644 index 0000000000..6d52526c8e --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -0,0 +1,188 @@ +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.nio.*; ++import java.util.*; + import org.lwjgl.opengl.*; + + // Referenced classes of package net.minecraft.src: +@@ -13,8 +14,7 @@ + public class Tessellator + { + +- private Tessellator(int i) +- { ++ public Tessellator() { + vertexCount = 0; + hasColor = false; + hasTexture = false; +@@ -24,21 +24,10 @@ + addedVertices = 0; + isColorDisabled = false; + isDrawing = false; +- useVBO = false; + vboIndex = 0; +- vboCount = 10; +- bufferSize = i; +- byteBuffer = GLAllocation.createDirectByteBuffer(i * 4); +- intBuffer = byteBuffer.asIntBuffer(); +- floatBuffer = byteBuffer.asFloatBuffer(); +- shortBuffer = byteBuffer.asShortBuffer(); +- rawBuffer = new int[i]; +- useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; +- if(useVBO) +- { +- vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); +- ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); +- } ++ ++ rawBuffer=null; ++ rawBufferSize=0; + } + + public void draw() +@@ -48,12 +37,20 @@ + throw new IllegalStateException("Not tesselating!"); + } + isDrawing = false; +- if(vertexCount > 0) +- { ++ int offs=0; ++ while(offs < vertexCount) { ++ int vtc; ++ if(drawMode == 7 && convertQuadsToTriangles) { ++ vtc=Math.min(vertexCount-offs,trivertsInBuffer); ++ } else { ++ vtc=Math.min(vertexCount-offs,nativeBufferSize>>5); ++ } ++ + intBuffer.clear(); +- intBuffer.put(rawBuffer, 0, rawBufferIndex); ++ intBuffer.put(rawBuffer, offs*8, vtc*8); + byteBuffer.position(0); +- byteBuffer.limit(rawBufferIndex * 4); ++ byteBuffer.limit(vtc*32); ++ offs+=vtc; + if(useVBO) + { + vboIndex = (vboIndex + 1) % vboCount; +@@ -121,10 +118,10 @@ + GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); + if(drawMode == 7 && convertQuadsToTriangles) + { +- GL11.glDrawArrays(4, 0, vertexCount); ++ GL11.glDrawArrays(4, 0, vtc); + } else + { +- GL11.glDrawArrays(drawMode, 0, vertexCount); ++ GL11.glDrawArrays(drawMode, 0, vtc); + } + GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); + if(hasTexture) +@@ -146,6 +143,10 @@ + GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); + } + } ++ if(rawBufferSize>0x20000 && rawBufferIndex<(rawBufferSize<<3)) { ++ rawBufferSize=0; ++ rawBuffer=null; ++ } + reset(); + } + +@@ -265,6 +266,15 @@ + + public void addVertex(double d, double d1, double d2) + { ++ if(rawBufferIndex >= rawBufferSize-32) { ++ if(rawBufferSize==0) { ++ rawBufferSize=0x10000; ++ rawBuffer=new int[rawBufferSize]; ++ } else { ++ rawBufferSize*=2; ++ rawBuffer=Arrays.copyOf(rawBuffer,rawBufferSize); ++ } ++ } + addedVertices++; + if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) + { +@@ -314,11 +324,6 @@ + rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); + rawBufferIndex += 8; + vertexCount++; +- if(vertexCount % 4 == 0 && rawBufferIndex >= bufferSize - 32) +- { +- draw(); +- isDrawing = true; +- } + } + + public void setColorOpaque_I(int i) +@@ -367,10 +372,7 @@ + + private static boolean convertQuadsToTriangles = false; + private static boolean tryVBO = false; +- private ByteBuffer byteBuffer; +- private IntBuffer intBuffer; +- private FloatBuffer floatBuffer; +- private ShortBuffer shortBuffer; ++ private static boolean useVBO = false; + private int rawBuffer[]; + private int vertexCount; + private double textureU; +@@ -384,17 +386,43 @@ + private int rawBufferIndex; + private int addedVertices; + private boolean isColorDisabled; +- private int drawMode; +- private double xOffset; +- private double yOffset; +- private double zOffset; ++ public int drawMode; ++ public double xOffset; ++ public double yOffset; ++ public double zOffset; + private int normal; +- public static final Tessellator instance = new Tessellator(0x200000); +- private boolean isDrawing; +- private boolean useVBO; +- private IntBuffer vertexBuffers; ++ public boolean isDrawing; + private int vboIndex; +- private int vboCount; +- private int bufferSize; + ++ public static boolean renderingWorldRenderer=false; ++ public boolean defaultTexture=false; ++ private int rawBufferSize; ++ private static int vboCount; ++ private static IntBuffer vertexBuffers; ++ private static int nativeBufferSize; ++ private static int trivertsInBuffer; ++ private static ByteBuffer byteBuffer; ++ private static IntBuffer intBuffer; ++ private static FloatBuffer floatBuffer; ++ private static ShortBuffer shortBuffer; ++ public static Tessellator instance; ++ ++ static { ++ instance=new Tessellator(); ++ instance.defaultTexture=true; ++ ++ nativeBufferSize = 0x200000; ++ trivertsInBuffer = (nativeBufferSize/48)*6; ++ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); ++ intBuffer = byteBuffer.asIntBuffer(); ++ floatBuffer = byteBuffer.asFloatBuffer(); ++ shortBuffer = byteBuffer.asShortBuffer(); ++ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; ++ vboCount = 10; ++ if(useVBO) ++ { ++ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); ++ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); ++ } ++ } + } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch new file mode 100644 index 0000000000..b63e70a654 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +@@ -61,6 +61,13 @@ + { + } + ++ /* FORGE: Return false if this TileEntity does not require updateEntity() ++ * calls. ++ */ ++ public boolean canUpdate() { ++ return true; ++ } ++ + public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) + { + TileEntity tileentity = null; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch new file mode 100644 index 0000000000..89dfe957d7 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -0,0 +1,87 @@ +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, NBTTagCompound, +@@ -12,7 +13,7 @@ + // EntityPlayer + + public class TileEntityFurnace extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + public TileEntityFurnace() +@@ -28,6 +29,16 @@ + return furnaceItemStacks.length; + } + ++ public int getStartInventorySide(int side) { ++ if(side==0) return 1; ++ if(side==1) return 0; ++ return 2; ++ } ++ ++ public int getSizeInventorySide(int side) { ++ return 1; ++ } ++ + public ItemStack getStackInSlot(int i) + { + return furnaceItemStacks[i]; +@@ -196,7 +207,7 @@ + { + return false; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(itemstack == null) + { + return false; +@@ -209,11 +220,9 @@ + { + return false; + } +- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) +- { +- return true; +- } +- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); ++ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; ++ return (st<=getInventoryStackLimit() && ++ st<=itemstack.getMaxStackSize()); + } + + public void smeltItem() +@@ -222,14 +231,14 @@ + { + return; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(furnaceItemStacks[2] == null) + { + furnaceItemStacks[2] = itemstack.copy(); + } else +- if(furnaceItemStacks[2].itemID == itemstack.itemID) ++ if(furnaceItemStacks[2].isItemEqual(itemstack)) + { +- furnaceItemStacks[2].stackSize++; ++ furnaceItemStacks[2].stackSize+=itemstack.stackSize; + } + if(furnaceItemStacks[0].getItem().hasContainerItem()) + { +@@ -244,7 +253,7 @@ + } + } + +- private int getItemBurnTime(ItemStack itemstack) ++ public static int getItemBurnTime(ItemStack itemstack) + { + if(itemstack == null) + { diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch new file mode 100644 index 0000000000..e3f6b6cc92 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -0,0 +1,26 @@ +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; + import net.minecraft.client.Minecraft; + import org.lwjgl.opengl.GL11; + +@@ -38,6 +39,7 @@ + { + GL11.glShadeModel(7424 /*GL_FLAT*/); + } ++ ForgeHooksClient.beforeBlockRender(block,field_31071_b); + tessellator.startDrawingQuads(); + tessellator.setTranslationD(((float)d - (float)tileentitypiston.xCoord) + tileentitypiston.func_31017_b(f), ((float)d1 - (float)tileentitypiston.yCoord) + tileentitypiston.func_31014_c(f), ((float)d2 - (float)tileentitypiston.zCoord) + tileentitypiston.func_31013_d(f)); + tessellator.setColorOpaque(1, 1, 1); +@@ -58,6 +60,7 @@ + } + tessellator.setTranslationD(0.0D, 0.0D, 0.0D); + tessellator.draw(); ++ ForgeHooksClient.afterBlockRender(block,field_31071_b); + RenderHelper.enableStandardItemLighting(); + } + } diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch new file mode 100644 index 0000000000..204a25f5c2 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -0,0 +1,192 @@ +--- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +@@ -336,7 +336,10 @@ + + public boolean isAirBlock(int i, int j, int k) + { +- return getBlockId(i, j, k) == 0; ++ int iBlockID = getBlockId( i, j, k ); ++ if ( iBlockID == 0 ) ++ return true; ++ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); + } + + public boolean blockExists(int i, int j, int k) +@@ -1476,7 +1479,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } +@@ -1503,16 +1506,16 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ } else { + if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) + { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); +- } ++ } + } while(true); + addedTileEntityList.clear(); + } +@@ -1520,13 +1523,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- addedTileEntityList.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1684,7 +1693,10 @@ + if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) + { + return true; +- } ++ } else { ++ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) ++ return true; ++ } + } + + } +@@ -1917,44 +1929,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(tileentity != null && !tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; +- addedTileEntityList.add(tileentity); +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public void func_35455_a(TileEntity tileentity) +@@ -1977,13 +1968,18 @@ + public boolean isBlockNormalCube(int i, int j, int k) + { + Block block = Block.blocksList[getBlockId(i, j, k)]; +- if(block == null) +- { +- return false; +- } else +- { +- return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); +- } ++ if(block == null) return false; ++ return block.isBlockNormalCube(this,i,j,k); ++ } ++ ++ /* FORGE: Determine if the given block is considered solid on the ++ * specified side. Used by placement logic. ++ */ ++ public boolean isBlockSolidOnSide(int i, int j, int k, int side) ++ { ++ Block block = Block.blocksList[getBlockId(i, j, k)]; ++ if(block == null) return false; ++ return block.isBlockSolidOnSide(this,i,j,k,side); + } + + public void saveWorldIndirectly(IProgressUpdate iprogressupdate) +@@ -2308,7 +2304,7 @@ + + private int computeBlockLightValue(int i, int j, int k, int l, int i1, int j1) + { +- int k1 = Block.lightValue[i1]; ++ int k1=(i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); + int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; + int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; + int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; +@@ -2679,6 +2675,7 @@ + { + block = null; + } ++ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; + return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); + } + +@@ -3193,7 +3190,7 @@ + public int lightningFlash; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch new file mode 100644 index 0000000000..cbf615ac7a --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -0,0 +1,77 @@ +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; ++ + import java.util.*; + import org.lwjgl.opengl.GL11; + +@@ -125,8 +127,9 @@ + GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); + GL11.glScalef(f, f, f); + GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); +- tessellator.startDrawingQuads(); +- tessellator.setTranslationD(-posX, -posY, -posZ); ++ ForgeHooksClient.beforeRenderPass(i2); ++ Tessellator.instance.startDrawingQuads(); ++ Tessellator.instance.setTranslationD(-posX, -posY, -posZ); + } + if(i2 == 0 && Block.isBlockContainer[i3]) + { +@@ -142,15 +145,13 @@ + { + flag1 = true; + } +- if(j3 != i2) +- { +- flag = true; +- continue; +- } +- if(j3 == i2) +- { +- flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); +- } ++ if(j3>i2) flag=true; ++ if(!ForgeHooksClient.canRenderInPass(block,i2)) ++ continue; ++ ++ ForgeHooksClient.beforeBlockRender(block, renderblocks); ++ flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); ++ ForgeHooksClient.afterBlockRender(block, renderblocks); + } + + } +@@ -159,10 +160,11 @@ + + if(flag2) + { +- tessellator.draw(); ++ ForgeHooksClient.afterRenderPass(i2); ++ Tessellator.instance.draw(); + GL11.glPopMatrix(); + GL11.glEndList(); +- tessellator.setTranslationD(0.0D, 0.0D, 0.0D); ++ Tessellator.instance.setTranslationD(0.0D, 0.0D, 0.0D); + } else + { + flag1 = false; +@@ -255,7 +257,6 @@ + + public World worldObj; + private int glRenderList; +- private static Tessellator tessellator; + public static int chunksUpdated = 0; + public int posX; + public int posY; +@@ -286,8 +287,4 @@ + public List tileEntityRenderers; + private List tileEntities; + +- static +- { +- tessellator = Tessellator.instance; +- } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch new file mode 100644 index 0000000000..eb70c99a17 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -0,0 +1,173 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.ArrayList; + import java.util.Random; +@@ -218,24 +219,40 @@ + return 1; + } + ++ /* FORGE: Metadata-sensitive version. ++ */ ++ public int quantityDropped(int i, Random random) ++ { ++ return quantityDropped(random); ++ } ++ + public int idDropped(int i, Random random) + { + return blockID; + } + ++ /* FORGE: This function isnt called by Minecraft anymore. Use ++ * blockStrength(EntityPlayer,int) instead. ++ */ + public float blockStrength(EntityPlayer entityplayer) + { +- if(blockHardness < 0.0F) +- { +- return 0.0F; +- } +- if(!entityplayer.canHarvestBlock(this)) +- { +- return 1.0F / blockHardness / 100F; +- } else +- { +- return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; +- } ++ return blockStrength(entityplayer,0); ++ } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ ++ int q=quantityDropped(md,world.rand); ++ for(int n=0; n0) { ++ tr.add(new ItemStack(id,1,damageDropped(md))); ++ } ++ } ++ return tr; + } + + public final void dropBlockAsItem(World world, int i, int j, int k, int l) +@@ -249,20 +266,12 @@ + { + return; + } +- int i1 = quantityDropped(world.rand); +- for(int j1 = 0; j1 < i1; j1++) +- { ++ ArrayList ar=getBlockDropped(world,i,j,k,l); ++ for(ItemStack ist : ar) { + if(world.rand.nextFloat() > f) +- { + continue; +- } +- int k1 = idDropped(l, world.rand); +- if(k1 > 0) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- } ++ dropBlockAsItem_do(world, i, j, k, ist); + } +- + } + + protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) +@@ -529,6 +538,86 @@ + return blockMaterial.getMaterialMobility(); + } + ++ /* FORGE: Allow a block to set illumination on a coordinate basis. ++ */ ++ public int getLightValue(IBlockAccess iba, int i, int j, int k) { ++ return lightValue[blockID]; ++ } ++ ++ /* FORGE: Implement and return true if you wish this block to behave ++ * like a ladder when the player is inside. ++ */ ++ public boolean isLadder() { ++ return false; ++ } ++ ++ /* FORGE: Return true if the block is a normal, solid cube. This ++ * determines indirect power state, entity ejection from blocks, and a few ++ * others. ++ */ ++ public boolean isBlockNormalCube(World world, int i, int j, int k) { ++ return blockMaterial.getIsOpaque() && isACube(); ++ } ++ ++ /* FORGE: Return true if the block is solid on the given side. This ++ * is used by placement logic. */ ++ public boolean isBlockSolidOnSide( World world, int i, int j, int k, ++ int side ) { ++ return isBlockNormalCube(world,i,j,k); ++ } ++ ++ /* FORGE: Return true if the player can place a new block in the block ++ * occupied by this one, like water, lava, fire, etc. ++ */ ++ public boolean isBlockReplaceable( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should set fire and deal fire damage ++ * to entities coming into contact with it, false otherwise. ++ */ ++ public boolean isBlockBurning( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return true if this block should be treated as an air block ++ * by the rest of the code, false otherwise. This method is primarily ++ * useful for creating pure logic-blocks that will be invisible ++ * to the player and otherwise interact as air would. ++ */ ++ public boolean isAirBlock( World world, int i, int j, int k ) { ++ return false; ++ } ++ ++ /* FORGE: Return the block hardness with metadata md. ++ */ ++ public float getHardness(int md) { ++ return blockHardness; ++ } ++ ++ /* FORGE: Return the block strength of the block at i,j,k against the ++ * player. ++ */ ++ public float blockStrength(World world, EntityPlayer player, ++ int i, int j, int k) { ++ int md=world.getBlockMetadata(i,j,k); ++ return blockStrength(player,md); ++ } ++ ++ /* FORGE: Return the block strength of a prototypical block with metadata ++ * md against the player. ++ */ ++ public float blockStrength(EntityPlayer player, int md) { ++ return ForgeHooks.blockStrength(this,player,md); ++ } ++ ++ /* FORGE: Return true if the player can harvest a prototypical block with ++ * metadata md. ++ */ ++ public boolean canHarvestBlock(EntityPlayer player, int md) { ++ return ForgeHooks.canHarvestBlock(this,player,md); ++ } ++ + static Class _mthclass$(String s) + { + try diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch new file mode 100644 index 0000000000..4b1fb3e7fb --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch @@ -0,0 +1,119 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +@@ -41,36 +41,36 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -78,19 +78,19 @@ + int i1 = world.getBlockMetadata(i, j, k); + int j1 = i1 & 8; + i1 &= 7; +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } else +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } else +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } else +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } else +@@ -102,19 +102,19 @@ + + private int getOrientation(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return 1; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return 2; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return 3; + } +- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4; ++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4; + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) +@@ -123,19 +123,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch new file mode 100644 index 0000000000..5e0acf20ad --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -0,0 +1,31 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +@@ -328,23 +328,23 @@ + { + return true; + } +- if(world.isBlockNormalCube(i, j + 1, k)) ++ if(world.isBlockSolidOnSide(i, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k)) ++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k)) ++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0)) + { + return true; + } +- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1)) ++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0)) + { + return true; + } +- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1)) ++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0)) + { + return true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch new file mode 100644 index 0000000000..24433f82fd --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -0,0 +1,24 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -26,7 +26,7 @@ + public void onBlockAdded(World world, int i, int j, int k) + { + super.onBlockAdded(world, i, j, k); +- world.setBlockTileEntity(i, j, k, getBlockEntity()); ++ world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k))); + } + + public void onBlockRemoval(World world, int i, int j, int k) +@@ -37,6 +37,12 @@ + + public abstract TileEntity getBlockEntity(); + ++ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. ++ */ ++ public TileEntity getBlockEntity(int md) { ++ return getBlockEntity(); ++ } ++ + public void playBlock(World world, int i, int j, int k, int l, int i1) + { + super.playBlock(world, i, j, k, l, i1); diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch new file mode 100644 index 0000000000..09c53056b2 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -0,0 +1,48 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Block, World, EntityItem, +@@ -103,27 +104,16 @@ + return blockIndexInTexture + j; + } + +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- { +- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- if(world.singleplayerWorld) +- { +- return; +- } +- for(int i1 = 0; i1 < 3; i1++) +- { +- if(world.rand.nextInt(15) <= l) +- { +- float f1 = 0.7F; +- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; +- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- } +- } +- ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(md==7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n=0; n<3; n++) { ++ if(world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); ++ } ++ return tr; + } + + public int idDropped(int i, Random random) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch new file mode 100644 index 0000000000..c1ea96b1fe --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -167,7 +167,7 @@ + world.setBlockWithNotify(i, j, k, 0); + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + world.setBlockWithNotify(i, j, k, 0); + flag = true; +@@ -231,7 +231,7 @@ + return false; + } else + { +- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); + } + } + diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch new file mode 100644 index 0000000000..7cf02273c6 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -0,0 +1,84 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +@@ -40,6 +40,11 @@ + return super.getCollisionBoundingBoxFromPool(world, i, j, k); + } + ++ /* FORGE: Implemented base method, see Block.isLadder */ ++ public boolean isLadder() { ++ return true; ++ } ++ + public boolean isOpaqueCube() + { + return false; +@@ -52,37 +57,37 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- return world.isBlockNormalCube(i, j, k + 1); ++ return world.isBlockSolidOnSide(i, j, k + 1,2); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) + { + int i1 = world.getBlockMetadata(i, j, k); +- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1)) ++ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 2; + } +- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1)) ++ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k)) ++ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 4; + } +- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k)) ++ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 5; + } +@@ -93,19 +98,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + flag = true; + } +- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + flag = true; + } +- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + flag = true; + } +- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch new file mode 100644 index 0000000000..09b539626e --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -0,0 +1,120 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +@@ -35,44 +35,44 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return true; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- return l == 5 && world.isBlockNormalCube(i - 1, j, k); ++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5); + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockPlaced(World world, int i, int j, int k, int l) +@@ -81,23 +81,23 @@ + int j1 = i1 & 8; + i1 &= 7; + i1 = -1; +- if(l == 1 && world.isBlockNormalCube(i, j - 1, k)) ++ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1)) + { + i1 = 5 + world.rand.nextInt(2); + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -119,27 +119,27 @@ + { + int i1 = world.getBlockMetadata(i, j, k) & 7; + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch new file mode 100644 index 0000000000..eff38e4bb4 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -0,0 +1,22 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +@@ -46,7 +46,8 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j - 1, k,1) || ++ world.getBlockId(i, j - 1, k) == Block.fence.blockID; + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -56,7 +57,8 @@ + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) ++ && world.getBlockId(i, j - 1, k) != Block.fence.blockID) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch new file mode 100644 index 0000000000..7034891beb --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -0,0 +1,55 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +@@ -16,12 +16,12 @@ + public static final boolean isRailBlockAt(World world, int i, int j, int k) + { + int l = world.getBlockId(i, j, k); +- return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID; ++ return Block.blocksList[l] instanceof BlockRail; + } + + public static final boolean isRailBlock(int i) + { +- return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID; ++ return Block.blocksList[i] instanceof BlockRail; + } + + protected BlockRail(int i, int j, boolean flag) +@@ -92,7 +92,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1); + } + + public void onBlockAdded(World world, int i, int j, int k) +@@ -116,23 +116,23 @@ + j1 &= 7; + } + boolean flag = false; +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + flag = true; + } +- if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k)) ++ if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1)) + { + flag = true; + } +- if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k)) ++ if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1)) + { + flag = true; + } +- if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1)) ++ if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1)) + { + flag = true; + } +- if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1)) ++ if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1)) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch new file mode 100644 index 0000000000..66372a4a8a --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +@@ -27,7 +27,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else +@@ -38,7 +38,7 @@ + + public boolean canBlockStay(World world, int i, int j, int k) + { +- if(!world.isBlockNormalCube(i, j - 1, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) + { + return false; + } else diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch new file mode 100644 index 0000000000..ec300c0949 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -0,0 +1,30 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -43,7 +44,7 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 1); + } + + private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) +@@ -413,6 +414,10 @@ + { + return false; + } ++ if(Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess,i,j,k,l); ++ } + if(Block.blocksList[i1].canProvidePower()) + { + return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch new file mode 100644 index 0000000000..31118139a4 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -0,0 +1,37 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,7 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; ++ + import java.util.Random; ++import java.util.ArrayList; + + // Referenced classes of package net.minecraft.src: + // BlockFlower, Item, World, EntityPlayer, +@@ -41,13 +44,17 @@ + + public int idDropped(int i, Random random) + { +- if(random.nextInt(8) == 0) +- { +- return Item.seeds.shiftedIndex; +- } else +- { + return -1; +- } ++ } ++ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); ++ if(world.rand.nextInt(8)!=0) ++ return tr; ++ ItemStack ist=ForgeHooks.getGrassSeed(world); ++ if(ist!=null) tr.add(ist); ++ return tr; + } + + public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch new file mode 100644 index 0000000000..6a8d951fa5 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -0,0 +1,104 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +@@ -36,24 +36,24 @@ + + private boolean canPlaceTorchOn(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; ++ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; + } + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + return true; + } +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + return true; + } +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + return true; + } +@@ -67,19 +67,19 @@ + { + i1 = 5; + } +- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) + { + i1 = 4; + } +- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) + { + i1 = 3; + } +- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) ++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) + { + i1 = 2; + } +- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) ++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) + { + i1 = 1; + } +@@ -97,19 +97,19 @@ + + public void onBlockAdded(World world, int i, int j, int k) + { +- if(world.isBlockNormalCube(i - 1, j, k)) ++ if(world.isBlockSolidOnSide(i - 1, j, k,5)) + { + world.setBlockMetadataWithNotify(i, j, k, 1); + } else +- if(world.isBlockNormalCube(i + 1, j, k)) ++ if(world.isBlockSolidOnSide(i + 1, j, k,4)) + { + world.setBlockMetadataWithNotify(i, j, k, 2); + } else +- if(world.isBlockNormalCube(i, j, k - 1)) ++ if(world.isBlockSolidOnSide(i, j, k - 1,3)) + { + world.setBlockMetadataWithNotify(i, j, k, 3); + } else +- if(world.isBlockNormalCube(i, j, k + 1)) ++ if(world.isBlockSolidOnSide(i, j, k + 1,2)) + { + world.setBlockMetadataWithNotify(i, j, k, 4); + } else +@@ -126,19 +126,19 @@ + { + int i1 = world.getBlockMetadata(i, j, k); + boolean flag = false; +- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) ++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) + { + flag = true; + } +- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) ++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) + { + flag = true; + } +- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) + { + flag = true; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch new file mode 100644 index 0000000000..6e2fcc1cd9 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -0,0 +1,36 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -130,7 +130,7 @@ + { + j1--; + } +- if(!world.isBlockNormalCube(j1, j, k1)) ++ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) + { + world.setBlockWithNotify(i, j, k, 0); + dropBlockAsItem(world, i, j, k, i1); +@@ -172,6 +172,7 @@ + + public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) + { ++ if(disableValidation) return true; + if(l == 0) + { + return false; +@@ -196,11 +197,15 @@ + { + i--; + } +- return world.isBlockNormalCube(i, j, k); ++ return world.isBlockSolidOnSide(i, j, k, l); + } + + public static boolean isTrapdoorOpen(int i) + { + return (i & 4) != 0; + } ++ ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ public static boolean disableValidation=false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch new file mode 100644 index 0000000000..1b328d5e10 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -0,0 +1,295 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.io.PrintStream; + import java.util.*; +@@ -68,16 +69,12 @@ + + public void generateSkylightMap() + { +- worldObj.getClass(); + int i = 128 - 1; + for(int j = 0; j < 16; j++) + { + for(int l = 0; l < 16; l++) + { +- worldObj.getClass(); + int j1 = 128 - 1; +- worldObj.getClass(); +- worldObj.getClass(); + int k1; + for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } + heightMap[l << 4 | j] = (byte)j1; +@@ -90,7 +87,6 @@ + continue; + } + int l1 = 15; +- worldObj.getClass(); + int i2 = 128 - 1; + do + { +@@ -128,7 +124,6 @@ + + private void func_35633_i() + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) + { + for(int i = 0; i < 16; i++) +@@ -190,7 +185,6 @@ + { + if(l > k) + { +- worldObj.getClass(); + if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) + { + for(int i1 = k; i1 < l; i1++) +@@ -211,8 +205,6 @@ + { + i1 = j; + } +- worldObj.getClass(); +- worldObj.getClass(); + for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } + if(i1 == l) + { +@@ -225,7 +217,6 @@ + lowestBlockHeight = i1; + } else + { +- worldObj.getClass(); + int k1 = 128 - 1; + for(int i2 = 0; i2 < 16; i2++) + { +@@ -294,8 +285,6 @@ + + public int getBlockID(int i, int j, int k) + { +- worldObj.getClass(); +- worldObj.getClass(); + return blocks[i << 11 | k << 7 | j] & 0xff; + } + +@@ -308,8 +297,6 @@ + field_35637_c[j1] = -999; + } + int k1 = heightMap[k << 4 | i] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int l1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(l1 == l && data.getNibble(i, j, k) == i1) + { +@@ -317,12 +304,17 @@ + } + int i2 = xPosition * 16 + i; + int j2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ if (Block.blocksList[l1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; ++ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); +- if(l1 != 0 && !worldObj.singleplayerWorld) +- { +- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ if(l1 != 0) { ++ if(!worldObj.singleplayerWorld) ++ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, i1); + if(!worldObj.worldProvider.hasNoSky) +@@ -354,7 +346,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -362,14 +354,6 @@ + tileentity.func_35164_g(); + } + } +- } else +- if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35164_g(); +- } + } + isModified = true; + return true; +@@ -384,8 +368,6 @@ + field_35637_c[i1] = -999; + } + int j1 = heightMap[i1] & 0xff; +- worldObj.getClass(); +- worldObj.getClass(); + int k1 = blocks[i << 11 | k << 7 | j] & 0xff; + if(k1 == l) + { +@@ -393,12 +375,18 @@ + } + int l1 = xPosition * 16 + i; + int i2 = zPosition * 16 + k; +- worldObj.getClass(); +- worldObj.getClass(); ++ ++ if (Block.blocksList[k1] instanceof IOverrideReplace) { ++ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; ++ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) ++ return iovr.getReplacedSuccess(); ++ } ++ + blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); +- if(k1 != 0) +- { +- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ if(k1 != 0) { ++ if(!worldObj.singleplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ removeChunkBlockTileEntity(i,j,k); + } + data.setNibble(i, j, k, 0); + if(Block.lightOpacity[byte0 & 0xff] != 0) +@@ -426,7 +414,7 @@ + TileEntity tileentity = getChunkBlockTileEntity(i, j, k); + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0); + worldObj.setBlockTileEntity(i, j, k, tileentity); + } + if(tileentity != null) +@@ -434,14 +422,6 @@ + tileentity.func_35164_g(); + } + } +- } else +- if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer)) +- { +- TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); +- if(tileentity1 != null) +- { +- tileentity1.func_35164_g(); +- } + } + isModified = true; + return true; +@@ -568,6 +548,11 @@ + { + ChunkPosition chunkposition = new ChunkPosition(i, j, k); + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity != null && tileentity.isInvalid()) ++ { ++ chunkTileEntityMap.remove(chunkposition); ++ tileentity=null; ++ } + if(tileentity == null) + { + int l = getBlockID(i, j, k); +@@ -577,18 +562,23 @@ + } + if(tileentity == null) + { +- tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(); ++ tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k)); + worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity); + } + tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); + } +- if(tileentity != null && tileentity.isInvalid()) +- { +- chunkTileEntityMap.remove(chunkposition); +- return null; +- } else ++ return tileentity; ++ } ++ ++ /* FORGE: Used to remove only invalid TileEntities */ ++ public void cleanChunkBlockTileEntity(int i, int j, int k) ++ { ++ ChunkPosition chunkposition = new ChunkPosition(i, j, k); ++ if(isChunkLoaded) + { +- return tileentity; ++ TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(tileentity!=null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); + } + } + +@@ -600,7 +590,7 @@ + setChunkBlockTileEntity(i, j, k, tileentity); + if(isChunkLoaded) + { +- worldObj.loadedTileEntityList.add(tileentity); ++ worldObj.addTileEntity(tileentity); + } + } + +@@ -617,6 +607,8 @@ + return; + } else + { ++ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); ++ if(old!=null) old.invalidate(); + tileentity.validate(); + chunkTileEntityMap.put(chunkposition, tileentity); + return; +@@ -766,8 +758,6 @@ + { + for(int k3 = k; k3 < j1; k3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int k4 = k2 << 11 | k3 << 7 | j; + int k5 = i1 - j; + System.arraycopy(blocks, k4, abyte0, k1, k5); +@@ -780,8 +770,6 @@ + { + for(int l3 = k; l3 < j1; l3++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int l4 = (l2 << 11 | l3 << 7 | j) >> 1; + int l5 = (i1 - j) / 2; + System.arraycopy(data.data, l4, abyte0, k1, l5); +@@ -794,8 +782,6 @@ + { + for(int i4 = k; i4 < j1; i4++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int i5 = (i3 << 11 | i4 << 7 | j) >> 1; + int i6 = (i1 - j) / 2; + System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); +@@ -808,8 +794,6 @@ + { + for(int j4 = k; j4 < j1; j4++) + { +- worldObj.getClass(); +- worldObj.getClass(); + int j5 = (j3 << 11 | j4 << 7 | j) >> 1; + int j6 = (i1 - j) / 2; + System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); +@@ -857,7 +841,6 @@ + int l = field_35637_c[k]; + if(l == -999) + { +- worldObj.getClass(); + int i1 = 128 - 1; + for(l = -1; i1 > 0 && l == -1;) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch new file mode 100644 index 0000000000..607f48d7dd --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -0,0 +1,13 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +@@ -600,7 +600,9 @@ + int i = MathHelper.floor_double(posX); + int j = MathHelper.floor_double(boundingBox.minY); + int k = MathHelper.floor_double(posZ); +- return worldObj.getBlockId(i, j, k) == Block.ladder.blockID; ++ Block block=Block.blocksList[worldObj.getBlockId(i,j,k)]; ++ if(block==null) return false; ++ return block.isLadder(); + } + + public void writeEntityToNBT(NBTTagCompound nbttagcompound) diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch new file mode 100644 index 0000000000..b8f5e13ba4 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -0,0 +1,76 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -6,6 +6,10 @@ + + import java.util.*; + ++import net.minecraft.src.forge.ArmorProperties; ++import net.minecraft.src.forge.ISpecialArmor; ++import net.minecraft.src.forge.ForgeHooks; ++ + // Referenced classes of package net.minecraft.src: + // EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, + // ContainerPlayer, World, ChunkCoordinates, DataWatcher, +@@ -433,6 +437,8 @@ + worldObj.entityJoinedWorld(entityitem); + } + ++ /* FORGE: This isnt called anymore ++ */ + public float getCurrentPlayerStrVsBlock(Block block) + { + float f = inventory.getStrVsBlock(block); +@@ -455,6 +461,32 @@ + return f; + } + ++ /* FORGE: Extended to allow metadata. ++ */ ++ public float getCurrentPlayerStrVsBlock(Block block, int md) ++ { ++ float f = 1.0F; ++ ItemStack ist=inventory.getCurrentItem(); ++ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); ++ if(isInsideOfMaterial(Material.water)) ++ { ++ f /= 5F; ++ } ++ if(!onGround) ++ { ++ f /= 5F; ++ } ++ if(func_35184_a(Potion.digSpeed)) ++ { ++ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).func_35652_c() + 1) * 0.2F; ++ } ++ if(func_35184_a(Potion.digSlowdown)) ++ { ++ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).func_35652_c() + 1) * 0.2F; ++ } ++ return f; ++ } ++ + public boolean canHarvestBlock(Block block) + { + return inventory.canHarvestBlock(block); +@@ -668,7 +700,9 @@ + + public void destroyCurrentEquippedItem() + { ++ ItemStack orig=inventory.getCurrentItem(); + inventory.setInventorySlotContents(inventory.currentItem, null); ++ ForgeHooks.onDestroyCurrentItem(this,orig); + } + + public double getYOffset() +@@ -757,6 +791,10 @@ + + public EnumStatus sleepInBedAt(int i, int j, int k) + { ++ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k); ++ if (customSleep != null) { ++ return customSleep; ++ } + if(!worldObj.singleplayerWorld) + { + if(isPlayerSleeping() || !isEntityAlive()) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch new file mode 100644 index 0000000000..7ee22e874c --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -0,0 +1,28 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ISpecialResistance; + + import java.util.*; + +@@ -66,7 +67,16 @@ + int i5 = worldObj.getBlockId(j4, k4, l4); + if(i5 > 0) + { +- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ if(Block.blocksList[i5] instanceof ISpecialResistance) { ++ ISpecialResistance isr=(ISpecialResistance) ++ Block.blocksList[i5]; ++ f1-=(isr.getSpecialExplosionResistance( ++ worldObj,j4,k4,l4, ++ explosionX,explosionY,explosionZ, ++ exploder) + 0.3F) * f2; ++ } else { ++ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; ++ } + } + if(f1 > 0.0F) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch new file mode 100644 index 0000000000..70d851bf1c --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -0,0 +1,58 @@ +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +@@ -6,6 +6,7 @@ + + import java.util.HashMap; + import java.util.Map; ++import java.util.Arrays; + + // Referenced classes of package net.minecraft.src: + // Block, ItemStack, Item +@@ -21,6 +22,7 @@ + private FurnaceRecipes() + { + smeltingList = new HashMap(); ++ metaSmeltingList = new HashMap(); + addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); + addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); + addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); +@@ -40,11 +42,32 @@ + smeltingList.put(Integer.valueOf(i), itemstack); + } + ++ /* FORGE: Add a metadata-sensitive furnace recipe. ++ */ ++ public void addSmelting(int i, int meta, ItemStack itemstack) ++ { ++ metaSmeltingList.put(Arrays.asList(i,meta), itemstack); ++ } ++ ++ /* FORGE: Not used anymore. ++ */ + public ItemStack getSmeltingResult(int i) + { + return (ItemStack)smeltingList.get(Integer.valueOf(i)); + } + ++ /* FORGE: Added to allow metadata-sensitive smelting. ++ */ ++ public ItemStack getSmeltingResult(ItemStack src) { ++ ItemStack tr; ++ ++ if(src==null) return null; ++ tr=(ItemStack)metaSmeltingList.get( ++ Arrays.asList(src.itemID,src.getItemDamage())); ++ if(tr!=null) return tr; ++ return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID)); ++ } ++ + public Map getSmeltingList() + { + return smeltingList; +@@ -52,5 +75,6 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch new file mode 100644 index 0000000000..545acffb2b --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +@@ -66,6 +66,13 @@ + return 1.0F; + } + ++ /* FORGE: Metadata-sensitive version of getStrVsBlock ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) ++ { ++ return getStrVsBlock(itemstack,block); ++ } ++ + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) + { + return itemstack; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch new file mode 100644 index 0000000000..794422dc09 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +@@ -62,7 +62,7 @@ + { + return false; + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch new file mode 100644 index 0000000000..ad858eb819 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -0,0 +1,24 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // Item, EntityPlayer, Vec3D, MathHelper, + // World, MovingObjectPosition, EnumMovingObjectType, Material, +@@ -56,6 +58,12 @@ + } + if(isFull == 0) + { ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); ++ if (customBucket != null) { ++ return customBucket; ++ } ++ + if(!entityplayer.func_35200_c(i, j, k)) + { + return itemstack; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch new file mode 100644 index 0000000000..30e1b2bb64 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -0,0 +1,45 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.ForgeHooks; + + import java.util.Random; + +@@ -29,13 +30,18 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } + if(itemstack.getItemDamage() == 15) + { + int i1 = world.getBlockId(i, j, k); ++ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { ++ if(!world.singleplayerWorld) ++ itemstack.stackSize--; ++ return true; ++ } + if(i1 == Block.sapling.blockID) + { + if(!world.singleplayerWorld) +@@ -102,13 +108,7 @@ + world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); + continue; + } +- if(itemRand.nextInt(3) != 0) +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantYellow.blockID); +- } else +- { +- world.setBlockWithNotify(k1, l1, i2, Block.plantRed.blockID); +- } ++ ForgeHooks.plantGrassPlant(world,k1,l1,i2); + } + + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch new file mode 100644 index 0000000000..167cde2315 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +@@ -46,7 +46,7 @@ + { + i++; + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch new file mode 100644 index 0000000000..4596ad1a1f --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +@@ -21,7 +21,7 @@ + + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch new file mode 100644 index 0000000000..fd72220c42 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -0,0 +1,82 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,7 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; +- ++import net.minecraft.src.forge.ForgeHooks; ++import net.minecraft.src.forge.IUseItemFirst; + + // Referenced classes of package net.minecraft.src: + // EntityPlayer, PlayerCapabilities, World, Block, +@@ -66,7 +67,8 @@ + if(j != 0) + { + Block block = Block.blocksList[j]; +- float f = block.blockStrength(thisPlayer) * (float)(i + 1); ++ float f = block.blockStrength(thisWorld,thisPlayer, ++ field_22049_l,field_22048_m,field_22047_n) * (float)(i + 1); + if(f >= 1.0F) + { + field_22050_k = false; +@@ -93,7 +95,7 @@ + { + Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); + } +- if(i1 > 0 && Block.blocksList[i1].blockStrength(thisPlayer) >= 1.0F) ++ if(i1 > 0 && Block.blocksList[i1].blockStrength(thisWorld,thisPlayer,i,j,k) >= 1.0F) + { + blockHarvessted(i, j, k); + } else +@@ -113,7 +115,7 @@ + if(i1 != 0) + { + Block block = Block.blocksList[i1]; +- float f = block.blockStrength(thisPlayer) * (float)(l + 1); ++ float f = block.blockStrength(thisWorld,thisPlayer,i,j,k) * (float)(l + 1); + if(f >= 0.7F) + { + blockHarvessted(i, j, k); +@@ -164,7 +166,7 @@ + thisPlayer.destroyCurrentEquippedItem(); + } + } +- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) ++ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) + { + Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); + } +@@ -188,6 +190,7 @@ + if(itemstack1.stackSize == 0) + { + entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack1); + } + return true; + } else +@@ -198,6 +201,11 @@ + + public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + { ++ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { ++ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); ++ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) ++ return true; ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { +@@ -217,7 +225,11 @@ + return flag; + } else + { +- return itemstack.useItem(entityplayer, world, i, j, k, l); ++ if(!itemstack.useItem(entityplayer, world, i, j, k, l)) ++ return false; ++ if(itemstack.stackSize == 0) ++ ForgeHooks.onDestroyCurrentItem(entityplayer,itemstack); ++ return true; + } + } + diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch new file mode 100644 index 0000000000..c7e7bd08e1 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +@@ -50,7 +50,7 @@ + return false; + } + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch new file mode 100644 index 0000000000..ad19a4c590 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +@@ -52,7 +52,7 @@ + i++; + } + } +- if(!entityplayer.func_35200_c(i, j, k)) ++ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch new file mode 100644 index 0000000000..e5170c75a5 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +@@ -24,7 +24,7 @@ + { + return false; + } +- if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)) ++ if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))) + { + return false; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch new file mode 100644 index 0000000000..4bc57d9f23 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -0,0 +1,36 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import java.util.Arrays; ++import net.minecraft.src.forge.ForgeHooks; + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, ItemStack, Block, +@@ -37,6 +39,14 @@ + return 1.0F; + } + ++ /* FORGE: Overridden to allow custom tool effectiveness ++ */ ++ public float getStrVsBlock(ItemStack itemstack, Block block, int md) { ++ if(ForgeHooks.isToolEffective(itemstack,block,md)) ++ return efficiencyOnProperMaterial; ++ return getStrVsBlock(itemstack,block); ++ } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) + { + itemstack.damageItem(2, entityliving1); +@@ -55,7 +65,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch new file mode 100644 index 0000000000..38011b3cf0 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -0,0 +1,10 @@ +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +@@ -35,4 +35,7 @@ + public int sideHit; + public Vec3D hitVec; + public Entity entityHit; ++ ++ // Added for RedPower subblocks. ++ public int subHit=-1; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch new file mode 100644 index 0000000000..bf56c4732d --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -0,0 +1,18 @@ +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 +@@ -168,12 +168,11 @@ + sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); + for(int k = 0; k < numBlocksToUpdate; k++) + { +- int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); +- int i2 = numBlocksToUpdate & 0xff; +- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); ++ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); ++ int i2 = blocksToUpdate[k] & 0xff; ++ int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); + if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) + { +- System.out.println("Sending!"); + updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); + } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch new file mode 100644 index 0000000000..39b6ed4f9e --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -0,0 +1,19 @@ +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,7 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; +- ++import net.minecraft.src.forge.ForgeHooks; + + // Referenced classes of package net.minecraft.src: + // Slot, EntityPlayer, ItemStack, Block, +@@ -60,6 +60,7 @@ + thePlayer.addStat(AchievementList.buildSword, 1); + } + ModLoader.TakenFromCrafting(thePlayer, itemstack); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); + for(int i = 0; i < craftMatrix.getSizeInventory(); i++) + { + ItemStack itemstack1 = craftMatrix.getStackInSlot(i); diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch new file mode 100644 index 0000000000..ef84f71cb6 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +@@ -61,6 +61,13 @@ + { + } + ++ /* FORGE: Return false if this TileEntity does not require updateEntity() ++ * calls. ++ */ ++ public boolean canUpdate() { ++ return true; ++ } ++ + public static TileEntity createAndLoadEntity(NBTTagCompound nbttagcompound) + { + TileEntity tileentity = null; diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch new file mode 100644 index 0000000000..5511bd75c0 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -0,0 +1,97 @@ +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, NBTTagCompound, +@@ -12,7 +13,7 @@ + // EntityPlayer + + public class TileEntityFurnace extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + public TileEntityFurnace() +@@ -28,6 +29,16 @@ + return furnaceItemStacks.length; + } + ++ public int getStartInventorySide(int side) { ++ if(side==0) return 1; ++ if(side==1) return 0; ++ return 2; ++ } ++ ++ public int getSizeInventorySide(int side) { ++ return 1; ++ } ++ + public ItemStack getStackInSlot(int i) + { + return furnaceItemStacks[i]; +@@ -176,7 +187,7 @@ + { + return false; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(itemstack == null) + { + return false; +@@ -189,13 +200,9 @@ + { + return false; + } +- if(furnaceItemStacks[2].stackSize < getInventoryStackLimit() && furnaceItemStacks[2].stackSize < furnaceItemStacks[2].getMaxStackSize()) +- { +- return true; +- } else +- { +- return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); +- } ++ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; ++ return (st<=getInventoryStackLimit() && ++ st<=itemstack.getMaxStackSize()); + } + + public void smeltItem() +@@ -204,23 +211,29 @@ + { + return; + } +- ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0].getItem().shiftedIndex); ++ ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnaceItemStacks[0]); + if(furnaceItemStacks[2] == null) + { + furnaceItemStacks[2] = itemstack.copy(); + } else +- if(furnaceItemStacks[2].itemID == itemstack.itemID) ++ if(furnaceItemStacks[2].isItemEqual(itemstack)) ++ { ++ furnaceItemStacks[2].stackSize+=itemstack.stackSize; ++ } ++ if(furnaceItemStacks[0].getItem().hasContainerItem()) ++ { ++ furnaceItemStacks[0] = new ItemStack(furnaceItemStacks[0].getItem().getContainerItem()); ++ } else + { +- furnaceItemStacks[2].stackSize++; ++ furnaceItemStacks[0].stackSize--; + } +- furnaceItemStacks[0].stackSize--; + if(furnaceItemStacks[0].stackSize <= 0) + { + furnaceItemStacks[0] = null; + } + } + +- private int getItemBurnTime(ItemStack itemstack) ++ public static int getItemBurnTime(ItemStack itemstack) + { + if(itemstack == null) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch new file mode 100644 index 0000000000..0b57d2df1d --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -0,0 +1,189 @@ +--- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +@@ -183,7 +183,11 @@ + + public boolean isAirBlock(int i, int j, int k) + { +- return getBlockId(i, j, k) == 0; ++ int iBlockID = getBlockId( i, j, k ); ++ ++ if ( iBlockID == 0 ) ++ return true; ++ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); + } + + public boolean blockExists(int i, int j, int k) +@@ -1124,7 +1128,7 @@ + Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); + if(chunk != null) + { +- chunk.removeChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); ++ chunk.cleanChunkBlockTileEntity(tileentity.xCoord & 0xf, tileentity.yCoord, tileentity.zCoord & 0xf); + } + } + } +@@ -1151,15 +1155,15 @@ + { + loadedTileEntityList.add(tileentity1); + } ++ } else { + if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) + { + Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); + if(chunk1 != null) + { +- chunk1.setChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf, tileentity1); ++ chunk1.cleanChunkBlockTileEntity(tileentity1.xCoord & 0xf, tileentity1.yCoord, tileentity1.zCoord & 0xf); + } + } +- markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); + } + } while(true); + addedTileEntityList.clear(); +@@ -1168,13 +1172,19 @@ + + public void addTileEntity(Collection collection) + { +- if(scanningTileEntities) +- { +- addedTileEntityList.addAll(collection); +- } else +- { +- loadedTileEntityList.addAll(collection); +- } ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te=(TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } ++ } ++ ++ /* FORGE: Used as a bugfix */ ++ public void addTileEntity(TileEntity te) { ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); + } + + public void updateEntity(Entity entity) +@@ -1372,6 +1382,9 @@ + if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) + { + return true; ++ } else { ++ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) ++ return true; + } + } + +@@ -1590,44 +1603,23 @@ + + public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) + { +- if(tileentity != null && !tileentity.isInvalid()) +- { +- if(scanningTileEntities) +- { +- tileentity.xCoord = i; +- tileentity.yCoord = j; +- tileentity.zCoord = k; +- addedTileEntityList.add(tileentity); +- } else +- { +- loadedTileEntityList.add(tileentity); +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); +- } +- } +- } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : ++ loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } + } + + public void removeBlockTileEntity(int i, int j, int k) + { +- TileEntity tileentity = getBlockTileEntity(i, j, k); +- if(tileentity != null && scanningTileEntities) +- { +- tileentity.invalidate(); +- } else +- { +- if(tileentity != null) +- { +- loadedTileEntityList.remove(tileentity); +- } +- Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); +- if(chunk != null) +- { +- chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); +- } +- } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } + } + + public void func_35239_a(TileEntity tileentity) +@@ -1650,13 +1642,18 @@ + public boolean isBlockNormalCube(int i, int j, int k) + { + Block block = Block.blocksList[getBlockId(i, j, k)]; +- if(block == null) +- { +- return false; +- } else +- { +- return block.blockMaterial.getIsOpaque() && block.isACube(); +- } ++ if(block == null) return false; ++ return block.isBlockNormalCube(this,i,j,k); ++ } ++ ++ /* FORGE: Determine if the given block is considered solid on the ++ * specified side. Used by placement logic. ++ */ ++ public boolean isBlockSolidOnSide(int i, int j, int k, int side) ++ { ++ Block block = Block.blocksList[getBlockId(i, j, k)]; ++ if(block == null) return false; ++ return block.isBlockSolidOnSide(this,i,j,k,side); + } + + public void calculateInitialSkylight() +@@ -1976,7 +1973,7 @@ + + private int func_35241_e(int i, int j, int k, int l, int i1, int j1) + { +- int k1 = Block.lightValue[i1]; ++ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); + int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; + int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; + int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; +@@ -2315,6 +2312,7 @@ + { + block = null; + } ++ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; + return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); + } + +@@ -2759,7 +2757,7 @@ + public int field_27080_i; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch new file mode 100644 index 0000000000..cdcb542ed0 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -0,0 +1,32 @@ +--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -54,15 +54,20 @@ + public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) + { + ArrayList arraylist = new ArrayList(); +- for(int k1 = 0; k1 < loadedTileEntityList.size(); k1++) +- { +- TileEntity tileentity = (TileEntity)loadedTileEntityList.get(k1); +- if(tileentity.xCoord >= i && tileentity.yCoord >= j && tileentity.zCoord >= k && tileentity.xCoord < l && tileentity.yCoord < i1 && tileentity.zCoord < j1) +- { +- arraylist.add(tileentity); +- } +- } +- ++ for(int x=(i>>4); x<=(l>>4); x++) ++ for(int z=(k>>4); z<=(j1>>4); z++) { ++ Chunk ch=getChunkFromChunkCoords(x,z); ++ if(ch==null) continue; ++ for(Object ob : ch.chunkTileEntityMap.values()) { ++ TileEntity te=(TileEntity)ob; ++ if(te.isInvalid()) continue; ++ if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k ++ && te.xCoord /dev/null - patch -p2 -i ../forge/minecraft.patch + for i in `find ../forge/patches/ -type f` + do + patch -p2 -i $i + done popd > /dev/null cp -a src_work src_forge diff --git a/forge/update_patch.sh b/forge/update_patch.sh deleted file mode 100755 index 9e9edfbb90..0000000000 --- a/forge/update_patch.sh +++ /dev/null @@ -1,5 +0,0 @@ -rm minecraft.patch -touch minecraft.patch - -diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \ - >> minecraft.patch diff --git a/forge/update_patches.bat b/forge/update_patches.bat new file mode 100644 index 0000000000..719b407f2f --- /dev/null +++ b/forge/update_patches.bat @@ -0,0 +1,25 @@ +@setlocal enabledelayedexpansion +@echo off + +rmdir /Q /S patches + +set PATH=.\bin;%PATH% +echo Creating directories +for /f %%i in ('find ../src_work -type d') do ( + set file=%%i + set file=!file:~11! + rem echo patches!file! + "./bin/mkdir.exe" --parents "patches!file!" +) +echo Creating patches +for /f %%i in ('find ../src_work -type f') do ( + set file=%%i + set file=!file:~11! + rem echo !file! + diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch +) +echo Removing empty patches +for /f %%i in ('find patches -size 0 -type f') do rm %%i +for /f %%i in ('find patches -depth -empty -type d') do rmdir "%%i" + +goto:eof diff --git a/forge/update_patches.sh b/forge/update_patches.sh new file mode 100644 index 0000000000..e2e8b6ea05 --- /dev/null +++ b/forge/update_patches.sh @@ -0,0 +1,26 @@ +rm -rf patches + +echo Creating directories + +for i in `find ../src_work -type d` +do + mkdir --parents "./patches${i:11}" +done + +echo Creating patches + +for i in `find ../src_work -type f` +do + diff -u ../src_base${i:11} $i -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -00/" | tr -d '\r' > ./patches${i:11}.patch +done + +echo Removing empty patches +for i in `find patches -size 0 -type f` +do + rm $i +done +for i in `find patches -depth -empty -type d` +do + rmdir "$i" +done + From 9f56b1cc034215306e67a8cb7856696d4c74afeb Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 10 Oct 2011 00:09:48 +0000 Subject: [PATCH 113/169] Made the windows setup script a bit more robust, also made both scripts filter out non-patch files. {Issue with svn files} --- forge/setup.bat | 62 ++++++++++++++++++++++++++++--------------------- forge/setup.sh | 4 +++- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/forge/setup.bat b/forge/setup.bat index fe4f6236a0..2bdb59e415 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -1,35 +1,45 @@ -cd .. +echo off +pushd .. >nul -rmdir /S /Q src - -IF EXIST src_base ( - move src_base src + rmdir /S /Q src + rmdir /S /Q src_base rmdir /S /Q src_work -) ELSE ( + cmd /C decompile.bat - cd src - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch - ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch - cd .. - cmd /C recompile.bat + + pushd src >nul + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch + ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch + ..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch + rm ../forge/mlprop-win.patch ../forge/modLoaderMP-win.patch + popd >nul + cmd /C updatemd5.bat -) -mkdir src_base -mkdir src_work -xcopy /Y /E src\* src_base -xcopy /Y /E src\* src_work -cd src_work -@setlocal enabledelayedexpansion -@echo off + mkdir src_base + mkdir src_work -set PATH=..\forge\bin;%PATH% -echo Applying patches -for /f %%i in ('find ../forge/patches -type f') do ( - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py %%i %%i - ..\runtime\bin\applydiff.exe -uf -p2 < %%i -) + xcopy /Y /E /Q src\* src_base + xcopy /Y /E /Q src\* src_work -cd ../forge + pushd src_work >nul + @setlocal enabledelayedexpansion + @echo off + + set PATH=..\forge\bin;%PATH% + echo Applying patches + for /f %%i in ('find ../forge/patches -type f') do ( + set file=%%i + rem Have to do this to filter out .svn entries + if /I "!file:~-6!" EQU ".patch" ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py %%i ..\forge\temp.patch + ..\runtime\bin\applydiff.exe -uf -p2 -i ..\forge\temp.patch + rm ../forge/temp.patch >nul 1>nul + ) + ) + popd >nul +popd >nul +echo finished pause diff --git a/forge/setup.sh b/forge/setup.sh index f038186a54..8180f56998 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -36,7 +36,9 @@ cp -a src_base src_work pushd src_work > /dev/null for i in `find ../forge/patches/ -type f` do - patch -p2 -i $i + if ["${i:(-6)}" == ".patch"]; then + patch -p2 -i $i + fi done popd > /dev/null From 579f4de29533f3a32cae9b8080c5eab8aa8f3ed5 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Mon, 10 Oct 2011 19:16:11 +0000 Subject: [PATCH 114/169] reactivated special armor code --- .../net/minecraft/src/Block.java.patch | 4 +-- .../net/minecraft/src/BlockButton.java.patch | 4 +-- .../net/minecraft/src/BlockChest.java.patch | 4 +-- .../minecraft/src/BlockContainer.java.patch | 4 +-- .../net/minecraft/src/BlockCrops.java.patch | 4 +-- .../net/minecraft/src/BlockDoor.java.patch | 4 +-- .../net/minecraft/src/BlockLadder.java.patch | 4 +-- .../net/minecraft/src/BlockLever.java.patch | 4 +-- .../src/BlockPressurePlate.java.patch | 4 +-- .../net/minecraft/src/BlockRail.java.patch | 4 +-- .../src/BlockRedstoneRepeater.java.patch | 4 +-- .../src/BlockRedstoneWire.java.patch | 4 +-- .../minecraft/src/BlockTallGrass.java.patch | 4 +-- .../net/minecraft/src/BlockTorch.java.patch | 4 +-- .../minecraft/src/BlockTrapDoor.java.patch | 4 +-- .../net/minecraft/src/Chunk.java.patch | 4 +-- .../minecraft/src/EffectRenderer.java.patch | 4 +-- .../net/minecraft/src/EntityLiving.java.patch | 4 +-- .../net/minecraft/src/EntityPlayer.java.patch | 34 ++++++++++++++++--- .../minecraft/src/EntityRenderer.java.patch | 4 +-- .../net/minecraft/src/Explosion.java.patch | 4 +-- .../minecraft/src/FurnaceRecipes.java.patch | 4 +-- .../net/minecraft/src/Item.java.patch | 4 +-- .../net/minecraft/src/ItemBlock.java.patch | 4 +-- .../net/minecraft/src/ItemBucket.java.patch | 4 +-- .../net/minecraft/src/ItemDye.java.patch | 4 +-- .../src/ItemFlintAndSteel.java.patch | 4 +-- .../net/minecraft/src/ItemHoe.java.patch | 4 +-- .../net/minecraft/src/ItemRedstone.java.patch | 4 +-- .../net/minecraft/src/ItemReed.java.patch | 4 +-- .../net/minecraft/src/ItemRenderer.java.patch | 4 +-- .../net/minecraft/src/ItemSeeds.java.patch | 4 +-- .../net/minecraft/src/ItemTool.java.patch | 4 +-- .../src/MovingObjectPosition.java.patch | 4 +-- .../minecraft/src/PlayerController.java.patch | 4 +-- .../src/PlayerControllerMP.java.patch | 4 +-- .../src/PlayerControllerSP.java.patch | 4 +-- .../net/minecraft/src/RenderBlocks.java.patch | 4 +-- .../net/minecraft/src/RenderEngine.java.patch | 4 +-- .../net/minecraft/src/RenderGlobal.java.patch | 4 +-- .../net/minecraft/src/RenderItem.java.patch | 4 +-- .../net/minecraft/src/RenderPlayer.java.patch | 4 +-- .../net/minecraft/src/SlotCrafting.java.patch | 4 +-- .../net/minecraft/src/Tessellator.java.patch | 4 +-- .../net/minecraft/src/TileEntity.java.patch | 4 +-- .../src/TileEntityFurnace.java.patch | 4 +-- .../src/TileEntityRendererPiston.java.patch | 4 +-- .../net/minecraft/src/World.java.patch | 4 +-- .../minecraft/src/WorldRenderer.java.patch | 4 +-- .../net/minecraft/src/Block.java.patch | 4 +-- .../net/minecraft/src/BlockButton.java.patch | 4 +-- .../net/minecraft/src/BlockChest.java.patch | 4 +-- .../minecraft/src/BlockContainer.java.patch | 4 +-- .../net/minecraft/src/BlockCrops.java.patch | 4 +-- .../net/minecraft/src/BlockDoor.java.patch | 4 +-- .../net/minecraft/src/BlockLadder.java.patch | 4 +-- .../net/minecraft/src/BlockLever.java.patch | 4 +-- .../src/BlockPressurePlate.java.patch | 4 +-- .../net/minecraft/src/BlockRail.java.patch | 4 +-- .../src/BlockRedstoneRepeater.java.patch | 4 +-- .../src/BlockRedstoneWire.java.patch | 4 +-- .../minecraft/src/BlockTallGrass.java.patch | 4 +-- .../net/minecraft/src/BlockTorch.java.patch | 4 +-- .../minecraft/src/BlockTrapDoor.java.patch | 4 +-- .../net/minecraft/src/Chunk.java.patch | 4 +-- .../net/minecraft/src/EntityLiving.java.patch | 4 +-- .../net/minecraft/src/EntityPlayer.java.patch | 34 ++++++++++++++++--- .../net/minecraft/src/Explosion.java.patch | 4 +-- .../minecraft/src/FurnaceRecipes.java.patch | 4 +-- .../net/minecraft/src/Item.java.patch | 4 +-- .../net/minecraft/src/ItemBlock.java.patch | 4 +-- .../net/minecraft/src/ItemBucket.java.patch | 4 +-- .../net/minecraft/src/ItemDye.java.patch | 4 +-- .../src/ItemFlintAndSteel.java.patch | 4 +-- .../net/minecraft/src/ItemHoe.java.patch | 4 +-- .../src/ItemInWorldManager.java.patch | 4 +-- .../net/minecraft/src/ItemRedstone.java.patch | 4 +-- .../net/minecraft/src/ItemReed.java.patch | 4 +-- .../net/minecraft/src/ItemSeeds.java.patch | 4 +-- .../net/minecraft/src/ItemTool.java.patch | 4 +-- .../src/MovingObjectPosition.java.patch | 4 +-- .../minecraft/src/PlayerInstance.java.patch | 4 +-- .../net/minecraft/src/SlotCrafting.java.patch | 4 +-- .../net/minecraft/src/TileEntity.java.patch | 4 +-- .../src/TileEntityFurnace.java.patch | 4 +-- .../net/minecraft/src/World.java.patch | 4 +-- .../net/minecraft/src/WorldServer.java.patch | 4 +-- forge/release.bat | 2 +- 88 files changed, 231 insertions(+), 179 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index b0233712d8..405f22a4b5 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch index cc54d7ee6b..8539149b11 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch index 8c69a81af3..9ea9ec81aa 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -423,23 +423,23 @@ { return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 1871f24c98..5fd9a0785c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 2706d14e6d..17b0d339a4 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index e6ba89fe80..a46e540beb 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch index 78010cb2ad..18e256f762 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch index f2937b1c37..d8b0a56be6 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch index 16abd9ba82..4c27c2a174 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 2e26b4bb34..1b7425a710 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch index 488e9ef02c..275b62bc8d 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch index f0c5c3468a..f2a839931b 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index d4750f5201..92c83744ad 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index c3f031031c..21067a5cee 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch index e3106e78e0..a602844b2c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -147,7 +147,7 @@ { j1--; diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 20285d71da..1f18cad900 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index d02350e5e8..8023965caa 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 6e09fb3851..244b0cead7 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index f10cc7362e..5bf97786ee 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -720,7 +752,9 @@ +@@ -667,6 +699,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.unblockable() && func_35162_ad()) + { + i = 1 + i >> 1; +@@ -720,7 +771,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -815,6 +849,10 @@ +@@ -815,6 +868,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index 852e814076..3ff87b7132 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch index bb54fe9488..9ad5cc4359 100644 --- a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch index b8a98fc45e..c789d9be7a 100644 --- a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 664d382446..c1f8a55679 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -76,6 +76,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch index f9cf25b4da..46bdb88286 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch index 251d86ec24..c567eba5a7 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 66e7f77eee..7b9aae403b 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch index 41c66ac63a..12bc6d21f2 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch index a82f7de402..4dc2c74be4 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch index d22e6a1b48..1c4116d095 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch index 15778ccf7d..155c33a5a9 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index 3bcb926ab0..1c4e3562ed 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch index 9e754e8583..5b1daeead2 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch index ba4765bcb3..b7046218c8 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch index 49a2ac24df..ca6044464d 100644 --- a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 7509b615f1..1210a4b09c 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index c78999f827..a01dcac600 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,9 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 2bbbf8121e..e9ac50b3fc 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index f7f78623c3..f1b01e65e3 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index eb2044e7c0..07bb39a10a 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 @@ -128,6 +128,9 @@ } try diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch index dfade4d45a..edb7724238 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 @@ -1635,8 +1635,8 @@ } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index f0d2249f2b..c0b6593049 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 50669f71cc..179174fe66 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index fabc12a24f..cfebc3c0e2 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch index 6d52526c8e..123700a2e7 100644 --- a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index b63e70a654..d771b66e34 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 89dfe957d7..9b9b224481 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch index e3f6b6cc92..bc984e3984 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 204a25f5c2..5213abff55 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch index cbf615ac7a..927c0f4c67 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index eb70c99a17..3d21e84c74 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch index 4b1fb3e7fb..fb25e5b274 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch index 5e0acf20ad..be9f6ab3a3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -328,23 +328,23 @@ { return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index 24433f82fd..cd35cd72a9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 09c53056b2..df52f41f8e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index c1ea96b1fe..7913f44b22 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch index 7cf02273c6..9f1dab7871 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch index 09b539626e..4a7993dc23 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch index eff38e4bb4..c1cbc7e1b5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index 7034891beb..5eb9f1a1e9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch index 66372a4a8a..5953cd8b02 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch index ec300c0949..846b9a21f2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 31118139a4..8e67bc098a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch index 6a8d951fa5..12316c0fa4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch index 6e2fcc1cd9..531e403415 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -130,7 +130,7 @@ { j1--; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 1b328d5e10..369cf0788f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index 607f48d7dd..eb01f279f6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index b8f5e13ba4..92bc123b87 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,10 @@ import java.util.*; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -668,7 +700,9 @@ +@@ -615,6 +647,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.func_35083_b() && func_35180_G()) + { + i = 1 + i >> 1; +@@ -668,7 +719,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -757,6 +791,10 @@ +@@ -757,6 +810,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch index 7ee22e874c..beeee5f0d7 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch index 70d851bf1c..89069f4f40 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 545acffb2b..5982ee09c7 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -66,6 +66,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch index 794422dc09..71dce34deb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch index ad858eb819..bca00196fa 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch index 30e1b2bb64..9540178fbc 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch index 167cde2315..a0e0cdc1da 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch index 4596ad1a1f..9b1da5455a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index fd72220c42..3c1bda8ce8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch index c7e7bd08e1..33ded38c47 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch index ad19a4c590..4e4cc75f57 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch index e5170c75a5..69dca2ba27 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch index 4bc57d9f23..b17018c381 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch index 38011b3cf0..0dcfa2389c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch index bf56c4732d..c6027ee04d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 39b6ed4f9e..8f4d8c418a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index ef84f71cb6..8d4d81e1f8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 5511bd75c0..30c940ff4d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 0b57d2df1d..266ac2dbd3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index cdcb542ed0..9fb2a0a260 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 @@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { diff --git a/forge/release.bat b/forge/release.bat index 8f7c89964e..9b359e1431 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.7 +sh package.sh 1.1.1 pause From ebc09a72db1bebfb10d210686673852e47391ed9 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Mon, 10 Oct 2011 19:21:41 +0000 Subject: [PATCH 115/169] bumbed forge minor version --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- forge/release.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 18815faee8..8f9ab4c992 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -230,7 +230,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=1; - public static final int revisionVersion=1; + public static final int revisionVersion=2; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/release.bat b/forge/release.bat index 9b359e1431..c327006a02 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.1.1 +sh package.sh 1.1.2 pause From b8a84f2c299bb0973b7ba7718559805db20480fa Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 10 Oct 2011 23:47:30 +0000 Subject: [PATCH 116/169] Changed the windows setup to use del instead of remove. Both update patches scripts no longer remove svn entries. Added the forge_client\bin and forge_server\bin folders to the svn ignore. --- .../net/minecraft/src/Block.java.patch | 4 ++-- .../net/minecraft/src/BlockButton.java.patch | 4 ++-- .../net/minecraft/src/BlockChest.java.patch | 4 ++-- .../minecraft/src/BlockContainer.java.patch | 4 ++-- .../net/minecraft/src/BlockCrops.java.patch | 4 ++-- .../net/minecraft/src/BlockDoor.java.patch | 4 ++-- .../net/minecraft/src/BlockLadder.java.patch | 4 ++-- .../net/minecraft/src/BlockLever.java.patch | 4 ++-- .../src/BlockPressurePlate.java.patch | 4 ++-- .../net/minecraft/src/BlockRail.java.patch | 4 ++-- .../src/BlockRedstoneRepeater.java.patch | 4 ++-- .../src/BlockRedstoneWire.java.patch | 4 ++-- .../minecraft/src/BlockTallGrass.java.patch | 4 ++-- .../net/minecraft/src/BlockTorch.java.patch | 4 ++-- .../minecraft/src/BlockTrapDoor.java.patch | 4 ++-- .../net/minecraft/src/Chunk.java.patch | 4 ++-- .../minecraft/src/EffectRenderer.java.patch | 4 ++-- .../net/minecraft/src/EntityLiving.java.patch | 4 ++-- .../net/minecraft/src/EntityPlayer.java.patch | 4 ++-- .../minecraft/src/EntityRenderer.java.patch | 4 ++-- .../net/minecraft/src/Explosion.java.patch | 4 ++-- .../minecraft/src/FurnaceRecipes.java.patch | 4 ++-- .../net/minecraft/src/Item.java.patch | 4 ++-- .../net/minecraft/src/ItemBlock.java.patch | 4 ++-- .../net/minecraft/src/ItemBucket.java.patch | 4 ++-- .../net/minecraft/src/ItemDye.java.patch | 4 ++-- .../src/ItemFlintAndSteel.java.patch | 4 ++-- .../net/minecraft/src/ItemHoe.java.patch | 4 ++-- .../net/minecraft/src/ItemRedstone.java.patch | 4 ++-- .../net/minecraft/src/ItemReed.java.patch | 4 ++-- .../net/minecraft/src/ItemRenderer.java.patch | 4 ++-- .../net/minecraft/src/ItemSeeds.java.patch | 4 ++-- .../net/minecraft/src/ItemTool.java.patch | 4 ++-- .../src/MovingObjectPosition.java.patch | 4 ++-- .../minecraft/src/PlayerController.java.patch | 4 ++-- .../src/PlayerControllerMP.java.patch | 4 ++-- .../src/PlayerControllerSP.java.patch | 4 ++-- .../net/minecraft/src/RenderBlocks.java.patch | 4 ++-- .../net/minecraft/src/RenderEngine.java.patch | 4 ++-- .../net/minecraft/src/RenderGlobal.java.patch | 4 ++-- .../net/minecraft/src/RenderItem.java.patch | 4 ++-- .../net/minecraft/src/RenderPlayer.java.patch | 4 ++-- .../net/minecraft/src/SlotCrafting.java.patch | 4 ++-- .../net/minecraft/src/Tessellator.java.patch | 4 ++-- .../net/minecraft/src/TileEntity.java.patch | 4 ++-- .../src/TileEntityFurnace.java.patch | 4 ++-- .../src/TileEntityRendererPiston.java.patch | 4 ++-- .../net/minecraft/src/World.java.patch | 4 ++-- .../minecraft/src/WorldRenderer.java.patch | 4 ++-- .../net/minecraft/src/Block.java.patch | 4 ++-- .../net/minecraft/src/BlockButton.java.patch | 4 ++-- .../net/minecraft/src/BlockChest.java.patch | 4 ++-- .../minecraft/src/BlockContainer.java.patch | 4 ++-- .../net/minecraft/src/BlockCrops.java.patch | 4 ++-- .../net/minecraft/src/BlockDoor.java.patch | 4 ++-- .../net/minecraft/src/BlockLadder.java.patch | 4 ++-- .../net/minecraft/src/BlockLever.java.patch | 4 ++-- .../src/BlockPressurePlate.java.patch | 4 ++-- .../net/minecraft/src/BlockRail.java.patch | 4 ++-- .../src/BlockRedstoneRepeater.java.patch | 4 ++-- .../src/BlockRedstoneWire.java.patch | 4 ++-- .../minecraft/src/BlockTallGrass.java.patch | 4 ++-- .../net/minecraft/src/BlockTorch.java.patch | 4 ++-- .../minecraft/src/BlockTrapDoor.java.patch | 4 ++-- .../net/minecraft/src/Chunk.java.patch | 4 ++-- .../net/minecraft/src/EntityLiving.java.patch | 4 ++-- .../net/minecraft/src/EntityPlayer.java.patch | 4 ++-- .../net/minecraft/src/Explosion.java.patch | 4 ++-- .../minecraft/src/FurnaceRecipes.java.patch | 4 ++-- .../net/minecraft/src/Item.java.patch | 4 ++-- .../net/minecraft/src/ItemBlock.java.patch | 4 ++-- .../net/minecraft/src/ItemBucket.java.patch | 4 ++-- .../net/minecraft/src/ItemDye.java.patch | 4 ++-- .../src/ItemFlintAndSteel.java.patch | 4 ++-- .../net/minecraft/src/ItemHoe.java.patch | 4 ++-- .../src/ItemInWorldManager.java.patch | 4 ++-- .../net/minecraft/src/ItemRedstone.java.patch | 4 ++-- .../net/minecraft/src/ItemReed.java.patch | 4 ++-- .../net/minecraft/src/ItemSeeds.java.patch | 4 ++-- .../net/minecraft/src/ItemTool.java.patch | 4 ++-- .../src/MovingObjectPosition.java.patch | 4 ++-- .../minecraft/src/PlayerInstance.java.patch | 4 ++-- .../net/minecraft/src/SlotCrafting.java.patch | 4 ++-- .../net/minecraft/src/TileEntity.java.patch | 4 ++-- .../src/TileEntityFurnace.java.patch | 4 ++-- .../net/minecraft/src/World.java.patch | 4 ++-- .../net/minecraft/src/WorldServer.java.patch | 4 ++-- forge/setup.bat | 4 ++-- forge/setup.sh | 4 +--- forge/update_patches.bat | 20 ++++++++++++++----- forge/update_patches.sh | 9 +++------ 91 files changed, 195 insertions(+), 190 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 405f22a4b5..b0233712d8 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch index 8539149b11..cc54d7ee6b 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch index 9ea9ec81aa..8c69a81af3 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 @@ -423,23 +423,23 @@ { return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 5fd9a0785c..1871f24c98 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 17b0d339a4..2706d14e6d 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index a46e540beb..e6ba89fe80 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch index 18e256f762..78010cb2ad 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch index d8b0a56be6..f2937b1c37 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch index 4c27c2a174..16abd9ba82 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 1b7425a710..2e26b4bb34 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch index 275b62bc8d..488e9ef02c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch index f2a839931b..f0c5c3468a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index 92c83744ad..d4750f5201 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index 21067a5cee..c3f031031c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch index a602844b2c..e3106e78e0 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 @@ -147,7 +147,7 @@ { j1--; diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 1f18cad900..20285d71da 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index 8023965caa..d02350e5e8 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 244b0cead7..6e09fb3851 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 5bf97786ee..69367be2b9 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index 3ff87b7132..852e814076 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch index 9ad5cc4359..bb54fe9488 100644 --- a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch index c789d9be7a..b8a98fc45e 100644 --- a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index c1f8a55679..664d382446 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 @@ -76,6 +76,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch index 46bdb88286..f9cf25b4da 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch index c567eba5a7..251d86ec24 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 7b9aae403b..66e7f77eee 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch index 12bc6d21f2..41c66ac63a 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch index 4dc2c74be4..a82f7de402 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch index 1c4116d095..d22e6a1b48 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch index 155c33a5a9..15778ccf7d 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index 1c4e3562ed..3bcb926ab0 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 @@ -5,6 +5,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch index 5b1daeead2..9e754e8583 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch index b7046218c8..ba4765bcb3 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch index ca6044464d..49a2ac24df 100644 --- a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 1210a4b09c..7509b615f1 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index a01dcac600..c78999f827 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,9 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index e9ac50b3fc..2bbbf8121e 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index f1b01e65e3..f7f78623c3 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index 07bb39a10a..eb2044e7c0 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 @@ -128,6 +128,9 @@ } try diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch index edb7724238..dfade4d45a 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 @@ -1635,8 +1635,8 @@ } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index c0b6593049..f0d2249f2b 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 179174fe66..50669f71cc 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index cfebc3c0e2..fabc12a24f 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch index 123700a2e7..6d52526c8e 100644 --- a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index d771b66e34..b63e70a654 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 9b9b224481..89dfe957d7 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch index bc984e3984..e3f6b6cc92 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 5213abff55..204a25f5c2 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch index 927c0f4c67..cbf615ac7a 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 3d21e84c74..eb70c99a17 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch index fb25e5b274..4b1fb3e7fb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch index be9f6ab3a3..5e0acf20ad 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 @@ -328,23 +328,23 @@ { return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index cd35cd72a9..24433f82fd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index df52f41f8e..09c53056b2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index 7913f44b22..c1ea96b1fe 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch index 9f1dab7871..7cf02273c6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch index 4a7993dc23..09b539626e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch index c1cbc7e1b5..eff38e4bb4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index 5eb9f1a1e9..7034891beb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch index 5953cd8b02..66372a4a8a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch index 846b9a21f2..ec300c0949 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 8e67bc098a..31118139a4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch index 12316c0fa4..6a8d951fa5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch index 531e403415..6e2fcc1cd9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 @@ -130,7 +130,7 @@ { j1--; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 369cf0788f..1b328d5e10 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index eb01f279f6..607f48d7dd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 92bc123b87..e55a83b31a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 @@ -6,6 +6,10 @@ import java.util.*; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch index beeee5f0d7..7ee22e874c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch index 89069f4f40..70d851bf1c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 5982ee09c7..545acffb2b 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 @@ -66,6 +66,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch index 71dce34deb..794422dc09 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch index bca00196fa..ad858eb819 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch index 9540178fbc..30e1b2bb64 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch index a0e0cdc1da..167cde2315 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch index 9b1da5455a..4596ad1a1f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index 3c1bda8ce8..fd72220c42 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch index 33ded38c47..c7e7bd08e1 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch index 4e4cc75f57..ad19a4c590 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch index 69dca2ba27..e5170c75a5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch index b17018c381..4bc57d9f23 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch index 0dcfa2389c..38011b3cf0 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch index c6027ee04d..bf56c4732d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 8f4d8c418a..39b6ed4f9e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index 8d4d81e1f8..ef84f71cb6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 30c940ff4d..5511bd75c0 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 266ac2dbd3..0b57d2df1d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index 9fb2a0a260..cdcb542ed0 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 +--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 @@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { diff --git a/forge/setup.bat b/forge/setup.bat index 2bdb59e415..46837586a1 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -12,7 +12,7 @@ pushd .. >nul ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch ..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch - rm ../forge/mlprop-win.patch ../forge/modLoaderMP-win.patch + del ..\forge\mlprop-win.patch ..\forge\modLoaderMP-win.patch >nul 1>nul popd >nul cmd /C updatemd5.bat @@ -35,7 +35,7 @@ pushd .. >nul if /I "!file:~-6!" EQU ".patch" ( ..\runtime\bin\python\python_mcp ..\forge\lfcr.py %%i ..\forge\temp.patch ..\runtime\bin\applydiff.exe -uf -p2 -i ..\forge\temp.patch - rm ../forge/temp.patch >nul 1>nul + del ..\forge\temp.patch >nul 1>nul ) ) popd >nul diff --git a/forge/setup.sh b/forge/setup.sh index 8180f56998..0a4db9b42e 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -34,11 +34,9 @@ fi cp -a src_base src_work pushd src_work > /dev/null - for i in `find ../forge/patches/ -type f` + for i in `find ../forge/patches/ -type f -name \*.patch` do - if ["${i:(-6)}" == ".patch"]; then patch -p2 -i $i - fi done popd > /dev/null diff --git a/forge/update_patches.bat b/forge/update_patches.bat index 719b407f2f..e34aa0bbc2 100644 --- a/forge/update_patches.bat +++ b/forge/update_patches.bat @@ -1,8 +1,6 @@ @setlocal enabledelayedexpansion @echo off -rmdir /Q /S patches - set PATH=.\bin;%PATH% echo Creating directories for /f %%i in ('find ../src_work -type d') do ( @@ -19,7 +17,19 @@ for /f %%i in ('find ../src_work -type f') do ( diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch ) echo Removing empty patches -for /f %%i in ('find patches -size 0 -type f') do rm %%i -for /f %%i in ('find patches -depth -empty -type d') do rmdir "%%i" +for /f %%i in ('find patches -size 0 -type f') do ( + set file=%%i + rem Have to do this to filter out .svn entries + if /I "!file:~-6!" EQU ".patch" ( + del !file:/=\! + ) +) +for /f %%i in ('find patches -depth -empty -type d') do ( + set file=%%i + if "!file:.svn=!" EQU "!file!" ( + rmdir "%%i" + ) +) -goto:eof +echo Finished +pause diff --git a/forge/update_patches.sh b/forge/update_patches.sh index e2e8b6ea05..4dd057b2c6 100644 --- a/forge/update_patches.sh +++ b/forge/update_patches.sh @@ -1,5 +1,3 @@ -rm -rf patches - echo Creating directories for i in `find ../src_work -type d` @@ -11,16 +9,15 @@ echo Creating patches for i in `find ../src_work -type f` do - diff -u ../src_base${i:11} $i -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -00/" | tr -d '\r' > ./patches${i:11}.patch + diff -u ../src_base${i:11} $i -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > ./patches${i:11}.patch done echo Removing empty patches -for i in `find patches -size 0 -type f` +for i in `find patches -size 0 -type f -name \*.patch` do rm $i done -for i in `find patches -depth -empty -type d` +for i in `find patches -depth -empty -type d | grep -a -v "svn"` do rmdir "$i" done - From 756c3ce812c8526fa4ecdc0cf59bc30050dc9907 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 11 Oct 2011 22:23:39 +0000 Subject: [PATCH 117/169] Updated the package.sh script to include the patches, the new install.sh, and modLoaderMP/mlprop.patch --- forge/package.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/forge/package.sh b/forge/package.sh index 624b3784b9..6940afc164 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -54,19 +54,25 @@ cd forge mkdir src mkdir src/minecraft mkdir src/minecraft_server +mkdir patches cp -r ../forge_client/src/* src/minecraft cp -r ../forge_server/src/* src/minecraft_server cp -r ../forge_common/* src/minecraft cp -r ../forge_common/* src/minecraft_server -cp ../minecraft.patch . +cp -r ../patches/* patches cp ../lfcr.py . cp ../install/install.cmd . +cp ../install/install.sh . +cp ../modLoaderMP.patch . +cp ../mlprop.patch . cp ../install/README.txt . cp ../minecraftforge_credits.txt . cp -r ../doc . cd src remove_svn . +cd ../patches +remove_svn . cd .. cd .. From 8a7c087e34c07f557913f84d33e4f497a9bb7f30 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 11 Oct 2011 22:38:39 +0000 Subject: [PATCH 118/169] Fixed line endings in install.sh --- forge/install/install.sh | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/forge/install/install.sh b/forge/install/install.sh index e5de30f20f..3851d2059a 100644 --- a/forge/install/install.sh +++ b/forge/install/install.sh @@ -1,23 +1,23 @@ -#!/bin/bash - -echo "MinecraftForge Linux Setup Program" -echo - -pushd .. > /dev/null - -./cleanup.sh -./decompile.sh - -pushd src > /dev/null - find . -name *.java -exec sed -i 's/\r//g' \{\} \; - patch -p2 -i ../forge/modLoaderMP.patch - patch -p1 -i ../forge/mlprop.patch - for i in `find ../forge/patches/ -type f` - do - patch -p2 -i $i - done -popd > /dev/null - -cp -r forge/src/* src - -./updatemd5.sh +#!/bin/bash + +echo "MinecraftForge Linux Setup Program" +echo + +pushd .. > /dev/null + +./cleanup.sh +./decompile.sh + +pushd src > /dev/null + find . -name *.java -exec sed -i 's/\r//g' \{\} \; + patch -p2 -i ../forge/modLoaderMP.patch + patch -p1 -i ../forge/mlprop.patch + for i in `find ../forge/patches/ -type f` + do + patch -p2 -i $i + done +popd > /dev/null + +cp -r forge/src/* src + +./updatemd5.sh From a64a47b24ce82207dc4f5bc08f4cf645dee84091 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 13 Oct 2011 07:10:43 +0000 Subject: [PATCH 119/169] Fix for new MCP mappings. Fixed the distribution of flowers with bonemeal. Fixed accidentally making obsidian easy to mine. --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 7 ++++--- .../net/minecraft/src/forge/MinecraftForge.java | 2 +- .../minecraft/net/minecraft/src/BlockContainer.java.patch | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 8f9ab4c992..c014d4c69e 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -96,10 +96,10 @@ public class ForgeHooks { static { plantGrassList=new ArrayList(); plantGrassList.add(new ProbableItem( - Block.plantYellow.blockID,0,1,0,30)); + Block.plantYellow.blockID,0,1,0,20)); plantGrassList.add(new ProbableItem( - Block.plantRed.blockID,0,1,30,40)); - plantGrassWeight=40; + Block.plantRed.blockID,0,1,20,30)); + plantGrassWeight=30; seedGrassList=new ArrayList(); seedGrassList.add(new ProbableItem( @@ -212,6 +212,7 @@ public class ForgeHooks { MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2); MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe"); MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.obsidian,"pickaxe"); Block[] pickeff ={ Block.cobblestone, Block.stairDouble, diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 51bff0894b..cd56b83c0a 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -70,7 +70,7 @@ public class MinecraftForge { * @param bid The block ID to plant. * @param md The metadata to plant. * @param prop The relative probability of the plant, where red flowers are - * 10 and yellow flowers are 30. + * 10 and yellow flowers are 20. */ public static void addGrassPlant(int item, int md, int prop) { ForgeHooks.addPlantGrass(item,md,prop); diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 1871f24c98..7c0e7b202d 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -18,7 +18,7 @@ + public TileEntity getBlockEntity(int md) { + return getBlockEntity(); + } -+ - public void playBlock(World world, int i, int j, int k, int l, int i1) ++ + public void powerBlock(World world, int i, int j, int k, int l, int i1) { - super.playBlock(world, i, j, k, l, i1); + super.powerBlock(world, i, j, k, l, i1); From c12b2c5b11519375292109ab9adfff1ac438a628 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 18 Oct 2011 18:56:10 +0000 Subject: [PATCH 120/169] Added ore dictionary. --- .../net/minecraft/src/forge/IOreHandler.java | 24 ++++ .../minecraft/src/forge/MinecraftForge.java | 133 +++++++++++++++++- 2 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 forge/forge_common/net/minecraft/src/forge/IOreHandler.java diff --git a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java new file mode 100644 index 0000000000..a4c8651e31 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java @@ -0,0 +1,24 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.ItemStack; + +/** The current list of known classes. + * oreTin, oreCopper, oreSilver + * ingotTin, ingotCopper, ingotSilver + * dyeBlue + * gemRuby, gemEmerald, gemSapphire + * woodRubber + */ + +public interface IOreHandler { + /** Called when a new ore is registered with the ore dictionary. + * @param oreClass The string class of the ore. + * @param ore The ItemStack for the ore. + */ + public void registerOre(String oreClass, ItemStack ore); +} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index cd56b83c0a..8a5449338e 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -15,7 +15,6 @@ import java.util.*; public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); - /** * Register a new custom bucket handler. */ @@ -66,6 +65,138 @@ public class MinecraftForge { return null; } + // Ore Dictionary + // ------------------------------------------------------------ + private static LinkedList oreHandlers = new LinkedList(); + private static TreeMap> oreDict= + new TreeMap>(); + + /** Register a new ore handler. This will automatically call the handler + * with all current ores during registration, and every time a new ore is + * added later. + */ + public static void registerOreHandler(IOreHandler handler) { + oreHandlers.add(handler); + + for(String key : oreDict.keySet()) { + List val=oreDict.get(key); + for(ItemStack ist : val) { + handler.registerOre(key,ist); + } + } + } + + /** Register a new item with the ore dictionary. + * @param oreClass The string class of the ore. + * @param ore The ItemStack for the ore. + */ + public static void registerOre(String oreClass, ItemStack ore) { + List orelist=oreDict.get(oreClass); + if(orelist==null) { + orelist=new ArrayList(); + oreDict.put(oreClass,orelist); + } + orelist.add(ore); + for(IOreHandler ioh : oreHandlers) { + ioh.registerOre(oreClass,ore); + } + } + + /** Get the list of ores in a given class. + */ + public static List getOreClass(String oreClass) { + return oreDict.get(oreClass); + } + + public static class OreQuery implements Iterable { + Object[] proto; + + public class OreQueryIterator implements Iterator { + LinkedList itering; + LinkedList output; + + private OreQueryIterator() { + itering=new LinkedList(); + output=new LinkedList(); + + for(int i=0; i iterator() { + return new OreQueryIterator(); + } + } + + /** Generate all valid legal recipe combinations. Any Lists in pattern + * will be fully expanded to all valid combinations. + */ + public static OreQuery generateRecipes(Object... pattern) { + return new OreQuery(pattern); + } + + // ------------------------------------------------------------ + /** Register a new plant to be planted when bonemeal is used on grass. * @param bid The block ID to plant. * @param md The metadata to plant. From bf5e706f0624ae1be8d8f0d03a3e4088cd6c70ef Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 18 Oct 2011 19:11:57 +0000 Subject: [PATCH 121/169] Rolled in a critical MLMP fix, because MLMP is virtually unmaintained. --- .../minecraft/src/Packet230ModLoader.java.patch | 14 ++++++++++++++ .../minecraft/src/Packet230ModLoader.java.patch | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch new file mode 100644 index 0000000000..216de77ab0 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 +@@ -68,7 +68,10 @@ + })); + } + byte abyte0[] = new byte[k1]; +- datainputstream.read(abyte0, 0, k1); ++ int bytesRead = 0; ++ while (bytesRead < k1) { ++ bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead); ++ } + dataString[j1] = new String(abyte0); + } + diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch new file mode 100644 index 0000000000..6b83f5ee95 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 +@@ -71,7 +71,10 @@ + })); + } + byte abyte0[] = new byte[k1]; +- datainputstream.read(abyte0, 0, k1); ++ int bytesRead = 0; ++ while (bytesRead < k1) { ++ bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead); ++ } + dataString[j1] = new String(abyte0); + } + From f1f672b5fd9e28a0c28757489848c3f3352f53da Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 19 Oct 2011 02:00:50 +0000 Subject: [PATCH 122/169] MCP update. Fixed a problem with TileEntity sending. --- forge/patches/minecraft/net/minecraft/src/Chunk.java.patch | 6 +++--- .../net/minecraft/src/WorldServer.java.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 20285d71da..f3c9b16881 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -113,7 +113,7 @@ } @@ -334,8 +315,6 @@ - field_35845_c[j1] = -999; + precipitationHeightMap[j1] = -999; } int k1 = heightMap[k << 4 | i] & 0xff; - worldObj.getClass(); @@ -170,7 +170,7 @@ isModified = true; return true; @@ -410,8 +387,6 @@ - field_35845_c[i1] = -999; + precipitationHeightMap[i1] = -999; } int j1 = heightMap[i1] & 0xff; - worldObj.getClass(); @@ -345,7 +345,7 @@ return k1; } @@ -880,7 +866,6 @@ - int l = field_35845_c[k]; + int l = precipitationHeightMap[k]; if(l == -999) { - worldObj.getClass(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index cdcb542ed0..5bd29eb807 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -21,8 +21,8 @@ + TileEntity te=(TileEntity)ob; + if(te.isInvalid()) continue; + if(te.xCoord>=i && te.yCoord>=j && te.zCoord>=k -+ && te.xCoord Date: Wed, 19 Oct 2011 02:45:51 +0000 Subject: [PATCH 123/169] Patch for a small activation glitch in doors. --- .../minecraft/net/minecraft/src/BlockDoor.java.patch | 9 +++++++++ .../net/minecraft/src/BlockDoor.java.patch | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index e6ba89fe80..11a54fb635 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -111,7 +111,7 @@ + { + if(blockMaterial == Material.iron) + { +- return true; ++ return false; + } + int l = world.getBlockMetadata(i, j, k); + if((l & 8) != 0) @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index c1ea96b1fe..1aba3da757 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +@@ -100,7 +100,7 @@ + { + if(blockMaterial == Material.iron) + { +- return true; ++ return false; + } + int l = world.getBlockMetadata(i, j, k); + if((l & 8) != 0) @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; From 56f612c18620db65cb4319a10dc4420f6e42ef68 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 21 Oct 2011 21:00:44 +0000 Subject: [PATCH 124/169] Fixed TileEntity caching. --- .../net/minecraft/src/Chunk.java.patch | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index f3c9b16881..9ec5023aba 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -287,7 +287,20 @@ tileentity.validate(); chunkTileEntityMap.put(chunkposition, tileentity); return; -@@ -777,8 +762,6 @@ +@@ -773,12 +758,19 @@ + public int setChunkData(byte abyte0[], int i, int j, int k, int l, int i1, int j1, + int k1) + { ++ TileEntity te; ++ Iterator iterator = chunkTileEntityMap.values().iterator(); ++ while(iterator.hasNext()) { ++ te = (TileEntity)iterator.next(); ++ te.func_35144_b(); ++ te.getBlockMetadata(); ++ te.getBlockType(); ++ } ++ + for(int l1 = i; l1 < l; l1++) { for(int l2 = k; l2 < j1; l2++) { @@ -296,7 +309,7 @@ int l3 = l1 << 11 | l2 << 7 | j; int l4 = i1 - j; System.arraycopy(abyte0, k1, blocks, l3, l4); -@@ -792,8 +775,6 @@ +@@ -792,8 +784,6 @@ { for(int i3 = k; i3 < j1; i3++) { @@ -305,7 +318,7 @@ int i4 = (i2 << 11 | i3 << 7 | j) >> 1; int i5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, data.data, i4, i5); -@@ -806,8 +787,6 @@ +@@ -806,8 +796,6 @@ { for(int j3 = k; j3 < j1; j3++) { @@ -314,7 +327,7 @@ int j4 = (j2 << 11 | j3 << 7 | j) >> 1; int j5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); -@@ -820,8 +799,6 @@ +@@ -820,8 +808,6 @@ { for(int k3 = k; k3 < j1; k3++) { @@ -323,28 +336,37 @@ int k4 = (k2 << 11 | k3 << 7 | j) >> 1; int k5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -830,11 +807,20 @@ +@@ -830,12 +816,24 @@ } +- TileEntity tileentity; +- for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) +- { +- tileentity = (TileEntity)iterator.next(); + List invalidList=new ArrayList(); - TileEntity tileentity; - for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) - { - tileentity = (TileEntity)iterator.next(); -+ if( (tileentity.xCoord&15)>=i && (tileentity.xCoord&15)<=l && -+ tileentity.yCoord>=j && tileentity.yCoord<=i1 && -+ (tileentity.zCoord&15)>=k && (tileentity.zCoord&15)<=j1) { ++ iterator = chunkTileEntityMap.values().iterator(); ++ while(iterator.hasNext()) { ++ te = (TileEntity)iterator.next(); ++ if( (te.xCoord&15)>=i && (te.xCoord&15)<=l && ++ te.yCoord>=j && te.yCoord<=i1 && ++ (te.zCoord&15)>=k && (te.zCoord&15)<=j1) { + -+ invalidList.add(tileentity); ++ if(te.getBlockType().blockID== ++ worldObj.getBlockId(te.xCoord,te.yCoord,te.zCoord) && ++ te.getBlockMetadata()==worldObj.getBlockMetadata( ++ te.xCoord,te.yCoord,te.zCoord)) ++ continue; ++ invalidList.add(te); + } } -+ for(TileEntity te : invalidList) -+ te.invalidate(); - +- ++ for(TileEntity te2 : invalidList) ++ te2.invalidate(); return k1; } -@@ -880,7 +866,6 @@ + +@@ -880,7 +878,6 @@ int l = precipitationHeightMap[k]; if(l == -999) { From 28345bf8395004a0a24fce7fd37dd6ad82460901 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 22 Oct 2011 11:53:00 +0000 Subject: [PATCH 125/169] Bugfix for numeric range of mob and window IDs. --- .../src/Packet100OpenWindow.java.patch | 14 +++++++++++++ .../minecraft/src/Packet24MobSpawn.java.patch | 20 +++++++++++++++++++ .../src/Packet100OpenWindow.java.patch | 14 +++++++++++++ .../minecraft/src/Packet24MobSpawn.java.patch | 20 +++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch new file mode 100644 index 0000000000..fc3f841a21 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -25,9 +25,9 @@ + throws IOException + { + windowId = datainputstream.readByte(); +- inventoryType = datainputstream.readByte(); ++ inventoryType = datainputstream.readByte()&0xFF; + windowTitle = readString(datainputstream, 16); +- slotsCount = datainputstream.readByte(); ++ slotsCount = datainputstream.readByte()&0xFF; + } + + public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch new file mode 100644 index 0000000000..add364620a --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +@@ -34,7 +34,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte()&0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); +@@ -72,7 +72,7 @@ + } + + public int entityId; +- public byte type; ++ public int type; + public int xPosition; + public int yPosition; + public int zPosition; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch new file mode 100644 index 0000000000..c79e7b22e2 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -33,9 +33,9 @@ + throws IOException + { + windowId = datainputstream.readByte(); +- inventoryType = datainputstream.readByte(); ++ inventoryType = datainputstream.readByte()&0xFF; + windowTitle = readString(datainputstream, 16); +- slotsCount = datainputstream.readByte(); ++ slotsCount = datainputstream.readByte()&0xFF; + } + + public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch new file mode 100644 index 0000000000..b024e03f0d --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +@@ -34,7 +34,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte()&0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); +@@ -67,7 +67,7 @@ + } + + public int entityId; +- public byte type; ++ public int type; + public int xPosition; + public int yPosition; + public int zPosition; From 6fb7b777ceaf1e3096db5e06a23cef94bc07f21b Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 25 Oct 2011 17:15:12 +0000 Subject: [PATCH 126/169] Added a few more known ingots. --- forge/forge_common/net/minecraft/src/forge/IOreHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java index a4c8651e31..7927e4a830 100644 --- a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java @@ -9,7 +9,7 @@ import net.minecraft.src.ItemStack; /** The current list of known classes. * oreTin, oreCopper, oreSilver - * ingotTin, ingotCopper, ingotSilver + * ingotTin, ingotCopper, ingotSilver, ingotBrass, ingotBronze * dyeBlue * gemRuby, gemEmerald, gemSapphire * woodRubber From 600b2b86a6eca5541f6193f7f57d4010b77e046e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 25 Oct 2011 19:28:47 +0000 Subject: [PATCH 127/169] Small TileEntity fix. --- forge/patches/minecraft/net/minecraft/src/Chunk.java.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 9ec5023aba..048c6b84db 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -336,7 +336,7 @@ int k4 = (k2 << 11 | k3 << 7 | j) >> 1; int k5 = (i1 - j) / 2; System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -830,12 +816,24 @@ +@@ -830,12 +816,25 @@ } @@ -352,7 +352,8 @@ + te.yCoord>=j && te.yCoord<=i1 && + (te.zCoord&15)>=k && (te.zCoord&15)<=j1) { + -+ if(te.getBlockType().blockID== ++ Block bl=te.getBlockType(); ++ if(bl!=null && bl.blockID== + worldObj.getBlockId(te.xCoord,te.yCoord,te.zCoord) && + te.getBlockMetadata()==worldObj.getBlockMetadata( + te.xCoord,te.yCoord,te.zCoord)) @@ -366,7 +367,7 @@ return k1; } -@@ -880,7 +878,6 @@ +@@ -880,7 +879,6 @@ int l = precipitationHeightMap[k]; if(l == -999) { From 2be3e5845adea004b225395f4fa545ea7a7c6d95 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 26 Oct 2011 04:42:37 +0000 Subject: [PATCH 128/169] Changed a field permission for MFR. --- .../net/minecraft/src/EntityPigZombie.java.patch | 11 +++++++++++ .../net/minecraft/src/EntityPigZombie.java.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch new file mode 100644 index 0000000000..bc405e9e77 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 +@@ -90,7 +90,7 @@ + return super.attackEntityFrom(damagesource, i); + } + +- private void becomeAngryAt(Entity entity) ++ public void becomeAngryAt(Entity entity) + { + entityToAttack = entity; + angerLevel = 400 + rand.nextInt(400); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch new file mode 100644 index 0000000000..3d14ddb8fa --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 +@@ -90,7 +90,7 @@ + return super.attackEntityFrom(damagesource, i); + } + +- private void becomeAngryAt(Entity entity) ++ public void becomeAngryAt(Entity entity) + { + entityToAttack = entity; + angerLevel = 400 + rand.nextInt(400); From 384da1b22215b9bf7e09b27dc0022febaff1898c Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 27 Oct 2011 02:05:43 +0000 Subject: [PATCH 129/169] Added some IC2 items. --- forge/forge_common/net/minecraft/src/forge/IOreHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java index 7927e4a830..aa0e66d57e 100644 --- a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java +++ b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java @@ -8,11 +8,14 @@ package net.minecraft.src.forge; import net.minecraft.src.ItemStack; /** The current list of known classes. - * oreTin, oreCopper, oreSilver + * oreTin, oreCopper, oreSilver, oreUranium * ingotTin, ingotCopper, ingotSilver, ingotBrass, ingotBronze + * ingotUranium, ingotRefinedIron * dyeBlue * gemRuby, gemEmerald, gemSapphire + * itemDropUranium * woodRubber + * itemRubber */ public interface IOreHandler { From 8acaaa0e530eda13f7f5d26004401ccb1c746f26 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 31 Oct 2011 19:24:45 +0000 Subject: [PATCH 130/169] Updated MCP mapping, backed out a useless patch. --- .../minecraft/src/EffectRenderer.java.patch | 64 +++++++++---------- .../net/minecraft/src/ItemBlock.java.patch | 11 ---- .../src/ItemFlintAndSteel.java.patch | 11 ---- .../net/minecraft/src/ItemHoe.java.patch | 11 ---- .../net/minecraft/src/ItemRedstone.java.patch | 11 ---- .../net/minecraft/src/ItemReed.java.patch | 11 ---- .../net/minecraft/src/ItemSeeds.java.patch | 11 ---- .../net/minecraft/src/ItemBlock.java.patch | 11 ---- .../src/ItemFlintAndSteel.java.patch | 11 ---- .../net/minecraft/src/ItemHoe.java.patch | 11 ---- .../net/minecraft/src/ItemRedstone.java.patch | 11 ---- .../net/minecraft/src/ItemReed.java.patch | 11 ---- .../net/minecraft/src/ItemSeeds.java.patch | 11 ---- 13 files changed, 32 insertions(+), 164 deletions(-) delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index d02350e5e8..39852bbad3 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -100,45 +100,45 @@ { d = (double)i + block.maxX + (double)f; } -- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, -+ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); -+ dig_effect.func_4041_a(i, j, k); -+ dig_effect.func_407_b(0.2F); -+ dig_effect.func_405_d(0.6F); -+ addDigParticleEffect(dig_effect, block); +- addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).multiplyVelocity(0.2F).func_405_d(0.6F)); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, ++ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); ++ dig_effect.func_4041_a(i, j, k); ++ dig_effect.multiplyVelocity(0.2F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, block); } public String getStatistics() { return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); } -+ ++ + public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { -+ boolean added = false; -+ String comp; -+ -+ if (block instanceof ITextureProvider) { -+ comp = ((ITextureProvider) block).getTextureFile(); -+ } else { -+ comp = "/terrain.png"; -+ } -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ if (entry.texture.equals(comp)) { -+ entry.effects.add(dig_effect); -+ added = true; -+ } -+ } -+ if (!added) { -+ BlockTextureParticles entry = new BlockTextureParticles(); -+ entry.texture = comp; -+ entry.effects.add(dig_effect); -+ effectList.add(entry); -+ } -+ addEffect(dig_effect); -+ } ++ boolean added = false; ++ String comp; ++ ++ if (block instanceof ITextureProvider) { ++ comp = ((ITextureProvider) block).getTextureFile(); ++ } else { ++ comp = "/terrain.png"; ++ } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ if (entry.texture.equals(comp)) { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if (!added) { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ addEffect(dig_effect); ++ } protected World worldObj; private List fxLayers[]; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch deleted file mode 100644 index f9cf25b4da..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -@@ -62,7 +62,7 @@ - { - return false; - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch deleted file mode 100644 index 41c66ac63a..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -@@ -46,7 +46,7 @@ - { - i++; - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch deleted file mode 100644 index a82f7de402..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -@@ -21,7 +21,7 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch deleted file mode 100644 index d22e6a1b48..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -@@ -50,7 +50,7 @@ - return false; - } - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch deleted file mode 100644 index 15778ccf7d..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -@@ -52,7 +52,7 @@ - i++; - } - } -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch deleted file mode 100644 index 9e754e8583..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -@@ -24,7 +24,7 @@ - { - return false; - } -- if(!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k)) -+ if(entityplayer!=null && (!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k))) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch deleted file mode 100644 index 794422dc09..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -@@ -62,7 +62,7 @@ - { - return false; - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch deleted file mode 100644 index 167cde2315..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -@@ -46,7 +46,7 @@ - { - i++; - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch deleted file mode 100644 index 4596ad1a1f..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -@@ -21,7 +21,7 @@ - - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) - { -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch deleted file mode 100644 index c7e7bd08e1..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -@@ -50,7 +50,7 @@ - return false; - } - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch deleted file mode 100644 index ad19a4c590..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -@@ -52,7 +52,7 @@ - i++; - } - } -- if(!entityplayer.func_35200_c(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k)) - { - return false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch deleted file mode 100644 index e5170c75a5..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -@@ -24,7 +24,7 @@ - { - return false; - } -- if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)) -+ if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))) - { - return false; - } From f1a6f453530b63c9d0cd693a712721ff5825d21e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 31 Oct 2011 20:07:31 +0000 Subject: [PATCH 131/169] New block destruction hook. Deprecated IOverrideReplace. --- .../minecraft/src/forge/IOverrideReplace.java | 1 + .../net/minecraft/src/Block.java.patch | 12 +++++++++- .../minecraft/src/PlayerController.java.patch | 20 +++++++++++++++- .../net/minecraft/src/Block.java.patch | 12 +++++++++- .../src/ItemInWorldManager.java.patch | 24 +++++++++++++++---- 5 files changed, 62 insertions(+), 7 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java index 69b2820eb2..fbfcf8a172 100644 --- a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java +++ b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java @@ -13,6 +13,7 @@ import net.minecraft.src.World; * to control how it can be replaced * * @see Block + * @deprecated. This functionality will be removed soon. */ public interface IOverrideReplace { diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index b0233712d8..4ba1a622d5 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -101,7 +101,7 @@ } protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -618,6 +629,86 @@ +@@ -618,6 +629,96 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -184,6 +184,16 @@ + public boolean canHarvestBlock(EntityPlayer player, int md) { + return ForgeHooks.canHarvestBlock(this,player,md); + } ++ ++ /* FORGE: Called when a player removes a block. This is responsible for ++ * actually destroying the block, and the block is intact at time of call. ++ * This is called regardless of whether the player can harvest the block or ++ * not. Return true if the block is actually destroyed. ++ */ ++ public boolean removeBlockByPlayer(World world, EntityPlayer player, ++ int i, int j, int k) { ++ return world.setBlockWithNotify(i, j, k, 0); ++ } + static Class _mthclass$(String s) { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 7509b615f1..508e56f216 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -8,7 +8,25 @@ import net.minecraft.client.Minecraft; -@@ -64,6 +65,7 @@ +@@ -36,12 +37,11 @@ + } + world.playAuxSFX(2001, i, j, k, block.blockID + world.getBlockMetadata(i, j, k) * 256); + int i1 = world.getBlockMetadata(i, j, k); +- boolean flag = world.setBlockWithNotify(i, j, k, 0); +- if(block != null && flag) +- { +- block.onBlockDestroyedByPlayer(world, i, j, k, i1); +- } +- return flag; ++ ++ if(block==null) return false; ++ boolean flag = block.removeBlockByPlayer(world,mc.thePlayer,i,j,k); ++ if(flag) block.onBlockDestroyedByPlayer(world, i, j, k, i1); ++ return flag; + } + + public abstract void sendBlockRemoving(int i, int j, int k, int l); +@@ -64,6 +64,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index eb70c99a17..e9bf719022 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -84,7 +84,7 @@ } protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -529,6 +538,86 @@ +@@ -529,6 +538,96 @@ return blockMaterial.getMaterialMobility(); } @@ -167,6 +167,16 @@ + public boolean canHarvestBlock(EntityPlayer player, int md) { + return ForgeHooks.canHarvestBlock(this,player,md); + } ++ ++ /* FORGE: Called when a player removes a block. This is responsible for ++ * actually destroying the block, and the block is intact at time of call. ++ * This is called regardless of whether the player can harvest the block or ++ * not. Return true if the block is actually destroyed. ++ */ ++ public boolean removeBlockByPlayer(World world, EntityPlayer player, ++ int i, int j, int k) { ++ return world.setBlockWithNotify(i, j, k, 0); ++ } + static Class _mthclass$(String s) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index fd72220c42..42658b8f9f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -38,7 +38,23 @@ if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -164,7 +166,7 @@ +@@ -135,11 +137,10 @@ + { + Block block = Block.blocksList[thisWorld.getBlockId(i, j, k)]; + int l = thisWorld.getBlockMetadata(i, j, k); +- boolean flag = thisWorld.setBlockWithNotify(i, j, k, 0); +- if(block != null && flag) +- { +- block.onBlockDestroyedByPlayer(thisWorld, i, j, k, l); +- } ++ ++ if(block==null) return false; ++ boolean flag = block.removeBlockByPlayer(thisWorld,thisPlayer,i,j,k); ++ if(flag) block.onBlockDestroyedByPlayer(thisWorld, i, j, k, l); + return flag; + } + +@@ -164,7 +165,7 @@ thisPlayer.destroyCurrentEquippedItem(); } } @@ -47,7 +63,7 @@ { Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); } -@@ -188,6 +190,7 @@ +@@ -188,6 +189,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -55,7 +71,7 @@ } return true; } else -@@ -198,6 +201,11 @@ +@@ -198,6 +200,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -67,7 +83,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -217,7 +225,11 @@ +@@ -217,7 +224,11 @@ return flag; } else { From d2cf70f8d52ee995efb32bdf4f9e4fbe0dbe906f Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 15 Nov 2011 18:46:42 +0000 Subject: [PATCH 132/169] fixed mapping --- .../minecraft/src/EffectRenderer.java.patch | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index 39852bbad3..c2be5a5e80 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -38,15 +38,7 @@ } public void renderParticles(Entity entity, float f) -@@ -94,6 +109,7 @@ - for(int k = 0; k < fxLayers[i].size(); k++) - { - EntityFX entityfx = (EntityFX)fxLayers[i].get(k); -+ if(entityfx instanceof EntityDiggingFX) continue; - tessellator.setBrightness(entityfx.func_35115_a(f)); - entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); - } -@@ -101,6 +117,21 @@ +@@ -101,6 +116,21 @@ tessellator.draw(); } @@ -59,7 +51,7 @@ + tessellator.startDrawingQuads(); + for (int y = 0; y < entry.effects.size(); y++) { + EntityFX entityfx = (EntityFX) entry.effects.get(y); -+ tessellator.setBrightness(entityfx.func_35115_a(f)); ++ tessellator.setBrightness(entityfx.getEntityBrightnessForRender(f)); + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } + tessellator.draw(); @@ -68,7 +60,7 @@ } public void func_1187_b(Entity entity, float f) -@@ -132,7 +163,12 @@ +@@ -132,7 +162,12 @@ { fxLayers[i].clear(); } @@ -82,7 +74,7 @@ } public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) -@@ -153,7 +189,12 @@ +@@ -153,7 +188,12 @@ double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; int j2 = rand.nextInt(6); @@ -96,7 +88,7 @@ } } -@@ -198,16 +239,48 @@ +@@ -198,16 +238,48 @@ { d = (double)i + block.maxX + (double)f; } From 96c05bbd25f96a16cb3d2a4ee9ff98af3a656d66 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Wed, 30 Nov 2011 19:00:43 +0000 Subject: [PATCH 133/169] merged with pre-1.9p5 branch, for 1.0.0 release --- .../net/minecraft/src/forge/ForgeHooks.java | 2 +- forge/install/install.cmd | 8 +- forge/install/install.sh | 4 +- forge/package.sh | 2 +- .../net/minecraft/src/Block.java.patch | 68 ++-- .../net/minecraft/src/BlockChest.java.patch | 2 +- .../net/minecraft/src/BlockCrops.java.patch | 32 +- .../net/minecraft/src/BlockDoor.java.patch | 2 +- .../src/BlockPressurePlate.java.patch | 4 +- .../net/minecraft/src/BlockRail.java.patch | 6 +- .../src/BlockRedstoneRepeater.java.patch | 4 +- .../src/BlockRedstoneWire.java.patch | 21 +- .../minecraft/src/BlockTallGrass.java.patch | 6 +- .../net/minecraft/src/BlockTorch.java.patch | 65 ++-- .../minecraft/src/BlockTrapDoor.java.patch | 47 ++- .../net/minecraft/src/Chunk.java.patch | 294 ++++-------------- .../minecraft/src/EffectRenderer.java.patch | 95 +++--- .../net/minecraft/src/EntityLiving.java.patch | 2 +- .../minecraft/src/EntityPigZombie.java.patch | 2 +- .../net/minecraft/src/EntityPlayer.java.patch | 12 +- .../minecraft/src/EntityRenderer.java.patch | 34 +- .../net/minecraft/src/Explosion.java.patch | 23 +- .../minecraft/src/FurnaceRecipes.java.patch | 19 +- .../net/minecraft/src/Item.java.patch | 32 +- .../net/minecraft/src/ItemBucket.java.patch | 6 +- .../net/minecraft/src/ItemDye.java.patch | 6 +- .../net/minecraft/src/ItemRenderer.java.patch | 8 +- .../net/minecraft/src/ItemTool.java.patch | 23 +- .../src/MovingObjectPosition.java.patch | 12 +- .../src/Packet100OpenWindow.java.patch | 2 +- .../src/Packet230ModLoader.java.patch | 2 +- .../minecraft/src/Packet24MobSpawn.java.patch | 22 +- .../minecraft/src/PlayerController.java.patch | 16 +- .../src/PlayerControllerMP.java.patch | 8 +- .../src/PlayerControllerSP.java.patch | 12 +- .../net/minecraft/src/RenderBlocks.java.patch | 48 +-- .../net/minecraft/src/RenderEngine.java.patch | 24 +- .../net/minecraft/src/RenderGlobal.java.patch | 6 +- .../net/minecraft/src/RenderItem.java.patch | 14 +- .../net/minecraft/src/RenderPlayer.java.patch | 2 +- .../net/minecraft/src/SlotCrafting.java.patch | 8 +- .../net/minecraft/src/Tessellator.java.patch | 179 ++++++----- .../net/minecraft/src/TileEntity.java.patch | 2 +- .../src/TileEntityFurnace.java.patch | 19 +- .../src/TileEntityRendererPiston.java.patch | 8 +- .../net/minecraft/src/World.java.patch | 101 +++--- .../minecraft/src/WorldRenderer.java.patch | 48 +-- .../net/minecraft/src/Block.java.patch | 79 ++--- .../net/minecraft/src/BlockChest.java.patch | 2 +- .../net/minecraft/src/BlockCrops.java.patch | 34 +- .../net/minecraft/src/BlockDoor.java.patch | 6 +- .../net/minecraft/src/BlockLadder.java.patch | 4 +- .../net/minecraft/src/BlockLever.java.patch | 6 +- .../src/BlockPressurePlate.java.patch | 4 +- .../net/minecraft/src/BlockRail.java.patch | 6 +- .../src/BlockRedstoneRepeater.java.patch | 4 +- .../src/BlockRedstoneWire.java.patch | 16 +- .../minecraft/src/BlockTallGrass.java.patch | 4 +- .../net/minecraft/src/BlockTorch.java.patch | 65 ++-- .../minecraft/src/BlockTrapDoor.java.patch | 38 ++- .../net/minecraft/src/Chunk.java.patch | 197 ++---------- .../net/minecraft/src/EntityLiving.java.patch | 2 +- .../minecraft/src/EntityPigZombie.java.patch | 2 +- .../net/minecraft/src/EntityPlayer.java.patch | 32 +- .../net/minecraft/src/Explosion.java.patch | 28 +- .../minecraft/src/FurnaceRecipes.java.patch | 19 +- .../net/minecraft/src/Item.java.patch | 32 +- .../net/minecraft/src/ItemBucket.java.patch | 6 +- .../net/minecraft/src/ItemDye.java.patch | 6 +- .../src/ItemInWorldManager.java.patch | 32 +- .../net/minecraft/src/ItemTool.java.patch | 23 +- .../src/MovingObjectPosition.java.patch | 12 +- .../src/Packet100OpenWindow.java.patch | 2 +- .../src/Packet230ModLoader.java.patch | 2 +- .../minecraft/src/Packet24MobSpawn.java.patch | 22 +- .../minecraft/src/PlayerInstance.java.patch | 2 +- .../net/minecraft/src/SlotCrafting.java.patch | 6 +- .../net/minecraft/src/TileEntity.java.patch | 2 +- .../src/TileEntityFurnace.java.patch | 10 +- .../net/minecraft/src/World.java.patch | 65 ++-- .../net/minecraft/src/WorldServer.java.patch | 2 +- forge/setup.bat | 10 +- forge/setup.sh | 1 - 83 files changed, 953 insertions(+), 1192 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index c014d4c69e..6173786128 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -231,7 +231,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=1; - public static final int revisionVersion=2; + public static final int revisionVersion=3; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/install/install.cmd b/forge/install/install.cmd index b2485d3fd1..e40fe371b8 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -11,8 +11,12 @@ cmd /C decompile.bat pushd src >nul ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch - ..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch + rem ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch + rem ..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch + del minecraft\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java + del minecraft_server\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do ( pushd "%%a" 2>nul diff --git a/forge/install/install.sh b/forge/install/install.sh index 3851d2059a..e51237c09f 100644 --- a/forge/install/install.sh +++ b/forge/install/install.sh @@ -11,7 +11,9 @@ pushd .. > /dev/null pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch - patch -p1 -i ../forge/mlprop.patch + #patch -p1 -i ../forge/mlprop.patch + cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java + cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java for i in `find ../forge/patches/ -type f` do patch -p2 -i $i diff --git a/forge/package.sh b/forge/package.sh index 6940afc164..8d337cf53e 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -64,7 +64,7 @@ cp ../lfcr.py . cp ../install/install.cmd . cp ../install/install.sh . cp ../modLoaderMP.patch . -cp ../mlprop.patch . +cp ../MLProp.java . cp ../install/README.txt . cp ../minecraftforge_credits.txt . cp -r ../doc . diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 4ba1a622d5..7e1af3014a 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -8,35 +8,37 @@ import java.util.ArrayList; import java.util.Random; -@@ -151,12 +152,14 @@ +@@ -312,12 +313,14 @@ public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k) { - return iblockaccess.getBrightness(i, j, k, lightValue[blockID]); + return iblockaccess.getBrightness(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); ++ getLightValue(iblockaccess,i,j,k)); } public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k) { - return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]); + return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, -+ getLightValue(iblockaccess,i,j,k)); ++ getLightValue(iblockaccess,i,j,k)); } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -278,24 +281,40 @@ +@@ -438,25 +441,41 @@ + { return 1; } - +- ++ + /* FORGE: Metadata-sensitive version. + */ + public int quantityDropped(int i, Random random) + { + return quantityDropped(random); + } -+ - public int idDropped(int i, Random random) ++ + public int idDropped(int i, Random random, int j) { return blockID; } @@ -57,51 +59,49 @@ - { - return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; - } -+ return blockStrength(entityplayer,0); ++ return blockStrength(entityplayer,0); + } + + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); ++ int i, int j, int k, int md) { ++ ArrayList tr=new ArrayList(); + -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); -+ } -+ } -+ return tr; ++ int q=quantityDropped(md,world.rand); ++ for(int n=0; n 0) { ++ tr.add(new ItemStack(id,1,damageDropped(md))); ++ } ++ } ++ return tr; } - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -309,20 +328,12 @@ + public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) +@@ -470,18 +489,13 @@ { return; } -- int i1 = quantityDropped(world.rand); -- for(int j1 = 0; j1 < i1; j1++) +- int j1 = func_40198_a(i1, world.rand); +- for(int k1 = 0; k1 < j1; k1++) - { -+ ArrayList ar=getBlockDropped(world,i,j,k,l); -+ for(ItemStack ist : ar) { ++ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ for (ItemStack ist : ar) { if(world.rand.nextFloat() > f) -- { + { continue; -- } -- int k1 = idDropped(l, world.rand); -- if(k1 > 0) + } +- int l1 = idDropped(l, world.rand, i1); +- if(l1 > 0) - { -- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- dropBlockAsItem_do(world, i, j, k, new ItemStack(l1, 1, damageDropped(l))); - } -+ dropBlockAsItem_do(world, i, j, k, ist); ++ dropBlockAsItem_do(world, i, j, k, ist); } -- - } - protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -618,6 +629,96 @@ + } +@@ -805,6 +819,96 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch index 8c69a81af3..bb69b0bc07 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -@@ -423,23 +423,23 @@ +@@ -429,23 +429,23 @@ { return true; } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 2706d14e6d..b1110702ca 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -8,18 +8,27 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, Block, World, EntityItem, -@@ -108,27 +109,16 @@ +@@ -108,28 +109,16 @@ return 6; } -- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1) - { -- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0); - if(world.multiplayerWorld) - { - return; -- } -- for(int i1 = 0; i1 < 3; i1++) ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr = new ArrayList(); ++ if (md == 7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n = 0; n < 3; n++) { ++ if (world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); + } +- int j1 = 3 + i1; +- for(int k1 = 0; k1 < j1; k1++) - { - if(world.rand.nextInt(15) <= l) - { @@ -33,16 +42,7 @@ - } - } - -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(md==7) tr.add(new ItemStack(Item.wheat)); -+ -+ for(int n=0; n<3; n++) { -+ if(world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); -+ } -+ return tr; ++ return tr; } - public int idDropped(int i, Random random) + public int idDropped(int i, Random random, int j) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index 11a54fb635..25ae0f794b 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -18,7 +18,7 @@ { world.setBlockWithNotify(i, j, k, 0); flag = true; -@@ -242,7 +242,7 @@ +@@ -241,7 +241,7 @@ return false; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch index 16abd9ba82..ee190d8bc7 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -@@ -46,7 +46,8 @@ +@@ -48,7 +48,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -10,7 +10,7 @@ } public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +57,8 @@ +@@ -58,7 +59,8 @@ public void onNeighborBlockChange(World world, int i, int j, int k, int l) { boolean flag = false; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 2e26b4bb34..bb8acdb06a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -@@ -16,12 +16,12 @@ +@@ -18,12 +18,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { int l = world.getBlockId(i, j, k); @@ -15,7 +15,7 @@ } protected BlockRail(int i, int j, boolean flag) -@@ -97,7 +97,7 @@ +@@ -99,7 +99,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -24,7 +24,7 @@ } public void onBlockAdded(World world, int i, int j, int k) -@@ -121,23 +121,23 @@ +@@ -123,23 +123,23 @@ j1 &= 7; } boolean flag = false; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch index 488e9ef02c..5325b2bd52 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -@@ -27,7 +27,7 @@ +@@ -35,7 +35,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -9,7 +9,7 @@ { return false; } else -@@ -38,7 +38,7 @@ +@@ -46,7 +46,7 @@ public boolean canBlockStay(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch index f0c5c3468a..b71f3ce05f 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,14 +1,15 @@ --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode - - package net.minecraft.src; -+import net.minecraft.src.forge.*; +@@ -6,6 +6,8 @@ import java.util.*; -@@ -53,7 +54,7 @@ ++import net.minecraft.src.forge.*; ++ + // Referenced classes of package net.minecraft.src: + // Block, Material, World, ChunkPosition, + // Item, IBlockAccess, Direction, AxisAlignedBB +@@ -56,7 +58,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -17,14 +18,14 @@ } private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -451,6 +452,10 @@ +@@ -454,6 +456,10 @@ { return false; } + if (Block.blocksList[i1] instanceof IConnectRedstone) { -+ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1]; -+ return icr.canConnectRedstone(iblockaccess, i, j, k, l); ++ IConnectRedstone icr = (IConnectRedstone)Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess, i, j, k, l); + } - if(Block.blocksList[i1].canProvidePower()) + if(Block.blocksList[i1].canProvidePower() && l != -1) { return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index d4750f5201..4a8a12f6a0 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -11,9 +11,9 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, -@@ -79,13 +82,17 @@ +@@ -73,13 +76,17 @@ - public int idDropped(int i, Random random) + public int idDropped(int i, Random random, int j) { - if(random.nextInt(8) == 0) - { @@ -35,4 +35,4 @@ + return tr; } - public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) + public int func_40198_a(int i, Random random) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index c3f031031c..b481a8bf52 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -1,104 +1,107 @@ --- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -@@ -41,24 +41,24 @@ +@@ -41,7 +41,7 @@ private boolean func_31032_h(World world, int i, int j, int k) { -- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; - } +- if(world.func_41082_b(i, j, k, true)) ++ if(world.isBlockSolidOnSide(i, j, k, 1)) + { + return true; + } else +@@ -53,19 +53,19 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { -- if(world.isBlockNormalCube(i - 1, j, k)) +- if(world.func_41082_b(i - 1, j, k, true)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { return true; } -- if(world.isBlockNormalCube(i + 1, j, k)) +- if(world.func_41082_b(i + 1, j, k, true)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { return true; } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(world.func_41082_b(i, j, k - 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k-1,3)) { return true; } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(world.func_41082_b(i, j, k + 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k+1,2)) { return true; } -@@ -72,19 +72,19 @@ +@@ -79,19 +79,19 @@ { i1 = 5; } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(l == 2 && world.func_41082_b(i, j, k + 1, true)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k+1,2)) { i1 = 4; } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(l == 3 && world.func_41082_b(i, j, k - 1, true)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k-1,3)) { i1 = 3; } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) +- if(l == 4 && world.func_41082_b(i + 1, j, k, true)) + if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) { i1 = 2; } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) +- if(l == 5 && world.func_41082_b(i - 1, j, k, true)) + if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) { i1 = 1; } -@@ -102,19 +102,19 @@ +@@ -109,19 +109,19 @@ public void onBlockAdded(World world, int i, int j, int k) { -- if(world.isBlockNormalCube(i - 1, j, k)) +- if(world.func_41082_b(i - 1, j, k, true)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { world.setBlockMetadataWithNotify(i, j, k, 1); } else -- if(world.isBlockNormalCube(i + 1, j, k)) +- if(world.func_41082_b(i + 1, j, k, true)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { world.setBlockMetadataWithNotify(i, j, k, 2); } else -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(world.func_41082_b(i, j, k - 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k-1,3)) { world.setBlockMetadataWithNotify(i, j, k, 3); } else -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(world.func_41082_b(i, j, k + 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k+1,2)) { world.setBlockMetadataWithNotify(i, j, k, 4); } else -@@ -131,19 +131,19 @@ +@@ -138,19 +138,19 @@ { int i1 = world.getBlockMetadata(i, j, k); boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) +- if(!world.func_41082_b(i - 1, j, k, true) && i1 == 1) + if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) { flag = true; } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) +- if(!world.func_41082_b(i + 1, j, k, true) && i1 == 2) + if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) { flag = true; } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) +- if(!world.func_41082_b(i, j, k - 1, true) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k-1,3) && i1 == 3) { flag = true; } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) +- if(!world.func_41082_b(i, j, k + 1, true) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k+1,2) && i1 == 4) { flag = true; } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch index e3106e78e0..2ab56b3c6e 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,36 +1,51 @@ --- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -@@ -147,7 +147,7 @@ +@@ -11,7 +11,10 @@ + + public class BlockTrapDoor extends Block + { +- ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ public static boolean disableValidation=false; ++ + protected BlockTrapDoor(int i, Material material) + { + super(i, material); +@@ -147,7 +150,7 @@ { j1--; } -- if(!world.isBlockNormalCube(j1, j, k1)) -+ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) +- if(!func_41052_f(world.getBlockId(j1, j, k1))) ++ if(!(func_41052_f(world.getBlockId(j1, j, k1)) || world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2))) { world.setBlockWithNotify(i, j, k, 0); - dropBlockAsItem(world, i, j, k, i1); -@@ -189,6 +189,7 @@ + dropBlockAsItem(world, i, j, k, i1, 0); +@@ -192,6 +195,7 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) { -+ if(disableValidation) return true; ++ if(disableValidation) return true; if(l == 0) { return false; -@@ -213,11 +214,15 @@ +@@ -216,7 +220,7 @@ { i--; } -- return world.isBlockNormalCube(i, j, k); -+ return world.isBlockSolidOnSide(i, j, k, l); +- return func_41052_f(world.getBlockId(i, j, k)); ++ return func_41052_f(world.getBlockId(i, j, k)) || world.isBlockSolidOnSide(i, j, k, l); } public static boolean isTrapdoorOpen(int i) +@@ -226,6 +230,10 @@ + + private static boolean func_41052_f(int i) { - return (i & 4) != 0; - } -+ -+ /* FORGE: Set this to allow trapdoors to remain free-floating -+ */ -+ public static boolean disableValidation=false; - } ++ if (disableValidation) ++ { ++ return true; ++ } + if(i <= 0) + { + return false; diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 048c6b84db..799878f108 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -1,151 +1,22 @@ --- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.*; import java.io.PrintStream; import java.util.*; -@@ -26,7 +27,6 @@ - hasEntities = false; - lastSaveTime = 0L; - field_35846_u = false; -- world.getClass(); - entities = new List[128 / 16]; - worldObj = world; - xPosition = i; -@@ -44,11 +44,8 @@ - { - this(world, i, j); - blocks = abyte0; -- world.getClass(); - data = new NibbleArray(abyte0.length, 7); -- world.getClass(); - skylightMap = new NibbleArray(abyte0.length, 7); -- world.getClass(); - blocklightMap = new NibbleArray(abyte0.length, 7); - } - -@@ -68,16 +65,12 @@ - - public void generateHeightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int k = 0; k < 16; k++) - { -- worldObj.getClass(); - int l = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - for(int i1 = j << 11 | k << 7; l > 0 && Block.lightOpacity[blocks[(i1 + l) - 1] & 0xff] == 0; l--) { } - heightMap[k << 4 | j] = (byte)l; - if(l < i) -@@ -94,16 +87,12 @@ - - public void generateSkylightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int l = 0; l < 16; l++) - { -- worldObj.getClass(); - int j1 = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - int k1; - for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } - heightMap[l << 4 | j] = (byte)j1; -@@ -116,7 +105,6 @@ - continue; - } - int l1 = 15; -- worldObj.getClass(); - int i2 = 128 - 1; - do - { -@@ -154,7 +142,6 @@ - - private void func_35839_k() - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) - { - for(int i = 0; i < 16; i++) -@@ -216,7 +203,6 @@ - { - if(l > k) - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) - { - for(int i1 = k; i1 < l; i1++) -@@ -237,8 +223,6 @@ - { - i1 = j; - } -- worldObj.getClass(); -- worldObj.getClass(); - for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } - if(i1 == l) - { -@@ -251,7 +235,6 @@ - lowestBlockHeight = i1; - } else - { -- worldObj.getClass(); - int k1 = 128 - 1; - for(int i2 = 0; i2 < 16; i2++) - { -@@ -320,8 +303,6 @@ - - public int getBlockID(int i, int j, int k) - { -- worldObj.getClass(); -- worldObj.getClass(); - return blocks[i << 11 | k << 7 | j] & 0xff; - } - -@@ -334,8 +315,6 @@ - precipitationHeightMap[j1] = -999; - } - int k1 = heightMap[k << 4 | i] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int l1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(l1 == l && data.getNibble(i, j, k) == i1) - { -@@ -343,12 +322,18 @@ +@@ -348,6 +349,7 @@ } int i2 = xPosition * 16 + i; int j2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ -+ if (Block.blocksList[l1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; -+ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(l1 != 0 && !worldObj.multiplayerWorld) -- { -- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ if(l1 != 0) { -+ if(!worldObj.multiplayerWorld) -+ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, i1); - if(!worldObj.worldProvider.hasNoSky) -@@ -380,7 +365,7 @@ ++ + blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); + if(l1 != 0) + { +@@ -390,7 +392,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -154,7 +25,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -388,14 +373,6 @@ +@@ -398,14 +400,6 @@ tileentity.func_35144_b(); } } @@ -169,40 +40,22 @@ } isModified = true; return true; -@@ -410,8 +387,6 @@ - precipitationHeightMap[i1] = -999; - } - int j1 = heightMap[i1] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int k1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(k1 == l) - { -@@ -419,12 +394,18 @@ +@@ -427,10 +421,13 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); + -+ if (Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; -+ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(k1 != 0) -- { + blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); + if(k1 != 0) + { - Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if(k1 != 0) { -+ if(!worldObj.multiplayerWorld) -+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ removeChunkBlockTileEntity(i,j,k); ++ if (!worldObj.multiplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ removeChunkBlockTileEntity(i, j, k); } data.setNibble(i, j, k, 0); if(Block.lightOpacity[byte0 & 0xff] != 0) -@@ -452,7 +433,7 @@ +@@ -458,7 +455,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -211,7 +64,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -460,14 +441,6 @@ +@@ -466,14 +463,6 @@ tileentity.func_35144_b(); } } @@ -226,7 +79,7 @@ } isModified = true; return true; -@@ -594,6 +567,11 @@ +@@ -609,6 +598,11 @@ { ChunkPosition chunkposition = new ChunkPosition(i, j, k); TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); @@ -238,7 +91,7 @@ if(tileentity == null) { int l = getBlockID(i, j, k); -@@ -603,18 +581,23 @@ +@@ -618,18 +612,23 @@ } if(tileentity == null) { @@ -253,7 +106,7 @@ - chunkTileEntityMap.remove(chunkposition); - return null; - } else -+ return tileentity; ++ return tileentity; + } + + /* FORGE: Used to remove only invalid TileEntities */ @@ -264,12 +117,12 @@ { - return tileentity; + TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(tileentity!=null && tileentity.isInvalid()) -+ chunkTileEntityMap.remove(chunkposition); ++ if(tileentity != null && tileentity.isInvalid()) ++ chunkTileEntityMap.remove(chunkposition); } } -@@ -626,7 +609,7 @@ +@@ -641,7 +640,7 @@ setChunkBlockTileEntity(i, j, k, tileentity); if(isChunkLoaded) { @@ -278,65 +131,32 @@ } } -@@ -643,6 +626,8 @@ +@@ -657,6 +656,8 @@ return; } else { -+ TileEntity old=(TileEntity)chunkTileEntityMap.get(chunkposition); -+ if(old!=null) old.invalidate(); ++ TileEntity old = (TileEntity)chunkTileEntityMap.get(chunkposition); ++ if (old != null) old.invalidate(); tileentity.validate(); chunkTileEntityMap.put(chunkposition, tileentity); return; -@@ -773,12 +758,19 @@ +@@ -810,6 +811,15 @@ public int setChunkData(byte abyte0[], int i, int j, int k, int l, int i1, int j1, int k1) { -+ TileEntity te; -+ Iterator iterator = chunkTileEntityMap.values().iterator(); -+ while(iterator.hasNext()) { -+ te = (TileEntity)iterator.next(); -+ te.func_35144_b(); -+ te.getBlockMetadata(); -+ te.getBlockType(); -+ } -+ ++ TileEntity te; ++ Iterator iterator = chunkTileEntityMap.values().iterator(); ++ while (iterator.hasNext()){ ++ te = (TileEntity)iterator.next(); ++ te.func_35144_b(); ++ te.getBlockMetadata(); ++ te.getBlockType(); ++ } ++ for(int l1 = i; l1 < l; l1++) { for(int l2 = k; l2 < j1; l2++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int l3 = l1 << 11 | l2 << 7 | j; - int l4 = i1 - j; - System.arraycopy(abyte0, k1, blocks, l3, l4); -@@ -792,8 +784,6 @@ - { - for(int i3 = k; i3 < j1; i3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int i4 = (i2 << 11 | i3 << 7 | j) >> 1; - int i5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, data.data, i4, i5); -@@ -806,8 +796,6 @@ - { - for(int j3 = k; j3 < j1; j3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int j4 = (j2 << 11 | j3 << 7 | j) >> 1; - int j5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, blocklightMap.data, j4, j5); -@@ -820,8 +808,6 @@ - { - for(int k3 = k; k3 < j1; k3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int k4 = (k2 << 11 | k3 << 7 | j) >> 1; - int k5 = (i1 - j) / 2; - System.arraycopy(abyte0, k1, skylightMap.data, k4, k5); -@@ -830,12 +816,25 @@ +@@ -859,12 +869,25 @@ } @@ -344,34 +164,26 @@ - for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) - { - tileentity = (TileEntity)iterator.next(); -+ List invalidList=new ArrayList(); -+ iterator = chunkTileEntityMap.values().iterator(); ++ List invalidList=new ArrayList(); ++ iterator = chunkTileEntityMap.values().iterator(); + while(iterator.hasNext()) { + te = (TileEntity)iterator.next(); -+ if( (te.xCoord&15)>=i && (te.xCoord&15)<=l && -+ te.yCoord>=j && te.yCoord<=i1 && -+ (te.zCoord&15)>=k && (te.zCoord&15)<=j1) { -+ -+ Block bl=te.getBlockType(); -+ if(bl!=null && bl.blockID== -+ worldObj.getBlockId(te.xCoord,te.yCoord,te.zCoord) && -+ te.getBlockMetadata()==worldObj.getBlockMetadata( -+ te.xCoord,te.yCoord,te.zCoord)) -+ continue; -+ invalidList.add(te); -+ } ++ if ((te.xCoord & 15) >= i && (te.xCoord & 15) <= l && ++ (te.yCoord >= j) && (te.yCoord <= i1) && ++ (te.zCoord & 15) >= k && (te.zCoord & 15) <=j1) { ++ ++ Block bl = te.getBlockType(); ++ if (bl != null && ++ bl.blockID == worldObj.getBlockId(te.xCoord, te.yCoord, te.zCoord) && ++ te.getBlockMetadata() == worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord)) ++ continue; ++ ++ invalidList.add(te); ++ } } - -+ for(TileEntity te2 : invalidList) -+ te2.invalidate(); ++ for(TileEntity te2 : invalidList) ++ te2.invalidate(); return k1; } -@@ -880,7 +879,6 @@ - int l = precipitationHeightMap[k]; - if(l == -999) - { -- worldObj.getClass(); - int i1 = 128 - 1; - for(l = -1; i1 > 0 && l == -1;) - { diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index c2be5a5e80..725eae27f4 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -8,9 +8,15 @@ +import net.minecraft.src.forge.ITextureProvider; + // Referenced classes of package net.minecraft.src: - // EntityFX, Entity, MathHelper, RenderEngine, - // Tessellator, Block, EntityDiggingFX, World -@@ -16,6 +19,7 @@ + // EntityFX, ActiveRenderInfo, Entity, RenderEngine, + // Tessellator, MathHelper, Block, EntityDiggingFX, +@@ -17,11 +20,13 @@ + + protected World worldObj; + private List fxLayers[]; ++ private List effectList; + private RenderEngine renderer; + private Random rand; public EffectRenderer(World world, RenderEngine renderengine) { @@ -18,7 +24,7 @@ fxLayers = new List[4]; rand = new Random(); if(world != null) -@@ -55,7 +59,18 @@ +@@ -61,7 +66,18 @@ } } @@ -38,7 +44,15 @@ } public void renderParticles(Entity entity, float f) -@@ -101,6 +116,21 @@ +@@ -100,6 +116,7 @@ + for(int k = 0; k < fxLayers[i].size(); k++) + { + EntityFX entityfx = (EntityFX)fxLayers[i].get(k); ++ if (entityfx instanceof EntityDiggingFX) continue; + tessellator.setBrightness(entityfx.getEntityBrightnessForRender(f)); + entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4); + } +@@ -107,6 +124,21 @@ tessellator.draw(); } @@ -60,7 +74,7 @@ } public void func_1187_b(Entity entity, float f) -@@ -132,7 +162,12 @@ +@@ -138,7 +170,12 @@ { fxLayers[i].clear(); } @@ -74,7 +88,7 @@ } public void addBlockDestroyEffects(int i, int j, int k, int l, int i1) -@@ -153,7 +188,12 @@ +@@ -159,7 +196,12 @@ double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1; double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1; int j2 = rand.nextInt(6); @@ -88,53 +102,44 @@ } } -@@ -198,16 +238,48 @@ +@@ -204,11 +246,39 @@ { d = (double)i + block.maxX + (double)f; } - addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).multiplyVelocity(0.2F).func_405_d(0.6F)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, -+ 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); -+ dig_effect.func_4041_a(i, j, k); -+ dig_effect.multiplyVelocity(0.2F); -+ dig_effect.func_405_d(0.6F); -+ addDigParticleEffect(dig_effect, block); ++ EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k)); ++ dig_effect.func_4041_a(i, j, k); ++ dig_effect.multiplyVelocity(0.4F); ++ dig_effect.func_405_d(0.6F); ++ addDigParticleEffect(dig_effect, block); } public String getStatistics() { return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString(); } -+ ++ + public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { -+ boolean added = false; -+ String comp; -+ -+ if (block instanceof ITextureProvider) { -+ comp = ((ITextureProvider) block).getTextureFile(); -+ } else { -+ comp = "/terrain.png"; -+ } -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ if (entry.texture.equals(comp)) { -+ entry.effects.add(dig_effect); -+ added = true; -+ } -+ } -+ if (!added) { -+ BlockTextureParticles entry = new BlockTextureParticles(); -+ entry.texture = comp; -+ entry.effects.add(dig_effect); -+ effectList.add(entry); -+ } -+ addEffect(dig_effect); -+ } - - protected World worldObj; - private List fxLayers[]; -+ private List effectList; - private RenderEngine renderer; - private Random rand; ++ boolean added = false; ++ String comp = "/terrain.png"; ++ ++ if (block instanceof ITextureProvider) { ++ comp = ((ITextureProvider) block).getTextureFile(); ++ } ++ for (int x = 0; x < effectList.size(); x++) { ++ BlockTextureParticles entry = (BlockTextureParticles) effectList ++ .get(x); ++ if (entry.texture.equals(comp)) { ++ entry.effects.add(dig_effect); ++ added = true; ++ } ++ } ++ if (!added) { ++ BlockTextureParticles entry = new BlockTextureParticles(); ++ entry.texture = comp; ++ entry.effects.add(dig_effect); ++ effectList.add(entry); ++ } ++ addEffect(dig_effect); ++ } } diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 6e09fb3851..c452466fbc 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -@@ -624,7 +624,9 @@ +@@ -794,7 +794,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); int k = MathHelper.floor_double(posZ); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch index bc405e9e77..a6c3fc34c7 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 -@@ -90,7 +90,7 @@ +@@ -94,7 +94,7 @@ return super.attackEntityFrom(damagesource, i); } diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 69367be2b9..9235f34df2 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -11,7 +11,7 @@ import java.util.*; // Referenced classes of package net.minecraft.src: -@@ -485,6 +489,8 @@ +@@ -548,6 +552,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -20,8 +20,8 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -507,6 +513,32 @@ - return f; +@@ -576,6 +582,32 @@ + return f1; } + /* FORGE: Extended to allow metadata. @@ -53,7 +53,7 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -667,6 +699,25 @@ +@@ -774,6 +806,25 @@ protected void damageEntity(DamageSource damagesource, int i) { @@ -79,7 +79,7 @@ if(!damagesource.unblockable() && func_35162_ad()) { i = 1 + i >> 1; -@@ -720,7 +771,9 @@ +@@ -825,7 +876,9 @@ public void destroyCurrentEquippedItem() { @@ -89,7 +89,7 @@ } public double getYOffset() -@@ -815,6 +868,10 @@ +@@ -957,6 +1010,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index 852e814076..c72429ad2b 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -8,29 +8,29 @@ import java.awt.image.BufferedImage; import java.nio.FloatBuffer; import java.util.Random; -@@ -803,8 +804,12 @@ - { +@@ -916,8 +917,10 @@ EntityPlayer entityplayer = (EntityPlayer)entityliving; GL11.glDisable(3008 /*GL_ALPHA_TEST*/); -+ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer, -+ mc.objectMouseOver,0, -+ entityplayer.inventory.getCurrentItem(),f)) { - renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); - renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); -+ } + Profiler.endStartSection("outline"); +- renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); +- renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ if (!ForgeHooksClient.onBlockHighlight(renderglobal, entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f)) { ++ renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f); ++ } GL11.glEnable(3008 /*GL_ALPHA_TEST*/); } } -@@ -853,8 +858,12 @@ - { +@@ -969,8 +972,10 @@ EntityPlayer entityplayer1 = (EntityPlayer)entityliving; GL11.glDisable(3008 /*GL_ALPHA_TEST*/); -+ if(!ForgeHooksClient.onBlockHighlight(renderglobal,entityplayer1, -+ mc.objectMouseOver,0, -+ entityplayer1.inventory.getCurrentItem(),f)) { - renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); - renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); -+ } + Profiler.endStartSection("outline"); +- renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); +- renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); ++ if (!ForgeHooksClient.onBlockHighlight(renderglobal, entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f)) { ++ renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); ++ renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f); ++ } GL11.glEnable(3008 /*GL_ALPHA_TEST*/); } - renderRainSnow(f); + Profiler.endStartSection("weather"); diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch index bb54fe9488..7c84bd964e 100644 --- a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -8,22 +8,19 @@ // Referenced classes of package net.minecraft.src: // World, MathHelper, Block, ChunkPosition, -@@ -66,7 +67,17 @@ - int i5 = worldObj.getBlockId(j4, k4, l4); - if(i5 > 0) +@@ -76,7 +77,14 @@ + int k3 = worldObj.getBlockId(l2, i3, j3); + if(k3 > 0) { -- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ if (Block.blocksList[i5] instanceof ISpecialResistance) { -+ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5]; -+ f1 -= (isr.getSpecialExplosionResistance( -+ worldObj, j4, k4, l4, explosionX, -+ explosionY, explosionZ, exploder) + 0.3F) -+ * f2; +- f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2; ++ if (Block.blocksList[k3] instanceof ISpecialResistance){ ++ ISpecialResistance isr = (ISpecialResistance)Block.blocksList[k3]; ++ f1 -= (isr.getSpecialExplosionResistance(worldObj, l2, i3, j3, ++ explosionX, explosionY, explosionZ, exploder) + 0.3F) * f2; + } else { -+ f1 -= (Block.blocksList[i5] -+ .getExplosionResistance(exploder) + 0.3F) -+ * f2; ++ f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2; + } ++ } if(f1 > 0.0F) { diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch index b8a98fc45e..fd30ce5e84 100644 --- a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -8,7 +8,15 @@ // Referenced classes of package net.minecraft.src: // Block, ItemStack, Item -@@ -21,6 +22,7 @@ +@@ -15,6 +16,7 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + public static final FurnaceRecipes smelting() + { +@@ -24,6 +26,7 @@ private FurnaceRecipes() { smeltingList = new HashMap(); @@ -16,7 +24,7 @@ addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); -@@ -40,11 +42,32 @@ +@@ -46,11 +49,32 @@ smeltingList.put(Integer.valueOf(i), itemstack); } @@ -49,10 +57,3 @@ public Map getSmeltingList() { return smeltingList; -@@ -52,5 +75,6 @@ - - private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); - private Map smeltingList; -+ private Map metaSmeltingList; - - } diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 664d382446..ce763e57f2 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,6 +1,16 @@ --- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -@@ -76,6 +76,13 @@ +@@ -177,6 +177,9 @@ + private String field_39010_c; + private String itemName; + ++ // FORGE: To disable repair recipes. ++ protected boolean canRepair=true; ++ + protected Item(int i) + { + maxStackSize = 64; +@@ -231,6 +234,13 @@ return 1.0F; } @@ -14,3 +24,23 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; +@@ -278,6 +288,19 @@ + return maxDamage > 0 && !hasSubtypes; + } + ++ /* FORGE: Called by CraftingManager to determine if an item is repairable. ++ */ ++ public boolean isRepairable() { ++ return canRepair && isDamageable(); ++ } ++ ++ /* FORGE: Call to disable repair recipes. ++ */ ++ public Item setNoRepair() { ++ canRepair=false; ++ return this; ++ } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) + { + return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch index 251d86ec24..73d2c99a04 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -7,9 +7,9 @@ +import net.minecraft.src.forge.MinecraftForge; + // Referenced classes of package net.minecraft.src: - // Item, EntityPlayer, Vec3D, MathHelper, - // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -60,6 +62,11 @@ + // Item, EntityPlayer, MovingObjectPosition, EnumMovingObjectType, + // World, Material, PlayerCapabilities, ItemStack, +@@ -50,6 +52,11 @@ { return itemstack; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 66e7f77eee..d78e4dea68 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ForgeHooks; import java.util.Random; -@@ -35,13 +36,18 @@ +@@ -45,13 +46,18 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { @@ -28,7 +28,7 @@ if(i1 == Block.sapling.blockID) { if(!world.multiplayerWorld) -@@ -108,13 +114,7 @@ +@@ -118,13 +124,7 @@ world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); continue; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index 3bcb926ab0..bd6528e6ee 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -9,10 +9,10 @@ +import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; - import org.lwjgl.opengl.GL13; -@@ -32,18 +36,27 @@ - public void renderItem(EntityLiving entityliving, ItemStack itemstack) + // Referenced classes of package net.minecraft.src: +@@ -40,18 +44,27 @@ + public void renderItem(EntityLiving entityliving, ItemStack itemstack, int i) { GL11.glPushMatrix(); - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) @@ -39,4 +39,4 @@ + ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]); } Tessellator tessellator = Tessellator.instance; - int i = entityliving.getItemIcon(itemstack); + int j = entityliving.getItemIcon(itemstack, i); diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch index ba4765bcb3..335ee75376 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -9,7 +9,18 @@ // Referenced classes of package net.minecraft.src: // Item, EnumToolMaterial, ItemStack, Block, -@@ -37,6 +39,14 @@ +@@ -13,8 +15,8 @@ + { + + private Block blocksEffectiveAgainst[]; +- protected float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + + protected ItemTool(int i, int j, EnumToolMaterial enumtoolmaterial, Block ablock[]) +@@ -42,6 +44,14 @@ return 1.0F; } @@ -24,13 +35,3 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); -@@ -60,7 +70,7 @@ - } - - private Block blocksEffectiveAgainst[]; -- private float efficiencyOnProperMaterial; -- private int damageVsEntity; -+ public float efficiencyOnProperMaterial; -+ public int damageVsEntity; - protected EnumToolMaterial toolMaterial; - } diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch index 49a2ac24df..24926d754e 100644 --- a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,10 +1,12 @@ --- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -@@ -35,4 +35,7 @@ +@@ -18,6 +18,9 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; -+ -+ // Added for RedPower subblocks. -+ public int subHit=-1; - } ++ ++ //Added for RedPower subblocks ++ public int subHit = -1; + + public MovingObjectPosition(int i, int j, int k, int l, Vec3D vec3d) + { diff --git a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch index fc3f841a21..ca03dd7a4a 100644 --- a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -25,9 +25,9 @@ +@@ -30,9 +30,9 @@ throws IOException { windowId = datainputstream.readByte(); diff --git a/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch index 216de77ab0..f9034a6fac 100644 --- a/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 -@@ -68,7 +68,10 @@ +@@ -75,7 +75,10 @@ })); } byte abyte0[] = new byte[k1]; diff --git a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch index add364620a..4a9e792aae 100644 --- a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch @@ -1,16 +1,7 @@ --- ../src_base/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -34,7 +34,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte()&0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); -@@ -72,7 +72,7 @@ - } +@@ -15,7 +15,7 @@ + { public int entityId; - public byte type; @@ -18,3 +9,12 @@ public int xPosition; public int yPosition; public int zPosition; +@@ -44,7 +44,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte() & 0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 508e56f216..2625946f0c 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.*; import net.minecraft.client.Minecraft; -@@ -36,12 +37,11 @@ +@@ -39,11 +40,10 @@ } world.playAuxSFX(2001, i, j, k, block.blockID + world.getBlockMetadata(i, j, k) * 256); int i1 = world.getBlockMetadata(i, j, k); @@ -17,16 +17,14 @@ - { - block.onBlockDestroyedByPlayer(world, i, j, k, i1); - } -- return flag; + -+ if(block==null) return false; -+ boolean flag = block.removeBlockByPlayer(world,mc.thePlayer,i,j,k); -+ if(flag) block.onBlockDestroyedByPlayer(world, i, j, k, i1); -+ return flag; ++ boolean flag = block.removeBlockByPlayer(world, mc.thePlayer, i, j, k); ++ if(flag) ++ block.onBlockDestroyedByPlayer(world, i, j, k, i1); + return flag; } - public abstract void sendBlockRemoving(int i, int j, int k, int l); -@@ -64,6 +64,7 @@ +@@ -67,6 +67,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index c78999f827..ed72c6faed 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -10,7 +10,7 @@ import net.minecraft.client.Minecraft; // Referenced classes of package net.minecraft.src: -@@ -91,7 +94,7 @@ +@@ -103,7 +106,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -19,7 +19,7 @@ { sendBlockRemoved(i, j, k, l); } else -@@ -137,7 +140,7 @@ +@@ -149,7 +152,7 @@ return; } Block block = Block.blocksList[i1]; @@ -28,7 +28,7 @@ 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); -@@ -204,6 +207,13 @@ +@@ -216,6 +219,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); @@ -42,7 +42,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -223,7 +233,11 @@ +@@ -235,7 +245,11 @@ return flag; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 2bbbf8121e..91ada64c48 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,8 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.IUseItemFirst; @@ -9,7 +9,7 @@ import net.minecraft.client.Minecraft; -@@ -42,7 +44,7 @@ +@@ -50,7 +52,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); @@ -18,7 +18,7 @@ if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -71,7 +73,7 @@ +@@ -79,7 +81,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -27,7 +27,7 @@ { sendBlockRemoved(i, j, k, l); } -@@ -102,7 +104,7 @@ +@@ -110,7 +112,7 @@ return; } Block block = Block.blocksList[i1]; @@ -36,7 +36,7 @@ if(field_1069_h % 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); -@@ -165,6 +167,12 @@ +@@ -173,6 +175,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -49,7 +49,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -175,7 +183,11 @@ +@@ -183,7 +191,11 @@ return false; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index f7f78623c3..01495bb6d5 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,42 +1,42 @@ --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 -@@ -2980,7 +2980,7 @@ +@@ -3301,7 +3301,7 @@ colorBlueTopRight *= f27; - int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); - renderEastFace(block, i, j, k, j2); -- if(cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) -+ if(Tessellator.instance.defaultTexture && cfgGrassFix && j2 == 3 && overrideBlockTexture < 0) - { - colorRedTopLeft *= f; - colorRedBottomLeft *= f; -@@ -3085,7 +3085,7 @@ - colorBlueTopRight *= f28; - int k2 = block.getBlockTexture(blockAccess, i, j, k, 3); - renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); + int k2 = block.getBlockTexture(blockAccess, i, j, k, 2); + renderEastFace(block, i, j, k, k2); - if(cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && k2 == 3 && overrideBlockTexture < 0) { colorRedTopLeft *= f; colorRedBottomLeft *= f; -@@ -3190,7 +3190,7 @@ - colorBlueTopRight *= f29; - int l2 = block.getBlockTexture(blockAccess, i, j, k, 4); - renderNorthFace(block, i, j, k, l2); +@@ -3412,7 +3412,7 @@ + colorBlueTopRight *= f28; + int l2 = block.getBlockTexture(blockAccess, i, j, k, 3); + renderWestFace(block, i, j, k, block.getBlockTexture(blockAccess, i, j, k, 3)); - if(cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && l2 == 3 && overrideBlockTexture < 0) { colorRedTopLeft *= f; colorRedBottomLeft *= f; -@@ -3295,7 +3295,7 @@ - colorBlueTopRight *= f30; - int i3 = block.getBlockTexture(blockAccess, i, j, k, 5); - renderSouthFace(block, i, j, k, i3); +@@ -3523,7 +3523,7 @@ + colorBlueTopRight *= f29; + int i3 = block.getBlockTexture(blockAccess, i, j, k, 4); + renderNorthFace(block, i, j, k, i3); - if(cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) + if(Tessellator.instance.defaultTexture && cfgGrassFix && i3 == 3 && overrideBlockTexture < 0) { colorRedTopLeft *= f; colorRedBottomLeft *= f; -@@ -3388,7 +3388,7 @@ +@@ -3634,7 +3634,7 @@ + colorBlueTopRight *= f30; + int j3 = block.getBlockTexture(blockAccess, i, j, k, 5); + renderSouthFace(block, i, j, k, j3); +- if(cfgGrassFix && j3 == 3 && overrideBlockTexture < 0) ++ if(Tessellator.instance.defaultTexture && cfgGrassFix && j3 == 3 && overrideBlockTexture < 0) + { + colorRedTopLeft *= f; + colorRedBottomLeft *= f; +@@ -3727,7 +3727,7 @@ tessellator.setColorOpaque_F(f11, f14, f17); int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); renderEastFace(block, i, j, k, i1); @@ -45,7 +45,7 @@ { tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); renderEastFace(block, i, j, k, 38); -@@ -3401,7 +3401,7 @@ +@@ -3740,7 +3740,7 @@ tessellator.setColorOpaque_F(f11, f14, f17); int j1 = block.getBlockTexture(blockAccess, i, j, k, 3); renderWestFace(block, i, j, k, j1); @@ -54,7 +54,7 @@ { tessellator.setColorOpaque_F(f11 * f, f14 * f1, f17 * f2); renderWestFace(block, i, j, k, 38); -@@ -3414,7 +3414,7 @@ +@@ -3753,7 +3753,7 @@ tessellator.setColorOpaque_F(f12, f15, f18); int k1 = block.getBlockTexture(blockAccess, i, j, k, 4); renderNorthFace(block, i, j, k, k1); @@ -63,7 +63,7 @@ { tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2); renderNorthFace(block, i, j, k, 38); -@@ -3427,7 +3427,7 @@ +@@ -3766,7 +3766,7 @@ tessellator.setColorOpaque_F(f12, f15, f18); int l1 = block.getBlockTexture(blockAccess, i, j, k, 5); renderSouthFace(block, i, j, k, l1); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index eb2044e7c0..3f43dc6635 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -1,16 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 -@@ -128,6 +128,9 @@ - } - try - { -+ if(Tessellator.renderingWorldRenderer) { -+ System.out.printf("Warning: Texture %s not preloaded, will cause render glitches!\n",s); -+ } - singleIntBuffer.clear(); - GLAllocation.generateTextureNames(singleIntBuffer); - int i = singleIntBuffer.get(0); -@@ -667,7 +670,7 @@ +@@ -39,7 +39,7 @@ private GameSettings options; public boolean clampTexture; public boolean blurTexture; @@ -18,4 +8,14 @@ + public TexturePackList texturePack; private BufferedImage missingTextureImage; - } + public RenderEngine(TexturePackList texturepacklist, GameSettings gamesettings) +@@ -142,6 +142,9 @@ + } + try + { ++ if(Tessellator.renderingWorldRenderer) { ++ System.out.printf("Warning: Texture %s not preloaded, will cause render glitches!\n",s); ++ } + singleIntBuffer.clear(); + GLAllocation.generateTextureNames(singleIntBuffer); + int i = singleIntBuffer.get(0); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch index dfade4d45a..8bfcdc2b22 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1635,8 +1635,8 @@ - } +@@ -34,8 +34,8 @@ + { public List tileEntities; - private World worldObj; @@ -11,7 +11,7 @@ private List worldRenderersToUpdate; private WorldRenderer sortedWorldRenderers[]; private WorldRenderer worldRenderers[]; -@@ -1644,8 +1644,8 @@ +@@ -43,8 +43,8 @@ private int renderChunksTall; private int renderChunksDeep; private int glRenderListBase; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index f0d2249f2b..cbd9091813 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -11,7 +11,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -@@ -47,10 +51,36 @@ +@@ -54,10 +58,36 @@ } GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); @@ -49,7 +49,7 @@ float f4 = 0.25F; int j = Block.blocksList[itemstack.itemID].getRenderType(); if(j == 1 || j == 19 || j == 12 || j == 2) -@@ -80,9 +110,11 @@ +@@ -108,9 +138,11 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -59,9 +59,9 @@ loadTexture("/gui/items.png"); + ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); } - Tessellator tessellator = Tessellator.instance; - float f5 = (float)((i % 16) * 16 + 0) / 256F; -@@ -129,10 +161,37 @@ + if(field_27004_a) + { +@@ -162,10 +194,37 @@ public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) { @@ -99,8 +99,8 @@ + ForgeHooksClient.overrideTexture (Block.blocksList[i]); Block block = Block.blocksList[j1]; GL11.glPushMatrix(); - GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -161,9 +220,11 @@ + GL11.glTranslatef(l - 2, i1 + 3, -3F + field_40268_b); +@@ -215,9 +274,11 @@ if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 50669f71cc..d38d3eda7c 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -8,7 +8,7 @@ import net.minecraft.client.Minecraft; import org.lwjgl.opengl.GL11; -@@ -34,7 +35,14 @@ +@@ -41,7 +42,14 @@ if(item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index fabc12a24f..38f04d3613 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,18 +1,18 @@ --- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ForgeHooks; // Referenced classes of package net.minecraft.src: -@@ -60,6 +61,7 @@ - thePlayer.addStat(AchievementList.buildSword, 1); +@@ -71,6 +72,7 @@ + thePlayer.addStat(AchievementList.bookcase, 1); } ModLoader.TakenFromCrafting(thePlayer, itemstack, craftMatrix); -+ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); ++ ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); for(int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack itemstack1 = craftMatrix.getStackInSlot(i); diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch index 6d52526c8e..1829b728d7 100644 --- a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -8,9 +8,74 @@ import org.lwjgl.opengl.*; // Referenced classes of package net.minecraft.src: -@@ -13,8 +14,7 @@ +@@ -12,13 +13,9 @@ + public class Tessellator { +- + private static boolean convertQuadsToTriangles = false; + private static boolean tryVBO = false; +- private ByteBuffer byteBuffer; +- private IntBuffer intBuffer; +- private FloatBuffer floatBuffer; +- private ShortBuffer shortBuffer; ++ private static boolean useVBO = false; + private int rawBuffer[]; + private int vertexCount; + private double textureU; +@@ -32,21 +29,47 @@ + private int rawBufferIndex; + private int addedVertices; + private boolean isColorDisabled; +- private int drawMode; +- private double xOffset; +- private double yOffset; +- private double zOffset; ++ public int drawMode; ++ public double xOffset; ++ public double yOffset; ++ public double zOffset; + private int normal; +- public static final Tessellator instance = new Tessellator(0x200000); +- private boolean isDrawing; +- private boolean useVBO; +- private IntBuffer vertexBuffers; ++ public boolean isDrawing; + private int vboIndex; +- private int vboCount; +- private int bufferSize; ++ ++ public static boolean renderingWorldRenderer=false; ++ public boolean defaultTexture=false; ++ private int rawBufferSize; ++ private static int vboCount; ++ private static IntBuffer vertexBuffers; ++ private static int nativeBufferSize; ++ private static int trivertsInBuffer; ++ private static ByteBuffer byteBuffer; ++ private static IntBuffer intBuffer; ++ private static FloatBuffer floatBuffer; ++ private static ShortBuffer shortBuffer; ++ public static Tessellator instance; ++ ++ static { ++ instance=new Tessellator(); ++ instance.defaultTexture=true; ++ ++ nativeBufferSize = 0x200000; ++ trivertsInBuffer = (nativeBufferSize/48)*6; ++ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); ++ intBuffer = byteBuffer.asIntBuffer(); ++ floatBuffer = byteBuffer.asFloatBuffer(); ++ shortBuffer = byteBuffer.asShortBuffer(); ++ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; ++ vboCount = 10; ++ if(useVBO) ++ { ++ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); ++ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); ++ } ++ } - private Tessellator(int i) - { @@ -18,7 +83,7 @@ vertexCount = 0; hasColor = false; hasTexture = false; -@@ -24,21 +24,10 @@ +@@ -56,21 +79,10 @@ addedVertices = 0; isColorDisabled = false; isDrawing = false; @@ -38,12 +103,12 @@ - ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); - } + -+ rawBuffer=null; -+ rawBufferSize=0; ++ rawBuffer=null; ++ rawBufferSize=0; } - public void draw() -@@ -48,12 +37,20 @@ + public int draw() +@@ -80,12 +92,20 @@ throw new IllegalStateException("Not tesselating!"); } isDrawing = false; @@ -68,7 +133,7 @@ if(useVBO) { vboIndex = (vboIndex + 1) % vboCount; -@@ -121,10 +118,10 @@ +@@ -153,10 +173,10 @@ GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(drawMode == 7 && convertQuadsToTriangles) { @@ -81,34 +146,34 @@ } GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(hasTexture) -@@ -146,6 +143,10 @@ +@@ -178,6 +198,10 @@ GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); } } -+ if(rawBufferSize>0x20000 && rawBufferIndex<(rawBufferSize<<3)) { -+ rawBufferSize=0; -+ rawBuffer=null; -+ } ++ if (rawBufferSize > 0x20000 && rawBufferIndex < (rawBufferSize<<3)) { ++ rawBufferSize=0; ++ rawBuffer=null; ++ } + int i = rawBufferIndex * 4; reset(); - } - -@@ -265,6 +266,15 @@ + return i; +@@ -299,6 +323,15 @@ public void addVertex(double d, double d1, double d2) { -+ if(rawBufferIndex >= rawBufferSize-32) { -+ if(rawBufferSize==0) { -+ rawBufferSize=0x10000; -+ rawBuffer=new int[rawBufferSize]; -+ } else { -+ rawBufferSize*=2; -+ rawBuffer=Arrays.copyOf(rawBuffer,rawBufferSize); ++ if (rawBufferIndex >= rawBufferSize-32) { ++ if (rawBufferSize == 0) { ++ rawBufferSize = 0x10000; ++ rawBuffer = new int[rawBufferSize]; ++ } else { ++ rawBufferSize *= 2; ++ rawBuffer = Arrays.copyOf(rawBuffer, rawBufferSize); ++ } + } -+ } addedVertices++; if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) { -@@ -314,11 +324,6 @@ +@@ -348,11 +381,6 @@ rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); rawBufferIndex += 8; vertexCount++; @@ -120,69 +185,3 @@ } public void setColorOpaque_I(int i) -@@ -367,10 +372,7 @@ - - private static boolean convertQuadsToTriangles = false; - private static boolean tryVBO = false; -- private ByteBuffer byteBuffer; -- private IntBuffer intBuffer; -- private FloatBuffer floatBuffer; -- private ShortBuffer shortBuffer; -+ private static boolean useVBO = false; - private int rawBuffer[]; - private int vertexCount; - private double textureU; -@@ -384,17 +386,43 @@ - private int rawBufferIndex; - private int addedVertices; - private boolean isColorDisabled; -- private int drawMode; -- private double xOffset; -- private double yOffset; -- private double zOffset; -+ public int drawMode; -+ public double xOffset; -+ public double yOffset; -+ public double zOffset; - private int normal; -- public static final Tessellator instance = new Tessellator(0x200000); -- private boolean isDrawing; -- private boolean useVBO; -- private IntBuffer vertexBuffers; -+ public boolean isDrawing; - private int vboIndex; -- private int vboCount; -- private int bufferSize; - -+ public static boolean renderingWorldRenderer=false; -+ public boolean defaultTexture=false; -+ private int rawBufferSize; -+ private static int vboCount; -+ private static IntBuffer vertexBuffers; -+ private static int nativeBufferSize; -+ private static int trivertsInBuffer; -+ private static ByteBuffer byteBuffer; -+ private static IntBuffer intBuffer; -+ private static FloatBuffer floatBuffer; -+ private static ShortBuffer shortBuffer; -+ public static Tessellator instance; -+ -+ static { -+ instance=new Tessellator(); -+ instance.defaultTexture=true; -+ -+ nativeBufferSize = 0x200000; -+ trivertsInBuffer = (nativeBufferSize/48)*6; -+ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); -+ intBuffer = byteBuffer.asIntBuffer(); -+ floatBuffer = byteBuffer.asFloatBuffer(); -+ shortBuffer = byteBuffer.asShortBuffer(); -+ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; -+ vboCount = 10; -+ if(useVBO) -+ { -+ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); -+ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); -+ } -+ } - } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index b63e70a654..36c99dc4f3 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -@@ -61,6 +61,13 @@ +@@ -72,6 +72,13 @@ { } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 89dfe957d7..118c84f4ee 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -16,8 +16,8 @@ + implements IInventory, ISidedInventory { - public TileEntityFurnace() -@@ -28,6 +29,16 @@ + private ItemStack furnaceItemStacks[]; +@@ -33,6 +34,16 @@ return furnaceItemStacks.length; } @@ -34,7 +34,7 @@ public ItemStack getStackInSlot(int i) { return furnaceItemStacks[i]; -@@ -196,7 +207,7 @@ +@@ -201,7 +212,7 @@ { return false; } @@ -43,7 +43,7 @@ if(itemstack == null) { return false; -@@ -209,11 +220,9 @@ +@@ -214,11 +225,8 @@ { return false; } @@ -52,13 +52,12 @@ - return true; - } - return furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize(); -+ int st=furnaceItemStacks[2].stackSize+itemstack.stackSize; -+ return (st<=getInventoryStackLimit() && -+ st<=itemstack.getMaxStackSize()); ++ int st = furnaceItemStacks[2].stackSize + itemstack.stackSize; ++ return (st <= getInventoryStackLimit() && st <= itemstack.getMaxStackSize()); } public void smeltItem() -@@ -222,14 +231,14 @@ +@@ -227,14 +235,14 @@ { return; } @@ -72,11 +71,11 @@ + if(furnaceItemStacks[2].isItemEqual(itemstack)) { - furnaceItemStacks[2].stackSize++; -+ furnaceItemStacks[2].stackSize+=itemstack.stackSize; ++ furnaceItemStacks[2].stackSize += itemstack.stackSize; } if(furnaceItemStacks[0].getItem().hasContainerItem()) { -@@ -244,7 +253,7 @@ +@@ -249,7 +257,7 @@ } } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch index e3f6b6cc92..f6cac73f73 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -8,19 +8,19 @@ import net.minecraft.client.Minecraft; import org.lwjgl.opengl.GL11; -@@ -38,6 +39,7 @@ +@@ -40,6 +41,7 @@ { GL11.glShadeModel(7424 /*GL_FLAT*/); } -+ ForgeHooksClient.beforeBlockRender(block,field_31071_b); ++ ForgeHooksClient.beforeBlockRender(block,field_31071_b); tessellator.startDrawingQuads(); tessellator.setTranslationD(((float)d - (float)tileentitypiston.xCoord) + tileentitypiston.func_31017_b(f), ((float)d1 - (float)tileentitypiston.yCoord) + tileentitypiston.func_31014_c(f), ((float)d2 - (float)tileentitypiston.zCoord) + tileentitypiston.func_31013_d(f)); tessellator.setColorOpaque(1, 1, 1); -@@ -58,6 +60,7 @@ +@@ -60,6 +62,7 @@ } tessellator.setTranslationD(0.0D, 0.0D, 0.0D); tessellator.draw(); -+ ForgeHooksClient.afterBlockRender(block,field_31071_b); ++ ForgeHooksClient.afterBlockRender(block,field_31071_b); RenderHelper.enableStandardItemLighting(); } } diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 204a25f5c2..a7f04659b8 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -1,6 +1,15 @@ --- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -@@ -336,7 +336,10 @@ +@@ -51,7 +51,7 @@ + public int lightningFlash; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; +@@ -406,7 +406,10 @@ public boolean isAirBlock(int i, int j, int k) { @@ -8,11 +17,11 @@ + int iBlockID = getBlockId( i, j, k ); + if ( iBlockID == 0 ) + return true; -+ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); ++ return Block.blocksList[iBlockID].isAirBlock(this,i,j,k); } public boolean blockExists(int i, int j, int k) -@@ -1476,7 +1479,7 @@ +@@ -1576,7 +1579,7 @@ Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); if(chunk != null) { @@ -21,11 +30,11 @@ } } } -@@ -1503,16 +1506,16 @@ +@@ -1604,16 +1607,16 @@ { loadedTileEntityList.add(tileentity1); } -+ } else { ++ } else { if(chunkExists(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4)) { Chunk chunk1 = getChunkFromChunkCoords(tileentity1.xCoord >> 4, tileentity1.zCoord >> 4); @@ -37,11 +46,11 @@ } - markBlockNeedsUpdate(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord); - } -+ } ++ } } while(true); addedTileEntityList.clear(); } -@@ -1520,13 +1523,19 @@ +@@ -1623,13 +1626,17 @@ public void addTileEntity(Collection collection) { @@ -52,35 +61,33 @@ - { - loadedTileEntityList.addAll(collection); - } -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ for(Object ob : collection) { -+ TileEntity te=(TileEntity)ob; -+ if(te.canUpdate()) dest.add(te); -+ } ++ List dest=scanningTileEntities ? addedTileEntityList : loadedTileEntityList; ++ for(Object ob : collection) { ++ TileEntity te = (TileEntity)ob; ++ if(te.canUpdate()) dest.add(te); ++ } + } + + /* FORGE: Used as a bugfix */ + public void addTileEntity(TileEntity te) { -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(te.canUpdate()) dest.add(te); ++ List dest=scanningTileEntities ? addedTileEntityList : loadedTileEntityList; ++ if(te.canUpdate()) dest.add(te); } public void updateEntity(Entity entity) -@@ -1684,7 +1693,10 @@ +@@ -1789,7 +1796,10 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; - } + } else { -+ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) -+ return true; -+ } ++ if(j2>0 && Block.blocksList[j2].isBlockBurning(this,k1,l1,i2)) ++ return true; ++ } } } -@@ -1917,44 +1929,23 @@ +@@ -2044,46 +2054,22 @@ public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) { @@ -102,15 +109,14 @@ - } - } - } -+ if(tileentity==null || tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } } public void removeBlockTileEntity(int i, int j, int k) @@ -119,10 +125,12 @@ - if(tileentity != null && scanningTileEntities) - { - tileentity.invalidate(); +- addedTileEntityList.remove(tileentity); - } else - { - if(tileentity != null) - { +- addedTileEntityList.remove(tileentity); - loadedTileEntityList.remove(tileentity); - } - Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); @@ -131,14 +139,14 @@ - chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); - } - } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } } public void func_35455_a(TileEntity tileentity) -@@ -1977,13 +1968,18 @@ +@@ -2106,13 +2092,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -150,7 +158,7 @@ - return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock(); - } + if(block == null) return false; -+ return block.isBlockNormalCube(this,i,j,k); ++ return block.isBlockNormalCube(this,i,j,k); + } + + /* FORGE: Determine if the given block is considered solid on the @@ -160,33 +168,24 @@ + { + Block block = Block.blocksList[getBlockId(i, j, k)]; + if(block == null) return false; -+ return block.isBlockSolidOnSide(this,i,j,k,side); ++ return block.isBlockSolidOnSide(this,i,j,k,side); } - public void saveWorldIndirectly(IProgressUpdate iprogressupdate) -@@ -2308,7 +2304,7 @@ + public boolean func_41082_b(int i, int j, int k, boolean flag) +@@ -2531,7 +2522,7 @@ private int computeBlockLightValue(int i, int j, int k, int l, int i1, int j1) { - 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); int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2679,6 +2675,7 @@ +@@ -2940,6 +2931,7 @@ { block = null; } -+ if(block!=null && block.isBlockReplaceable(this,j,k,l)) block=null; ++ if (block != null && block.isBlockReplaceable(this,j,k,l)) block = null; return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -3193,7 +3190,7 @@ - public int lightningFlash; - public boolean editingBlocks; - private long lockTimestamp; -- protected int autosavePeriod; -+ public int autosavePeriod; - public int difficultySetting; - public Random rand; - public boolean isNewWorld; diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch index cbf615ac7a..c605eecbe2 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -9,19 +9,27 @@ import java.util.*; import org.lwjgl.opengl.GL11; -@@ -125,8 +127,9 @@ +@@ -18,7 +20,6 @@ + + public World worldObj; + private int glRenderList; +- private static Tessellator tessellator; + public static int chunksUpdated = 0; + public int posX; + public int posY; +@@ -160,8 +161,9 @@ GL11.glTranslatef((float)(-sizeDepth) / 2.0F, (float)(-sizeHeight) / 2.0F, (float)(-sizeDepth) / 2.0F); GL11.glScalef(f, f, f); GL11.glTranslatef((float)sizeDepth / 2.0F, (float)sizeHeight / 2.0F, (float)sizeDepth / 2.0F); - tessellator.startDrawingQuads(); - tessellator.setTranslationD(-posX, -posY, -posZ); -+ ForgeHooksClient.beforeRenderPass(i2); ++ ForgeHooksClient.beforeRenderPass(i2); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setTranslationD(-posX, -posY, -posZ); } if(i2 == 0 && Block.isBlockContainer[i3]) { -@@ -142,15 +145,13 @@ +@@ -177,15 +179,13 @@ { flag1 = true; } @@ -34,23 +42,23 @@ - { - flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); - } -+ if(j3>i2) flag=true; -+ if(!ForgeHooksClient.canRenderInPass(block,i2)) -+ continue; ++ if (j3 > i2) flag = true; ++ if(!ForgeHooksClient.canRenderInPass(block,i2)) ++ continue; + -+ ForgeHooksClient.beforeBlockRender(block, renderblocks); -+ flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); -+ ForgeHooksClient.afterBlockRender(block, renderblocks); ++ ForgeHooksClient.beforeBlockRender(block, renderblocks); ++ flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2); ++ ForgeHooksClient.afterBlockRender(block, renderblocks); } } -@@ -159,10 +160,11 @@ +@@ -194,10 +194,11 @@ if(flag2) { -- tessellator.draw(); -+ ForgeHooksClient.afterRenderPass(i2); -+ Tessellator.instance.draw(); +- bytesDrawn += tessellator.draw(); ++ ForgeHooksClient.afterRenderPass(i2); ++ bytesDrawn += Tessellator.instance.draw(); GL11.glPopMatrix(); GL11.glEndList(); - tessellator.setTranslationD(0.0D, 0.0D, 0.0D); @@ -58,17 +66,9 @@ } else { flag1 = false; -@@ -255,7 +257,6 @@ - - public World worldObj; - private int glRenderList; -- private static Tessellator tessellator; - public static int chunksUpdated = 0; - public int posX; - public int posY; -@@ -286,8 +287,4 @@ - public List tileEntityRenderers; - private List tileEntities; +@@ -288,8 +289,4 @@ + needsUpdate = true; + } - static - { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index e9bf719022..19277633bb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ForgeHooks; import java.util.ArrayList; import java.util.Random; -@@ -218,24 +219,40 @@ +@@ -384,26 +385,41 @@ return 1; } @@ -16,14 +16,14 @@ + */ + public int quantityDropped(int i, Random random) + { -+ return quantityDropped(random); ++ return quantityDropped(random); + } -+ - public int idDropped(int i, Random random) ++ + public int idDropped(int i, Random random, int j) { return blockID; } - +- + /* FORGE: This function isnt called by Minecraft anymore. Use + * blockStrength(EntityPlayer,int) instead. + */ @@ -40,51 +40,52 @@ - { - return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F; - } -+ return blockStrength(entityplayer,0); -+ } -+ ++ return blockStrength(entityplayer); + } +- ++ + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); -+ } -+ } -+ return tr; - } - - public final void dropBlockAsItem(World world, int i, int j, int k, int l) -@@ -249,20 +266,12 @@ ++ int i, int j, int k, int md) { ++ ArrayList tr = new ArrayList(); ++ ++ int q = quantityDropped(md, world.rand); ++ for(int n = 0; n < q; n++) { ++ int id = idDropped(md, world.rand, 0); ++ if (id > 0) { ++ tr.add(new ItemStack(id, 1, damageDropped(md))); ++ } ++ } ++ return tr; ++ } ++ + public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) + { + dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); +@@ -415,18 +431,14 @@ { return; } -- int i1 = quantityDropped(world.rand); -- for(int j1 = 0; j1 < i1; j1++) -- { -+ ArrayList ar=getBlockDropped(world,i,j,k,l); -+ for(ItemStack ist : ar) { +- int j1 = func_40162_a(i1, world.rand); +- for(int k1 = 0; k1 < j1; k1++) ++ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ for (ItemStack ist : ar) + { if(world.rand.nextFloat() > f) -- { + { continue; -- } -- int k1 = idDropped(l, world.rand); -- if(k1 > 0) + } +- int l1 = idDropped(l, world.rand, i1); +- if(l1 > 0) - { -- dropBlockAsItem_do(world, i, j, k, new ItemStack(k1, 1, damageDropped(l))); +- dropBlockAsItem_do(world, i, j, k, new ItemStack(l1, 1, damageDropped(l))); - } -+ dropBlockAsItem_do(world, i, j, k, ist); ++ dropBlockAsItem_do(world, i, j, k, ist); } -- - } - protected void dropBlockAsItem_do(World world, int i, int j, int k, ItemStack itemstack) -@@ -529,6 +538,96 @@ + } +@@ -725,6 +737,96 @@ return blockMaterial.getMaterialMobility(); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch index 5e0acf20ad..686923fc0a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -@@ -328,23 +328,23 @@ +@@ -339,23 +339,23 @@ { return true; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 09c53056b2..64ee6042a8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -8,18 +8,27 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, Block, World, EntityItem, -@@ -103,27 +104,16 @@ - return blockIndexInTexture + j; +@@ -108,28 +109,16 @@ + return 6; } -- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f) +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1) - { -- super.dropBlockAsItemWithChance(world, i, j, k, l, f); +- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0); - if(world.singleplayerWorld) - { - return; -- } -- for(int i1 = 0; i1 < 3; i1++) ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ ArrayList tr = new ArrayList(); ++ if (md == 7) tr.add(new ItemStack(Item.wheat)); ++ ++ for(int n = 0; n < 3; n++) { ++ if (world.rand.nextInt(15) <= md) ++ tr.add(new ItemStack(Item.seeds)); + } +- int j1 = 3 + i1; +- for(int k1 = 0; k1 < j1; k1++) - { - if(world.rand.nextInt(15) <= l) - { @@ -33,16 +42,7 @@ - } - } - -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(md==7) tr.add(new ItemStack(Item.wheat)); -+ -+ for(int n=0; n<3; n++) { -+ if(world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); -+ } -+ return tr; ++ return tr; } - public int idDropped(int i, Random random) + public int idDropped(int i, Random random, int j) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index 1aba3da757..9aacbc33cd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -@@ -100,7 +100,7 @@ +@@ -105,7 +105,7 @@ { if(blockMaterial == Material.iron) { @@ -9,7 +9,7 @@ } int l = world.getBlockMetadata(i, j, k); if((l & 8) != 0) -@@ -167,7 +167,7 @@ +@@ -172,7 +172,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; } @@ -18,7 +18,7 @@ { world.setBlockWithNotify(i, j, k, 0); flag = true; -@@ -231,7 +231,7 @@ +@@ -235,7 +235,7 @@ return false; } else { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch index 7cf02273c6..2956eb84fe 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -12,7 +12,7 @@ public boolean isOpaqueCube() { return false; -@@ -52,37 +57,37 @@ +@@ -57,37 +62,37 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -58,7 +58,7 @@ { i1 = 5; } -@@ -93,19 +98,19 @@ +@@ -98,19 +103,19 @@ { int i1 = world.getBlockMetadata(i, j, k); boolean flag = false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch index 09b539626e..f9fe3e5691 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -@@ -35,44 +35,44 @@ +@@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) { @@ -55,7 +55,7 @@ } public void onBlockPlaced(World world, int i, int j, int k, int l) -@@ -81,23 +81,23 @@ +@@ -86,23 +86,23 @@ int j1 = i1 & 8; i1 &= 7; i1 = -1; @@ -84,7 +84,7 @@ { i1 = 1; } -@@ -119,27 +119,27 @@ +@@ -124,27 +124,27 @@ { int i1 = world.getBlockMetadata(i, j, k) & 7; boolean flag = false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch index eff38e4bb4..f9dc5e2afc 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -@@ -46,7 +46,8 @@ +@@ -48,7 +48,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -10,7 +10,7 @@ } public void onBlockAdded(World world, int i, int j, int k) -@@ -56,7 +57,8 @@ +@@ -58,7 +59,8 @@ public void onNeighborBlockChange(World world, int i, int j, int k, int l) { boolean flag = false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index 7034891beb..16c10b78d5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -@@ -16,12 +16,12 @@ +@@ -18,12 +18,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { int l = world.getBlockId(i, j, k); @@ -15,7 +15,7 @@ } protected BlockRail(int i, int j, boolean flag) -@@ -92,7 +92,7 @@ +@@ -99,7 +99,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -24,7 +24,7 @@ } public void onBlockAdded(World world, int i, int j, int k) -@@ -116,23 +116,23 @@ +@@ -123,23 +123,23 @@ j1 &= 7; } boolean flag = false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch index 66372a4a8a..0c363d96f4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -@@ -27,7 +27,7 @@ +@@ -35,7 +35,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -9,7 +9,7 @@ { return false; } else -@@ -38,7 +38,7 @@ +@@ -46,7 +46,7 @@ public boolean canBlockStay(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch index ec300c0949..e03ef196ce 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.*; import java.util.*; -@@ -43,7 +44,7 @@ +@@ -51,7 +52,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -17,14 +17,14 @@ } private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -413,6 +414,10 @@ +@@ -421,6 +422,10 @@ { return false; } -+ if(Block.blocksList[i1] instanceof IConnectRedstone) { -+ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; -+ return icr.canConnectRedstone(iblockaccess,i,j,k,l); -+ } - if(Block.blocksList[i1].canProvidePower()) ++ if(Block.blocksList[i1] instanceof IConnectRedstone) { ++ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; ++ return icr.canConnectRedstone(iblockaccess,i,j,k,l); ++ } + if(Block.blocksList[i1].canProvidePower() && l != -1) { return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 31118139a4..5af36c4fde 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -13,7 +13,7 @@ // BlockFlower, Item, World, EntityPlayer, @@ -41,13 +44,17 @@ - public int idDropped(int i, Random random) + public int idDropped(int i, Random random, int j) { - if(random.nextInt(8) == 0) - { @@ -34,4 +34,4 @@ + return tr; } - public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) + public int func_40162_a(int i, Random random) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch index 6a8d951fa5..10c371951e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -1,104 +1,107 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -@@ -36,24 +36,24 @@ +@@ -41,7 +41,7 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) { -- return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; -+ return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; - } +- if(world.func_41047_b(i, j, k, true)) ++ if(world.isBlockSolidOnSide(i, j, k, 1)) + { + return true; + } else +@@ -53,19 +53,19 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { -- if(world.isBlockNormalCube(i - 1, j, k)) +- if(world.func_41047_b(i - 1, j, k, true)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { return true; } -- if(world.isBlockNormalCube(i + 1, j, k)) +- if(world.func_41047_b(i + 1, j, k, true)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { return true; } -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(world.func_41047_b(i, j, k - 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k-1,3)) { return true; } -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(world.func_41047_b(i, j, k + 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k+1,2)) { return true; } -@@ -67,19 +67,19 @@ +@@ -79,19 +79,19 @@ { i1 = 5; } -- if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) -+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(l == 2 && world.func_41047_b(i, j, k + 1, true)) ++ if(l == 2 && world.isBlockSolidOnSide(i, j, k+1,2)) { i1 = 4; } -- if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) -+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(l == 3 && world.func_41047_b(i, j, k - 1, true)) ++ if(l == 3 && world.isBlockSolidOnSide(i, j, k-1,3)) { i1 = 3; } -- if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) +- if(l == 4 && world.func_41047_b(i + 1, j, k, true)) + if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) { i1 = 2; } -- if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) +- if(l == 5 && world.func_41047_b(i - 1, j, k, true)) + if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) { i1 = 1; } -@@ -97,19 +97,19 @@ +@@ -109,19 +109,19 @@ public void onBlockAdded(World world, int i, int j, int k) { -- if(world.isBlockNormalCube(i - 1, j, k)) +- if(world.func_41047_b(i - 1, j, k, true)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { world.setBlockMetadataWithNotify(i, j, k, 1); } else -- if(world.isBlockNormalCube(i + 1, j, k)) +- if(world.func_41047_b(i + 1, j, k, true)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { world.setBlockMetadataWithNotify(i, j, k, 2); } else -- if(world.isBlockNormalCube(i, j, k - 1)) -+ if(world.isBlockSolidOnSide(i, j, k - 1,3)) +- if(world.func_41047_b(i, j, k - 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k-1,3)) { world.setBlockMetadataWithNotify(i, j, k, 3); } else -- if(world.isBlockNormalCube(i, j, k + 1)) -+ if(world.isBlockSolidOnSide(i, j, k + 1,2)) +- if(world.func_41047_b(i, j, k + 1, true)) ++ if(world.isBlockSolidOnSide(i, j, k+1,2)) { world.setBlockMetadataWithNotify(i, j, k, 4); } else -@@ -126,19 +126,19 @@ +@@ -138,19 +138,19 @@ { int i1 = world.getBlockMetadata(i, j, k); boolean flag = false; -- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) +- if(!world.func_41047_b(i - 1, j, k, true) && i1 == 1) + if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) { flag = true; } -- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) +- if(!world.func_41047_b(i + 1, j, k, true) && i1 == 2) + if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) { flag = true; } -- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) -+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) +- if(!world.func_41047_b(i, j, k - 1, true) && i1 == 3) ++ if(!world.isBlockSolidOnSide(i, j, k-1,3) && i1 == 3) { flag = true; } -- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) -+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) +- if(!world.func_41047_b(i, j, k + 1, true) && i1 == 4) ++ if(!world.isBlockSolidOnSide(i, j, k+1,2) && i1 == 4) { flag = true; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch index 6e2fcc1cd9..250d9a2826 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,36 +1,40 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -@@ -130,7 +130,7 @@ +@@ -11,7 +11,10 @@ + + public class BlockTrapDoor extends Block + { +- ++ /* FORGE: Set this to allow trapdoors to remain free-floating ++ */ ++ public static boolean disableValidation=false; ++ + protected BlockTrapDoor(int i, Material material) + { + super(i, material); +@@ -141,7 +144,7 @@ { j1--; } -- if(!world.isBlockNormalCube(j1, j, k1)) -+ if(!disableValidation && !world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)) +- if(!func_41006_g(world.getBlockId(j1, j, k1))) ++ if(!(func_41006_g(world.getBlockId(j1, j, k1)) || world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2))) { world.setBlockWithNotify(i, j, k, 0); - dropBlockAsItem(world, i, j, k, i1); -@@ -172,6 +172,7 @@ + dropBlockAsItem(world, i, j, k, i1, 0); +@@ -186,6 +189,7 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) { -+ if(disableValidation) return true; ++ if(disableValidation) return true; if(l == 0) { return false; -@@ -196,11 +197,15 @@ +@@ -210,7 +214,7 @@ { i--; } -- return world.isBlockNormalCube(i, j, k); -+ return world.isBlockSolidOnSide(i, j, k, l); +- return func_41006_g(world.getBlockId(i, j, k)); ++ return func_41006_g(world.getBlockId(i, j, k)) || world.isBlockSolidOnSide(i, j, k, l); } public static boolean isTrapdoorOpen(int i) - { - return (i & 4) != 0; - } -+ -+ /* FORGE: Set this to allow trapdoors to remain free-floating -+ */ -+ public static boolean disableValidation=false; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 1b328d5e10..6d7110c8be 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -1,113 +1,22 @@ --- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.*; import java.io.PrintStream; import java.util.*; -@@ -68,16 +69,12 @@ - - public void generateSkylightMap() - { -- worldObj.getClass(); - int i = 128 - 1; - for(int j = 0; j < 16; j++) - { - for(int l = 0; l < 16; l++) - { -- worldObj.getClass(); - int j1 = 128 - 1; -- worldObj.getClass(); -- worldObj.getClass(); - int k1; - for(k1 = j << 11 | l << 7; j1 > 0 && Block.lightOpacity[blocks[(k1 + j1) - 1] & 0xff] == 0; j1--) { } - heightMap[l << 4 | j] = (byte)j1; -@@ -90,7 +87,6 @@ - continue; - } - int l1 = 15; -- worldObj.getClass(); - int i2 = 128 - 1; - do - { -@@ -128,7 +124,6 @@ - - private void func_35633_i() - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(xPosition * 16 + 8, 128 / 2, zPosition * 16 + 8, 16)) - { - for(int i = 0; i < 16; i++) -@@ -190,7 +185,6 @@ - { - if(l > k) - { -- worldObj.getClass(); - if(worldObj.doChunksNearChunkExist(i, 128 / 2, j, 16)) - { - for(int i1 = k; i1 < l; i1++) -@@ -211,8 +205,6 @@ - { - i1 = j; - } -- worldObj.getClass(); -- worldObj.getClass(); - for(int j1 = i << 11 | k << 7; i1 > 0 && Block.lightOpacity[blocks[(j1 + i1) - 1] & 0xff] == 0; i1--) { } - if(i1 == l) - { -@@ -225,7 +217,6 @@ - lowestBlockHeight = i1; - } else - { -- worldObj.getClass(); - int k1 = 128 - 1; - for(int i2 = 0; i2 < 16; i2++) - { -@@ -294,8 +285,6 @@ - - public int getBlockID(int i, int j, int k) - { -- worldObj.getClass(); -- worldObj.getClass(); - return blocks[i << 11 | k << 7 | j] & 0xff; - } - -@@ -308,8 +297,6 @@ - field_35637_c[j1] = -999; - } - int k1 = heightMap[k << 4 | i] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int l1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(l1 == l && data.getNibble(i, j, k) == i1) - { -@@ -317,12 +304,17 @@ +@@ -325,6 +326,7 @@ } int i2 = xPosition * 16 + i; int j2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ if (Block.blocksList[l1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[l1]; -+ if (!iovr.canReplaceBlock(worldObj, i2, j, j2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(l1 != 0 && !worldObj.singleplayerWorld) -- { -- Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ if(l1 != 0) { -+ if(!worldObj.singleplayerWorld) -+ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); -+ removeChunkBlockTileEntity(i,j,k); - } - data.setNibble(i, j, k, i1); - if(!worldObj.worldProvider.hasNoSky) -@@ -354,7 +346,7 @@ ++ + blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff); + if(l1 != 0) + { +@@ -367,7 +369,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -116,7 +25,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -362,14 +354,6 @@ +@@ -375,14 +377,6 @@ tileentity.func_35164_g(); } } @@ -131,40 +40,22 @@ } isModified = true; return true; -@@ -384,8 +368,6 @@ - field_35637_c[i1] = -999; - } - int j1 = heightMap[i1] & 0xff; -- worldObj.getClass(); -- worldObj.getClass(); - int k1 = blocks[i << 11 | k << 7 | j] & 0xff; - if(k1 == l) - { -@@ -393,12 +375,18 @@ +@@ -404,10 +398,13 @@ } int l1 = xPosition * 16 + i; int i2 = zPosition * 16 + k; -- worldObj.getClass(); -- worldObj.getClass(); -+ -+ if (Block.blocksList[k1] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1]; -+ if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l)) -+ return iovr.getReplacedSuccess(); -+ } -+ - blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); -- if(k1 != 0) -- { ++ + blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff); + if(k1 != 0) + { - Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if(k1 != 0) { -+ if(!worldObj.singleplayerWorld) -+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ removeChunkBlockTileEntity(i,j,k); ++ if (!worldObj.singleplayerWorld) ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ worldObj.removeBlockTileEntity(l1, j, i2); } data.setNibble(i, j, k, 0); if(Block.lightOpacity[byte0 & 0xff] != 0) -@@ -426,7 +414,7 @@ +@@ -435,7 +432,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -173,7 +64,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -434,14 +422,6 @@ +@@ -443,14 +440,6 @@ tileentity.func_35164_g(); } } @@ -188,7 +79,7 @@ } isModified = true; return true; -@@ -568,6 +548,11 @@ +@@ -586,6 +575,11 @@ { ChunkPosition chunkposition = new ChunkPosition(i, j, k); TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); @@ -200,7 +91,7 @@ if(tileentity == null) { int l = getBlockID(i, j, k); -@@ -577,18 +562,23 @@ +@@ -595,18 +589,23 @@ } if(tileentity == null) { @@ -231,7 +122,7 @@ } } -@@ -600,7 +590,7 @@ +@@ -618,7 +617,7 @@ setChunkBlockTileEntity(i, j, k, tileentity); if(isChunkLoaded) { @@ -240,7 +131,7 @@ } } -@@ -617,6 +607,8 @@ +@@ -634,6 +633,8 @@ return; } else { @@ -249,47 +140,3 @@ tileentity.validate(); chunkTileEntityMap.put(chunkposition, tileentity); return; -@@ -766,8 +758,6 @@ - { - for(int k3 = k; k3 < j1; k3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int k4 = k2 << 11 | k3 << 7 | j; - int k5 = i1 - j; - System.arraycopy(blocks, k4, abyte0, k1, k5); -@@ -780,8 +770,6 @@ - { - for(int l3 = k; l3 < j1; l3++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int l4 = (l2 << 11 | l3 << 7 | j) >> 1; - int l5 = (i1 - j) / 2; - System.arraycopy(data.data, l4, abyte0, k1, l5); -@@ -794,8 +782,6 @@ - { - for(int i4 = k; i4 < j1; i4++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int i5 = (i3 << 11 | i4 << 7 | j) >> 1; - int i6 = (i1 - j) / 2; - System.arraycopy(blocklightMap.data, i5, abyte0, k1, i6); -@@ -808,8 +794,6 @@ - { - for(int j4 = k; j4 < j1; j4++) - { -- worldObj.getClass(); -- worldObj.getClass(); - int j5 = (j3 << 11 | j4 << 7 | j) >> 1; - int j6 = (i1 - j) / 2; - System.arraycopy(skylightMap.data, j5, abyte0, k1, j6); -@@ -857,7 +841,6 @@ - int l = field_35637_c[k]; - if(l == -999) - { -- worldObj.getClass(); - int i1 = 128 - 1; - for(l = -1; i1 > 0 && l == -1;) - { diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index 607f48d7dd..fcf04d4ffe 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -@@ -600,7 +600,9 @@ +@@ -771,7 +771,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); int k = MathHelper.floor_double(posZ); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch index 3d14ddb8fa..7093b0392b 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPigZombie.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPigZombie.java 0000-00-00 00:00:00.000000000 -0000 -@@ -90,7 +90,7 @@ +@@ -94,7 +94,7 @@ return super.attackEntityFrom(damagesource, i); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index e55a83b31a..b7fb291f74 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -11,7 +11,7 @@ // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, // ContainerPlayer, World, ChunkCoordinates, DataWatcher, -@@ -433,6 +437,8 @@ +@@ -493,6 +497,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -20,8 +20,8 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -455,6 +461,32 @@ - return f; +@@ -521,6 +527,32 @@ + return f1; } + /* FORGE: Extended to allow metadata. @@ -41,11 +41,11 @@ + } + if(func_35184_a(Potion.digSpeed)) + { -+ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).func_35652_c() + 1) * 0.2F; ++ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } + if(func_35184_a(Potion.digSlowdown)) + { -+ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).func_35652_c() + 1) * 0.2F; ++ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } + return f; + } @@ -53,33 +53,35 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -615,6 +647,25 @@ +@@ -718,7 +750,26 @@ + } protected void damageEntity(DamageSource damagesource, int i) - { -+ boolean doRegularComputation = true; +- { ++ { ++ boolean doRegularComputation = true; + int initialDamage = i; -+ ++ + for (ItemStack stack : inventory.armorInventory) { + if (stack != null && stack.getItem() instanceof ISpecialArmor) { + ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ ++ + ArmorProperties props = armor.getProperties(this, initialDamage, i); + i = i - props.damageRemove; + doRegularComputation = doRegularComputation -+ && props.allowRegularComputation; ++ && props.allowRegularComputation; + } + } -+ ++ + if (!doRegularComputation) { + super.damageEntity(damagesource, i); + return; + } + - if(!damagesource.func_35083_b() && func_35180_G()) + if(!damagesource.unblockable() && func_35180_G()) { i = 1 + i >> 1; -@@ -668,7 +719,9 @@ +@@ -770,7 +821,9 @@ public void destroyCurrentEquippedItem() { @@ -89,7 +91,7 @@ } public double getYOffset() -@@ -757,6 +810,10 @@ +@@ -896,6 +949,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch index 7ee22e874c..d6143143f6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -1,28 +1,26 @@ --- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ISpecialResistance; import java.util.*; -@@ -66,7 +67,16 @@ - int i5 = worldObj.getBlockId(j4, k4, l4); - if(i5 > 0) +@@ -76,7 +77,14 @@ + int k3 = worldObj.getBlockId(l2, i3, j3); + if(k3 > 0) { -- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ if(Block.blocksList[i5] instanceof ISpecialResistance) { -+ ISpecialResistance isr=(ISpecialResistance) -+ Block.blocksList[i5]; -+ f1-=(isr.getSpecialExplosionResistance( -+ worldObj,j4,k4,l4, -+ explosionX,explosionY,explosionZ, -+ exploder) + 0.3F) * f2; -+ } else { -+ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; -+ } +- f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2; ++ if (Block.blocksList[k3] instanceof ISpecialResistance){ ++ ISpecialResistance isr = (ISpecialResistance)Block.blocksList[k3]; ++ f1 -= (isr.getSpecialExplosionResistance(worldObj, l2, i3, j3, ++ explosionX, explosionY, explosionZ, exploder) + 0.3F) * f2; ++ } else { ++ f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2; ++ } ++ } if(f1 > 0.0F) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch index 70d851bf1c..740a81dad4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -8,7 +8,15 @@ // Referenced classes of package net.minecraft.src: // Block, ItemStack, Item -@@ -21,6 +22,7 @@ +@@ -15,6 +16,7 @@ + + private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); + private Map smeltingList; ++ private Map metaSmeltingList; + + public static final FurnaceRecipes smelting() + { +@@ -24,6 +26,7 @@ private FurnaceRecipes() { smeltingList = new HashMap(); @@ -16,7 +24,7 @@ addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron)); addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold)); addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond)); -@@ -40,11 +42,32 @@ +@@ -46,11 +49,32 @@ smeltingList.put(Integer.valueOf(i), itemstack); } @@ -49,10 +57,3 @@ public Map getSmeltingList() { return smeltingList; -@@ -52,5 +75,6 @@ - - private static final FurnaceRecipes smeltingBase = new FurnaceRecipes(); - private Map smeltingList; -+ private Map metaSmeltingList; - - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 545acffb2b..a2c313796e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,6 +1,16 @@ --- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -@@ -66,6 +66,13 @@ +@@ -175,6 +175,9 @@ + private String field_39006_bR; + private String itemName; + ++ // FORGE: To disable repair recipes. ++ protected boolean canRepair=true; ++ + protected Item(int i) + { + maxStackSize = 64; +@@ -219,6 +222,13 @@ return 1.0F; } @@ -14,3 +24,23 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; +@@ -266,6 +276,19 @@ + return maxDamage > 0 && !hasSubtypes; + } + ++ /* FORGE: Called by CraftingManager to determine if an item is repairable. ++ */ ++ public boolean isRepairable() { ++ return canRepair && isDamageable(); ++ } ++ ++ /* FORGE: Call to disable repair recipes. ++ */ ++ public Item setNoRepair() { ++ canRepair=false; ++ return this; ++ } ++ + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) + { + return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch index ad858eb819..90b3b62eb8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -7,9 +7,9 @@ +import net.minecraft.src.forge.MinecraftForge; + // Referenced classes of package net.minecraft.src: - // Item, EntityPlayer, Vec3D, MathHelper, - // World, MovingObjectPosition, EnumMovingObjectType, Material, -@@ -56,6 +58,12 @@ + // Item, EntityPlayer, MovingObjectPosition, EnumMovingObjectType, + // World, Material, PlayerCapabilities, ItemStack, +@@ -46,6 +48,12 @@ } if(isFull == 0) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch index 30e1b2bb64..094891bc5a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,6 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ForgeHooks; import java.util.Random; -@@ -29,13 +30,18 @@ +@@ -39,13 +40,18 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { @@ -28,7 +28,7 @@ if(i1 == Block.sapling.blockID) { if(!world.singleplayerWorld) -@@ -102,13 +108,7 @@ +@@ -112,13 +118,7 @@ world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); continue; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index 42658b8f9f..6175d136a1 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,7 +3,8 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; - @@ -10,7 +10,7 @@ // Referenced classes of package net.minecraft.src: // EntityPlayer, PlayerCapabilities, World, Block, -@@ -66,7 +67,8 @@ +@@ -81,7 +82,8 @@ if(j != 0) { Block block = Block.blocksList[j]; @@ -20,7 +20,7 @@ if(f >= 1.0F) { field_22050_k = false; -@@ -93,7 +95,7 @@ +@@ -108,7 +110,7 @@ { Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); } @@ -29,7 +29,7 @@ { blockHarvessted(i, j, k); } else -@@ -113,7 +115,7 @@ +@@ -128,7 +130,7 @@ if(i1 != 0) { Block block = Block.blocksList[i1]; @@ -38,7 +38,7 @@ if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -135,11 +137,10 @@ +@@ -150,11 +152,10 @@ { Block block = Block.blocksList[thisWorld.getBlockId(i, j, k)]; int l = thisWorld.getBlockMetadata(i, j, k); @@ -54,16 +54,16 @@ return flag; } -@@ -164,7 +165,7 @@ - thisPlayer.destroyCurrentEquippedItem(); - } - } -- if(flag && thisPlayer.canHarvestBlock(Block.blocksList[l])) -+ if(flag && Block.blocksList[l].canHarvestBlock(thisPlayer,i1)) +@@ -170,7 +171,7 @@ + } else + { + ItemStack itemstack = thisPlayer.getCurrentEquippedItem(); +- boolean flag1 = thisPlayer.canHarvestBlock(Block.blocksList[l]); ++ boolean flag1 = Block.blocksList[l].canHarvestBlock(thisPlayer, i1); + if(itemstack != null) { - Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); - } -@@ -188,6 +189,7 @@ + itemstack.onDestroyBlock(l, i, j, k, thisPlayer); +@@ -204,6 +205,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -71,7 +71,7 @@ } return true; } else -@@ -198,6 +200,11 @@ +@@ -214,6 +216,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -83,7 +83,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -217,7 +224,11 @@ +@@ -233,7 +240,11 @@ return flag; } else { diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch index 4bc57d9f23..9b0391dc2a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -9,7 +9,18 @@ // Referenced classes of package net.minecraft.src: // Item, EnumToolMaterial, ItemStack, Block, -@@ -37,6 +39,14 @@ +@@ -13,8 +15,8 @@ + { + + private Block blocksEffectiveAgainst[]; +- protected float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + + protected ItemTool(int i, int j, EnumToolMaterial enumtoolmaterial, Block ablock[]) +@@ -42,6 +44,14 @@ return 1.0F; } @@ -24,13 +35,3 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); -@@ -55,7 +65,7 @@ - } - - private Block blocksEffectiveAgainst[]; -- private float efficiencyOnProperMaterial; -- private int damageVsEntity; -+ public float efficiencyOnProperMaterial; -+ public int damageVsEntity; - protected EnumToolMaterial toolMaterial; - } diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch index 38011b3cf0..8fc9d52b05 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,10 +1,12 @@ --- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -@@ -35,4 +35,7 @@ +@@ -18,6 +18,9 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; -+ -+ // Added for RedPower subblocks. -+ public int subHit=-1; - } ++ ++ //Added for RedPower SubBlocks. ++ public int subHit = -1; + + public MovingObjectPosition(int i, int j, int k, int l, Vec3D vec3d) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch index c79e7b22e2..9eda3eae1f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -33,9 +33,9 @@ +@@ -38,9 +38,9 @@ throws IOException { windowId = datainputstream.readByte(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch index 6b83f5ee95..44dc80c554 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 -@@ -71,7 +71,10 @@ +@@ -79,7 +79,10 @@ })); } byte abyte0[] = new byte[k1]; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch index b024e03f0d..886ae732c3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch @@ -1,16 +1,7 @@ --- ../src_base/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -34,7 +34,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte()&0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); -@@ -67,7 +67,7 @@ - } +@@ -15,7 +15,7 @@ + { public int entityId; - public byte type; @@ -18,3 +9,12 @@ public int xPosition; public int yPosition; public int zPosition; +@@ -44,7 +44,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte() & 0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch index bf56c4732d..1547e7a4bf 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -@@ -168,12 +168,11 @@ +@@ -183,12 +183,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 39b6ed4f9e..5295fbac59 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 @@ -3,7 +3,7 @@ - // Decompiler options: packimports(3) braces deadcode + // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; - @@ -9,8 +9,8 @@ // Referenced classes of package net.minecraft.src: // Slot, EntityPlayer, ItemStack, Block, -@@ -60,6 +60,7 @@ - thePlayer.addStat(AchievementList.buildSword, 1); +@@ -71,6 +71,7 @@ + thePlayer.addStat(AchievementList.bookcase, 1); } ModLoader.TakenFromCrafting(thePlayer, itemstack); + ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix); diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index ef84f71cb6..2645f52f6d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -@@ -61,6 +61,13 @@ +@@ -72,6 +72,13 @@ { } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 5511bd75c0..96e465c15c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -16,8 +16,8 @@ + implements IInventory, ISidedInventory { - public TileEntityFurnace() -@@ -28,6 +29,16 @@ + private ItemStack furnaceItemStacks[]; +@@ -33,6 +34,16 @@ return furnaceItemStacks.length; } @@ -34,7 +34,7 @@ public ItemStack getStackInSlot(int i) { return furnaceItemStacks[i]; -@@ -176,7 +187,7 @@ +@@ -181,7 +192,7 @@ { return false; } @@ -43,7 +43,7 @@ if(itemstack == null) { return false; -@@ -189,13 +200,9 @@ +@@ -194,13 +205,9 @@ { return false; } @@ -60,7 +60,7 @@ } public void smeltItem() -@@ -204,23 +211,29 @@ +@@ -209,23 +216,29 @@ { return; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 0b57d2df1d..8dfd2463e9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -1,6 +1,15 @@ --- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -@@ -183,7 +183,11 @@ +@@ -51,7 +51,7 @@ + public int lightningFlash; + public boolean editingBlocks; + private long lockTimestamp; +- protected int autosavePeriod; ++ public int autosavePeriod; + public int difficultySetting; + public Random rand; + public boolean isNewWorld; +@@ -244,7 +244,11 @@ public boolean isAirBlock(int i, int j, int k) { @@ -13,7 +22,7 @@ } public boolean blockExists(int i, int j, int k) -@@ -1124,7 +1128,7 @@ +@@ -1207,7 +1211,7 @@ Chunk chunk = getChunkFromChunkCoords(tileentity.xCoord >> 4, tileentity.zCoord >> 4); if(chunk != null) { @@ -22,7 +31,7 @@ } } } -@@ -1151,15 +1155,15 @@ +@@ -1235,15 +1239,15 @@ { loadedTileEntityList.add(tileentity1); } @@ -40,7 +49,7 @@ } } while(true); addedTileEntityList.clear(); -@@ -1168,13 +1172,19 @@ +@@ -1254,13 +1258,19 @@ public void addTileEntity(Collection collection) { @@ -67,7 +76,7 @@ } public void updateEntity(Entity entity) -@@ -1372,6 +1382,9 @@ +@@ -1460,6 +1470,9 @@ if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID) { return true; @@ -77,7 +86,7 @@ } } -@@ -1590,44 +1603,23 @@ +@@ -1700,46 +1713,22 @@ public void setBlockTileEntity(int i, int j, int k, TileEntity tileentity) { @@ -99,15 +108,14 @@ - } - } - } -+ if(tileentity==null || tileentity.isInvalid()) -+ return; -+ List dest=scanningTileEntities ? addedTileEntityList : -+ loadedTileEntityList; -+ if(tileentity.canUpdate()) dest.add(tileentity); -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); -+ } ++ if(tileentity==null || tileentity.isInvalid()) ++ return; ++ List dest=scanningTileEntities ? addedTileEntityList : loadedTileEntityList; ++ if(tileentity.canUpdate()) dest.add(tileentity); ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.setChunkBlockTileEntity(i & 0xf, j, k & 0xf, tileentity); ++ } } public void removeBlockTileEntity(int i, int j, int k) @@ -116,10 +124,12 @@ - if(tileentity != null && scanningTileEntities) - { - tileentity.invalidate(); +- addedTileEntityList.remove(tileentity); - } else - { - if(tileentity != null) - { +- addedTileEntityList.remove(tileentity); - loadedTileEntityList.remove(tileentity); - } - Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); @@ -128,14 +138,14 @@ - chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); - } - } -+ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); -+ if(chunk != null) { -+ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); -+ } ++ Chunk chunk = getChunkFromChunkCoords(i >> 4, k >> 4); ++ if(chunk != null) { ++ chunk.removeChunkBlockTileEntity(i & 0xf, j, k & 0xf); ++ } } public void func_35239_a(TileEntity tileentity) -@@ -1650,13 +1642,18 @@ +@@ -1762,13 +1751,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { Block block = Block.blocksList[getBlockId(i, j, k)]; @@ -160,8 +170,8 @@ + return block.isBlockSolidOnSide(this,i,j,k,side); } - public void calculateInitialSkylight() -@@ -1976,7 +1973,7 @@ + public boolean func_41047_b(int i, int j, int k, boolean flag) +@@ -2179,7 +2173,7 @@ private int func_35241_e(int i, int j, int k, int l, int i1, int j1) { @@ -170,7 +180,7 @@ int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1; -@@ -2315,6 +2312,7 @@ +@@ -2556,6 +2550,7 @@ { block = null; } @@ -178,12 +188,3 @@ return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1); } -@@ -2759,7 +2757,7 @@ - public int field_27080_i; - public boolean editingBlocks; - private long lockTimestamp; -- protected int autosavePeriod; -+ public int autosavePeriod; - public int difficultySetting; - public Random rand; - public boolean isNewWorld; diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index 5bd29eb807..05a7cfd0ff 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -54,15 +54,20 @@ +@@ -63,15 +63,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { ArrayList arraylist = new ArrayList(); diff --git a/forge/setup.bat b/forge/setup.bat index 46837586a1..fba467b751 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -10,9 +10,13 @@ pushd .. >nul pushd src >nul ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch - ..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch - del ..\forge\mlprop-win.patch ..\forge\modLoaderMP-win.patch >nul 1>nul + rem ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch + rem ..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch + rem del ..\forge\mlprop-win.patch ..\forge\modLoaderMP-win.patch >nul 1>nul + del minecraft\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java + del minecraft_server\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java popd >nul cmd /C updatemd5.bat diff --git a/forge/setup.sh b/forge/setup.sh index 0a4db9b42e..64750ecf80 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -25,7 +25,6 @@ if [ ! -d src_base ] ; then find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch - patch -p1 -i ../forge/mlprop.patch popd > /dev/null From 68cc1d315bdd56b50728a5778ad946693e99f530 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Wed, 30 Nov 2011 19:02:10 +0000 Subject: [PATCH 134/169] bumped version number --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 4 ++-- forge/release.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 6173786128..746da75e92 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -230,8 +230,8 @@ public class ForgeHooks { } public static final int majorVersion=1; - public static final int minorVersion=1; - public static final int revisionVersion=3; + public static final int minorVersion=2; + public static final int revisionVersion=0; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/release.bat b/forge/release.bat index c327006a02..f952f04494 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.1.2 +sh package.sh 1.2.0 pause From 5c7978d3471f7d8aa60947653ec3de24327a11f0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 1 Dec 2011 07:29:06 +0000 Subject: [PATCH 135/169] Added MLprop.java that ST forgot when he merged. Fixed EntityPlayer.getPlayerStrVsBlock metadata function for 1.0.0 changes in Enchantments/Potions. --- forge/MLProp.java | 11 +++++++ .../net/minecraft/src/EntityPlayer.java.patch | 33 +++++++++++++------ .../net/minecraft/src/EntityPlayer.java.patch | 33 +++++++++++++------ 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 forge/MLProp.java diff --git a/forge/MLProp.java b/forge/MLProp.java new file mode 100644 index 0000000000..29dfae7ff8 --- /dev/null +++ b/forge/MLProp.java @@ -0,0 +1,11 @@ +package net.minecraft.src; +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface MLProp { + String name() default ""; + String info() default ""; + double min() default Double.NEGATIVE_INFINITY; + double max() default Double.POSITIVE_INFINITY; +} \ No newline at end of file diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 9235f34df2..0a3eff1d89 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -20,7 +20,7 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -576,6 +582,32 @@ +@@ -576,6 +582,45 @@ return f1; } @@ -29,31 +29,44 @@ + public float getCurrentPlayerStrVsBlock(Block block, int md) + { + float f = 1.0F; -+ ItemStack ist=inventory.getCurrentItem(); -+ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); -+ if(isInsideOfMaterial(Material.water)) ++ ItemStack ist = inventory.getCurrentItem(); ++ if(ist != null) + { -+ f /= 5F; ++ f = ist.getItem().getStrVsBlock(ist, block, md); + } -+ if(!onGround) ++ ++ int i = EnchantmentHelper.getEfficiencyModifier(inventory); ++ if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md)) + { -+ f /= 5F; ++ f += i * i + 1; + } ++ + if(isPotionActive(Potion.potionDigSpeed)) + { + f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; + } ++ + if(isPotionActive(Potion.potionDigSlow)) + { + f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; + } ++ ++ if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory)) ++ { ++ f /= 5F; ++ } ++ ++ if(!onGround) ++ { ++ f /= 5F; ++ } + return f; + } + public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -774,6 +806,25 @@ +@@ -774,6 +819,25 @@ protected void damageEntity(DamageSource damagesource, int i) { @@ -79,7 +92,7 @@ if(!damagesource.unblockable() && func_35162_ad()) { i = 1 + i >> 1; -@@ -825,7 +876,9 @@ +@@ -825,7 +889,9 @@ public void destroyCurrentEquippedItem() { @@ -89,7 +102,7 @@ } public double getYOffset() -@@ -957,6 +1010,10 @@ +@@ -957,6 +1023,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index b7fb291f74..676a56ec92 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -20,7 +20,7 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -521,6 +527,32 @@ +@@ -521,6 +527,45 @@ return f1; } @@ -29,31 +29,44 @@ + public float getCurrentPlayerStrVsBlock(Block block, int md) + { + float f = 1.0F; -+ ItemStack ist=inventory.getCurrentItem(); -+ if(ist!=null) f=ist.getItem().getStrVsBlock(ist,block,md); -+ if(isInsideOfMaterial(Material.water)) ++ ItemStack ist = inventory.getCurrentItem(); ++ if(ist != null) + { -+ f /= 5F; ++ f = ist.getItem().getStrVsBlock(ist, block, md); + } -+ if(!onGround) ++ ++ int i = EnchantmentHelper.func_40630_b(inventory); ++ if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md)) + { -+ f /= 5F; ++ f += i * i + 1; + } ++ + if(func_35184_a(Potion.digSpeed)) + { + f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } ++ + if(func_35184_a(Potion.digSlowdown)) + { + f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } ++ ++ if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.func_40632_g(inventory)) ++ { ++ f /= 5F; ++ } ++ ++ if(!onGround) ++ { ++ f /= 5F; ++ } + return f; + } + public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -718,7 +750,26 @@ +@@ -718,7 +763,26 @@ } protected void damageEntity(DamageSource damagesource, int i) @@ -81,7 +94,7 @@ if(!damagesource.unblockable() && func_35180_G()) { i = 1 + i >> 1; -@@ -770,7 +821,9 @@ +@@ -770,7 +834,9 @@ public void destroyCurrentEquippedItem() { @@ -91,7 +104,7 @@ } public double getYOffset() -@@ -896,6 +949,10 @@ +@@ -896,6 +962,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { From e35435abd53dea31d6f36ddc38d796a6a5f2ec82 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 2 Dec 2011 02:26:15 +0000 Subject: [PATCH 136/169] Fixed missing CraftingManager patches for the repair disable hook. Fixed smp mlprop. --- .../minecraft/src/CraftingManager.java.patch | 11 ++++++ .../minecraft/src/CraftingManager.java.patch | 11 ++++++ .../net/minecraft/src/MLProp.java.patch | 34 +++++++++++++++++++ forge/setup.sh | 1 + 4 files changed, 57 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch b/forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch new file mode 100644 index 0000000000..23b8ec0646 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 +@@ -363,7 +363,7 @@ + i++; + } + +- if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable()) ++ if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isRepairable()) + { + Item item = Item.itemsList[itemstack.itemID]; + int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch new file mode 100644 index 0000000000..fff409902e --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 +@@ -363,7 +363,7 @@ + i++; + } + +- if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable()) ++ if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isRepairable()) + { + Item item = Item.itemsList[itemstack.itemID]; + int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch new file mode 100644 index 0000000000..ac54e306ce --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch @@ -0,0 +1,34 @@ +--- ../src_base/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 +@@ -1,22 +1,13 @@ +-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. +-// Jad home page: http://www.kpdus.com/jad.html +-// Decompiler options: packimports(3) braces deadcode fieldsfirst +- + package net.minecraft.src; ++import java.lang.annotation.*; + +-import java.lang.annotation.Annotation; +- +-public interface MLProp +- extends Annotation +-{ +- +- public abstract String name(); +- +- public abstract String info(); +- +- public abstract double min(); +- +- public abstract double max(); ++@Retention(RetentionPolicy.RUNTIME) ++@Target(ElementType.FIELD) ++public @interface MLProp { ++ String name() default ""; ++ String info() default ""; ++ double min() default Double.NEGATIVE_INFINITY; ++ double max() default Double.POSITIVE_INFINITY; + +- public abstract int reobf(); ++ public int reobf() default 0; + } diff --git a/forge/setup.sh b/forge/setup.sh index 64750ecf80..dfba813ec4 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -25,6 +25,7 @@ if [ ! -d src_base ] ; then find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch + cp -f ../forge/MLProp.java minecraft/net/minecraft/src popd > /dev/null From 6c578cd84db124c0e313d63ad396f432f3b4ef51 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 2 Dec 2011 03:37:48 +0000 Subject: [PATCH 137/169] Creative Container population hook. --- .../net/minecraft/src/Block.java.patch | 10 ++++- .../src/ContainerCreative.java.patch | 25 +++++++++++ .../net/minecraft/src/Item.java.patch | 43 +++++++++++++++++-- 3 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 7e1af3014a..956d3829c0 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -101,7 +101,7 @@ } } -@@ -805,6 +819,96 @@ +@@ -805,6 +819,104 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -194,6 +194,14 @@ + int i, int j, int k) { + return world.setBlockWithNotify(i, j, k, 0); + } ++ ++ /* FORGE: Called when a new CreativeContainer is opened, populate the list ++ * with all of the items for this block you want a player in creative mode ++ * to have access to. ++ */ ++ public void addCreativeItems(ArrayList itemList) ++ { ++ } + static Class _mthclass$(String s) { diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch new file mode 100644 index 0000000000..44c2bbd4d8 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch @@ -0,0 +1,25 @@ +--- ../src_base/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 +@@ -74,12 +74,20 @@ + } + itemList.add(new ItemStack(ablock[l1], 1, k2)); + } ++ ++ for(int x = 0; x < 256; x++) ++ { ++ if (Block.blocksList[x] != null) ++ { ++ Block.blocksList[x].addCreativeItems((ArrayList)itemList); ++ } ++ } + + for(int i2 = 256; i2 < Item.itemsList.length; i2++) + { +- if(Item.itemsList[i2] != null && Item.itemsList[i2].shiftedIndex != Item.potion.shiftedIndex) ++ if(Item.itemsList[i2] != null) + { +- itemList.add(new ItemStack(Item.itemsList[i2])); ++ Item.itemsList[i2].addCreativeItems((ArrayList)itemList); + } + } + diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index ce763e57f2..ac62ae845a 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -@@ -177,6 +177,9 @@ +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.io.PrintStream; ++import java.util.ArrayList; + import java.util.List; + import java.util.Random; + +@@ -177,6 +178,9 @@ private String field_39010_c; private String itemName; @@ -10,7 +18,7 @@ protected Item(int i) { maxStackSize = 64; -@@ -231,6 +234,13 @@ +@@ -231,6 +235,13 @@ return 1.0F; } @@ -24,7 +32,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -278,6 +288,19 @@ +@@ -278,6 +289,19 @@ return maxDamage > 0 && !hasSubtypes; } @@ -44,3 +52,32 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; +@@ -473,6 +497,28 @@ + { + return 0; + } ++ ++ /* FORGE: Called when a new CreativeContainer is opened, populate the list ++ * with all of the items for this item you want a player in creative mode ++ * to have access to. ++ */ ++ public void addCreativeItems(ArrayList itemList) ++ { ++ if (this.shiftedIndex != Item.potion.shiftedIndex) ++ { ++ if (this.shiftedIndex == Item.dyePowder.shiftedIndex) ++ { ++ for (int x = 0; x < 16; x++) ++ { ++ itemList.add(new ItemStack(Item.dyePowder, 1, x)); ++ } ++ } ++ else ++ { ++ itemList.add(new ItemStack(this, 1)); ++ } ++ } ++ } + + static + { From a2c606e98c0f437d26b503029ae4f854db64c189 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 2 Dec 2011 03:57:11 +0000 Subject: [PATCH 138/169] Moved dye creative adds to the ItemDye class. --- .../src/ContainerCreative.java.patch | 10 ++++++- .../net/minecraft/src/Item.java.patch | 14 ++-------- .../net/minecraft/src/ItemDye.java.patch | 26 ++++++++++++++++--- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch index 44c2bbd4d8..ec26b86266 100644 --- a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 -@@ -74,12 +74,20 @@ +@@ -74,20 +74,23 @@ } itemList.add(new ItemStack(ablock[l1], 1, k2)); } @@ -23,3 +23,11 @@ } } +- for(int j2 = 1; j2 < 16; j2++) +- { +- itemList.add(new ItemStack(Item.dyePowder.shiftedIndex, 1, j2)); +- } +- + InventoryPlayer inventoryplayer = entityplayer.inventory; + for(int l2 = 0; l2 < 9; l2++) + { diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index ac62ae845a..c9753669ce 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -52,7 +52,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -473,6 +497,28 @@ +@@ -473,6 +497,18 @@ { return 0; } @@ -65,17 +65,7 @@ + { + if (this.shiftedIndex != Item.potion.shiftedIndex) + { -+ if (this.shiftedIndex == Item.dyePowder.shiftedIndex) -+ { -+ for (int x = 0; x < 16; x++) -+ { -+ itemList.add(new ItemStack(Item.dyePowder, 1, x)); -+ } -+ } -+ else -+ { -+ itemList.add(new ItemStack(this, 1)); -+ } ++ itemList.add(new ItemStack(this, 1)); + } + } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index d78e4dea68..6d7d6c8c43 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,14 +1,16 @@ --- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,7 @@ +@@ -3,7 +3,9 @@ // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; +import net.minecraft.src.forge.ForgeHooks; ++import java.util.ArrayList; import java.util.Random; -@@ -45,13 +46,18 @@ + // Referenced classes of package net.minecraft.src: +@@ -45,13 +47,18 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { @@ -28,7 +30,7 @@ if(i1 == Block.sapling.blockID) { if(!world.multiplayerWorld) -@@ -118,13 +124,7 @@ +@@ -118,13 +125,7 @@ world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); continue; } @@ -43,3 +45,21 @@ } } +@@ -147,5 +148,17 @@ + } + } + } ++ ++ /* FORGE: Called when a new CreativeContainer is opened, populate the list ++ * with all of the items for this item you want a player in creative mode ++ * to have access to. ++ */ ++ public void addCreativeItems(ArrayList itemList) ++ { ++ for (int x = 0; x < 16; x++) ++ { ++ itemList.add(new ItemStack(this, 1, x)); ++ } ++ } + + } From 9c6f5bd8ee6170a68b2282e8df8283aad55467f2 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 2 Dec 2011 04:08:15 +0000 Subject: [PATCH 139/169] Added new tool harvest intercept hook. Removed mlprop.patch. --- forge/mlprop.patch | 70 ------------------- .../net/minecraft/src/Block.java.patch | 5 +- .../net/minecraft/src/Item.java.patch | 12 +++- .../src/PlayerControllerMP.java.patch | 26 +++++-- .../src/PlayerControllerSP.java.patch | 20 ++++-- .../net/minecraft/src/Block.java.patch | 5 +- .../net/minecraft/src/Item.java.patch | 12 +++- .../src/ItemInWorldManager.java.patch | 22 ++++-- 8 files changed, 82 insertions(+), 90 deletions(-) delete mode 100644 forge/mlprop.patch diff --git a/forge/mlprop.patch b/forge/mlprop.patch deleted file mode 100644 index f6f9569792..0000000000 --- a/forge/mlprop.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -ru src/minecraft/net/minecraft/src/MLProp.java src_fix/minecraft/net/minecraft/src/MLProp.java ---- src/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400 -+++ src_fix/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:12:55.000000000 -0400 -@@ -1,20 +1,11 @@ --// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. --// Jad home page: http://www.kpdus.com/jad.html --// Decompiler options: packimports(3) braces deadcode -- --package net.minecraft.src; -- --import java.lang.annotation.Annotation; -- --public interface MLProp -- extends Annotation --{ -- -- public abstract String name(); -- -- public abstract String info(); -- -- public abstract double min(); -- -- public abstract double max(); --} -+package net.minecraft.src; -+import java.lang.annotation.*; -+ -+@Retention(RetentionPolicy.RUNTIME) -+@Target(ElementType.FIELD) -+public @interface MLProp { -+ String name() default ""; -+ String info() default ""; -+ double min() default Double.NEGATIVE_INFINITY; -+ double max() default Double.POSITIVE_INFINITY; -+} -diff -ru src/minecraft_server/net/minecraft/src/MLProp.java src_fix/minecraft_server/net/minecraft/src/MLProp.java ---- src/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400 -+++ src_fix/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:13:00.000000000 -0400 -@@ -1,20 +1,11 @@ --// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. --// Jad home page: http://www.kpdus.com/jad.html --// Decompiler options: packimports(3) braces deadcode -- --package net.minecraft.src; -- --import java.lang.annotation.Annotation; -- --public interface MLProp -- extends Annotation --{ -- -- public abstract String name(); -- -- public abstract String info(); -- -- public abstract double min(); -- -- public abstract double max(); --} -+package net.minecraft.src; -+import java.lang.annotation.*; -+ -+@Retention(RetentionPolicy.RUNTIME) -+@Target(ElementType.FIELD) -+public @interface MLProp { -+ String name() default ""; -+ String info() default ""; -+ double min() default Double.NEGATIVE_INFINITY; -+ double max() default Double.POSITIVE_INFINITY; -+} diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 956d3829c0..07adca7714 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -101,7 +101,7 @@ } } -@@ -805,6 +819,104 @@ +@@ -805,6 +819,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -189,6 +189,9 @@ + * actually destroying the block, and the block is intact at time of call. + * This is called regardless of whether the player can harvest the block or + * not. Return true if the block is actually destroyed. ++ * ++ * Note: When used in multiplayer, this is called on both client and ++ * server sides! + */ + public boolean removeBlockByPlayer(World world, EntityPlayer player, + int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index c9753669ce..319bb71f67 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -32,7 +32,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -278,6 +289,19 @@ +@@ -278,6 +289,29 @@ return maxDamage > 0 && !hasSubtypes; } @@ -48,6 +48,16 @@ + canRepair=false; + return this; + } ++ ++ /* FORGE: Called before a block is broken. Return true to prevent default ++ * block harvesting. ++ * ++ * Note: In SMP, this is called on both client and server sides! ++ */ ++ public boolean onBlockStartBreak(ItemStack itemstack, int i, int j, int k, ++ EntityPlayer player) { ++ return false; ++ } + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index ed72c6faed..aa53cf7395 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -10,7 +10,25 @@ import net.minecraft.client.Minecraft; // Referenced classes of package net.minecraft.src: -@@ -103,7 +106,7 @@ +@@ -68,13 +71,16 @@ + + public boolean sendBlockRemoved(int i, int j, int k, int l) + { ++ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); ++ if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack, ++ i,j,k,mc.thePlayer)) ++ return false; + if(creativeMode) + { + return super.sendBlockRemoved(i, j, k, l); + } + int i1 = mc.theWorld.getBlockId(i, j, k); + boolean flag = super.sendBlockRemoved(i, j, k, l); +- ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); + if(itemstack != null) + { + itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); +@@ -103,7 +109,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -19,7 +37,7 @@ { sendBlockRemoved(i, j, k, l); } else -@@ -149,7 +152,7 @@ +@@ -149,7 +155,7 @@ return; } Block block = Block.blocksList[i1]; @@ -28,7 +46,7 @@ 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); -@@ -216,6 +219,13 @@ +@@ -216,6 +222,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); @@ -42,7 +60,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -235,7 +245,11 @@ +@@ -235,7 +248,11 @@ return flag; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 91ada64c48..0414252dae 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -9,16 +9,24 @@ import net.minecraft.client.Minecraft; -@@ -50,7 +52,7 @@ +@@ -46,11 +48,14 @@ + + public boolean sendBlockRemoved(int i, int j, int k, int l) + { ++ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); ++ if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack, ++ i,j,k,mc.thePlayer)) ++ return false; + int i1 = mc.theWorld.getBlockId(i, j, k); int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); - ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); +- ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); - boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); + boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -79,7 +81,7 @@ +@@ -79,7 +84,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -27,7 +35,7 @@ { sendBlockRemoved(i, j, k, l); } -@@ -110,7 +112,7 @@ +@@ -110,7 +115,7 @@ return; } Block block = Block.blocksList[i1]; @@ -36,7 +44,7 @@ if(field_1069_h % 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); -@@ -173,6 +175,12 @@ +@@ -173,6 +178,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -49,7 +57,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -183,7 +191,11 @@ +@@ -183,7 +194,11 @@ return false; } else { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 19277633bb..ed12169be5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -85,7 +85,7 @@ } } -@@ -725,6 +737,96 @@ +@@ -725,6 +737,99 @@ return blockMaterial.getMaterialMobility(); } @@ -173,6 +173,9 @@ + * actually destroying the block, and the block is intact at time of call. + * This is called regardless of whether the player can harvest the block or + * not. Return true if the block is actually destroyed. ++ * ++ * Note: When used in multiplayer, this is called on both client and ++ * server sides! + */ + public boolean removeBlockByPlayer(World world, EntityPlayer player, + int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index a2c313796e..e2e0d081f3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -24,7 +24,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -266,6 +276,19 @@ +@@ -266,6 +276,29 @@ return maxDamage > 0 && !hasSubtypes; } @@ -40,6 +40,16 @@ + canRepair=false; + return this; + } ++ ++ /* FORGE: Called before a block is broken. Return true to prevent default ++ * block harvesting. ++ * ++ * Note: In SMP, this is called on both client and server sides! ++ */ ++ public boolean onBlockStartBreak(ItemStack itemstack, int i, int j, int k, ++ EntityPlayer player) { ++ return false; ++ } + public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index 6175d136a1..f6a6b2be26 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -38,7 +38,7 @@ if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -150,11 +152,10 @@ +@@ -150,16 +152,19 @@ { Block block = Block.blocksList[thisWorld.getBlockId(i, j, k)]; int l = thisWorld.getBlockMetadata(i, j, k); @@ -54,16 +54,26 @@ return flag; } -@@ -170,7 +171,7 @@ + public boolean blockHarvessted(int i, int j, int k) + { ++ ItemStack itemstack = thisPlayer.getCurrentEquippedItem(); ++ if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack, ++ i,j,k,thisPlayer)) ++ return false; + int l = thisWorld.getBlockId(i, j, k); + int i1 = thisWorld.getBlockMetadata(i, j, k); + thisWorld.playAuxSFXAtEntity(thisPlayer, 2001, i, j, k, l + thisWorld.getBlockMetadata(i, j, k) * 256); +@@ -169,8 +174,7 @@ + ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld)); } else { - ItemStack itemstack = thisPlayer.getCurrentEquippedItem(); +- ItemStack itemstack = thisPlayer.getCurrentEquippedItem(); - boolean flag1 = thisPlayer.canHarvestBlock(Block.blocksList[l]); + boolean flag1 = Block.blocksList[l].canHarvestBlock(thisPlayer, i1); if(itemstack != null) { itemstack.onDestroyBlock(l, i, j, k, thisPlayer); -@@ -204,6 +205,7 @@ +@@ -204,6 +208,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -71,7 +81,7 @@ } return true; } else -@@ -214,6 +216,11 @@ +@@ -214,6 +219,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -83,7 +93,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -233,7 +240,11 @@ +@@ -233,7 +243,11 @@ return flag; } else { From 8a4636cba3a66ad3ef812a6109c17ee9dd9e165f Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 2 Dec 2011 04:32:10 +0000 Subject: [PATCH 140/169] Added a hoe handler for advanced farming. --- .../net/minecraft/src/forge/ForgeHooks.java | 11 ++++++++++ .../net/minecraft/src/forge/IHoeHandler.java | 21 +++++++++++++++++++ .../minecraft/src/forge/MinecraftForge.java | 7 +++++++ .../net/minecraft/src/Item.java.patch | 2 +- .../net/minecraft/src/ItemHoe.java.patch | 21 +++++++++++++++++++ .../net/minecraft/src/ItemHoe.java.patch | 21 +++++++++++++++++++ 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 forge/forge_common/net/minecraft/src/forge/IHoeHandler.java create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 746da75e92..2099b599c1 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -49,6 +49,17 @@ public class ForgeHooks { static LinkedList bonemealHandlers = new LinkedList(); + public static boolean onUseHoe(ItemStack hoe, EntityPlayer player, + World world, int i, int j, int k) { + for(IHoeHandler handler : hoeHandlers) { + if(handler.onUseHoe(hoe,player,world,i,j,k)) + return true; + } + return false; + } + + static LinkedList hoeHandlers = new LinkedList(); + public static EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k) { for (ISleepHandler handler : sleepHandlers) { EnumStatus status = handler.sleepInBedAt(player, i, j, k); diff --git a/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java b/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java new file mode 100644 index 0000000000..78886bdbaa --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java @@ -0,0 +1,21 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +import net.minecraft.src.World; +import net.minecraft.src.ItemStack; +import net.minecraft.src.EntityPlayer; + +public interface IHoeHandler { + /** Called when a hoe is used on a block. This is called on both sides + * in SMP. + * @return true to consume a use of the hoe and return. + */ + public boolean onUseHoe(ItemStack hoe, EntityPlayer player, World world, + int i, int j, int k); + +} + diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 8a5449338e..89c049dde3 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -36,6 +36,13 @@ public class MinecraftForge { ForgeHooks.bonemealHandlers.add(handler); } + /** + * Registers a new hoe handler. + */ + public static void registerHoeHandler(IHoeHandler handler) { + ForgeHooks.hoeHandlers.add(handler); + } + /** * Registers a new destroy tool handler. */ diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 319bb71f67..440b06e87c 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -62,7 +62,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -473,6 +497,18 @@ +@@ -473,6 +507,18 @@ { return 0; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch new file mode 100644 index 0000000000..a6b7b417b3 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -0,0 +1,21 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, EntityPlayer, World, +@@ -25,6 +26,10 @@ + { + return false; + } ++ if(ForgeHooks.onUseHoe(itemstack,entityplayer,world,i,j,k)) { ++ itemstack.damageItem(1, entityplayer); ++ return true; ++ } + int i1 = world.getBlockId(i, j, k); + int j1 = world.getBlockId(i, j + 1, k); + if(l != 0 && j1 == 0 && i1 == Block.grass.blockID || i1 == Block.dirt.blockID) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch new file mode 100644 index 0000000000..18402927ea --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -0,0 +1,21 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooks; + + // Referenced classes of package net.minecraft.src: + // Item, EnumToolMaterial, EntityPlayer, World, +@@ -25,6 +26,10 @@ + { + return false; + } ++ if(ForgeHooks.onUseHoe(itemstack,entityplayer,world,i,j,k)) { ++ itemstack.damageItem(1, entityplayer); ++ return true; ++ } + int i1 = world.getBlockId(i, j, k); + int j1 = world.getBlockId(i, j + 1, k); + if(l != 0 && j1 == 0 && i1 == Block.grass.blockID || i1 == Block.dirt.blockID) From b883254220a438bc430a7bb76e460414e5df914e Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 5 Dec 2011 08:30:07 +0000 Subject: [PATCH 141/169] Cleaned up a few things related to MLProp Deleted unmaintained fernflower patch. --- forge/install/install.cmd | 7 +- forge/install/install.sh | 4 +- forge/minecraft-fern.patch | 637 ------------------ forge/modLoaderMP.patch | 11 + .../net/minecraft/src/MLProp.java.patch | 34 - forge/setup.bat | 8 +- forge/setup.sh | 3 +- 7 files changed, 21 insertions(+), 683 deletions(-) delete mode 100644 forge/minecraft-fern.patch delete mode 100644 forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch diff --git a/forge/install/install.cmd b/forge/install/install.cmd index e40fe371b8..f8a8d3b2d6 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -9,15 +9,14 @@ cmd /C cleanup.bat cmd /C decompile.bat pushd src >nul - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch - ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch - rem ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch - rem ..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch del minecraft\net\minecraft\src\MLProp.java copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java del minecraft_server\net\minecraft\src\MLProp.java copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch + ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do ( pushd "%%a" 2>nul if errorlevel 1 ( diff --git a/forge/install/install.sh b/forge/install/install.sh index e51237c09f..5129755ab5 100644 --- a/forge/install/install.sh +++ b/forge/install/install.sh @@ -10,10 +10,10 @@ pushd .. > /dev/null pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; - patch -p2 -i ../forge/modLoaderMP.patch - #patch -p1 -i ../forge/mlprop.patch cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java + patch -p2 -i ../forge/modLoaderMP.patch + #patch -p1 -i ../forge/mlprop.patch for i in `find ../forge/patches/ -type f` do patch -p2 -i $i diff --git a/forge/minecraft-fern.patch b/forge/minecraft-fern.patch deleted file mode 100644 index 1de1ab8a9a..0000000000 --- a/forge/minecraft-fern.patch +++ /dev/null @@ -1,637 +0,0 @@ -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-12 13:47:09.501407000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-12 13:55:57.161587800 +0200 -@@ -637,6 +637,10 @@ - public int getMobilityFlag() { - return this.blockMaterial.getMaterialMobility(); - } -+ -+ public boolean isLadder() { -+ return false; -+ } - - static { - Item.itemsList[cloth.blockID] = (new ItemCloth(cloth.blockID - 256)).setItemName("cloth"); -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-12 13:47:09.859427000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-12 13:57:35.729225600 +0200 -@@ -55,6 +55,10 @@ - - return super.getSelectedBoundingBoxFromPool(var1, var2, var3, var4); - } -+ -+ public boolean isLadder() { -+ return true; -+ } - - public boolean isOpaqueCube() { - return false; -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-12 13:47:10.092441000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-12 14:01:13.353673000 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.*; - import java.util.ArrayList; - import java.util.HashSet; - import java.util.Random; -@@ -369,6 +370,9 @@ - return true; - } else if(var5 == 0) { - return false; -+ } else if (Block.blocksList[var5] instanceof IConnectRedstone) { -+ IConnectRedstone icr = (IConnectRedstone) Block.blocksList[var5]; -+ return icr.canConnectRedstone(var0, var1, var2, var3, var4); - } else if(Block.blocksList[var5].canProvidePower()) { - return true; - } else if(var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) { -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-12 13:47:10.334455000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-12 14:07:37.321634700 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.*; - import java.util.ArrayList; - import java.util.HashMap; - import java.util.Iterator; -@@ -256,6 +257,12 @@ - } else { - int var9 = this.xPosition * 16 + var1; - int var10 = this.zPosition * 16 + var3; -+ -+ if (Block.blocksList[var8] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[var8]; -+ if (!iovr.canReplaceBlock(this.worldObj, var9, var2, var10, var4)) -+ return iovr.getReplacedSuccess(); -+ } - this.blocks[var1 << 11 | var3 << 7 | var2] = (byte)(var6 & 255); - if(var8 != 0 && !this.worldObj.multiplayerWorld) { - Block.blocksList[var8].onBlockRemoval(this.worldObj, var9, var2, var10); -@@ -295,6 +302,11 @@ - } else { - int var8 = this.xPosition * 16 + var1; - int var9 = this.zPosition * 16 + var3; -+ if (Block.blocksList[var7] instanceof IOverrideReplace) { -+ IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[var7]; -+ if (!iovr.canReplaceBlock(this.worldObj, var8, var2, var9, var4)) -+ return iovr.getReplacedSuccess(); -+ } - this.blocks[var1 << 11 | var3 << 7 | var2] = (byte)(var5 & 255); - if(var7 != 0) { - Block.blocksList[var7].onBlockRemoval(this.worldObj, var8, var2, var9); -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-12 13:47:10.674474500 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-12 14:23:05.961749800 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.*; - import java.util.ArrayList; - import java.util.List; - import java.util.Random; -@@ -17,6 +18,7 @@ - - protected World worldObj; - private List[] fxLayers = new List[4]; -+ private List effectList = new ArrayList();; - private RenderEngine renderer; - private Random rand = new Random(); - -@@ -53,6 +55,18 @@ - } - } - } -+ -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); -+ for (int y = 0; y < entry.effects.size(); y++) { -+ EntityFX entityfx = (EntityFX) entry.effects.get(y); -+ if (entityfx.isDead) { -+ entry.effects.remove(y--); -+ } -+ } -+ if (effectList.size() == 0) -+ effectList.remove(x--); -+ } - - } - -@@ -87,12 +101,24 @@ - - for(int var11 = 0; var11 < this.fxLayers[var8].size(); ++var11) { - EntityFX var12 = (EntityFX)this.fxLayers[var8].get(var11); -+ if(var12 instanceof EntityDiggingFX) continue; - var12.renderParticle(var10, var2, var3, var7, var4, var5, var6); - } - - var10.draw(); - } - } -+ Tessellator tessellator = Tessellator.instance; -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); -+ GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, renderer.getTexture(entry.texture)); -+ tessellator.startDrawingQuads(); -+ for (int y = 0; y < entry.effects.size(); y++) { -+ EntityFX entityfx = (EntityFX) entry.effects.get(y); -+ entityfx.renderParticle(tessellator, var2, var3, var7, var4, var5, var6); -+ } -+ tessellator.draw(); -+ } - - } - -@@ -115,6 +141,12 @@ - for(int var2 = 0; var2 < 4; ++var2) { - this.fxLayers[var2].clear(); - } -+ -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList.get(x); -+ entry.effects.clear(); -+ } -+ effectList.clear(); - - } - -@@ -130,7 +162,9 @@ - double var13 = (double)var2 + ((double)var9 + 0.5D) / (double)var7; - double var15 = (double)var3 + ((double)var10 + 0.5D) / (double)var7; - int var17 = this.rand.nextInt(6); -- this.addEffect((new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (double)var1 - 0.5D, var13 - (double)var2 - 0.5D, var15 - (double)var3 - 0.5D, var6, var17, var5)).func_4041_a(var1, var2, var3)); -+ EntityDiggingFX dig_effect = new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (double)var1 - 0.5D, var13 - (double)var2 - 0.5D, var15 - (double)var3 - 0.5D, var6, var17, var5); -+ dig_effect.func_4041_a(var1, var2, var3); -+ this.addDigParticleEffect(dig_effect, var6); - } - } - } -@@ -169,10 +203,39 @@ - if(var4 == 5) { - var8 = (double)var1 + var6.maxX + (double)var7; - } -- -- this.addEffect((new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, var4, this.worldObj.getBlockMetadata(var1, var2, var3))).func_4041_a(var1, var2, var3).func_407_b(0.2F).func_405_d(0.6F)); -- } -- } -+ EntityDiggingFX dig_effect = new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, var4, this.worldObj.getBlockMetadata(var1, var2, var3)); -+ dig_effect.func_4041_a(var1, var2, var3); -+ dig_effect.func_407_b(0.2F); -+ dig_effect.func_405_d(0.6F); -+ addDigParticleEffect(dig_effect, var6); -+ } -+ } -+ -+ public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) { -+ boolean added = false; -+ String comp; -+ -+ if (block instanceof ITextureProvider) { -+ comp = ((ITextureProvider) block).getTextureFile(); -+ } else { -+ comp = "/terrain.png"; -+ } -+ for (int x = 0; x < effectList.size(); x++) { -+ BlockTextureParticles entry = (BlockTextureParticles) effectList -+ .get(x); -+ if (entry.texture.equals(comp)) { -+ entry.effects.add(dig_effect); -+ added = true; -+ } -+ } -+ if (!added) { -+ BlockTextureParticles entry = new BlockTextureParticles(); -+ entry.texture = comp; -+ entry.effects.add(dig_effect); -+ effectList.add(entry); -+ } -+ this.addEffect(dig_effect); -+ } - - public String getStatistics() { - return "" + (this.fxLayers[0].size() + this.fxLayers[1].size() + this.fxLayers[2].size()); -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-12 13:47:11.117499000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-12 14:25:47.273976400 +0200 -@@ -566,7 +566,9 @@ - int var1 = MathHelper.floor_double(this.posX); - int var2 = MathHelper.floor_double(this.boundingBox.minY); - int var3 = MathHelper.floor_double(this.posZ); -- return this.worldObj.getBlockId(var1, var2, var3) == Block.ladder.blockID; -+ Block block=Block.blocksList[worldObj.getBlockId(var1, var2, var3)]; -+ if(block==null) return false; -+ return block.isLadder(); - } - - public void writeEntityToNBT(NBTTagCompound var1) { -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-12 13:47:11.258507000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-12 14:28:36.672665400 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.ISpecialArmor; - import java.util.Iterator; - import java.util.List; - import net.minecraft.src.AchievementList; -@@ -460,6 +461,18 @@ - } - - protected void damageEntity(int var1) { -+ boolean doRegularComputation = true; -+ for (ItemStack stack : this.inventory.armorInventory) { -+ if (stack != null && stack.getItem() instanceof ISpecialArmor) { -+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -+ var1 = armor.adjustArmorDamage(var1); -+ doRegularComputation = doRegularComputation && armor.allowRegularComputation(); -+ } -+ } -+ -+ if (!doRegularComputation) { -+ super.damageEntity(var1); -+ } - int var2 = 25 - this.inventory.getTotalArmorValue(); - int var3 = var1 * var2 + this.damageRemainder; - this.inventory.damageArmor(var1); -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-12 13:47:11.653530000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-12 14:34:12.001845200 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.ISpecialResistance; - import java.util.ArrayList; - import java.util.HashSet; - import java.util.List; -@@ -67,7 +68,17 @@ - int var24 = MathHelper.floor_double(var19); - int var25 = this.worldObj.getBlockId(var22, var23, var24); - if(var25 > 0) { -- var14 -= (Block.blocksList[var25].getExplosionResistance(this.exploder) + 0.3F) * var21; -+ if (Block.blocksList[var25] instanceof ISpecialResistance) { -+ ISpecialResistance isr = (ISpecialResistance) Block.blocksList[var25]; -+ var14 -= (isr.getSpecialExplosionResistance( -+ this.worldObj, var22, var23, var24, this.explosionX, -+ this.explosionY, this.explosionZ, this.exploder) + 0.3F) -+ * var21; -+ } else { -+ var14 -= (Block.blocksList[var25] -+ .getExplosionResistance(this.exploder) + 0.3F) -+ * var21; -+ } - } - - if(var14 > 0.0F) { -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-12 13:47:12.457576000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-12 14:37:03.833673400 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.MinecraftForge; - import net.minecraft.src.Block; - import net.minecraft.src.EntityCow; - import net.minecraft.src.EntityPlayer; -@@ -52,6 +53,13 @@ - } - - if(this.isFull == 0) { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(var2, -+ var25, var26, var27); -+ -+ if (customBucket != null) { -+ return customBucket; -+ } -+ - if(var2.getBlockMaterial(var25, var26, var27) == Material.water && var2.getBlockMetadata(var25, var26, var27) == 0) { - var2.setBlockWithNotify(var25, var26, var27, 0); - return new ItemStack(Item.bucketWater); -diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java ---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-12 13:47:12.719591000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-08-12 14:40:12.313453800 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.MinecraftForge; - import net.minecraft.src.Block; - import net.minecraft.src.EnumToolMaterial; - import net.minecraft.src.ItemTool; -@@ -15,6 +16,7 @@ - } - - public boolean canHarvestBlock(Block var1) { -+ if (MinecraftForge.canHarvestBlock(this, var1)) return true; - return var1 == Block.obsidian?this.toolMaterial.getHarvestLevel() == 3:(var1 != Block.blockDiamond && var1 != Block.oreDiamond?(var1 != Block.blockGold && var1 != Block.oreGold?(var1 != Block.blockSteel && var1 != Block.oreIron?(var1 != Block.blockLapis && var1 != Block.oreLapis?(var1 != Block.oreRedstone && var1 != Block.oreRedstoneGlowing?(var1.blockMaterial == Material.rock?true:var1.blockMaterial == Material.iron):this.toolMaterial.getHarvestLevel() >= 2):this.toolMaterial.getHarvestLevel() >= 1):this.toolMaterial.getHarvestLevel() >= 1):this.toolMaterial.getHarvestLevel() >= 2):this.toolMaterial.getHarvestLevel() >= 2); - } - -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-12 13:47:12.779594900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-12 15:46:50.977164300 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; - import net.minecraft.client.Minecraft; - import net.minecraft.src.Block; - import net.minecraft.src.EntityLiving; -@@ -38,12 +39,15 @@ - GL11.glPushMatrix(); - if(var2.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var2.itemID].getRenderType())) { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[var2.itemID]); - this.renderBlocksInstance.renderBlockOnInventory(Block.blocksList[var2.itemID], var2.getItemDamage(), var1.getEntityBrightness(1.0F)); - } else { - if(var2.itemID < 256) { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[var2.itemID]); - } else { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, this.mc.renderEngine.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture (Item.itemsList[var2.itemID]); - } - - Tessellator var3 = Tessellator.instance; -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-12 13:47:12.875600000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-12 14:44:44.057996700 +0200 -@@ -1,5 +1,7 @@ - package net.minecraft.src; - -+import java.util.Arrays; -+ - import net.minecraft.src.Block; - import net.minecraft.src.Entity; - import net.minecraft.src.EntityLiving; -@@ -52,4 +54,11 @@ - public boolean isFull3D() { - return true; - } -+ -+ public void addBlockEffectiveAgainst (Block block) { -+ blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst, -+ blocksEffectiveAgainst.length + 1); -+ -+ blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block; -+ } - } -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-12 13:47:13.829654000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-12 14:45:53.427964400 +0200 -@@ -13,6 +13,9 @@ - public int sideHit; - public Vec3D hitVec; - public Entity entityHit; -+ -+ // Added for RedPower subblocks. -+ public int subHit=0; - - - public MovingObjectPosition(int var1, int var2, int var3, int var4, Vec3D var5) { -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-12 13:47:14.822711000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-12 14:48:25.809680200 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.*; - import net.minecraft.client.Minecraft; - import net.minecraft.src.Block; - import net.minecraft.src.Entity; -@@ -74,6 +75,12 @@ - public void func_6473_b(EntityPlayer var1) {} - - public boolean sendPlaceBlock(EntityPlayer var1, World var2, ItemStack var3, int var4, int var5, int var6, int var7) { -+ if (var3 != null && var3.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif = (IUseItemFirst) var3.getItem(); -+ if (iuif.onItemUseFirst(var3, var1, var2, var4, var5, var6, var7)) { -+ return true; -+ } -+ } - int var8 = var2.getBlockId(var4, var5, var6); - return var8 > 0 && Block.blocksList[var8].blockActivated(var2, var4, var5, var6, var1)?true:(var3 == null?false:var3.useItem(var1, var2, var4, var5, var6, var7)); - } -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-12 13:47:15.680760800 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-12 14:54:24.801213300 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import net.minecraft.src.forge.ForgeHooksClient; - import java.util.Random; - import net.minecraft.src.Block; - import net.minecraft.src.Entity; -@@ -53,6 +54,7 @@ - if(var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) { - GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); - this.loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[var10.itemID]); - float var29 = 0.25F; - if(!Block.blocksList[var10.itemID].renderAsNormalBlock() && var10.itemID != Block.stairSingle.blockID && Block.blocksList[var10.itemID].getRenderType() != 16) { - var29 = 0.5F; -@@ -77,8 +79,10 @@ - int var14 = var10.getIconIndex(); - if(var10.itemID < 256) { - this.loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[var10.itemID]); - } else { - this.loadTexture("/gui/items.png"); -+ ForgeHooksClient.overrideTexture(Item.itemsList[var10.itemID]); - } - - Tessellator var15 = Tessellator.instance; -@@ -131,6 +135,7 @@ - float var11; - if(var3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var3].getRenderType())) { - var2.bindTexture(var2.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[var3]); - Block var14 = Block.blocksList[var3]; - GL11.glPushMatrix(); - GL11.glTranslatef((float)(var6 - 2), (float)(var7 + 3), -3.0F); -@@ -156,8 +161,10 @@ - GL11.glDisable(2896 /*GL_LIGHTING*/); - if(var3 < 256) { - var2.bindTexture(var2.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[var3]); - } else { - var2.bindTexture(var2.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture (Item.itemsList[var3]); - } - - int var8 = Item.itemsList[var3].getColorFromDamage(var4); -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-12 13:47:16.233792400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-12 15:40:09.194183600 +0200 -@@ -1,5 +1,6 @@ - package net.minecraft.src; - -+import java.util.*; - import java.nio.ByteBuffer; - import java.nio.ByteOrder; - import java.nio.FloatBuffer; -@@ -13,9 +14,6 @@ - - private static boolean convertQuadsToTriangles = true; - private static boolean tryVBO = false; -- private ByteBuffer byteBuffer; -- private IntBuffer intBuffer; -- private FloatBuffer floatBuffer; - private int[] rawBuffer; - private int vertexCount = 0; - private double textureU; -@@ -28,31 +26,33 @@ - private int addedVertices = 0; - private boolean isColorDisabled = false; - private int drawMode; -- private double xOffset; -- private double yOffset; -- private double zOffset; -+ public double xOffset; -+ public double yOffset; -+ public double zOffset; - private int normal; -- public static final Tessellator instance = new Tessellator(2097152); - private boolean isDrawing = false; -- private boolean useVBO = false; -- private IntBuffer vertexBuffers; -+ private static boolean useVBO = false; - private int vboIndex = 0; -- private int vboCount = 10; - private int bufferSize; -- -- -- private Tessellator(int var1) { -- this.bufferSize = var1; -- this.byteBuffer = GLAllocation.createDirectByteBuffer(var1 * 4); -- this.intBuffer = this.byteBuffer.asIntBuffer(); -- this.floatBuffer = this.byteBuffer.asFloatBuffer(); -- this.rawBuffer = new int[var1]; -- this.useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; -- if(this.useVBO) { -- this.vertexBuffers = GLAllocation.createDirectIntBuffer(this.vboCount); -- ARBVertexBufferObject.glGenBuffersARB(this.vertexBuffers); -- } -- -+ public int instanceNo; -+ static int instanceTotal=0; -+ -+ private int rawBufferSize; -+ private static int vboCount; -+ private static IntBuffer vertexBuffers; -+ private static int nativeBufferSize; -+ private static int trivertsInBuffer; -+ private static ByteBuffer byteBuffer; -+ private static IntBuffer intBuffer; -+ private static FloatBuffer floatBuffer; -+ public static Tessellator instance; -+ public static Tessellator firstInstance; -+ -+ -+ public Tessellator() { -+ this.instanceNo=instanceTotal++; -+ this.rawBuffer=null; -+ this.rawBufferSize=0; - } - - public void draw() { -@@ -61,10 +61,19 @@ - } else { - this.isDrawing = false; - if(this.vertexCount > 0) { -- this.intBuffer.clear(); -- this.intBuffer.put(this.rawBuffer, 0, this.rawBufferIndex); -- this.byteBuffer.position(0); -- this.byteBuffer.limit(this.rawBufferIndex * 4); -+ int offs=0; -+ while(offs < vertexCount) { -+ int vtc; -+ if(drawMode == 7 && convertQuadsToTriangles) { -+ vtc=Math.min(vertexCount-offs,trivertsInBuffer); -+ } else { -+ vtc=Math.min(vertexCount-offs,nativeBufferSize>>5); -+ } -+ this.intBuffer.clear(); -+ this.intBuffer.put(this.rawBuffer, offs*8, vtc*8); -+ this.byteBuffer.position(0); -+ this.byteBuffer.limit(vtc*32); -+ offs+=vtc; - if(this.useVBO) { - this.vboIndex = (this.vboIndex + 1) % this.vboCount; - ARBVertexBufferObject.glBindBufferARB('\u8892', this.vertexBuffers.get(this.vboIndex)); -@@ -113,9 +122,9 @@ - - GL11.glEnableClientState('\u8074'); - if(this.drawMode == 7 && convertQuadsToTriangles) { -- GL11.glDrawArrays(4, 0, this.vertexCount); -+ GL11.glDrawArrays(4, 0, vtc); - } else { -- GL11.glDrawArrays(this.drawMode, 0, this.vertexCount); -+ GL11.glDrawArrays(drawMode, 0, vtc); - } - - GL11.glDisableClientState('\u8074'); -@@ -131,9 +140,14 @@ - GL11.glDisableClientState('\u8075'); - } - } -+ if(this.rawBufferSize>0x20000 && this.rawBufferIndex<(this.rawBufferSize<<3)) { -+ this.rawBufferSize=0; -+ this.rawBuffer=null; -+ } - - this.reset(); - } -+ } - } - - private void reset() { -@@ -229,6 +243,15 @@ - } - - public void addVertex(double var1, double var3, double var5) { -+ if(this.rawBufferIndex >= this.rawBufferSize-32) { -+ if(this.rawBufferSize==0) { -+ this.rawBufferSize=0x10000; -+ this.rawBuffer=new int[this.rawBufferSize]; -+ } else { -+ this.rawBufferSize*=2; -+ this.rawBuffer=Arrays.copyOf(this.rawBuffer,this.rawBufferSize); -+ } -+ } - ++this.addedVertices; - if(this.drawMode == 7 && convertQuadsToTriangles && this.addedVertices % 4 == 0) { - for(int var7 = 0; var7 < 2; ++var7) { -@@ -268,10 +291,6 @@ - this.rawBuffer[this.rawBufferIndex + 2] = Float.floatToRawIntBits((float)(var5 + this.zOffset)); - this.rawBufferIndex += 8; - ++this.vertexCount; -- if(this.vertexCount % 4 == 0 && this.rawBufferIndex >= this.bufferSize - 32) { -- this.draw(); -- this.isDrawing = true; -- } - - } - -@@ -316,5 +335,23 @@ - this.yOffset += (double)var2; - this.zOffset += (double)var3; - } -+ -+ static { -+ instance=new Tessellator(); -+ firstInstance=instance; -+ -+ nativeBufferSize = 0x200000; -+ trivertsInBuffer = (nativeBufferSize/48)*6; -+ byteBuffer = GLAllocation.createDirectByteBuffer(nativeBufferSize * 4); -+ intBuffer = byteBuffer.asIntBuffer(); -+ floatBuffer = byteBuffer.asFloatBuffer(); -+ useVBO = tryVBO && GLContext.getCapabilities().GL_ARB_vertex_buffer_object; -+ vboCount = 10; -+ if(useVBO) -+ { -+ vertexBuffers = GLAllocation.createDirectIntBuffer(vboCount); -+ ARBVertexBufferObject.glGenBuffersARB(vertexBuffers); -+ } -+ } - - } diff --git a/forge/modLoaderMP.patch b/forge/modLoaderMP.patch index babf5b9a11..d468288e5f 100755 --- a/forge/modLoaderMP.patch +++ b/forge/modLoaderMP.patch @@ -57,3 +57,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server private void doTick() { +diff U3 ../src_base/minecraft_server/net/minecraft/src/MLProp.java ../src_work/minecraft_server/net/minecraft/src/MLProp.java +--- ../src_base/minecraft_server/net/minecraft/src/MLProp.java Wed Nov 30 22:27:22 2011 ++++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java Sun Dec 04 14:31:04 2011 +@@ -8,4 +8,6 @@ + String info() default ""; + double min() default Double.NEGATIVE_INFINITY; + double max() default Double.POSITIVE_INFINITY; ++ ++ public int reobf() default 0; + } +\ No newline at end of file diff --git a/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch deleted file mode 100644 index ac54e306ce..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/MLProp.java.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1,22 +1,13 @@ --// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. --// Jad home page: http://www.kpdus.com/jad.html --// Decompiler options: packimports(3) braces deadcode fieldsfirst -- - package net.minecraft.src; -+import java.lang.annotation.*; - --import java.lang.annotation.Annotation; -- --public interface MLProp -- extends Annotation --{ -- -- public abstract String name(); -- -- public abstract String info(); -- -- public abstract double min(); -- -- public abstract double max(); -+@Retention(RetentionPolicy.RUNTIME) -+@Target(ElementType.FIELD) -+public @interface MLProp { -+ String name() default ""; -+ String info() default ""; -+ double min() default Double.NEGATIVE_INFINITY; -+ double max() default Double.POSITIVE_INFINITY; - -- public abstract int reobf(); -+ public int reobf() default 0; - } diff --git a/forge/setup.bat b/forge/setup.bat index fba467b751..deb61e7ba2 100755 --- a/forge/setup.bat +++ b/forge/setup.bat @@ -8,15 +8,13 @@ pushd .. >nul cmd /C decompile.bat pushd src >nul - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch - ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch - rem ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch - rem ..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch - rem del ..\forge\mlprop-win.patch ..\forge\modLoaderMP-win.patch >nul 1>nul del minecraft\net\minecraft\src\MLProp.java copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java del minecraft_server\net\minecraft\src\MLProp.java copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch + ..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch + del ..\forge\modLoaderMP-win.patch popd >nul cmd /C updatemd5.bat diff --git a/forge/setup.sh b/forge/setup.sh index dfba813ec4..fde826c7a0 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -24,8 +24,9 @@ if [ ! -d src_base ] ; then pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; + cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java + cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java patch -p2 -i ../forge/modLoaderMP.patch - cp -f ../forge/MLProp.java minecraft/net/minecraft/src popd > /dev/null From d67cda76b870a105acee903c440f6eacaf1e4604 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 6 Dec 2011 07:41:59 +0000 Subject: [PATCH 142/169] Fixed fortune enchant. This breaks forge's quantityDropped signature, be careful when updating mods. --- .../net/minecraft/src/Block.java.patch | 23 ++++++++++--------- .../net/minecraft/src/Block.java.patch | 18 ++++++++------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 07adca7714..0e126e746b 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,41 @@ +@@ -438,25 +441,42 @@ { return 1; } @@ -33,9 +33,9 @@ + + /* FORGE: Metadata-sensitive version. + */ -+ public int quantityDropped(int i, Random random) ++ public int quantityDropped(int meta, int fortune, Random random) + { -+ return quantityDropped(random); ++ return func_40198_a(fortune, random); + } + public int idDropped(int i, Random random, int j) @@ -65,28 +65,29 @@ + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); ++ int i, int j, int k, int md, int fortune) { ++ ++ ArrayList tr = new ArrayList(); + -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n 0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); ++ tr.add(new ItemStack(id, 1, damageDropped(md))); + } + } + return tr; } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +489,13 @@ +@@ -470,18 +490,13 @@ { return; } - int j1 = func_40198_a(i1, world.rand); - for(int k1 = 0; k1 < j1; k1++) - { -+ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ ArrayList ar = getBlockDropped(world, i, j, k, l, i1); + for (ItemStack ist : ar) { if(world.rand.nextFloat() > f) { @@ -101,7 +102,7 @@ } } -@@ -805,6 +819,107 @@ +@@ -805,6 +820,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index ed12169be5..8fcdce6f1e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,41 @@ +@@ -384,26 +385,43 @@ return 1; } + /* FORGE: Metadata-sensitive version. + */ -+ public int quantityDropped(int i, Random random) ++ public int quantityDropped(int meta, int fortune, Random random) + { -+ return quantityDropped(random); ++ return func_40162_a(fortune, random); + } + public int idDropped(int i, Random random, int j) @@ -24,6 +24,7 @@ return blockID; } - ++ + /* FORGE: This function isnt called by Minecraft anymore. Use + * blockStrength(EntityPlayer,int) instead. + */ @@ -47,10 +48,11 @@ + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { ++ int i, int j, int k, int md, int fortune) { ++ + ArrayList tr = new ArrayList(); + -+ int q = quantityDropped(md, world.rand); ++ int q = quantityDropped(md, fortune, world.rand); + for(int n = 0; n < q; n++) { + int id = idDropped(md, world.rand, 0); + if (id > 0) { @@ -63,13 +65,13 @@ public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +431,14 @@ +@@ -415,18 +433,14 @@ { return; } - int j1 = func_40162_a(i1, world.rand); - for(int k1 = 0; k1 < j1; k1++) -+ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ ArrayList ar = getBlockDropped(world, i, j, k, l, i1); + for (ItemStack ist : ar) { if(world.rand.nextFloat() > f) @@ -85,7 +87,7 @@ } } -@@ -725,6 +737,99 @@ +@@ -725,6 +739,99 @@ return blockMaterial.getMaterialMobility(); } From db1f438c2d443226bca8f9bc7ef908da7ab35b3c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Wed, 7 Dec 2011 21:30:48 +0000 Subject: [PATCH 143/169] fixed backwards compatibility --- .../minecraft/net/minecraft/src/Block.java.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 0e126e746b..25ca61edd1 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,42 @@ +@@ -438,25 +441,49 @@ { return 1; } @@ -37,6 +37,13 @@ + { + return func_40198_a(fortune, random); + } ++ ++ /* FORGE: Metadata-sensitive version. ++ */ ++ public int quantityDropped(int meta, Random random) ++ { ++ return quantityDropped(meta, 0, random); ++ } + public int idDropped(int i, Random random, int j) { @@ -80,7 +87,7 @@ } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +490,13 @@ +@@ -470,18 +497,13 @@ { return; } @@ -102,7 +109,7 @@ } } -@@ -805,6 +820,107 @@ +@@ -805,6 +827,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } From 17c9f9bf9bca2c7217786cf6c72a8704376af911 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 8 Dec 2011 07:51:17 +0000 Subject: [PATCH 144/169] added server side of the previous commit --- .../net/minecraft/src/Block.java.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 8fcdce6f1e..deede8e4fe 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,43 @@ +@@ -384,26 +385,50 @@ return 1; } @@ -18,6 +18,13 @@ + { + return func_40162_a(fortune, random); + } ++ ++ /* FORGE: Metadata-sensitive version. ++ */ ++ public int quantityDropped(int meta, Random random) ++ { ++ return quantityDropped(meta, 0, random); ++ } + public int idDropped(int i, Random random, int j) { @@ -65,7 +72,7 @@ public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +433,14 @@ +@@ -415,18 +440,14 @@ { return; } @@ -87,7 +94,7 @@ } } -@@ -725,6 +739,99 @@ +@@ -725,6 +746,99 @@ return blockMaterial.getMaterialMobility(); } From 1931d4fc09f462e12be2ceb0127fa04ec61e7cd4 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Dec 2011 04:40:32 +0000 Subject: [PATCH 145/169] For for updated mappings. --- .../net/minecraft/src/Chunk.java.patch | 24 ++++++------------- .../net/minecraft/src/EntityPlayer.java.patch | 8 +++---- .../net/minecraft/src/ItemRenderer.java.patch | 10 ++++---- .../net/minecraft/src/RenderItem.java.patch | 2 +- .../net/minecraft/src/Item.java.patch | 2 +- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 799878f108..613f252572 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -8,15 +8,7 @@ import java.io.PrintStream; import java.util.*; -@@ -348,6 +349,7 @@ - } - int i2 = xPosition * 16 + i; - int j2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); - if(l1 != 0) - { -@@ -390,7 +392,7 @@ +@@ -390,7 +391,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -25,7 +17,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -398,14 +400,6 @@ +@@ -398,14 +399,6 @@ tileentity.func_35144_b(); } } @@ -40,17 +32,15 @@ } isModified = true; return true; -@@ -427,10 +421,13 @@ - } - int l1 = xPosition * 16 + i; - int i2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); +@@ -430,7 +423,11 @@ + blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff); if(k1 != 0) { - Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if (!worldObj.multiplayerWorld) ++ if (!worldObj.multiplayerWorld) ++ { + Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ } + removeChunkBlockTileEntity(i, j, k); } data.setNibble(i, j, k, 0); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 0a3eff1d89..3e10b58ebe 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -41,14 +41,14 @@ + f += i * i + 1; + } + -+ if(isPotionActive(Potion.potionDigSpeed)) ++ if(isPotionActive(Potion.digSpeed)) + { -+ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } + -+ if(isPotionActive(Potion.potionDigSlow)) ++ if(isPotionActive(Potion.digSlowdown)) + { -+ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } + + if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory)) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index bd6528e6ee..a38f491e97 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -17,16 +17,16 @@ GL11.glPushMatrix(); - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); -+ ++ + if (customRenderer != null) { -+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (itemstack.getItem()); -+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); - renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); + renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); } else { if(itemstack.itemID < 256) diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index cbd9091813..08da9b35ed 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -99,7 +99,7 @@ + ForgeHooksClient.overrideTexture (Block.blocksList[i]); Block block = Block.blocksList[j1]; GL11.glPushMatrix(); - GL11.glTranslatef(l - 2, i1 + 3, -3F + field_40268_b); + GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel); @@ -215,9 +274,11 @@ if(i < 256) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index e2e0d081f3..8c426a6f49 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 @@ -175,6 +175,9 @@ - private String field_39006_bR; + private String potionInfo; private String itemName; + // FORGE: To disable repair recipes. From 800bb21bc8b7f26bdaf3783702e1951dcc338837 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Dec 2011 06:51:31 +0000 Subject: [PATCH 146/169] Missed some mappings --- .../net/minecraft/src/EntityPlayer.java.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 676a56ec92..0876c65252 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -35,7 +35,7 @@ + f = ist.getItem().getStrVsBlock(ist, block, md); + } + -+ int i = EnchantmentHelper.func_40630_b(inventory); ++ int i = EnchantmentHelper.getEfficiencyModifier(inventory); + if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md)) + { + f += i * i + 1; @@ -43,15 +43,15 @@ + + if(func_35184_a(Potion.digSpeed)) + { -+ f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } + + if(func_35184_a(Potion.digSlowdown)) + { -+ f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } + -+ if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.func_40632_g(inventory)) ++ if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory)) + { + f /= 5F; + } From d64c3322668470feebe271f701a69cefe4ee54b3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Dec 2011 07:58:32 +0000 Subject: [PATCH 147/169] Added my EnumHelper classes, this allows for dynamic creation of Enum values at runtime. See My post for a example: http://www.minecraftforum.net/topic/514000-api-minecraft-forge/page__view__findpost__p__10948540 --- .../minecraft/src/forge/EnumHelperClient.java | 99 +++++ .../net/minecraft/src/forge/EnumHelper.java | 342 ++++++++++++++++++ 2 files changed, 441 insertions(+) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java create mode 100644 forge/forge_common/net/minecraft/src/forge/EnumHelper.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java b/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java new file mode 100644 index 0000000000..9f9d41947c --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java @@ -0,0 +1,99 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.EnumJsonNodeType; +import net.minecraft.src.EnumOS2; +import net.minecraft.src.EnumOptions; +import net.minecraft.src.EnumRarity; + +public class EnumHelperClient extends EnumHelper { + + private static Class[][] ctrs = { + {EnumJsonNodeType.class}, + {EnumOptions.class, String.class, boolean.class, boolean.class}, + {EnumOS2.class}, + {EnumRarity.class, int.class, String.class} + }; + + private static boolean[] decompiled = new boolean[ctrs.length]; + private static boolean isSetup = false; + + public static EnumJsonNodeType addJsonNodeType(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[0], EnumJsonNodeType.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumOptions addOptions(String name, String langName, boolean isSlider, boolean isToggle) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[1], EnumOptions.class, name, + new Class[] {String.class, boolean.class, boolean.class}, + new Object[]{langName, isSlider, isToggle }); + } + public static EnumOS2 addOS2(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[2], EnumOS2.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumRarity addRarity(String name, int color, String displayName) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[3], EnumRarity.class, name, + new Class[] {int.class, String.class}, + new Object[]{color, displayName }); + } + + private static void setup() + { + //System.out.println("Enum Helper Initalizing: "); + for(int x = 0; x < ctrs.length; x++) + { + try { + Class[] enumHeaders = new Class[ctrs[x].length + 3]; + enumHeaders[0] = String.class; + enumHeaders[1] = int.class; + enumHeaders[2] = String.class; + enumHeaders[3] = int.class; + + for (int y = 1; y < ctrs[x].length; y++) + enumHeaders[3 + y] = ctrs[x][y]; + + ctrs[x][0].getDeclaredConstructor(enumHeaders); + decompiled[x] = true; + + } catch(Exception e) { + //Nom Nom Nom + } + //System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]); + } + isSetup = true; + } + + static + { + if (!isSetup) + { + setup(); + } + } + +} diff --git a/forge/forge_common/net/minecraft/src/forge/EnumHelper.java b/forge/forge_common/net/minecraft/src/forge/EnumHelper.java new file mode 100644 index 0000000000..94e8242c53 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/EnumHelper.java @@ -0,0 +1,342 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.*; +import java.lang.reflect.*; +import java.util.*; + +public class EnumHelper { + private static Object reflectionFactory = null; + private static Method newConstructorAccessor = null; + private static Method newInstance = null; + private static Method newFieldAccessor = null; + private static Method fieldAccessorSet = null; + private static boolean isSetup = false; + + //Some enums are decompiled with extra arguments, so lets check for that + private static Class[][] ctrs = { + {EnumAction.class}, + {EnumArmorMaterial.class, int.class, int[].class, int.class}, + {EnumArt.class, String.class, int.class, int.class, int.class, int.class}, + {EnumCreatureAttribute.class}, + {EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class}, + {EnumDoor.class}, + {EnumEnchantmentType.class}, + {EnumMobType.class}, + {EnumMovingObjectType.class}, + {EnumSkyBlock.class, int.class}, + {EnumStatus.class}, + {EnumToolMaterial.class, int.class, int.class, float.class, int.class, int.class} + }; + + private static boolean[] decompiled = new boolean[ctrs.length]; + + public static EnumAction addAction(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[0], EnumAction.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumArmorMaterial addArmorMaterial(String name, int durability, int[] reductionAmounts, int enchantability) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[1], EnumArmorMaterial.class, name, + new Class[] { int.class, int[].class, int.class }, + new Object[]{ durability, reductionAmounts, enchantability }); + } + public static EnumArt addArt(String name, String tile, int sizeX, int sizeY, int offsetX, int offsetY) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[2], EnumArt.class, name, + new Class[] {String.class, int.class, int.class, int.class, int.class}, + new Object[]{tile, sizeX, sizeY, offsetX, offsetY}); + } + public static EnumCreatureAttribute addCreatureAttribute(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[3], EnumCreatureAttribute.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumCreatureType addCreatureType(String name, Class typeClass, int maxNumber, Material material, boolean peaceful) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[4], EnumCreatureType.class, name, + new Class[] {Class.class, int.class, Material.class, boolean.class}, + new Object[]{typeClass, maxNumber, material, peaceful}); + } + public static EnumDoor addDoor(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[5], EnumDoor.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumEnchantmentType addEnchantmentType(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[6], EnumEnchantmentType.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumMobType addMobType(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[7], EnumMobType.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumMovingObjectType addMovingObjectType(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[8], EnumMovingObjectType.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumSkyBlock addSkyBlock(String name, int lightValue) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[9], EnumSkyBlock.class, name, + new Class[] {int.class }, + new Object[]{lightValue}); + } + public static EnumStatus addStatus(String name) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[10], EnumStatus.class, name, + new Class[] {}, + new Object[]{}); + } + public static EnumToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, int damage, int enchantability) + { + if (!isSetup) + { + setup(); + } + + return addEnum(decompiled[11], EnumToolMaterial.class, name, + new Class[] { int.class, int.class, float.class, int.class, int.class }, + new Object[]{ harvestLevel, maxUses, efficiency, damage, enchantability }); + } + + private static void setup() + { + if (isSetup) + { + return; + } + + //System.out.println("Enum Helper Initalizing: "); + for(int x = 0; x < ctrs.length; x++) + { + try { + Class[] enumHeaders = new Class[ctrs[x].length + 3]; + enumHeaders[0] = String.class; + enumHeaders[1] = int.class; + enumHeaders[2] = String.class; + enumHeaders[3] = int.class; + + for (int y = 1; y < ctrs[x].length; y++) + enumHeaders[3 + y] = ctrs[x][y]; + + ctrs[x][0].getDeclaredConstructor(enumHeaders); + decompiled[x] = true; + + } catch(Exception e) { + //Nom Nom Nom + } + //System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]); + } + + + + try { + Method getReflectionFactory = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("getReflectionFactory"); + reflectionFactory = getReflectionFactory.invoke(null); + newConstructorAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newConstructorAccessor", Constructor.class); + newInstance = Class.forName("sun.reflect.ConstructorAccessor").getDeclaredMethod("newInstance", Object[].class); + newFieldAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newFieldAccessor", Field.class, boolean.class); + fieldAccessorSet = Class.forName("sun.reflect.FieldAccessor").getDeclaredMethod("set", Object.class, Object.class); + } catch (Exception e) { + e.printStackTrace(); + } + + isSetup = true; + } + + + /* + * Everything below this is found at the site below, and updated to be able to compile in Eclipse/Java 1.6+ + * Also modified for use in decompiled code. + * Found at: http://niceideas.ch/roller2/badtrash/entry/java_create_enum_instances_dynamically + */ + + private static Object getConstructorAccessor(boolean decompiled, Class enumClass, Class[] additionalParameterTypes) throws Exception { + Class[] parameterTypes = null; + if (decompiled) + { + parameterTypes = new Class[additionalParameterTypes.length + 4]; + parameterTypes[0] = String.class; + parameterTypes[1] = int.class; + parameterTypes[2] = String.class; + parameterTypes[3] = int.class; + System.arraycopy(additionalParameterTypes, 0, parameterTypes, 4, additionalParameterTypes.length); + } + else + { + parameterTypes = new Class[additionalParameterTypes.length + 2]; + parameterTypes[0] = String.class; + parameterTypes[1] = int.class; + System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length); + } + return newConstructorAccessor.invoke(reflectionFactory, enumClass.getDeclaredConstructor(parameterTypes)); + } + + private static > T makeEnum(boolean decompiled, Class enumClass, String value, int ordinal, Class[] additionalTypes, Object[] additionalValues) throws Exception { + Object[] parms = null; + if (decompiled) + { + parms = new Object[additionalValues.length + 4]; + parms[0] = value; + parms[1] = Integer.valueOf(ordinal); + parms[2] = value; + parms[3] = Integer.valueOf(ordinal); + System.arraycopy(additionalValues, 0, parms, 4, additionalValues.length); + } + else + { + parms = new Object[additionalValues.length + 2]; + parms[0] = value; + parms[1] = Integer.valueOf(ordinal); + System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length); + } + return enumClass.cast(newInstance.invoke(getConstructorAccessor(decompiled, enumClass, additionalTypes), new Object[]{parms})); + } + + private static void setFailsafeFieldValue(Field field, Object target, Object value) throws Exception { + field.setAccessible(true); + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); + Object fieldAccessor = newFieldAccessor.invoke(reflectionFactory, field, false); + fieldAccessorSet.invoke(fieldAccessor, target, value); + } + + private static void blankField(Class enumClass, String fieldName) throws Exception { + for (Field field : Class.class.getDeclaredFields()) { + if (field.getName().contains(fieldName)) { + field.setAccessible(true); + setFailsafeFieldValue(field, enumClass, null); + break; + } + } + } + + private static void cleanEnumCache(Class enumClass) throws Exception { + blankField(enumClass, "enumConstantDirectory"); + blankField(enumClass, "enumConstants"); + } + + public static > T addEnum(Class enumType, String enumName, boolean decompiled) { + return addEnum(decompiled, enumType, enumName, new Class[]{}, new Object[]{}); + } + + @SuppressWarnings("unchecked") + public static > T addEnum(boolean decompiled, Class enumType, String enumName, Class[] paramTypes, Object[] paramValues) { + if (!isSetup) + { + setup(); + } + + Field valuesField = null; + Field[] fields = enumType.getDeclaredFields(); + int flags = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL | 0x1000 /*SYNTHETIC*/; + String valueType = String.format("[L%s;", enumType.getName().replace('.', '/')); + + for (Field field : fields) { + if (decompiled) + { + if (field.getName().contains("$VALUES")) + { + valuesField = field; + break; + } + } + else + { + if ((field.getModifiers() & flags) == flags && + field.getType().getName().equals(valueType)) + { + valuesField = field; + break; + } + } + } + valuesField.setAccessible(true); + + try { + T[] previousValues = (T[])valuesField.get(enumType); + List values = new ArrayList(Arrays.asList(previousValues)); + T newValue = (T)makeEnum(decompiled, enumType, enumName, values.size(), paramTypes, paramValues); + values.add(newValue); + setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0))); + cleanEnumCache(enumType); + + return newValue; + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(e.getMessage(), e); + } + } + + static { + if (!isSetup) + { + setup(); + } + } +} \ No newline at end of file From 707a07511f37058d03124d6c3002c6e7604ce49c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 10 Dec 2011 11:05:49 +0000 Subject: [PATCH 148/169] further backward compatibility fixes --- .../minecraft/net/minecraft/src/Block.java.patch | 13 ++++++++++--- .../net/minecraft/src/Block.java.patch | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 25ca61edd1..4ee7aefd55 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,49 @@ +@@ -438,25 +441,56 @@ { return 1; } @@ -84,10 +84,17 @@ + } + } + return tr; ++ } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ return getBlockDropped (world, i, j, k, md); } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +497,13 @@ +@@ -470,18 +504,13 @@ { return; } @@ -109,7 +116,7 @@ } } -@@ -805,6 +827,107 @@ +@@ -805,6 +834,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index deede8e4fe..b4d38e4ed9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,50 @@ +@@ -384,26 +385,57 @@ return 1; } @@ -68,11 +68,18 @@ + } + return tr; + } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ return getBlockDropped (world, i, j, k, md); ++ } + public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +440,14 @@ +@@ -415,18 +447,14 @@ { return; } @@ -94,7 +101,7 @@ } } -@@ -725,6 +746,99 @@ +@@ -725,6 +753,99 @@ return blockMaterial.getMaterialMobility(); } From c726e219d79ff180378b3436f718d7d34ffab562 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 10 Dec 2011 11:07:51 +0000 Subject: [PATCH 149/169] bumped version number --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- forge/release.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 2099b599c1..b5bcac92d9 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -242,7 +242,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=2; - public static final int revisionVersion=0; + public static final int revisionVersion=1; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/release.bat b/forge/release.bat index f952f04494..af4ba43a6c 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.2.0 +sh package.sh 1.2.1 pause From 9bf4f67d9d2147114caceea50064ba4ea547aac0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 11 Dec 2011 07:04:21 +0000 Subject: [PATCH 150/169] Fixed a infinite recursion loop in spacetoad's commit to Block.java.patch Added @Deprecated annotations to the 'backwards compatible' functions spacetoad re-added. Made changes to the install scripts: -Will overwrite the current MCP mappings and use the ones that ship with forge, this should eliminate all the issues of people not being able to install it because they updated there mcp.cfg -Will now move fernflower.jar if it is found, so that MCP will not decompile using it. Should fix the issues of people trying to use forge with fernflower installed. -Will call updatemcp/updatenames so that users get the latest mappings for unmapped items. -Also calls updatemd5s so that the forge API is skipped when spitting out reobfusicated files. Update the readme to be more accurate. Added my name to the credits :P Updated the update_patches/package scripts to account for grabbing the conf folder. Added GnuWin32's grep --- forge/bin/grep.exe | 1 + forge/bin/pcre3.dll | Bin 0 -> 140288 bytes forge/conf/classes.csv | 1591 +++++ forge/conf/client.exc | 228 + forge/conf/fields.csv | 5999 +++++++++++++++++ forge/conf/mcp.cfg | 139 + forge/conf/methods.csv | 4880 ++++++++++++++ forge/conf/patches/Start.java | 27 + forge/conf/patches/me.java | 10 + forge/conf/patches/minecraft.patch | 2989 ++++++++ forge/conf/patches/minecraft_ff.patch | 109 + forge/conf/patches/minecraft_server.patch | 2024 ++++++ forge/conf/patches/minecraft_server_ff.patch | 26 + forge/conf/patches/splashes.txt | 1 + forge/conf/server.exc | 202 + forge/conf/version.cfg | 4 + forge/install/README.txt | 15 +- forge/install/install.cmd | 8 + forge/install/install.sh | 36 +- forge/minecraftforge_credits.txt | 2 + forge/package.sh | 4 + .../net/minecraft/src/Block.java.patch | 22 +- .../net/minecraft/src/Block.java.patch | 22 +- forge/update_patches.bat | 27 +- forge/update_patches.sh | 19 +- 25 files changed, 18354 insertions(+), 31 deletions(-) create mode 100644 forge/bin/grep.exe create mode 100644 forge/bin/pcre3.dll create mode 100644 forge/conf/classes.csv create mode 100644 forge/conf/client.exc create mode 100644 forge/conf/fields.csv create mode 100644 forge/conf/mcp.cfg create mode 100644 forge/conf/methods.csv create mode 100644 forge/conf/patches/Start.java create mode 100644 forge/conf/patches/me.java create mode 100644 forge/conf/patches/minecraft.patch create mode 100644 forge/conf/patches/minecraft_ff.patch create mode 100644 forge/conf/patches/minecraft_server.patch create mode 100644 forge/conf/patches/minecraft_server_ff.patch create mode 100644 forge/conf/patches/splashes.txt create mode 100644 forge/conf/server.exc create mode 100644 forge/conf/version.cfg diff --git a/forge/bin/grep.exe b/forge/bin/grep.exe new file mode 100644 index 0000000000..bf11b93ff8 --- /dev/null +++ b/forge/bin/grep.exe @@ -0,0 +1 @@ +asdfsnb -a -v "svn"+ diff --git a/forge/bin/pcre3.dll b/forge/bin/pcre3.dll new file mode 100644 index 0000000000000000000000000000000000000000..b5fd2a63785922c9898e7d25d9c50ef47524ba13 GIT binary patch literal 140288 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 literal 0 HcmV?d00001 diff --git a/forge/conf/classes.csv b/forge/conf/classes.csv new file mode 100644 index 0000000000..fe2f4b1e86 --- /dev/null +++ b/forge/conf/classes.csv @@ -0,0 +1,1591 @@ +"name","notch","supername","package","side" +"EntityEnderCrystal","sf","Entity","net/minecraft/src","0" +"RecipesArmor","xx","","net/minecraft/src","0" +"BiomeGenHills","az","BiomeGenBase","net/minecraft/src","0" +"ComponentVillage","xf","StructureComponent","net/minecraft/src","0" +"ModelSheep1","od","ModelQuadruped","net/minecraft/src","0" +"Packet1Login","aj","Packet","net/minecraft/src","0" +"GuiDownloadTerrain","acd","GuiScreen","net/minecraft/src","0" +"StatTypeTime","i","","net/minecraft/src","0" +"IProgressUpdate","rz","","net/minecraft/src","0" +"EntityDragonBase","adh","EntityLiving","net/minecraft/src","0" +"InventoryCraftResult","iy","","net/minecraft/src","0" +"SaveOldDir","ar","SaveHandler","net/minecraft/src","0" +"ItemHoe","wr","Item","net/minecraft/src","0" +"EntityFX","wc","Entity","net/minecraft/src","0" +"Packet54PlayNoteBlock","agm","Packet","net/minecraft/src","0" +"BlockNetherrack","et","Block","net/minecraft/src","0" +"IBlockAccess","kq","","net/minecraft/src","0" +"RenderManager","wb","","net/minecraft/src","0" +"EntityEnderman","aii","EntityMob","net/minecraft/src","0" +"EntityAuraFX","cn","EntityFX","net/minecraft/src","0" +"BlockRedstoneRepeater","mz","Block","net/minecraft/src","0" +"ModelMinecart","iv","ModelBase","net/minecraft/src","0" +"RenderDragon","ado","RenderLiving","net/minecraft/src","0" +"Packet2Handshake","hh","Packet","net/minecraft/src","0" +"PlayerControllerCreative","uq","PlayerController","net/minecraft/src","0" +"RenderGlobal","afv","","net/minecraft/src","0" +"J_JsonArrayNodeBuilder","ft","","net/minecraft/src","0" +"ItemRecord","pe","Item","net/minecraft/src","0" +"WorldGenFlowers","bu","WorldGenerator","net/minecraft/src","0" +"BlockTallGrass","kv","BlockFlower","net/minecraft/src","0" +"ComponentStrongholdCrossing","kt","ComponentStronghold","net/minecraft/src","0" +"ModelBoat","ua","ModelBase","net/minecraft/src","0" +"ModelChest","xl","ModelBase","net/minecraft/src","0" +"ThreadedFileIOBase","ll","","net/minecraft/src","0" +"EntityFlying","wk","EntityLiving","net/minecraft/src","0" +"EnumCreatureAttribute","el","","net/minecraft/src","0" +"EffectRenderer","f","","net/minecraft/src","0" +"RegionFileChunkBuffer","ahg","","net/minecraft/src","0" +"SoundPool","cf","","net/minecraft/src","0" +"GuiSlotStatsBlock","hz","GuiSlotStats","net/minecraft/src","0" +"NetworkReaderThread","pa","","net/minecraft/src","0" +"GuiConflictWarning","ach","GuiScreen","net/minecraft/src","0" +"MaterialPortal","bk","Material","net/minecraft/src","0" +"Packet106Transaction","ly","Packet","net/minecraft/src","0" +"MovingObjectPosition","gv","","net/minecraft/src","0" +"EntitySpellParticleFX","sq","EntityFX","net/minecraft/src","0" +"BlockTNT","abm","Block","net/minecraft/src","0" +"Material","p","","net/minecraft/src","0" +"ComponentNetherBridgeStraight","ac","ComponentNetherBridgePiece","net/minecraft/src","0" +"BlockStationary","add","BlockFluid","net/minecraft/src","0" +"ChunkPosition","am","","net/minecraft/src","0" +"BlockLeavesBase","zt","Block","net/minecraft/src","0" +"NextTickListEntry","ahn","","net/minecraft/src","0" +"J_SajParser","oi","","net/minecraft/src","0" +"InventoryCrafting","lm","","net/minecraft/src","0" +"ComponentStrongholdRightTurn","xg","ComponentStrongholdLeftTurn","net/minecraft/src","0" +"EntityPigZombie","jm","EntityZombie","net/minecraft/src","0" +"Facing","ot","","net/minecraft/src","0" +"Gui","ht","","net/minecraft/src","0" +"GenLayerSnow","hv","GenLayer","net/minecraft/src","0" +"EntityFootStepFX","nb","EntityFX","net/minecraft/src","0" +"FontRenderer","abe","","net/minecraft/src","0" +"GuiSlider","zd","GuiButton","net/minecraft/src","0" +"RenderItem","iw","Render","net/minecraft/src","0" +"ItemStack","dk","","net/minecraft/src","0" +"ItemPotion","abk","Item","net/minecraft/src","0" +"Packet31RelEntityMove","y","Packet30Entity","net/minecraft/src","0" +"RenderGiantZombie","ahi","RenderLiving","net/minecraft/src","0" +"SaveFormatOld","w","","net/minecraft/src","0" +"EntityClientPlayerMP","cx","EntityPlayerSP","net/minecraft/src","0" +"MaterialWeb","tx","Material","net/minecraft/src","0" +"EntityPortalFX","afy","EntityFX","net/minecraft/src","0" +"BlockFence","nz","Block","net/minecraft/src","0" +"KeyBinding","aby","","net/minecraft/src","0" +"MapGenStructure","hl","MapGenBase","net/minecraft/src","0" +"BlockLeaves","qo","BlockLeavesBase","net/minecraft/src","0" +"BlockNote","yq","BlockContainer","net/minecraft/src","0" +"BlockLockedChest","vj","Block","net/minecraft/src","0" +"BiomeGenDesert","ada","BiomeGenBase","net/minecraft/src","0" +"StructureVillagePieceWeight","aan","","net/minecraft/src","0" +"EnchantmentDigging","kr","Enchantment","net/minecraft/src","0" +"StatsSyncher","jq","","net/minecraft/src","0" +"EnumDoorHelper","aay","","net/minecraft/src","0" +"EntityFallingSand","uo","Entity","net/minecraft/src","0" +"ChunkFilePattern","rm","","net/minecraft/src","0" +"J_LeafFunctor","yz","","net/minecraft/src","0" +"ItemEnderEye","aag","Item","net/minecraft/src","0" +"ModelEnderman","ta","ModelBiped","net/minecraft/src","0" +"Packet28EntityVelocity","qm","Packet","net/minecraft/src","0" +"ComponentVillagePathGen","ahz","ComponentVillageRoadPiece","net/minecraft/src","0" +"MapGenStronghold","dc","MapGenStructure","net/minecraft/src","0" +"J_JsonTrueNodeBuilder","by","","net/minecraft/src","0" +"WorldGenDeadBush","mb","WorldGenerator","net/minecraft/src","0" +"ISaveHandler","nh","","net/minecraft/src","0" +"BlockFenceGate","fp","Block","net/minecraft/src","0" +"Packet130UpdateSign","hy","Packet","net/minecraft/src","0" +"RenderSlime","xm","RenderLiving","net/minecraft/src","0" +"WorldProviderEnd","ol","WorldProvider","net/minecraft/src","0" +"RenderArrow","ahs","Render","net/minecraft/src","0" +"ComponentNetherBridgeCrossing3","bw","ComponentNetherBridgePiece","net/minecraft/src","0" +"ItemPainting","ve","Item","net/minecraft/src","0" +"CodecMus","vo","","net/minecraft/src","0" +"GuiChest","gj","GuiContainer","net/minecraft/src","0" +"MinecraftError","adj","","net/minecraft/src","0" +"EnchantmentKnockback","dz","Enchantment","net/minecraft/src","0" +"WorldGenDungeons","acj","WorldGenerator","net/minecraft/src","0" +"ItemRenderer","n","","net/minecraft/src","0" +"WorldGenSand","fc","WorldGenerator","net/minecraft/src","0" +"SoundPoolEntry","lr","","net/minecraft/src","0" +"RenderLiving","acq","Render","net/minecraft/src","0" +"BlockCactus","ow","Block","net/minecraft/src","0" +"PacketCount","lg","","net/minecraft/src","0" +"EntityPlayer","vi","EntityLiving","net/minecraft/src","0" +"ItemColored","hf","ItemBlock","net/minecraft/src","0" +"BiomeGenBase","sr","","net/minecraft/src","0" +"MaterialLiquid","sn","Material","net/minecraft/src","0" +"SaveConverterMcRegion","adg","SaveFormatOld","net/minecraft/src","0" +"PlayerControllerSP","dm","PlayerController","net/minecraft/src","0" +"Packet12PlayerLook","aht","Packet10Flying","net/minecraft/src","0" +"ThreadCloseConnection","po","","net/minecraft/src","0" +"ContainerEnchantment","ahk","Container","net/minecraft/src","0" +"LoadingScreenRenderer","xw","","net/minecraft/src","0" +"Packet6SpawnPosition","aee","Packet","net/minecraft/src","0" +"BlockBreakable","aaf","Block","net/minecraft/src","0" +"TextureWaterFlowFX","va","TextureFX","net/minecraft/src","0" +"BiomeGenSnow","ce","BiomeGenBase","net/minecraft/src","0" +"IChunkProvider","ej","","net/minecraft/src","0" +"EntityCloudFX","kz","EntityFX","net/minecraft/src","0" +"TileEntityEndPortal","yg","TileEntity","net/minecraft/src","0" +"EntityXPOrb","fk","Entity","net/minecraft/src","0" +"ComponentStrongholdPortalRoom","ir","ComponentStronghold","net/minecraft/src","0" +"StructureBoundingBox","nl","","net/minecraft/src","0" +"BlockMushroom","js","BlockFlower","net/minecraft/src","0" +"PathFinder","rw","","net/minecraft/src","0" +"EntityDragon","oo","EntityDragonBase","net/minecraft/src","0" +"ThreadCheckHasPaid","hr","","net/minecraft/src","0" +"WorldGenLakes","qv","WorldGenerator","net/minecraft/src","0" +"LongHashMapEntry","ahc","","net/minecraft/src","0" +"WorldRenderer","ge","","net/minecraft/src","0" +"WorldGenLiquids","ib","WorldGenerator","net/minecraft/src","0" +"BlockObsidian","ain","BlockStone","net/minecraft/src","0" +"ThreadStatSyncherReceive","uf","","net/minecraft/src","0" +"SoundManager","ahm","","net/minecraft/src","0" +"RenderPig","yf","RenderLiving","net/minecraft/src","0" +"EntitySuspendFX","jd","EntityFX","net/minecraft/src","0" +"J_JsonStringNodeBuilder","h","","net/minecraft/src","0" +"RenderList","aak","","net/minecraft/src","0" +"WorldGenTallGrass","ahu","WorldGenerator","net/minecraft/src","0" +"Packet13PlayerLookMove","ul","Packet10Flying","net/minecraft/src","0" +"ThreadDownloadImageData","aap","","net/minecraft/src","0" +"ModelRenderer","acf","","net/minecraft/src","0" +"GuiSleepMP","rj","GuiChat","net/minecraft/src","0" +"StructureStrongholdPieceWeight3","th","StructureStrongholdPieceWeight","net/minecraft/src","0" +"BlockIce","ahq","BlockBreakable","net/minecraft/src","0" +"TileEntityMobSpawner","ze","TileEntity","net/minecraft/src","0" +"Packet107CreativeSetSlot","dg","Packet","net/minecraft/src","0" +"RenderBlocks","acr","","net/minecraft/src","0" +"ComponentStrongholdStairs2","aeh","ComponentStrongholdStairs","net/minecraft/src","0" +"EntityWolf","aik","EntityAnimal","net/minecraft/src","0" +"ItemDoor","zg","Item","net/minecraft/src","0" +"TexturePackCustom","adw","TexturePackBase","net/minecraft/src","0" +"WorldInfo","si","","net/minecraft/src","0" +"Packet","gt","","net/minecraft/src","0" +"CanvasMojangLogo","td","","net/minecraft/src","0" +"EntitySnowball","aah","EntityThrowable","net/minecraft/src","0" +"ItemShears","abo","Item","net/minecraft/src","0" +"EntityVillager","ai","EntityCreature","net/minecraft/src","0" +"Entity","ia","","net/minecraft/src","0" +"StructureNetherBridgePieceWeight","aaz","","net/minecraft/src","0" +"IChunkLoader","d","","net/minecraft/src","0" +"GuiWinGame","lt","GuiScreen","net/minecraft/src","0" +"J_JsonNodeFactories","ahf","","net/minecraft/src","0" +"EntitySnowmanBase","aeo","EntityCreature","net/minecraft/src","0" +"SorterStatsBlock","agt","","net/minecraft/src","0" +"BlockRedstoneOre","oc","Block","net/minecraft/src","0" +"StructureMineshaftPieces","aez","","net/minecraft/src","0" +"EnchantmentUntouching","gi","Enchantment","net/minecraft/src","0" +"J_JsonNodeDoesNotMatchPathElementsException","xo","J_JsonNodeDoesNotMatchJsonNodeSelectorException","net/minecraft/src","0" +"RenderBiped","tp","RenderLiving","net/minecraft/src","0" +"ServerNBTStorage","lo","","net/minecraft/src","0" +"NBTTagDouble","fg","NBTBase","net/minecraft/src","0" +"ScreenShotHelper","abx","","net/minecraft/src","0" +"GuiControls","ee","GuiScreen","net/minecraft/src","0" +"BlockDetectorRail","ags","BlockRail","net/minecraft/src","0" +"ChatAllowedCharacters","age","","net/minecraft/src","0" +"AxisAlignedBB","c","","net/minecraft/src","0" +"WorldGenMinable","ky","WorldGenerator","net/minecraft/src","0" +"TexturedQuad","pv","","net/minecraft/src","0" +"ItemBucketMilk","om","Item","net/minecraft/src","0" +"ComponentNetherBridgeNetherStalkRoom","io","ComponentNetherBridgePiece","net/minecraft/src","0" +"GenLayerVillageLandscape","afa","GenLayer","net/minecraft/src","0" +"TileEntitySign","u","TileEntity","net/minecraft/src","0" +"ComponentStrongholdLeftTurn","hq","ComponentStronghold","net/minecraft/src","0" +"BlockStone","gm","Block","net/minecraft/src","0" +"Packet100OpenWindow","wm","Packet","net/minecraft/src","0" +"ComponentNetherBridgeStairs","bl","ComponentNetherBridgePiece","net/minecraft/src","0" +"ComponentVillageWoodHut","wi","ComponentVillage","net/minecraft/src","0" +"TileEntityChestRenderer","fv","TileEntitySpecialRenderer","net/minecraft/src","0" +"Packet23VehicleSpawn","gh","Packet","net/minecraft/src","0" +"PathPoint","mo","","net/minecraft/src","0" +"ModelGhast","mu","ModelBase","net/minecraft/src","0" +"BiomeGenEnd","gu","BiomeGenBase","net/minecraft/src","0" +"ContainerCreative","afp","Container","net/minecraft/src","0" +"EntitySlime","aed","EntityLiving","net/minecraft/src","0" +"ModelBox","ad","","net/minecraft/src","0" +"Packet102WindowClick","aa","Packet","net/minecraft/src","0" +"ItemSoup","l","ItemFood","net/minecraft/src","0" +"WorldGenSwamp","qj","WorldGenerator","net/minecraft/src","0" +"EntityEgg","qw","EntityThrowable","net/minecraft/src","0" +"RenderMinecart","pg","Render","net/minecraft/src","0" +"ModelMagmaCube","agy","ModelBase","net/minecraft/src","0" +"GuiOptions","ex","GuiScreen","net/minecraft/src","0" +"Packet43Experience","nw","Packet","net/minecraft/src","0" +"GuiSlotServer","jo","GuiSlot","net/minecraft/src","0" +"TextureLavaFlowFX","ss","TextureFX","net/minecraft/src","0" +"ColorizerFoliage","db","","net/minecraft/src","0" +"EntityBubbleFX","pq","EntityFX","net/minecraft/src","0" +"GuiContainer","mg","GuiScreen","net/minecraft/src","0" +"Packet27Position","zi","Packet","net/minecraft/src","0" +"EnumDoor","mj","","net/minecraft/src","0" +"GenLayerMushroomIsland","aas","GenLayer","net/minecraft/src","0" +"EnumOptionsMappingHelper","ka","","net/minecraft/src","0" +"MaterialTransparent","br","Material","net/minecraft/src","0" +"ISaveFormat","tq","","net/minecraft/src","0" +"GuiFurnace","aaw","GuiContainer","net/minecraft/src","0" +"ComponentMineshaftCorridor","aba","StructureComponent","net/minecraft/src","0" +"TextureWatchFX","at","TextureFX","net/minecraft/src","0" +"EntityItem","ih","Entity","net/minecraft/src","0" +"EntityPlayerSP","di","EntityPlayer","net/minecraft/src","0" +"GenLayerRiverMix","na","GenLayer","net/minecraft/src","0" +"NBTTagShort","cg","NBTBase","net/minecraft/src","0" +"EnumToolMaterial","nu","","net/minecraft/src","0" +"BlockCake","aem","Block","net/minecraft/src","0" +"ItemBoat","abv","Item","net/minecraft/src","0" +"BlockPressurePlate","wx","Block","net/minecraft/src","0" +"EntityRenderer","adt","","net/minecraft/src","0" +"ClippingHelper","ip","","net/minecraft/src","0" +"SpawnListEntry","yx","WeightedRandomChoice","net/minecraft/src","0" +"EntitySkeleton","it","EntityMob","net/minecraft/src","0" +"BlockFluid","agw","Block","net/minecraft/src","0" +"J_ThingWithPosition","if","","net/minecraft/src","0" +"EnchantmentProtection","ii","Enchantment","net/minecraft/src","0" +"PathEntity","dw","","net/minecraft/src","0" +"EntityBreakingFX","ug","EntityFX","net/minecraft/src","0" +"Render","rg","","net/minecraft/src","0" +"BlockSoulSand","mq","Block","net/minecraft/src","0" +"RenderSnowMan","bh","RenderLiving","net/minecraft/src","0" +"TileEntityPiston","agb","TileEntity","net/minecraft/src","0" +"BlockJukeBox","abl","BlockContainer","net/minecraft/src","0" +"StepSoundStone","bj","StepSound","net/minecraft/src","0" +"ItemLilyPad","pd","ItemColored","net/minecraft/src","0" +"ItemSlab","r","ItemBlock","net/minecraft/src","0" +"ModelWolf","ei","ModelBase","net/minecraft/src","0" +"GuiYesNo","go","GuiScreen","net/minecraft/src","0" +"Packet42RemoveEntityEffect","af","Packet","net/minecraft/src","0" +"ItemPiston","afi","ItemBlock","net/minecraft/src","0" +"Packet4UpdateTime","cb","Packet","net/minecraft/src","0" +"EntityFishHook","ael","Entity","net/minecraft/src","0" +"GuiAchievements","qx","GuiScreen","net/minecraft/src","0" +"EntityDamageSource","fq","DamageSource","net/minecraft/src","0" +"EnumArt","sv","","net/minecraft/src","0" +"Packet29DestroyEntity","fw","Packet","net/minecraft/src","0" +"EnumSkyBlock","bn","","net/minecraft/src","0" +"TextureFX","dt","","net/minecraft/src","0" +"CompressedStreamTools","vx","","net/minecraft/src","0" +"BiomeCacheBlock","cq","","net/minecraft/src","0" +"ThreadedChunkLoader","tn","","net/minecraft/src","0" +"EntitySpider","vq","EntityMob","net/minecraft/src","0" +"GuiSlotStats","mx","GuiSlot","net/minecraft/src","0" +"StructureVillageStart","yo","StructureStart","net/minecraft/src","0" +"EntityMinecart","vm","Entity","net/minecraft/src","0" +"ItemSnowball","re","Item","net/minecraft/src","0" +"EntityAnimal","fx","EntityCreature","net/minecraft/src","0" +"EntityPotion","ab","EntityThrowable","net/minecraft/src","0" +"IMob","aey","","net/minecraft/src","0" +"J_Functor","gz","","net/minecraft/src","0" +"ModelBiped","fa","ModelBase","net/minecraft/src","0" +"BlockDoor","uc","Block","net/minecraft/src","0" +"WatchableObject","afh","","net/minecraft/src","0" +"BlockCrops","aha","BlockFlower","net/minecraft/src","0" +"RecipesIngots","ady","","net/minecraft/src","0" +"GuiSmallButton","abs","GuiButton","net/minecraft/src","0" +"ModelDragon","afo","ModelBase","net/minecraft/src","0" +"StepSound","wu","","net/minecraft/src","0" +"ScaledResolution","ef","","net/minecraft/src","0" +"Packet7UseEntity","zm","Packet","net/minecraft/src","0" +"RenderWolf","acb","RenderLiving","net/minecraft/src","0" +"GuiVideoSettings","cc","GuiScreen","net/minecraft/src","0" +"GuiSlotStatsItem","xa","GuiSlotStats","net/minecraft/src","0" +"EntityLavaFX","aw","EntityFX","net/minecraft/src","0" +"Session","dr","","net/minecraft/src","0" +"Packet105UpdateProgressbar","gb","Packet","net/minecraft/src","0" +"BiomeGenMushroomIsland","aev","BiomeGenBase","net/minecraft/src","0" +"ModelBook","uj","ModelBase","net/minecraft/src","0" +"SlotCrafting","afe","Slot","net/minecraft/src","0" +"MapStorage","ew","","net/minecraft/src","0" +"J_JsonFieldNodeSelector","jr","J_LeafFunctor","net/minecraft/src","0" +"StructureStrongholdPieceWeight","ci","","net/minecraft/src","0" +"MusInputStream","cm","","net/minecraft/src","0" +"WorldGenFire","pl","WorldGenerator","net/minecraft/src","0" +"BlockStep","xs","Block","net/minecraft/src","0" +"StatBasic","cl","StatBase","net/minecraft/src","0" +"BlockRedstoneWire","kw","Block","net/minecraft/src","0" +"BlockGrass","jb","Block","net/minecraft/src","0" +"Explosion","xp","","net/minecraft/src","0" +"OpenGlHelper","adx","","net/minecraft/src","0" +"GuiSlotStatsGeneral","b","GuiSlot","net/minecraft/src","0" +"ComponentStrongholdPrison","fj","ComponentStronghold","net/minecraft/src","0" +"ItemEgg","sb","Item","net/minecraft/src","0" +"StructureVillagePieces","xy","","net/minecraft/src","0" +"BlockRail","afr","Block","net/minecraft/src","0" +"ComponentVillageChurch","uz","ComponentVillage","net/minecraft/src","0" +"ComponentNetherBridgeThrone","kf","ComponentNetherBridgePiece","net/minecraft/src","0" +"MapGenRavine","rf","MapGenBase","net/minecraft/src","0" +"GuiEditSign","fl","GuiScreen","net/minecraft/src","0" +"BlockOre","v","Block","net/minecraft/src","0" +"BiomeGenPlains","ym","BiomeGenBase","net/minecraft/src","0" +"GuiScreen","xe","Gui","net/minecraft/src","0" +"DataWatcher","cr","","net/minecraft/src","0" +"PotionHelper","pk","","net/minecraft/src","0" +"Packet20NamedEntitySpawn","ph","Packet","net/minecraft/src","0" +"SlotBrewingStandIngredient","aer","Slot","net/minecraft/src","0" +"ItemCoal","pr","Item","net/minecraft/src","0" +"MovementInputFromOptions","wa","MovementInput","net/minecraft/src","0" +"ActiveRenderInfo","abz","","net/minecraft/src","0" +"EntityEnderEye","bs","Entity","net/minecraft/src","0" +"Packet3Chat","abb","Packet","net/minecraft/src","0" +"TileEntityBrewingStand","tt","TileEntity","net/minecraft/src","0" +"GuiTexturePackSlot","ju","GuiSlot","net/minecraft/src","0" +"BlockMycelium","ez","Block","net/minecraft/src","0" +"EntityGiantZombie","abc","EntityMob","net/minecraft/src","0" +"CanvasMinecraftApplet","ep","","net/minecraft/src","0" +"EnumOS2","qe","","net/minecraft/src","0" +"Packet38EntityStatus","bf","Packet","net/minecraft/src","0" +"ItemArmor","agi","Item","net/minecraft/src","0" +"EnumAction","ps","","net/minecraft/src","0" +"GuiParticle","vg","Gui","net/minecraft/src","0" +"ComponentStrongholdStairs","vl","ComponentStronghold","net/minecraft/src","0" +"GuiScreenServerList","nn","GuiScreen","net/minecraft/src","0" +"Packet33RelEntityMoveLook","mc","Packet30Entity","net/minecraft/src","0" +"TextureWaterFX","gk","TextureFX","net/minecraft/src","0" +"AchievementMap","kp","","net/minecraft/src","0" +"Potion","abg","","net/minecraft/src","0" +"ComponentVillageTorch","abj","ComponentVillage","net/minecraft/src","0" +"TextureOffset","sx","","net/minecraft/src","0" +"BlockSand","cj","Block","net/minecraft/src","0" +"StructureStrongholdStones","qa","StructurePieceBlockSelector","net/minecraft/src","0" +"WorldGenPumpkin","sz","WorldGenerator","net/minecraft/src","0" +"NBTTagCompound","ik","NBTBase","net/minecraft/src","0" +"WorldGenGlowStone2","aew","WorldGenerator","net/minecraft/src","0" +"ModelSkeleton","afg","ModelZombie","net/minecraft/src","0" +"Packet41EntityEffect","ij","Packet","net/minecraft/src","0" +"ComponentMineshaftCross","id","StructureComponent","net/minecraft/src","0" +"ICrafting","abd","","net/minecraft/src","0" +"GuiInventory","hw","GuiContainer","net/minecraft/src","0" +"ItemFishingRod","hd","Item","net/minecraft/src","0" +"EntitySquid","yv","EntityWaterMob","net/minecraft/src","0" +"BiomeGenForest","fo","BiomeGenBase","net/minecraft/src","0" +"EntityCaveSpider","aco","EntitySpider","net/minecraft/src","0" +"GuiSelectWorld","xz","GuiScreen","net/minecraft/src","0" +"GuiIngameMenu","nd","GuiScreen","net/minecraft/src","0" +"MapGenCavesHell","cz","MapGenBase","net/minecraft/src","0" +"ChunkProviderClient","er","","net/minecraft/src","0" +"NBTTagFloat","vd","NBTBase","net/minecraft/src","0" +"PotionEffect","s","","net/minecraft/src","0" +"ComponentStrongholdStraight","gp","ComponentStronghold","net/minecraft/src","0" +"ComponentNetherBridgePiece","rh","StructureComponent","net/minecraft/src","0" +"TileEntityFurnace","oe","TileEntity","net/minecraft/src","0" +"EntityLiving","nq","Entity","net/minecraft/src","0" +"LayerIsland","aib","GenLayer","net/minecraft/src","0" +"IInvBasic","afq","","net/minecraft/src","0" +"TileEntityEnchantmentTable","rq","TileEntity","net/minecraft/src","0" +"PositionTextureVertex","fs","","net/minecraft/src","0" +"ChunkLoader","gy","","net/minecraft/src","0" +"GenLayerIsland","tv","GenLayer","net/minecraft/src","0" +"ModelBlaze","adm","ModelBase","net/minecraft/src","0" +"GuiErrorScreen","ov","GuiScreen","net/minecraft/src","0" +"BlockWeb","kc","Block","net/minecraft/src","0" +"ModelBase","al","","net/minecraft/src","0" +"GuiIngame","qd","Gui","net/minecraft/src","0" +"ItemSapling","z","ItemBlock","net/minecraft/src","0" +"ComponentVillageField","ec","ComponentVillage","net/minecraft/src","0" +"EmptyChunk","hn","Chunk","net/minecraft/src","0" +"J_JsonFormatter","wo","","net/minecraft/src","0" +"ModelSheep2","gg","ModelQuadruped","net/minecraft/src","0" +"ComponentVillageField2","agr","ComponentVillage","net/minecraft/src","0" +"GuiTexturePacks","lb","GuiScreen","net/minecraft/src","0" +"NBTTagString","yt","NBTBase","net/minecraft/src","0" +"ChunkProviderLoadOrGenerate","mv","","net/minecraft/src","0" +"J_JsonFalseNodeBuilder","lh","","net/minecraft/src","0" +"ChunkBlockMap","aig","","net/minecraft/src","0" +"GenLayerRiver","xu","GenLayer","net/minecraft/src","0" +"SaveHandler","e","","net/minecraft/src","0" +"ShapelessRecipes","bc","","net/minecraft/src","0" +"TextureFlamesFX","agp","TextureFX","net/minecraft/src","0" +"RenderCow","lj","RenderLiving","net/minecraft/src","0" +"BlockSponge","wh","Block","net/minecraft/src","0" +"BlockStem","pu","BlockFlower","net/minecraft/src","0" +"ItemMinecart","aex","Item","net/minecraft/src","0" +"BlockWorkbench","rn","Block","net/minecraft/src","0" +"Packet26EntityExpOrb","fi","Packet","net/minecraft/src","0" +"MapGenVillage","xn","MapGenStructure","net/minecraft/src","0" +"BiomeGenRiver","lq","BiomeGenBase","net/minecraft/src","0" +"Packet201PlayerInfo","oz","Packet","net/minecraft/src","0" +"EntityCreature","ww","EntityLiving","net/minecraft/src","0" +"Teleporter","aim","","net/minecraft/src","0" +"BlockNetherStalk","vy","BlockFlower","net/minecraft/src","0" +"StructureStrongholdPieceWeight2","iz","StructureStrongholdPieceWeight","net/minecraft/src","0" +"MapColor","aav","","net/minecraft/src","0" +"StructureStrongholdPieces","tc","","net/minecraft/src","0" +"RailLogic","aiq","","net/minecraft/src","0" +"MapCoord","aar","","net/minecraft/src","0" +"Achievement","ws","StatBase","net/minecraft/src","0" +"J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","J_JsonNodeDoesNotMatchJsonNodeSelectorException","net/minecraft/src","0" +"J_JsonListenerToJdomAdapter","es","","net/minecraft/src","0" +"TileEntityRecordPlayer","agc","TileEntity","net/minecraft/src","0" +"ImageBufferDownload","vt","","net/minecraft/src","0" +"ComponentVillageHouse1","gs","ComponentVillage","net/minecraft/src","0" +"J_JsonNumberNode","ds","J_JsonNode","net/minecraft/src","0" +"MouseHelper","hs","","net/minecraft/src","0" +"StatFileWriter","tk","","net/minecraft/src","0" +"BiomeGenOcean","aeq","BiomeGenBase","net/minecraft/src","0" +"EnumOptions","lp","","net/minecraft/src","0" +"WorldClient","ma","World","net/minecraft/src","0" +"BiomeDecorator","ql","","net/minecraft/src","0" +"BlockDragonEgg","aci","Block","net/minecraft/src","0" +"BlockPistonMoving","qz","BlockContainer","net/minecraft/src","0" +"MinecraftImpl","ahy","Minecraft","net/minecraft/src","0" +"Path","zs","","net/minecraft/src","0" +"J_JsonFieldBuilder","aax","","net/minecraft/src","0" +"Item","acy","","net/minecraft/src","0" +"J_JsonObjectNodeList","nv","","net/minecraft/src","0" +"TileEntity","bq","","net/minecraft/src","0" +"BlockFlowing","ahx","BlockFluid","net/minecraft/src","0" +"EnumOSMappingHelper","qr","","net/minecraft/src","0" +"ComponentStrongholdChestCorridor","ys","ComponentStronghold","net/minecraft/src","0" +"WorldGenTaiga1","us","WorldGenerator","net/minecraft/src","0" +"InventoryPlayer","x","","net/minecraft/src","0" +"Slot","vv","","net/minecraft/src","0" +"Direction","lz","","net/minecraft/src","0" +"ModelVillager","zf","ModelBase","net/minecraft/src","0" +"EntityRainFX","ub","EntityFX","net/minecraft/src","0" +"ItemBed","kn","Item","net/minecraft/src","0" +"Packet108EnchantItem","acv","Packet","net/minecraft/src","0" +"EntityCreeper","abh","EntityMob","net/minecraft/src","0" +"Packet101CloseWindow","hi","Packet","net/minecraft/src","0" +"EntitySmallFireball","yn","EntityFireball","net/minecraft/src","0" +"Packet24MobSpawn","mn","Packet","net/minecraft/src","0" +"J_InvalidSyntaxException","zz","","net/minecraft/src","0" +"ItemRedstone","dl","Item","net/minecraft/src","0" +"ThreadedChunkLoaderPending","vp","","net/minecraft/src","0" +"Packet14BlockDig","sm","Packet","net/minecraft/src","0" +"OpenGlCapsChecker","mm","","net/minecraft/src","0" +"J_JsonStringNode","oj","J_JsonNode","net/minecraft/src","0" +"MapInfo","sa","","net/minecraft/src","0" +"NetClientHandler","abp","NetHandler","net/minecraft/src","0" +"ItemTool","ads","Item","net/minecraft/src","0" +"ImageBuffer","aaj","","net/minecraft/src","0" +"Container","pj","","net/minecraft/src","0" +"EntityPig","fd","EntityAnimal","net/minecraft/src","0" +"GuiSavingLevelString","ao","","net/minecraft/src","0" +"GuiGameOver","j","GuiScreen","net/minecraft/src","0" +"EnchantmentDurability","dq","Enchantment","net/minecraft/src","0" +"J_JsonNumberNodeBuilder","ms","","net/minecraft/src","0" +"GuiContainerCreative","aec","GuiContainer","net/minecraft/src","0" +"EntityMagmaCube","aea","EntitySlime","net/minecraft/src","0" +"Packet5PlayerInventory","lw","Packet","net/minecraft/src","0" +"BlockBrewingStand","ahp","BlockContainer","net/minecraft/src","0" +"NoiseGeneratorOctaves","eb","NoiseGenerator","net/minecraft/src","0" +"ItemBlock","uw","Item","net/minecraft/src","0" +"BlockPumpkin","nf","Block","net/minecraft/src","0" +"Packet30Entity","rd","Packet","net/minecraft/src","0" +"SorterStatsItem","gf","","net/minecraft/src","0" +"StructureNetherBridgePieces","rp","","net/minecraft/src","0" +"J_JdomParser","nx","","net/minecraft/src","0" +"RenderLightningBolt","adu","Render","net/minecraft/src","0" +"InventoryBasic","bb","","net/minecraft/src","0" +"ItemFood","agu","Item","net/minecraft/src","0" +"UnexpectedThrowable","oq","","net/minecraft/src","0" +"EnchantmentOxygen","vu","Enchantment","net/minecraft/src","0" +"EnchantmentWaterWorker","adz","Enchantment","net/minecraft/src","0" +"StatStringFormatKeyInv","qb","","net/minecraft/src","0" +"EntityThrowable","fm","Entity","net/minecraft/src","0" +"Packet255KickDisconnect","sw","Packet","net/minecraft/src","0" +"StatCrafting","yl","StatBase","net/minecraft/src","0" +"ItemBow","il","Item","net/minecraft/src","0" +"J_JsonArrayNodeSelector","ahj","J_LeafFunctor","net/minecraft/src","0" +"WorldGenBigTree","yd","WorldGenerator","net/minecraft/src","0" +"ItemSeeds","adf","Item","net/minecraft/src","0" +"SlotBrewingStandPotion","aeb","Slot","net/minecraft/src","0" +"WorldGenGlowStone1","pt","WorldGenerator","net/minecraft/src","0" +"EntitySmokeFX","aca","EntityFX","net/minecraft/src","0" +"EntityPickupFX","acw","EntityFX","net/minecraft/src","0" +"RecipesFood","air","","net/minecraft/src","0" +"ContainerDispenser","qu","Container","net/minecraft/src","0" +"BlockSnowBlock","jk","Block","net/minecraft/src","0" +"ComponentNetherBridgeEntrance","xr","ComponentNetherBridgePiece","net/minecraft/src","0" +"ModelSnowMan","aai","ModelBase","net/minecraft/src","0" +"EntityGhast","is","EntityFlying","net/minecraft/src","0" +"NBTTagLong","vw","NBTBase","net/minecraft/src","0" +"Empty3","qt","","net/minecraft/src","0" +"Packet131MapData","aej","Packet","net/minecraft/src","0" +"StructureNetherBridgeEnd","ld","ComponentNetherBridgePiece","net/minecraft/src","0" +"RenderSquid","aic","RenderLiving","net/minecraft/src","0" +"Particle","dy","","net/minecraft/src","0" +"EntityArrow","ro","Entity","net/minecraft/src","0" +"RegionFile","as","","net/minecraft/src","0" +"GuiStats","in","GuiScreen","net/minecraft/src","0" +"TexturePackBase","afs","","net/minecraft/src","0" +"BlockRedstoneTorch","ku","BlockTorch","net/minecraft/src","0" +"BlockButton","ahv","Block","net/minecraft/src","0" +"BlockBed","aab","Block","net/minecraft/src","0" +"NoiseGeneratorPerlin","agk","NoiseGenerator","net/minecraft/src","0" +"StatCollector","hj","","net/minecraft/src","0" +"J_ArrayNodeContainer","tl","","net/minecraft/src","0" +"GenLayer","jx","","net/minecraft/src","0" +"RenderFireball","ke","Render","net/minecraft/src","0" +"ThreadDownloadImage","cw","","net/minecraft/src","0" +"EntityCritFX","afj","EntityFX","net/minecraft/src","0" +"RegionFileCache","wl","","net/minecraft/src","0" +"ItemSpade","adb","ItemTool","net/minecraft/src","0" +"EnumJsonNodeTypeMappingHelper","ux","","net/minecraft/src","0" +"ComponentMineshaftRoom","uk","StructureComponent","net/minecraft/src","0" +"EnumArmorMaterial","dj","","net/minecraft/src","0" +"J_JsonNodeBuilders","tz","","net/minecraft/src","0" +"ComponentVillageHouse4_Garden","uy","ComponentVillage","net/minecraft/src","0" +"GuiSlot","jn","","net/minecraft/src","0" +"MapItemRenderer","sg","","net/minecraft/src","0" +"ComponentNetherBridgeCorridor5","hg","ComponentNetherBridgePiece","net/minecraft/src","0" +"J_JsonArray","kx","J_JsonRootNode","net/minecraft/src","0" +"NBTTagEnd","hp","NBTBase","net/minecraft/src","0" +"EnchantmentData","vs","WeightedRandomChoice","net/minecraft/src","0" +"GenLayerRiverInit","sp","GenLayer","net/minecraft/src","0" +"GuiCreateWorld","xh","GuiScreen","net/minecraft/src","0" +"RenderPainting","zv","Render","net/minecraft/src","0" +"IStatType","un","","net/minecraft/src","0" +"BlockPistonBase","abr","Block","net/minecraft/src","0" +"ModelLargeChest","vk","ModelChest","net/minecraft/src","0" +"Packet8UpdateHealth","qg","Packet","net/minecraft/src","0" +"CraftingManager","sl","","net/minecraft/src","0" +"FurnaceRecipes","mt","","net/minecraft/src","0" +"ComponentStrongholdStairsStraight","so","ComponentStronghold","net/minecraft/src","0" +"GuiEnchantment","zw","GuiContainer","net/minecraft/src","0" +"EnumMovingObjectType","bo","","net/minecraft/src","0" +"ThreadDownloadResources","ng","","net/minecraft/src","0" +"J_JsonElementNodeSelector","da","J_LeafFunctor","net/minecraft/src","0" +"NBTTagByte","xq","NBTBase","net/minecraft/src","0" +"EnchantmentLootBonus","qn","Enchantment","net/minecraft/src","0" +"WorldGenForest","jp","WorldGenerator","net/minecraft/src","0" +"StructureComponent","nk","","net/minecraft/src","0" +"BlockDirt","agd","Block","net/minecraft/src","0" +"RenderSnowball","cd","Render","net/minecraft/src","0" +"ThreadPollServers","yb","","net/minecraft/src","0" +"WeightedRandom","nc","","net/minecraft/src","0" +"BlockCloth","fr","Block","net/minecraft/src","0" +"DamageSource","pm","","net/minecraft/src","0" +"RenderHelper","rt","","net/minecraft/src","0" +"SaveFormatComparator","rr","","net/minecraft/src","0" +"Packet15Place","em","Packet","net/minecraft/src","0" +"Packet18Animation","abu","Packet","net/minecraft/src","0" +"ComponentNetherBridgeCorridor","ahw","ComponentNetherBridgePiece","net/minecraft/src","0" +"RenderTNTPrimed","nt","Render","net/minecraft/src","0" +"RenderFallingSand","agh","Render","net/minecraft/src","0" +"TextureLavaFX","yu","TextureFX","net/minecraft/src","0" +"RecipesCrafting","do","","net/minecraft/src","0" +"TileEntityNote","nj","TileEntity","net/minecraft/src","0" +"ShapedRecipes","aga","","net/minecraft/src","0" +"WorldSettings","yw","","net/minecraft/src","0" +"RenderFish","ls","Render","net/minecraft/src","0" +"GuiMainMenu","eh","GuiScreen","net/minecraft/src","0" +"EnumStatus","qy","","net/minecraft/src","0" +"EntityLightningBolt","su","EntityWeatherEffect","net/minecraft/src","0" +"StructurePieceTreasure","agq","WeightedRandomChoice","net/minecraft/src","0" +"GenLayerSmoothZoom","jw","GenLayer","net/minecraft/src","0" +"EntityMooshroom","tb","EntityCow","net/minecraft/src","0" +"WorldBlockPositionType","agf","","net/minecraft/src","0" +"BlockFarmland","ni","Block","net/minecraft/src","0" +"ItemEnderPearl","eo","Item","net/minecraft/src","0" +"WorldProviderSurface","ix","WorldProvider","net/minecraft/src","0" +"RecipesDyes","jc","","net/minecraft/src","0" +"IThreadedFileIO","pz","","net/minecraft/src","0" +"Packet103SetSlot","iu","Packet","net/minecraft/src","0" +"Packet34EntityTeleport","be","Packet","net/minecraft/src","0" +"NBTTagInt","hx","NBTBase","net/minecraft/src","0" +"Packet53BlockChange","ack","Packet","net/minecraft/src","0" +"SlotArmor","pi","Slot","net/minecraft/src","0" +"EntityEnchantmentTableParticleFX","afn","EntityFX","net/minecraft/src","0" +"RenderMagmaCube","m","RenderLiving","net/minecraft/src","0" +"Profiler","pf","","net/minecraft/src","0" +"World","ry","","net/minecraft/src","0" +"SignModel","rb","ModelBase","net/minecraft/src","0" +"IWorldAccess","bd","","net/minecraft/src","0" +"EntityWeatherEffect","sd","Entity","net/minecraft/src","0" +"J_ChainedFunctor","zk","","net/minecraft/src","0" +"RenderBoat","ru","Render","net/minecraft/src","0" +"TileEntityRendererPiston","xd","TileEntitySpecialRenderer","net/minecraft/src","0" +"GenLayerZoom","act","GenLayer","net/minecraft/src","0" +"EntitySheep","hm","EntityAnimal","net/minecraft/src","0" +"ChunkCache","xk","","net/minecraft/src","0" +"Packet19EntityAction","ag","Packet","net/minecraft/src","0" +"GLAllocation","bt","","net/minecraft/src","0" +"MapGenWaterlily","jj","WorldGenerator","net/minecraft/src","0" +"IntCache","bm","","net/minecraft/src","0" +"ChunkCoordIntPair","acm","","net/minecraft/src","0" +"RenderSilverfish","xt","RenderLiving","net/minecraft/src","0" +"ComponentVillageHouse2","ko","ComponentVillage","net/minecraft/src","0" +"ItemReed","to","Item","net/minecraft/src","0" +"ItemGlassBottle","qc","Item","net/minecraft/src","0" +"J_FieldNodeContainer","co","","net/minecraft/src","0" +"BlockContainer","ba","Block","net/minecraft/src","0" +"GuiScreenAddServer","iq","GuiScreen","net/minecraft/src","0" +"GenLayerSmooth","acn","GenLayer","net/minecraft/src","0" +"MinecraftAppletImpl","nm","Minecraft","net/minecraft/src","0" +"Packet52MultiBlockChange","np","Packet","net/minecraft/src","0" +"NetworkMasterThread","acx","","net/minecraft/src","0" +"BlockMelon","of","Block","net/minecraft/src","0" +"BlockChest","au","BlockContainer","net/minecraft/src","0" +"EnchantmentModifierLiving","aen","","net/minecraft/src","0" +"J_JsonNodeSelectors","ek","","net/minecraft/src","0" +"ModelZombie","le","ModelBiped","net/minecraft/src","0" +"ComponentStronghold","os","StructureComponent","net/minecraft/src","0" +"ClippingHelperImpl","qs","ClippingHelper","net/minecraft/src","0" +"BlockStairs","ahh","Block","net/minecraft/src","0" +"Packet21PickupSpawn","ts","Packet","net/minecraft/src","0" +"BlockClay","pc","Block","net/minecraft/src","0" +"SlotEnchantmentTable","li","InventoryBasic","net/minecraft/src","0" +"ChestItemRenderHelper","acl","","net/minecraft/src","0" +"J_JsonNodeList","abn","","net/minecraft/src","0" +"RecipeSorter","ga","","net/minecraft/src","0" +"StructureNetherBridgeStart","tg","StructureStart","net/minecraft/src","0" +"J_NodeContainer","ye","","net/minecraft/src","0" +"Vec3D","fb","","net/minecraft/src","0" +"RenderEnderCrystal","ti","Render","net/minecraft/src","0" +"EntitySorter","oy","","net/minecraft/src","0" +"J_JsonRootNode","wz","J_JsonNode","net/minecraft/src","0" +"Packet25EntityPainting","yr","Packet","net/minecraft/src","0" +"Packet16BlockItemSwitch","aio","Packet","net/minecraft/src","0" +"NBTBase","um","","net/minecraft/src","0" +"ContainerBrewingStand","ok","Container","net/minecraft/src","0" +"RenderVillager","ch","RenderLiving","net/minecraft/src","0" +"ItemDye","xv","Item","net/minecraft/src","0" +"Packet104WindowItems","yh","Packet","net/minecraft/src","0" +"ModelSlime","fy","ModelBase","net/minecraft/src","0" +"PotionHealth","py","Potion","net/minecraft/src","0" +"J_JsonConstants","gw","J_JsonNode","net/minecraft/src","0" +"EntitySnowman","ahd","EntitySnowmanBase","net/minecraft/src","0" +"GuiCrafting","uv","GuiContainer","net/minecraft/src","0" +"Timer","aij","","net/minecraft/src","0" +"BlockFire","wj","Block","net/minecraft/src","0" +"BiomeCache","agl","","net/minecraft/src","0" +"EntityCrit2FX","hu","EntityFX","net/minecraft/src","0" +"ComponentStrongholdCorridor","vn","ComponentStronghold","net/minecraft/src","0" +"BlockTorch","bg","Block","net/minecraft/src","0" +"StepSoundSand","aeg","StepSound","net/minecraft/src","0" +"GuiBrewingStand","cy","GuiContainer","net/minecraft/src","0" +"EnchantmentDamage","ap","Enchantment","net/minecraft/src","0" +"BlockEnchantmentTable","sy","BlockContainer","net/minecraft/src","0" +"BiomeEndDecorator","uu","BiomeDecorator","net/minecraft/src","0" +"ThreadSleepForever","yk","","net/minecraft/src","0" +"MouseFilter","ne","","net/minecraft/src","0" +"J_JsonNodeDoesNotMatchJsonNodeSelectorException","xc","","net/minecraft/src","0" +"WorldGenerator","ig","","net/minecraft/src","0" +"BlockGlass","aho","BlockBreakable","net/minecraft/src","0" +"ComponentNetherBridgeStartPiece","gc","ComponentNetherBridgeCrossing3","net/minecraft/src","0" +"EntityFlameFX","o","EntityFX","net/minecraft/src","0" +"NetHandler","fe","","net/minecraft/src","0" +"EntitySilverfish","gl","EntityMob","net/minecraft/src","0" +"EnchantmentFireAspect","aie","Enchantment","net/minecraft/src","0" +"Packet39AttachEntity","agx","Packet","net/minecraft/src","0" +"RenderBlaze","aq","RenderLiving","net/minecraft/src","0" +"Packet50PreChunk","t","Packet","net/minecraft/src","0" +"ComponentNetherBridgeCorridor3","tr","ComponentNetherBridgePiece","net/minecraft/src","0" +"ModelSquid","op","ModelBase","net/minecraft/src","0" +"EntityOtherPlayerMP","zb","EntityPlayer","net/minecraft/src","0" +"EnumCreatureType","jf","","net/minecraft/src","0" +"TileEntityMobSpawnerRenderer","on","TileEntitySpecialRenderer","net/minecraft/src","0" +"EntityLargeExplodeFX","ail","EntityFX","net/minecraft/src","0" +"SlotFurnace","ie","Slot","net/minecraft/src","0" +"WorldGenCactus","ade","WorldGenerator","net/minecraft/src","0" +"StatList","ny","","net/minecraft/src","0" +"ICamera","fn","","net/minecraft/src","0" +"Packet70Bed","ho","Packet","net/minecraft/src","0" +"GuiAchievement","lk","Gui","net/minecraft/src","0" +"EntityReddustFX","aao","EntityFX","net/minecraft/src","0" +"ModelPig","je","ModelQuadruped","net/minecraft/src","0" +"ChunkFile","ck","","net/minecraft/src","0" +"GenLayerZoomVoronoi","df","GenLayer","net/minecraft/src","0" +"MapGenMineshaft","kd","MapGenStructure","net/minecraft/src","0" +"NoiseGenerator","cs","","net/minecraft/src","0" +"WorldGenHellLava","ey","WorldGenerator","net/minecraft/src","0" +"Packet11PlayerPosition","vb","Packet10Flying","net/minecraft/src","0" +"RenderXPOrb","pw","Render","net/minecraft/src","0" +"MathHelper","me","","net/minecraft/src","0" +"BiomeGenHell","av","BiomeGenBase","net/minecraft/src","0" +"EntityMob","zo","EntityCreature","net/minecraft/src","0" +"BlockSandStone","aat","Block","net/minecraft/src","0" +"TileEntityDispenser","bp","TileEntity","net/minecraft/src","0" +"EntityHeartFX","ff","EntityFX","net/minecraft/src","0" +"GuiChat","gx","GuiScreen","net/minecraft/src","0" +"GuiUnused","aff","GuiScreen","net/minecraft/src","0" +"ModelEnderCrystal","afb","ModelBase","net/minecraft/src","0" +"ItemLeaves","og","ItemBlock","net/minecraft/src","0" +"ContainerChest","ak","Container","net/minecraft/src","0" +"BlockReed","md","Block","net/minecraft/src","0" +"TexturePackList","adk","","net/minecraft/src","0" +"ComponentNetherBridgeCrossing2","yj","ComponentNetherBridgePiece","net/minecraft/src","0" +"TexturePortalFX","vr","TextureFX","net/minecraft/src","0" +"EntityDropParticleFX","st","EntityFX","net/minecraft/src","0" +"Packet254ServerPing","lx","Packet","net/minecraft/src","0" +"Chunk","zx","","net/minecraft/src","0" +"GenLayerShore","zy","GenLayer","net/minecraft/src","0" +"J_JsonNodeBuilder","rv","","net/minecraft/src","0" +"StructureStrongholdStart","kg","StructureStart","net/minecraft/src","0" +"EnumMobType","xb","","net/minecraft/src","0" +"NBTTagList","yi","NBTBase","net/minecraft/src","0" +"GenLayerTemperature","afc","GenLayer","net/minecraft/src","0" +"EnchantmentModifierDamage","cp","","net/minecraft/src","0" +"ItemSword","zp","Item","net/minecraft/src","0" +"WorldProviderHell","aau","WorldProvider","net/minecraft/src","0" +"TileEntityChest","tu","TileEntity","net/minecraft/src","0" +"WorldGenBigMushroom","acp","WorldGenerator","net/minecraft/src","0" +"BlockSapling","aet","BlockFlower","net/minecraft/src","0" +"Packet71Weather","abf","Packet","net/minecraft/src","0" +"WorldGenTrees","gq","WorldGenerator","net/minecraft/src","0" +"GenLayerZoomFuzzy","gn","GenLayer","net/minecraft/src","0" +"Packet32EntityLook","ks","Packet30Entity","net/minecraft/src","0" +"IInventory","de","","net/minecraft/src","0" +"StructureStart","oa","","net/minecraft/src","0" +"RenderEnderman","aae","RenderLiving","net/minecraft/src","0" +"ContainerFurnace","eg","Container","net/minecraft/src","0" +"NetworkWriterThread","agv","","net/minecraft/src","0" +"GenLayerDownfallMix","mh","GenLayer","net/minecraft/src","0" +"EnumJsonNodeType","pp","","net/minecraft/src","0" +"J_ObjectNodeContainer","lc","","net/minecraft/src","0" +"ItemBucket","en","Item","net/minecraft/src","0" +"BlockLog","aip","Block","net/minecraft/src","0" +"StatBase","px","","net/minecraft/src","0" +"DragonPart","vc","Entity","net/minecraft/src","0" +"J_CompactJsonFormatter","rx","","net/minecraft/src","0" +"ModelCow","agg","ModelQuadruped","net/minecraft/src","0" +"BlockOreStorage","rs","Block","net/minecraft/src","0" +"WeightedRandomChoice","abt","","net/minecraft/src","0" +"RecipesWeapons","kj","","net/minecraft/src","0" +"J_JsonNode","an","","net/minecraft/src","0" +"RenderSpider","abw","RenderLiving","net/minecraft/src","0" +"ProfilerResult","afx","","net/minecraft/src","0" +"TexturePackDefault","ax","TexturePackBase","net/minecraft/src","0" +"ComponentVillageHouse3","tf","ComponentVillage","net/minecraft/src","0" +"PlayerController","aes","","net/minecraft/src","0" +"EntityNoteFX","ae","EntityFX","net/minecraft/src","0" +"GuiDispenser","wt","GuiContainer","net/minecraft/src","0" +"RenderChicken","dp","RenderLiving","net/minecraft/src","0" +"EntityChicken","qh","EntityAnimal","net/minecraft/src","0" +"PlayerCapabilities","wq","","net/minecraft/src","0" +"ItemPickaxe","zu","ItemTool","net/minecraft/src","0" +"IEnchantmentModifier","fz","","net/minecraft/src","0" +"ModelSilverfish","aaq","ModelBase","net/minecraft/src","0" +"RenderEngine","zh","","net/minecraft/src","0" +"EntityExplodeFX","nr","EntityFX","net/minecraft/src","0" +"IStatStringFormat","aal","","net/minecraft/src","0" +"Tessellator","cv","","net/minecraft/src","0" +"RenderSorter","jy","","net/minecraft/src","0" +"ChunkCoordinates","dh","","net/minecraft/src","0" +"BlockVine","ahl","Block","net/minecraft/src","0" +"ChatLine","ahe","","net/minecraft/src","0" +"ChunkFolderPattern","agj","","net/minecraft/src","0" +"AchievementList","ut","","net/minecraft/src","0" +"IRecipe","ue","","net/minecraft/src","0" +"MD5String","vz","","net/minecraft/src","0" +"GameWindowListener","sj","","net/minecraft/src","0" +"ColorizerGrass","ha","","net/minecraft/src","0" +"ChunkProviderHell","jv","","net/minecraft/src","0" +"WorldChunkManagerHell","bx","WorldChunkManager","net/minecraft/src","0" +"ItemMetadata","afm","ItemBlock","net/minecraft/src","0" +"RenderEndPortal","abi","TileEntitySpecialRenderer","net/minecraft/src","0" +"BlockGravel","kb","BlockSand","net/minecraft/src","0" +"J_JsonObjectNodeBuilder","abq","","net/minecraft/src","0" +"ItemAxe","ago","ItemTool","net/minecraft/src","0" +"EntityZombie","gr","EntityMob","net/minecraft/src","0" +"EntityEnderPearl","tm","EntityThrowable","net/minecraft/src","0" +"TileEntitySignRenderer","aeu","TileEntitySpecialRenderer","net/minecraft/src","0" +"ChunkProvider","jz","","net/minecraft/src","0" +"ItemSign","my","Item","net/minecraft/src","0" +"EnumEnchantmentType","q","","net/minecraft/src","0" +"EntityWaterMob","dn","EntityCreature","net/minecraft/src","0" +"WorldGenReed","tw","WorldGenerator","net/minecraft/src","0" +"ModelQuadruped","fh","ModelBase","net/minecraft/src","0" +"StructureMineshaftStart","ns","StructureStart","net/minecraft/src","0" +"Packet17Sleep","aft","Packet","net/minecraft/src","0" +"GuiDisconnected","aam","GuiScreen","net/minecraft/src","0" +"ItemCloth","ahb","ItemBlock","net/minecraft/src","0" +"ModelChicken","adq","ModelBase","net/minecraft/src","0" +"J_JsonEscapedString","aek","","net/minecraft/src","0" +"BlockPortal","sc","BlockBreakable","net/minecraft/src","0" +"GuiTextField","dv","Gui","net/minecraft/src","0" +"EntityHugeExplodeFX","adc","EntityFX","net/minecraft/src","0" +"PlayerControllerMP","zn","PlayerController","net/minecraft/src","0" +"RenderEntity","wy","Render","net/minecraft/src","0" +"BlockTrapDoor","mf","Block","net/minecraft/src","0" +"ThreadStatSyncherSend","mi","","net/minecraft/src","0" +"J_JsonNodeSelector","dx","","net/minecraft/src","0" +"ItemMap","bv","ItemMapBase","net/minecraft/src","0" +"EntityTNTPrimed","dd","Entity","net/minecraft/src","0" +"EntityPainting","tj","Entity","net/minecraft/src","0" +"Packet22Collect","rc","Packet","net/minecraft/src","0" +"BlockBookshelf","ay","Block","net/minecraft/src","0" +"TileEntityRenderer","ah","","net/minecraft/src","0" +"ItemAppleGold","afk","ItemFood","net/minecraft/src","0" +"BlockFurnace","eu","BlockContainer","net/minecraft/src","0" +"WorldProvider","k","","net/minecraft/src","0" +"BlockSnow","aif","Block","net/minecraft/src","0" +"BlockEndPortalFrame","rl","Block","net/minecraft/src","0" +"BlockLever","aaa","Block","net/minecraft/src","0" +"ComponentNetherBridgeCrossing","ui","ComponentNetherBridgePiece","net/minecraft/src","0" +"J_PositionTrackingPushbackReader","ud","","net/minecraft/src","0" +"Packet10Flying","hk","Packet","net/minecraft/src","0" +"EntitySnowShovelFX","zj","EntityFX","net/minecraft/src","0" +"StatTypeDistance","jg","","net/minecraft/src","0" +"RecipesTools","zq","","net/minecraft/src","0" +"BlockLilyPad","qi","BlockFlower","net/minecraft/src","0" +"GenLayerDownfall","afd","GenLayer","net/minecraft/src","0" +"J_JsonNullNodeBuilder","afl","","net/minecraft/src","0" +"InventoryLargeChest","adv","","net/minecraft/src","0" +"MapGenBase","bz","","net/minecraft/src","0" +"BlockSign","mr","BlockContainer","net/minecraft/src","0" +"J_JsonObject","g","J_JsonRootNode","net/minecraft/src","0" +"BlockMushroomCap","wd","Block","net/minecraft/src","0" +"MaterialLogic","mw","Material","net/minecraft/src","0" +"ComponentStrongholdRoomCrossing","jt","ComponentStronghold","net/minecraft/src","0" +"BlockCauldron","ic","Block","net/minecraft/src","0" +"PanelCrashReport","wp","","net/minecraft/src","0" +"BiomeGenSwamp","mk","BiomeGenBase","net/minecraft/src","0" +"MovementInput","agn","","net/minecraft/src","0" +"Packet200Statistic","zl","Packet","net/minecraft/src","0" +"SpawnerAnimals","we","","net/minecraft/src","0" +"WorldGenTaiga2","ty","WorldGenerator","net/minecraft/src","0" +"BlockSilverfish","vf","Block","net/minecraft/src","0" +"EntityDiggingFX","mp","EntityFX","net/minecraft/src","0" +"ContainerWorkbench","ace","Container","net/minecraft/src","0" +"NetworkManager","hc","","net/minecraft/src","0" +"TextureCompassFX","aih","TextureFX","net/minecraft/src","0" +"ComponentVillageWell","aia","ComponentVillage","net/minecraft/src","0" +"ContainerPlayer","gd","Container","net/minecraft/src","0" +"GuiMultiplayer","xi","GuiScreen","net/minecraft/src","0" +"EntityFireball","aad","Entity","net/minecraft/src","0" +"WorldChunkManager","vh","","net/minecraft/src","0" +"ComponentVillageHall","acz","ComponentVillage","net/minecraft/src","0" +"BlockDeadBush","jl","BlockFlower","net/minecraft/src","0" +"ItemSaddle","acg","Item","net/minecraft/src","0" +"EnchantmentHelper","ml","","net/minecraft/src","0" +"StatTypeSimple","acc","","net/minecraft/src","0" +"Packet61DoorChange","sh","Packet","net/minecraft/src","0" +"EntityCow","adr","EntityAnimal","net/minecraft/src","0" +"Empty2","te","","net/minecraft/src","0" +"GuiWorldSlot","pb","GuiSlot","net/minecraft/src","0" +"Enchantment","aef","","net/minecraft/src","0" +"MapGenNetherBridge","ed","MapGenStructure","net/minecraft/src","0" +"TileEntitySpecialRenderer","du","","net/minecraft/src","0" +"BlockDispenser","cu","BlockContainer","net/minecraft/src","0" +"EnumRarity","ja","","net/minecraft/src","0" +"BiomeGenTaiga","qk","BiomeGenBase","net/minecraft/src","0" +"BlockPane","uh","Block","net/minecraft/src","0" +"ThreadConnectToServer","pn","","net/minecraft/src","0" +"BlockEndPortal","aid","BlockContainer","net/minecraft/src","0" +"Packet51MapChunk","kh","Packet","net/minecraft/src","0" +"ComponentVillageRoadPiece","za","ComponentVillage","net/minecraft/src","0" +"CanvasCrashReport","adn","","net/minecraft/src","0" +"Packet9Respawn","aep","Packet","net/minecraft/src","0" +"RenderCreeper","hb","RenderLiving","net/minecraft/src","0" +"RenderSheep","ahr","RenderLiving","net/minecraft/src","0" +"IntHashMapEntry","aei","","net/minecraft/src","0" +"IntHashMap","ob","","net/minecraft/src","0" +"ItemMapBase","fu","Item","net/minecraft/src","0" +"NibbleArray","up","","net/minecraft/src","0" +"BlockStoneBrick","jh","Block","net/minecraft/src","0" +"EntityBoat","no","Entity","net/minecraft/src","0" +"Block","yy","","net/minecraft/src","0" +"GuiButton","ct","Gui","net/minecraft/src","0" +"LongHashMap","wv","","net/minecraft/src","0" +"Packet40EntityMetadata","se","Packet","net/minecraft/src","0" +"EnchantmentNameParts","ea","","net/minecraft/src","0" +"ComponentNetherBridgeCorridor4","acs","ComponentNetherBridgePiece","net/minecraft/src","0" +"ComponentNetherBridgeCorridor2","lu","ComponentNetherBridgePiece","net/minecraft/src","0" +"EntityBlaze","qf","EntityMob","net/minecraft/src","0" +"MapData","kl","WorldSavedData","net/minecraft/src","0" +"J_JsonStringNodeSelector","ji","J_LeafFunctor","net/minecraft/src","0" +"BlockFlower","wg","Block","net/minecraft/src","0" +"StringTranslate","qp","","net/minecraft/src","0" +"GameSettings","ki","","net/minecraft/src","0" +"Frustrum","ev","","net/minecraft/src","0" +"BlockMobSpawner","kk","BlockContainer","net/minecraft/src","0" +"RenderGhast","im","RenderLiving","net/minecraft/src","0" +"Packet0KeepAlive","wf","Packet","net/minecraft/src","0" +"Packet60Explosion","km","Packet","net/minecraft/src","0" +"MinecraftException","adl","","net/minecraft/src","0" +"WorldSavedData","afz","","net/minecraft/src","0" +"FoodStats","eq","","net/minecraft/src","0" +"GuiRenameWorld","or","GuiScreen","net/minecraft/src","0" +"ItemFlintAndSteel","ou","Item","net/minecraft/src","0" +"WorldGenSpikes","oh","WorldGenerator","net/minecraft/src","0" +"RedstoneUpdateInfo","lf","","net/minecraft/src","0" +"SlotEnchantment","ur","Slot","net/minecraft/src","0" +"EntityDamageSourceIndirect","qq","EntityDamageSource","net/minecraft/src","0" +"J_JsonListener","yc","","net/minecraft/src","0" +"StructurePieceBlockSelector","ox","","net/minecraft/src","0" +"RenderEnchantmentTable","wn","TileEntitySpecialRenderer","net/minecraft/src","0" +"MapGenCaves","ln","MapGenBase","net/minecraft/src","0" +"EntityList","afw","","net/minecraft/src","0" +"EntitySplashFX","adi","EntityRainFX","net/minecraft/src","0" +"BlockPistonExtension","acu","Block","net/minecraft/src","0" +"ChunkProviderEnd","a","","net/minecraft/src","0" +"RenderMooshroom","la","RenderLiving","net/minecraft/src","0" +"ComponentMineshaftStairs","ra","StructureComponent","net/minecraft/src","0" +"BlockGlowStone","sk","Block","net/minecraft/src","0" +"ModelSpider","lv","ModelBase","net/minecraft/src","0" +"GenLayerTemperatureMix","rk","GenLayer","net/minecraft/src","0" +"J_JsonObjectNodeSelector","agz","J_LeafFunctor","net/minecraft/src","0" +"ColorizerWater","ya","","net/minecraft/src","0" +"NBTTagByteArray","ca","NBTBase","net/minecraft/src","0" +"ComponentVillageStartPiece","yp","ComponentVillageWell","net/minecraft/src","0" +"ModelCreeper","aac","ModelBase","net/minecraft/src","0" +"ComponentStrongholdLibrary","zc","ComponentStronghold","net/minecraft/src","0" +"SaveHandlerMP","bi","","net/minecraft/src","0" +"ChunkProviderGenerate","xj","","net/minecraft/src","0" +"WorldGenClay","adp","WorldGenerator","net/minecraft/src","0" +"BlockLadder","afu","Block","net/minecraft/src","0" +"RenderPlayer","zr","RenderLiving","net/minecraft/src","0" +"GuiConnecting","ri","GuiScreen","net/minecraft/src","0" +"MinecraftApplet","MinecraftApplet","","net/minecraft/client","0" +"Minecraft","Minecraft","","net/minecraft/client","0" +"EntityEnderCrystal","gb","Entity","net/minecraft/src","1" +"RecipesArmor","z","","net/minecraft/src","1" +"BiomeGenHills","ry","BiomeGenBase","net/minecraft/src","1" +"ComponentVillage","sr","StructureComponent","net/minecraft/src","1" +"Packet1Login","nl","Packet","net/minecraft/src","1" +"StatTypeTime","br","","net/minecraft/src","1" +"IProgressUpdate","xk","","net/minecraft/src","1" +"EntityDragonBase","ui","EntityLiving","net/minecraft/src","1" +"InventoryCraftResult","vu","","net/minecraft/src","1" +"SaveOldDir","mi","PlayerNBTManager","net/minecraft/src","1" +"ItemHoe","ks","Item","net/minecraft/src","1" +"Packet54PlayNoteBlock","va","Packet","net/minecraft/src","1" +"BlockNetherrack","xt","Block","net/minecraft/src","1" +"IBlockAccess","wy","","net/minecraft/src","1" +"EntityEnderman","mb","EntityMob","net/minecraft/src","1" +"IPlayerFileData","ii","","net/minecraft/src","1" +"BlockRedstoneRepeater","wa","Block","net/minecraft/src","1" +"Packet2Handshake","ma","Packet","net/minecraft/src","1" +"ItemRecord","sn","Item","net/minecraft/src","1" +"WorldGenFlowers","bg","WorldGenerator","net/minecraft/src","1" +"BlockTallGrass","qv","BlockFlower","net/minecraft/src","1" +"ComponentStrongholdCrossing","up","ComponentStronghold","net/minecraft/src","1" +"ThreadedFileIOBase","ct","","net/minecraft/src","1" +"EntityFlying","wc","EntityLiving","net/minecraft/src","1" +"EnumCreatureAttribute","bq","","net/minecraft/src","1" +"RegionFileChunkBuffer","id","","net/minecraft/src","1" +"NetworkReaderThread","wu","","net/minecraft/src","1" +"MaterialPortal","of","Material","net/minecraft/src","1" +"Packet106Transaction","nv","Packet","net/minecraft/src","1" +"MovingObjectPosition","uc","","net/minecraft/src","1" +"BlockTNT","ai","Block","net/minecraft/src","1" +"Material","lg","","net/minecraft/src","1" +"ComponentNetherBridgeStraight","du","ComponentNetherBridgePiece","net/minecraft/src","1" +"BlockStationary","nh","BlockFluid","net/minecraft/src","1" +"ChunkPosition","vo","","net/minecraft/src","1" +"BlockLeavesBase","nb","Block","net/minecraft/src","1" +"NextTickListEntry","qa","","net/minecraft/src","1" +"InventoryCrafting","mc","","net/minecraft/src","1" +"ComponentStrongholdRightTurn","od","ComponentStrongholdLeftTurn","net/minecraft/src","1" +"EntityPigZombie","xj","EntityZombie","net/minecraft/src","1" +"Facing","vs","","net/minecraft/src","1" +"GenLayerSnow","az","GenLayer","net/minecraft/src","1" +"ItemStack","jb","","net/minecraft/src","1" +"ItemPotion","ft","Item","net/minecraft/src","1" +"Packet31RelEntityMove","rt","Packet30Entity","net/minecraft/src","1" +"SaveFormatOld","sl","","net/minecraft/src","1" +"MaterialWeb","jq","Material","net/minecraft/src","1" +"BlockFence","jv","Block","net/minecraft/src","1" +"MapGenStructure","qp","MapGenBase","net/minecraft/src","1" +"BlockLeaves","bm","BlockLeavesBase","net/minecraft/src","1" +"BlockNote","oy","BlockContainer","net/minecraft/src","1" +"BlockLockedChest","ki","Block","net/minecraft/src","1" +"BiomeGenDesert","rw","BiomeGenBase","net/minecraft/src","1" +"StructureVillagePieceWeight","ex","","net/minecraft/src","1" +"EnchantmentDigging","dq","Enchantment","net/minecraft/src","1" +"EnumDoorHelper","au","","net/minecraft/src","1" +"EntityFallingSand","jt","Entity","net/minecraft/src","1" +"ChunkFilePattern","qs","","net/minecraft/src","1" +"ItemEnderEye","ud","Item","net/minecraft/src","1" +"Packet28EntityVelocity","gu","Packet","net/minecraft/src","1" +"ComponentVillagePathGen","so","ComponentVillageRoadPiece","net/minecraft/src","1" +"MapGenStronghold","fz","MapGenStructure","net/minecraft/src","1" +"ServerWindowAdapter","ab","","net/minecraft/src","1" +"WorldGenDeadBush","kj","WorldGenerator","net/minecraft/src","1" +"ISaveHandler","wg","","net/minecraft/src","1" +"BlockFenceGate","tt","Block","net/minecraft/src","1" +"Packet130UpdateSign","td","Packet","net/minecraft/src","1" +"WorldProviderEnd","lb","WorldProvider","net/minecraft/src","1" +"ComponentNetherBridgeCrossing3","pm","ComponentNetherBridgePiece","net/minecraft/src","1" +"ItemPainting","xw","Item","net/minecraft/src","1" +"EnchantmentKnockback","pc","Enchantment","net/minecraft/src","1" +"WorldGenDungeons","ev","WorldGenerator","net/minecraft/src","1" +"WorldGenSand","gl","WorldGenerator","net/minecraft/src","1" +"BlockCactus","nz","Block","net/minecraft/src","1" +"PacketCount","vn","","net/minecraft/src","1" +"EntityPlayer","gz","EntityLiving","net/minecraft/src","1" +"ItemColored","wm","ItemBlock","net/minecraft/src","1" +"BiomeGenBase","kb","","net/minecraft/src","1" +"MaterialLiquid","rg","Material","net/minecraft/src","1" +"SaveConverterMcRegion","ho","SaveFormatOld","net/minecraft/src","1" +"Packet12PlayerLook","ug","Packet10Flying","net/minecraft/src","1" +"ContainerEnchantment","iq","Container","net/minecraft/src","1" +"Packet6SpawnPosition","qe","Packet","net/minecraft/src","1" +"BlockBreakable","jo","Block","net/minecraft/src","1" +"BiomeGenSnow","pb","BiomeGenBase","net/minecraft/src","1" +"IChunkProvider","co","","net/minecraft/src","1" +"TileEntityEndPortal","ci","TileEntity","net/minecraft/src","1" +"EntityXPOrb","cn","Entity","net/minecraft/src","1" +"ComponentStrongholdPortalRoom","lf","ComponentStronghold","net/minecraft/src","1" +"StructureBoundingBox","vb","","net/minecraft/src","1" +"BlockMushroom","sf","BlockFlower","net/minecraft/src","1" +"PathFinder","ge","","net/minecraft/src","1" +"EntityDragon","sy","EntityDragonBase","net/minecraft/src","1" +"WorldGenLakes","dm","WorldGenerator","net/minecraft/src","1" +"IUpdatePlayerListBox","fe","","net/minecraft/src","1" +"LongHashMapEntry","pv","","net/minecraft/src","1" +"RConThreadBase","uu","","net/minecraft/src","1" +"WorldGenLiquids","wx","WorldGenerator","net/minecraft/src","1" +"BlockObsidian","ff","BlockStone","net/minecraft/src","1" +"WorldGenTallGrass","ar","WorldGenerator","net/minecraft/src","1" +"Packet13PlayerLookMove","ey","Packet10Flying","net/minecraft/src","1" +"StructureStrongholdPieceWeight3","av","StructureStrongholdPieceWeight","net/minecraft/src","1" +"BlockIce","mv","BlockBreakable","net/minecraft/src","1" +"TileEntityMobSpawner","de","TileEntity","net/minecraft/src","1" +"Packet107CreativeSetSlot","dy","Packet","net/minecraft/src","1" +"PlayerInstance","al","","net/minecraft/src","1" +"ComponentStrongholdStairs2","w","ComponentStrongholdStairs","net/minecraft/src","1" +"EntityWolf","gs","EntityAnimal","net/minecraft/src","1" +"ItemDoor","ia","Item","net/minecraft/src","1" +"WorldInfo","eo","","net/minecraft/src","1" +"Packet","kf","","net/minecraft/src","1" +"EntitySnowball","cc","EntityThrowable","net/minecraft/src","1" +"ItemShears","bp","Item","net/minecraft/src","1" +"EntityVillager","fm","EntityCreature","net/minecraft/src","1" +"Entity","rn","","net/minecraft/src","1" +"StructureNetherBridgePieceWeight","rr","","net/minecraft/src","1" +"IChunkLoader","bh","","net/minecraft/src","1" +"EntitySnowmanBase","vz","EntityCreature","net/minecraft/src","1" +"BlockRedstoneOre","bw","Block","net/minecraft/src","1" +"StructureMineshaftPieces","iv","","net/minecraft/src","1" +"EnchantmentUntouching","ld","Enchantment","net/minecraft/src","1" +"NBTTagDouble","rv","NBTBase","net/minecraft/src","1" +"BlockDetectorRail","os","BlockRail","net/minecraft/src","1" +"ChatAllowedCharacters","fx","","net/minecraft/src","1" +"AxisAlignedBB","eu","","net/minecraft/src","1" +"WorldGenMinable","fr","WorldGenerator","net/minecraft/src","1" +"ItemBucketMilk","tm","Item","net/minecraft/src","1" +"ComponentNetherBridgeNetherStalkRoom","fc","ComponentNetherBridgePiece","net/minecraft/src","1" +"GenLayerVillageLandscape","sg","GenLayer","net/minecraft/src","1" +"TileEntitySign","xu","TileEntity","net/minecraft/src","1" +"ComponentStrongholdLeftTurn","sh","ComponentStronghold","net/minecraft/src","1" +"BlockStone","es","Block","net/minecraft/src","1" +"Packet100OpenWindow","iz","Packet","net/minecraft/src","1" +"ComponentNetherBridgeStairs","mw","ComponentNetherBridgePiece","net/minecraft/src","1" +"ComponentVillageWoodHut","yd","ComponentVillage","net/minecraft/src","1" +"Packet23VehicleSpawn","ro","Packet","net/minecraft/src","1" +"PathPoint","e","","net/minecraft/src","1" +"BiomeGenEnd","ie","BiomeGenBase","net/minecraft/src","1" +"EntitySlime","tn","EntityLiving","net/minecraft/src","1" +"Packet102WindowClick","pw","Packet","net/minecraft/src","1" +"ItemSoup","cd","ItemFood","net/minecraft/src","1" +"WorldGenSwamp","bk","WorldGenerator","net/minecraft/src","1" +"EntityEgg","uz","EntityThrowable","net/minecraft/src","1" +"ThreadLoginVerifier","eq","","net/minecraft/src","1" +"Packet43Experience","ky","Packet","net/minecraft/src","1" +"Packet27Position","pl","Packet","net/minecraft/src","1" +"EnumDoor","pt","","net/minecraft/src","1" +"GenLayerMushroomIsland","kd","GenLayer","net/minecraft/src","1" +"MaterialTransparent","lm","Material","net/minecraft/src","1" +"ISaveFormat","mz","","net/minecraft/src","1" +"ComponentMineshaftCorridor","rz","StructureComponent","net/minecraft/src","1" +"EntityItem","hp","Entity","net/minecraft/src","1" +"GenLayerRiverMix","vw","GenLayer","net/minecraft/src","1" +"NBTTagShort","tg","NBTBase","net/minecraft/src","1" +"EnumToolMaterial","by","","net/minecraft/src","1" +"BlockCake","th","Block","net/minecraft/src","1" +"ItemBoat","ua","Item","net/minecraft/src","1" +"BlockPressurePlate","bz","Block","net/minecraft/src","1" +"SpawnListEntry","bl","WeightedRandomChoice","net/minecraft/src","1" +"EntitySkeleton","ga","EntityMob","net/minecraft/src","1" +"BlockFluid","qr","Block","net/minecraft/src","1" +"EnchantmentProtection","qg","Enchantment","net/minecraft/src","1" +"PathEntity","dk","","net/minecraft/src","1" +"BlockSoulSand","nj","Block","net/minecraft/src","1" +"TileEntityPiston","tf","TileEntity","net/minecraft/src","1" +"BlockJukeBox","fw","BlockContainer","net/minecraft/src","1" +"StepSoundStone","an","StepSound","net/minecraft/src","1" +"ItemLilyPad","qm","ItemColored","net/minecraft/src","1" +"ItemSlab","er","ItemBlock","net/minecraft/src","1" +"Packet42RemoveEntityEffect","mx","Packet","net/minecraft/src","1" +"ItemPiston","pr","ItemBlock","net/minecraft/src","1" +"Packet4UpdateTime","hn","Packet","net/minecraft/src","1" +"EntityFishHook","lq","Entity","net/minecraft/src","1" +"EntityDamageSource","hi","DamageSource","net/minecraft/src","1" +"EnumArt","it","","net/minecraft/src","1" +"Packet29DestroyEntity","qw","Packet","net/minecraft/src","1" +"EnumSkyBlock","ei","","net/minecraft/src","1" +"GuiStatsComponent","kp","","net/minecraft/src","1" +"CompressedStreamTools","ax","","net/minecraft/src","1" +"BiomeCacheBlock","tb","","net/minecraft/src","1" +"ThreadedChunkLoader","oc","","net/minecraft/src","1" +"EntitySpider","cq","EntityMob","net/minecraft/src","1" +"StructureVillageStart","gg","StructureStart","net/minecraft/src","1" +"EntityMinecart","xv","Entity","net/minecraft/src","1" +"ItemSnowball","dn","Item","net/minecraft/src","1" +"EntityAnimal","bi","EntityCreature","net/minecraft/src","1" +"EntityPotion","bs","EntityThrowable","net/minecraft/src","1" +"IMob","fj","","net/minecraft/src","1" +"BlockDoor","ku","Block","net/minecraft/src","1" +"WatchableObject","lt","","net/minecraft/src","1" +"BlockCrops","mt","BlockFlower","net/minecraft/src","1" +"RecipesIngots","sk","","net/minecraft/src","1" +"StepSound","db","","net/minecraft/src","1" +"Packet7UseEntity","a","Packet","net/minecraft/src","1" +"RConUtils","io","","net/minecraft/src","1" +"Packet105UpdateProgressbar","mj","Packet","net/minecraft/src","1" +"BiomeGenMushroomIsland","ip","BiomeGenBase","net/minecraft/src","1" +"SlotCrafting","yg","Slot","net/minecraft/src","1" +"MapStorage","hf","","net/minecraft/src","1" +"RConConsoleSource","vj","","net/minecraft/src","1" +"StructureStrongholdPieceWeight","rl","","net/minecraft/src","1" +"WorldGenFire","xb","WorldGenerator","net/minecraft/src","1" +"BlockStep","ya","Block","net/minecraft/src","1" +"ThreadCommandReader","cy","","net/minecraft/src","1" +"StatBasic","xn","StatBase","net/minecraft/src","1" +"BlockRedstoneWire","rm","Block","net/minecraft/src","1" +"BlockGrass","wb","Block","net/minecraft/src","1" +"Explosion","py","","net/minecraft/src","1" +"ComponentStrongholdPrison","og","ComponentStronghold","net/minecraft/src","1" +"ItemEgg","lz","Item","net/minecraft/src","1" +"StructureVillagePieces","xr","","net/minecraft/src","1" +"BlockRail","ok","Block","net/minecraft/src","1" +"ComponentVillageChurch","ob","ComponentVillage","net/minecraft/src","1" +"ComponentNetherBridgeThrone","vd","ComponentNetherBridgePiece","net/minecraft/src","1" +"MapGenRavine","wo","MapGenBase","net/minecraft/src","1" +"BlockOre","mf","Block","net/minecraft/src","1" +"BiomeGenPlains","mu","BiomeGenBase","net/minecraft/src","1" +"DataWatcher","su","","net/minecraft/src","1" +"PotionHelper","km","","net/minecraft/src","1" +"Packet20NamedEntitySpawn","lw","Packet","net/minecraft/src","1" +"SlotBrewingStandIngredient","dd","Slot","net/minecraft/src","1" +"ItemCoal","qy","Item","net/minecraft/src","1" +"EntityEnderEye","ck","Entity","net/minecraft/src","1" +"Packet3Chat","op","Packet","net/minecraft/src","1" +"TileEntityBrewingStand","xx","TileEntity","net/minecraft/src","1" +"BlockMycelium","xi","Block","net/minecraft/src","1" +"EntityGiantZombie","nf","EntityMob","net/minecraft/src","1" +"RConThreadQuery","sv","RConThreadBase","net/minecraft/src","1" +"Packet38EntityStatus","jg","Packet","net/minecraft/src","1" +"ItemArmor","vf","Item","net/minecraft/src","1" +"EnumAction","jf","","net/minecraft/src","1" +"ItemInWorldManager","to","","net/minecraft/src","1" +"ComponentStrongholdStairs","ig","ComponentStronghold","net/minecraft/src","1" +"Packet33RelEntityMoveLook","pe","Packet30Entity","net/minecraft/src","1" +"AchievementMap","b","","net/minecraft/src","1" +"Potion","ir","","net/minecraft/src","1" +"ComponentVillageTorch","oe","ComponentVillage","net/minecraft/src","1" +"BlockSand","gv","Block","net/minecraft/src","1" +"StructureStrongholdStones","ue","StructurePieceBlockSelector","net/minecraft/src","1" +"WorldGenPumpkin","wl","WorldGenerator","net/minecraft/src","1" +"NBTTagCompound","ng","NBTBase","net/minecraft/src","1" +"WorldGenGlowStone2","rf","WorldGenerator","net/minecraft/src","1" +"Packet41EntityEffect","dx","Packet","net/minecraft/src","1" +"ComponentMineshaftCross","my","StructureComponent","net/minecraft/src","1" +"ICrafting","ej","","net/minecraft/src","1" +"ItemFishingRod","da","Item","net/minecraft/src","1" +"EntitySquid","xc","EntityWaterMob","net/minecraft/src","1" +"BiomeGenForest","qd","BiomeGenBase","net/minecraft/src","1" +"EntityCaveSpider","hl","EntitySpider","net/minecraft/src","1" +"MapGenCavesHell","ou","MapGenBase","net/minecraft/src","1" +"NBTTagFloat","q","NBTBase","net/minecraft/src","1" +"PotionEffect","ww","","net/minecraft/src","1" +"ComponentStrongholdStraight","nu","ComponentStronghold","net/minecraft/src","1" +"ComponentNetherBridgePiece","jh","StructureComponent","net/minecraft/src","1" +"TileEntityFurnace","rj","TileEntity","net/minecraft/src","1" +"EntityLiving","lk","Entity","net/minecraft/src","1" +"LayerIsland","oj","GenLayer","net/minecraft/src","1" +"ServerConfigurationManager","hv","","net/minecraft/src","1" +"IInvBasic","hz","","net/minecraft/src","1" +"TileEntityEnchantmentTable","cj","TileEntity","net/minecraft/src","1" +"ChunkLoader","sj","","net/minecraft/src","1" +"GenLayerIsland","cg","GenLayer","net/minecraft/src","1" +"BlockWeb","qq","Block","net/minecraft/src","1" +"ItemSapling","md","ItemBlock","net/minecraft/src","1" +"ComponentVillageField","p","ComponentVillage","net/minecraft/src","1" +"EmptyChunk","kz","Chunk","net/minecraft/src","1" +"ThreadServerApplication","cu","","net/minecraft/src","1" +"ComponentVillageField2","vc","ComponentVillage","net/minecraft/src","1" +"NBTTagString","wq","NBTBase","net/minecraft/src","1" +"ChunkBlockMap","uj","","net/minecraft/src","1" +"GenLayerRiver","hr","GenLayer","net/minecraft/src","1" +"ShapelessRecipes","sp","","net/minecraft/src","1" +"BlockSponge","wr","Block","net/minecraft/src","1" +"BlockStem","np","BlockFlower","net/minecraft/src","1" +"ItemMinecart","qn","Item","net/minecraft/src","1" +"BlockWorkbench","fo","Block","net/minecraft/src","1" +"Packet26EntityExpOrb","ot","Packet","net/minecraft/src","1" +"MapGenVillage","ao","MapGenStructure","net/minecraft/src","1" +"BiomeGenRiver","ml","BiomeGenBase","net/minecraft/src","1" +"Packet201PlayerInfo","ef","Packet","net/minecraft/src","1" +"EntityCreature","il","EntityLiving","net/minecraft/src","1" +"Teleporter","ti","","net/minecraft/src","1" +"BlockNetherStalk","xf","BlockFlower","net/minecraft/src","1" +"StructureStrongholdPieceWeight2","aw","StructureStrongholdPieceWeight","net/minecraft/src","1" +"MapColor","ec","","net/minecraft/src","1" +"StructureStrongholdPieces","jn","","net/minecraft/src","1" +"RailLogic","uo","","net/minecraft/src","1" +"MapCoord","bb","","net/minecraft/src","1" +"Achievement","ni","StatBase","net/minecraft/src","1" +"TileEntityRecordPlayer","en","TileEntity","net/minecraft/src","1" +"ComponentVillageHouse1","ve","ComponentVillage","net/minecraft/src","1" +"BiomeGenOcean","aq","BiomeGenBase","net/minecraft/src","1" +"NetServerHandler","kt","NetHandler","net/minecraft/src","1" +"BiomeDecorator","go","","net/minecraft/src","1" +"BlockDragonEgg","eb","Block","net/minecraft/src","1" +"ConsoleCommandHandler","sc","","net/minecraft/src","1" +"BlockPistonMoving","tk","BlockContainer","net/minecraft/src","1" +"Path","kv","","net/minecraft/src","1" +"RConThreadMain","pd","RConThreadBase","net/minecraft/src","1" +"Item","gw","","net/minecraft/src","1" +"TileEntity","oh","","net/minecraft/src","1" +"BlockFlowing","nx","BlockFluid","net/minecraft/src","1" +"ComponentStrongholdChestCorridor","gx","ComponentStronghold","net/minecraft/src","1" +"WorldGenTaiga1","pa","WorldGenerator","net/minecraft/src","1" +"InventoryPlayer","ja","","net/minecraft/src","1" +"Slot","gy","","net/minecraft/src","1" +"Direction","jj","","net/minecraft/src","1" +"ItemBed","lh","Item","net/minecraft/src","1" +"Packet108EnchantItem","oq","Packet","net/minecraft/src","1" +"EntityCreeper","gj","EntityMob","net/minecraft/src","1" +"Packet101CloseWindow","ly","Packet","net/minecraft/src","1" +"EntitySmallFireball","ux","EntityFireball","net/minecraft/src","1" +"Packet24MobSpawn","jl","Packet","net/minecraft/src","1" +"WorldManager","fn","","net/minecraft/src","1" +"ItemRedstone","ih","Item","net/minecraft/src","1" +"ThreadedChunkLoaderPending","xq","","net/minecraft/src","1" +"Packet14BlockDig","ju","Packet","net/minecraft/src","1" +"MapInfo","ri","","net/minecraft/src","1" +"ItemTool","dv","Item","net/minecraft/src","1" +"Container","ea","","net/minecraft/src","1" +"EntityPig","vr","EntityAnimal","net/minecraft/src","1" +"EnchantmentDurability","eg","Enchantment","net/minecraft/src","1" +"EntityMagmaCube","sm","EntitySlime","net/minecraft/src","1" +"Packet5PlayerInventory","r","Packet","net/minecraft/src","1" +"BlockBrewingStand","fh","BlockContainer","net/minecraft/src","1" +"NoiseGeneratorOctaves","sw","NoiseGenerator","net/minecraft/src","1" +"ItemBlock","cl","Item","net/minecraft/src","1" +"BlockPumpkin","fg","Block","net/minecraft/src","1" +"Packet30Entity","sz","Packet","net/minecraft/src","1" +"StructureNetherBridgePieces","lu","","net/minecraft/src","1" +"InventoryBasic","pq","","net/minecraft/src","1" +"ItemFood","yf","Item","net/minecraft/src","1" +"EnchantmentOxygen","ut","Enchantment","net/minecraft/src","1" +"EnchantmentWaterWorker","xh","Enchantment","net/minecraft/src","1" +"EntityThrowable","bc","Entity","net/minecraft/src","1" +"Packet255KickDisconnect","xz","Packet","net/minecraft/src","1" +"StatCrafting","st","StatBase","net/minecraft/src","1" +"ItemBow","qb","Item","net/minecraft/src","1" +"WorldGenBigTree","im","WorldGenerator","net/minecraft/src","1" +"ItemSeeds","ql","Item","net/minecraft/src","1" +"SlotBrewingStandPotion","lj","Slot","net/minecraft/src","1" +"WorldGenGlowStone1","gn","WorldGenerator","net/minecraft/src","1" +"IServer","vp","","net/minecraft/src","1" +"PlayerListBox","m","","net/minecraft/src","1" +"RecipesFood","no","","net/minecraft/src","1" +"ContainerDispenser","rh","Container","net/minecraft/src","1" +"BlockSnowBlock","ac","Block","net/minecraft/src","1" +"ComponentNetherBridgeEntrance","tv","ComponentNetherBridgePiece","net/minecraft/src","1" +"PlayerManager","wi","","net/minecraft/src","1" +"EntityGhast","bv","EntityFlying","net/minecraft/src","1" +"NBTTagLong","lx","NBTBase","net/minecraft/src","1" +"Empty3","om","","net/minecraft/src","1" +"Packet131MapData","aj","Packet","net/minecraft/src","1" +"StructureNetherBridgeEnd","ko","ComponentNetherBridgePiece","net/minecraft/src","1" +"EntityArrow","rk","Entity","net/minecraft/src","1" +"RegionFile","pj","","net/minecraft/src","1" +"ServerGuiCommandListener","ad","","net/minecraft/src","1" +"BlockRedstoneTorch","df","BlockTorch","net/minecraft/src","1" +"BlockButton","ns","Block","net/minecraft/src","1" +"BlockBed","ub","Block","net/minecraft/src","1" +"NoiseGeneratorPerlin","ap","NoiseGenerator","net/minecraft/src","1" +"StatCollector","dr","","net/minecraft/src","1" +"GenLayer","el","","net/minecraft/src","1" +"RegionFileCache","qk","","net/minecraft/src","1" +"ItemSpade","vh","ItemTool","net/minecraft/src","1" +"ComponentMineshaftRoom","h","StructureComponent","net/minecraft/src","1" +"EnumArmorMaterial","cx","","net/minecraft/src","1" +"ComponentVillageHouse4_Garden","gp","ComponentVillage","net/minecraft/src","1" +"ComponentNetherBridgeCorridor5","ne","ComponentNetherBridgePiece","net/minecraft/src","1" +"NBTTagEnd","kx","NBTBase","net/minecraft/src","1" +"EnchantmentData","on","WeightedRandomChoice","net/minecraft/src","1" +"GenLayerRiverInit","mp","GenLayer","net/minecraft/src","1" +"IStatType","vt","","net/minecraft/src","1" +"BlockPistonBase","jp","Block","net/minecraft/src","1" +"Packet8UpdateHealth","ew","Packet","net/minecraft/src","1" +"GuiLogFormatter","ic","","net/minecraft/src","1" +"CraftingManager","hq","","net/minecraft/src","1" +"FurnaceRecipes","fb","","net/minecraft/src","1" +"EntityTracker","uh","","net/minecraft/src","1" +"ComponentStrongholdStairsStraight","nk","ComponentStronghold","net/minecraft/src","1" +"EnumMovingObjectType","ji","","net/minecraft/src","1" +"ConsoleLogFormatter","vy","","net/minecraft/src","1" +"NBTTagByte","ps","NBTBase","net/minecraft/src","1" +"EnchantmentLootBonus","ol","Enchantment","net/minecraft/src","1" +"WorldGenForest","l","WorldGenerator","net/minecraft/src","1" +"StructureComponent","jx","","net/minecraft/src","1" +"BlockDirt","oa","Block","net/minecraft/src","1" +"EntityPlayerMP","fl","EntityPlayer","net/minecraft/src","1" +"ServerCommand","ay","","net/minecraft/src","1" +"WeightedRandom","tx","","net/minecraft/src","1" +"BlockCloth","ek","Block","net/minecraft/src","1" +"DamageSource","po","","net/minecraft/src","1" +"Packet15Place","ha","Packet","net/minecraft/src","1" +"Packet18Animation","na","Packet","net/minecraft/src","1" +"ComponentNetherBridgeCorridor","lo","ComponentNetherBridgePiece","net/minecraft/src","1" +"RecipesCrafting","jy","","net/minecraft/src","1" +"TileEntityNote","si","TileEntity","net/minecraft/src","1" +"ShapedRecipes","ix","","net/minecraft/src","1" +"WorldSettings","hg","","net/minecraft/src","1" +"EnumStatus","dc","","net/minecraft/src","1" +"EntityLightningBolt","d","EntityWeatherEffect","net/minecraft/src","1" +"StructurePieceTreasure","ib","WeightedRandomChoice","net/minecraft/src","1" +"GenLayerSmoothZoom","li","GenLayer","net/minecraft/src","1" +"EntityMooshroom","se","EntityCow","net/minecraft/src","1" +"BlockFarmland","um","Block","net/minecraft/src","1" +"ItemEnderPearl","ke","Item","net/minecraft/src","1" +"WorldProviderSurface","qi","WorldProvider","net/minecraft/src","1" +"RecipesDyes","mo","","net/minecraft/src","1" +"IThreadedFileIO","gm","","net/minecraft/src","1" +"Packet103SetSlot","hx","Packet","net/minecraft/src","1" +"Packet34EntityTeleport","qh","Packet","net/minecraft/src","1" +"NBTTagInt","ox","NBTBase","net/minecraft/src","1" +"Packet53BlockChange","ss","Packet","net/minecraft/src","1" +"SlotArmor","oz","Slot","net/minecraft/src","1" +"GuiLogOutputHandler","dt","","net/minecraft/src","1" +"Profiler","pf","","net/minecraft/src","1" +"World","fi","","net/minecraft/src","1" +"IWorldAccess","ow","","net/minecraft/src","1" +"EntityWeatherEffect","yh","Entity","net/minecraft/src","1" +"EntityTrackerEntry","hy","","net/minecraft/src","1" +"GenLayerZoom","eh","GenLayer","net/minecraft/src","1" +"EntitySheep","do","EntityAnimal","net/minecraft/src","1" +"ChunkCache","fa","","net/minecraft/src","1" +"Packet19EntityAction","sq","Packet","net/minecraft/src","1" +"INpc","us","","net/minecraft/src","1" +"MapGenWaterlily","ms","WorldGenerator","net/minecraft/src","1" +"IntCache","af","","net/minecraft/src","1" +"ChunkCoordIntPair","yi","","net/minecraft/src","1" +"ComponentVillageHouse2","di","ComponentVillage","net/minecraft/src","1" +"ItemReed","ln","Item","net/minecraft/src","1" +"ItemGlassBottle","sx","Item","net/minecraft/src","1" +"BlockContainer","qx","Block","net/minecraft/src","1" +"GenLayerSmooth","hh","GenLayer","net/minecraft/src","1" +"Packet52MultiBlockChange","wj","Packet","net/minecraft/src","1" +"NetworkMasterThread","ws","","net/minecraft/src","1" +"BlockMelon","fk","Block","net/minecraft/src","1" +"BlockChest","f","BlockContainer","net/minecraft/src","1" +"EnchantmentModifierLiving","xp","","net/minecraft/src","1" +"ComponentStronghold","hc","StructureComponent","net/minecraft/src","1" +"BlockStairs","rs","Block","net/minecraft/src","1" +"Packet21PickupSpawn","mn","Packet","net/minecraft/src","1" +"BlockClay","ra","Block","net/minecraft/src","1" +"SlotEnchantmentTable","x","InventoryBasic","net/minecraft/src","1" +"RecipeSorter","kn","","net/minecraft/src","1" +"StructureNetherBridgeStart","bd","StructureStart","net/minecraft/src","1" +"Vec3D","bx","","net/minecraft/src","1" +"Packet25EntityPainting","uy","Packet","net/minecraft/src","1" +"IAnimals","ah","","net/minecraft/src","1" +"Packet16BlockItemSwitch","hw","Packet","net/minecraft/src","1" +"NBTBase","ik","","net/minecraft/src","1" +"ContainerBrewingStand","je","Container","net/minecraft/src","1" +"ItemDye","kg","Item","net/minecraft/src","1" +"Packet104WindowItems","ka","Packet","net/minecraft/src","1" +"PotionHealth","ts","Potion","net/minecraft/src","1" +"EntitySnowman","u","EntitySnowmanBase","net/minecraft/src","1" +"PlayerNBTManager","fs","","net/minecraft/src","1" +"BlockFire","xy","Block","net/minecraft/src","1" +"BiomeCache","tz","","net/minecraft/src","1" +"ComponentStrongholdCorridor","nm","ComponentStronghold","net/minecraft/src","1" +"NetworkAcceptThread","qz","","net/minecraft/src","1" +"BlockTorch","un","Block","net/minecraft/src","1" +"StepSoundSand","ak","StepSound","net/minecraft/src","1" +"EnchantmentDamage","kl","Enchantment","net/minecraft/src","1" +"BlockEnchantmentTable","gr","BlockContainer","net/minecraft/src","1" +"BiomeEndDecorator","lv","BiomeDecorator","net/minecraft/src","1" +"ThreadSleepForever","cz","","net/minecraft/src","1" +"WorldGenerator","or","","net/minecraft/src","1" +"BlockGlass","fq","BlockBreakable","net/minecraft/src","1" +"ComponentNetherBridgeStartPiece","pk","ComponentNetherBridgeCrossing3","net/minecraft/src","1" +"WorldServerMulti","gt","WorldServer","net/minecraft/src","1" +"NetHandler","sd","","net/minecraft/src","1" +"EntitySilverfish","vl","EntityMob","net/minecraft/src","1" +"EnchantmentFireAspect","lc","Enchantment","net/minecraft/src","1" +"ConvertProgressUpdater","cv","","net/minecraft/src","1" +"Packet39AttachEntity","nc","Packet","net/minecraft/src","1" +"Packet50PreChunk","re","Packet","net/minecraft/src","1" +"ComponentNetherBridgeCorridor3","ye","ComponentNetherBridgePiece","net/minecraft/src","1" +"EnumCreatureType","la","","net/minecraft/src","1" +"SlotFurnace","ur","Slot","net/minecraft/src","1" +"WorldGenCactus","gf","WorldGenerator","net/minecraft/src","1" +"StatList","jk","","net/minecraft/src","1" +"Packet70Bed","ce","Packet","net/minecraft/src","1" +"ChunkFile","ee","","net/minecraft/src","1" +"GenLayerZoomVoronoi","kc","GenLayer","net/minecraft/src","1" +"MapGenMineshaft","xg","MapGenStructure","net/minecraft/src","1" +"NoiseGenerator","dj","","net/minecraft/src","1" +"WorldGenHellLava","pg","WorldGenerator","net/minecraft/src","1" +"Packet11PlayerPosition","ag","Packet10Flying","net/minecraft/src","1" +"MathHelper","in","","net/minecraft/src","1" +"BiomeGenHell","v","BiomeGenBase","net/minecraft/src","1" +"EntityMob","hb","EntityCreature","net/minecraft/src","1" +"BlockSandStone","qf","Block","net/minecraft/src","1" +"TileEntityDispenser","be","TileEntity","net/minecraft/src","1" +"ItemLeaves","tq","ItemBlock","net/minecraft/src","1" +"ContainerChest","cf","Container","net/minecraft/src","1" +"BlockReed","qj","Block","net/minecraft/src","1" +"ComponentNetherBridgeCrossing2","xl","ComponentNetherBridgePiece","net/minecraft/src","1" +"Packet254ServerPing","dw","Packet","net/minecraft/src","1" +"Chunk","le","","net/minecraft/src","1" +"GenLayerShore","is","GenLayer","net/minecraft/src","1" +"StructureStrongholdStart","uk","StructureStart","net/minecraft/src","1" +"EnumMobType","qu","","net/minecraft/src","1" +"NBTTagList","rp","NBTBase","net/minecraft/src","1" +"GenLayerTemperature","ph","GenLayer","net/minecraft/src","1" +"EnchantmentModifierDamage","kr","","net/minecraft/src","1" +"ItemSword","pi","Item","net/minecraft/src","1" +"ConsoleLogManager","hm","","net/minecraft/src","1" +"WorldProviderHell","vk","WorldProvider","net/minecraft/src","1" +"TileEntityChest","js","TileEntity","net/minecraft/src","1" +"WorldGenBigMushroom","vi","WorldGenerator","net/minecraft/src","1" +"BlockSapling","hk","BlockFlower","net/minecraft/src","1" +"Packet71Weather","fd","Packet","net/minecraft/src","1" +"WorldGenTrees","xs","WorldGenerator","net/minecraft/src","1" +"GenLayerZoomFuzzy","we","GenLayer","net/minecraft/src","1" +"Packet32EntityLook","rc","Packet30Entity","net/minecraft/src","1" +"IInventory","lp","","net/minecraft/src","1" +"StructureStart","tr","","net/minecraft/src","1" +"ContainerFurnace","bo","Container","net/minecraft/src","1" +"NetworkWriterThread","wv","","net/minecraft/src","1" +"GenLayerDownfallMix","ta","GenLayer","net/minecraft/src","1" +"ItemBucket","bf","Item","net/minecraft/src","1" +"BlockLog","uf","Block","net/minecraft/src","1" +"StatBase","uv","","net/minecraft/src","1" +"DragonPart","ed","Entity","net/minecraft/src","1" +"BlockOreStorage","n","Block","net/minecraft/src","1" +"NetworkListenThread","ep","","net/minecraft/src","1" +"WeightedRandomChoice","cp","","net/minecraft/src","1" +"RecipesWeapons","wp","","net/minecraft/src","1" +"ComponentVillageHouse3","gi","ComponentVillage","net/minecraft/src","1" +"EntityChicken","wk","EntityAnimal","net/minecraft/src","1" +"PlayerCapabilities","vv","","net/minecraft/src","1" +"ItemPickaxe","ba","ItemTool","net/minecraft/src","1" +"IEnchantmentModifier","y","","net/minecraft/src","1" +"ChunkCoordinates","bu","","net/minecraft/src","1" +"BlockVine","nw","Block","net/minecraft/src","1" +"ChunkFolderPattern","cm","","net/minecraft/src","1" +"AchievementList","et","","net/minecraft/src","1" +"IRecipe","dz","","net/minecraft/src","1" +"ChunkProviderHell","pp","","net/minecraft/src","1" +"WorldChunkManagerHell","hj","WorldChunkManager","net/minecraft/src","1" +"ItemMetadata","jm","ItemBlock","net/minecraft/src","1" +"BlockGravel","mm","BlockSand","net/minecraft/src","1" +"ItemAxe","ru","ItemTool","net/minecraft/src","1" +"EntityZombie","tu","EntityMob","net/minecraft/src","1" +"EntityEnderPearl","nd","EntityThrowable","net/minecraft/src","1" +"ChunkProvider","nt","","net/minecraft/src","1" +"ItemSign","ty","Item","net/minecraft/src","1" +"EnumEnchantmentType","pn","","net/minecraft/src","1" +"EntityWaterMob","at","EntityCreature","net/minecraft/src","1" +"WorldGenReed","iu","WorldGenerator","net/minecraft/src","1" +"StructureMineshaftStart","vm","StructureStart","net/minecraft/src","1" +"Packet17Sleep","jz","Packet","net/minecraft/src","1" +"ItemCloth","bj","ItemBlock","net/minecraft/src","1" +"BlockPortal","am","BlockBreakable","net/minecraft/src","1" +"BlockTrapDoor","ny","Block","net/minecraft/src","1" +"ItemMap","wd","ItemMapBase","net/minecraft/src","1" +"EntityTNTPrimed","pz","Entity","net/minecraft/src","1" +"RConThreadQueryAuth","g","","net/minecraft/src","1" +"EntityPainting","px","Entity","net/minecraft/src","1" +"Packet22Collect","dl","Packet","net/minecraft/src","1" +"BlockBookshelf","he","Block","net/minecraft/src","1" +"ItemAppleGold","yb","ItemFood","net/minecraft/src","1" +"BlockFurnace","rx","BlockContainer","net/minecraft/src","1" +"WorldProvider","wn","","net/minecraft/src","1" +"BlockSnow","jr","Block","net/minecraft/src","1" +"BlockEndPortalFrame","yc","Block","net/minecraft/src","1" +"BlockLever","xa","Block","net/minecraft/src","1" +"ComponentNetherBridgeCrossing","uw","ComponentNetherBridgePiece","net/minecraft/src","1" +"Packet10Flying","ij","Packet","net/minecraft/src","1" +"StatTypeDistance","bn","","net/minecraft/src","1" +"RecipesTools","hd","","net/minecraft/src","1" +"BlockLilyPad","gk","BlockFlower","net/minecraft/src","1" +"GenLayerDownfall","ul","GenLayer","net/minecraft/src","1" +"InventoryLargeChest","nr","","net/minecraft/src","1" +"MapGenBase","gd","","net/minecraft/src","1" +"BlockSign","te","BlockContainer","net/minecraft/src","1" +"NetLoginHandler","gq","NetHandler","net/minecraft/src","1" +"BlockMushroomCap","uq","Block","net/minecraft/src","1" +"MaterialLogic","as","Material","net/minecraft/src","1" +"ComponentStrongholdRoomCrossing","kk","ComponentStronghold","net/minecraft/src","1" +"BlockCauldron","fv","Block","net/minecraft/src","1" +"BiomeGenSwamp","sa","BiomeGenBase","net/minecraft/src","1" +"RConOutputStream","ez","","net/minecraft/src","1" +"GuiStatsListener","ll","","net/minecraft/src","1" +"Packet200Statistic","nq","Packet","net/minecraft/src","1" +"SpawnerAnimals","cs","","net/minecraft/src","1" +"WorldGenTaiga2","wf","WorldGenerator","net/minecraft/src","1" +"BlockSilverfish","pu","Block","net/minecraft/src","1" +"ContainerWorkbench","iw","Container","net/minecraft/src","1" +"NetworkManager","oo","","net/minecraft/src","1" +"PropertyManager","qt","","net/minecraft/src","1" +"ComponentVillageWell","ov","ComponentVillage","net/minecraft/src","1" +"ContainerPlayer","aa","Container","net/minecraft/src","1" +"EntityFireball","ch","Entity","net/minecraft/src","1" +"WorldChunkManager","xe","","net/minecraft/src","1" +"ComponentVillageHall","s","ComponentVillage","net/minecraft/src","1" +"BlockDeadBush","jc","BlockFlower","net/minecraft/src","1" +"ItemSaddle","rb","Item","net/minecraft/src","1" +"EnchantmentHelper","tc","","net/minecraft/src","1" +"StatTypeSimple","bt","","net/minecraft/src","1" +"Packet61DoorChange","fu","Packet","net/minecraft/src","1" +"EntityCow","ca","EntityAnimal","net/minecraft/src","1" +"Empty2","if","","net/minecraft/src","1" +"Enchantment","mq","","net/minecraft/src","1" +"MapGenNetherBridge","kh","MapGenStructure","net/minecraft/src","1" +"BlockDispenser","wz","BlockContainer","net/minecraft/src","1" +"BiomeGenTaiga","i","BiomeGenBase","net/minecraft/src","1" +"BlockPane","wh","Block","net/minecraft/src","1" +"BlockEndPortal","t","BlockContainer","net/minecraft/src","1" +"Packet51MapChunk","em","Packet","net/minecraft/src","1" +"ComponentVillageRoadPiece","cw","ComponentVillage","net/minecraft/src","1" +"Packet9Respawn","oi","Packet","net/minecraft/src","1" +"IntHashMapEntry","vx","","net/minecraft/src","1" +"IntHashMap","jw","","net/minecraft/src","1" +"ItemMapBase","cr","Item","net/minecraft/src","1" +"NibbleArray","vq","","net/minecraft/src","1" +"BlockStoneBrick","qc","Block","net/minecraft/src","1" +"EntityBoat","gh","Entity","net/minecraft/src","1" +"Block","tl","","net/minecraft/src","1" +"LongHashMap","gc","","net/minecraft/src","1" +"Packet40EntityMetadata","tp","Packet","net/minecraft/src","1" +"ComponentNetherBridgeCorridor4","mk","ComponentNetherBridgePiece","net/minecraft/src","1" +"ComponentNetherBridgeCorridor2","dh","ComponentNetherBridgePiece","net/minecraft/src","1" +"EntityBlaze","mh","EntityMob","net/minecraft/src","1" +"MapData","iy","WorldSavedData","net/minecraft/src","1" +"BlockFlower","vg","Block","net/minecraft/src","1" +"StringTranslate","mr","","net/minecraft/src","1" +"ThreadMonitorConnection","wt","","net/minecraft/src","1" +"ServerGUI","tw","","net/minecraft/src","1" +"ICommandListener","sb","","net/minecraft/src","1" +"BlockMobSpawner","dg","BlockContainer","net/minecraft/src","1" +"Packet0KeepAlive","ls","Packet","net/minecraft/src","1" +"Packet60Explosion","qo","Packet","net/minecraft/src","1" +"MinecraftException","tj","","net/minecraft/src","1" +"WorldSavedData","hs","","net/minecraft/src","1" +"RConThreadClient","o","RConThreadBase","net/minecraft/src","1" +"FoodStats","rd","","net/minecraft/src","1" +"ItemFlintAndSteel","xm","Item","net/minecraft/src","1" +"WorldGenSpikes","nn","WorldGenerator","net/minecraft/src","1" +"RedstoneUpdateInfo","xd","","net/minecraft/src","1" +"SlotEnchantment","c","Slot","net/minecraft/src","1" +"EntityDamageSourceIndirect","hu","EntityDamageSource","net/minecraft/src","1" +"StructurePieceBlockSelector","cb","","net/minecraft/src","1" +"MapGenCaves","rq","MapGenBase","net/minecraft/src","1" +"ChunkProviderServer","kw","","net/minecraft/src","1" +"EntityList","jd","","net/minecraft/src","1" +"BlockPistonExtension","k","Block","net/minecraft/src","1" +"ChunkProviderEnd","fy","","net/minecraft/src","1" +"ComponentMineshaftStairs","kq","StructureComponent","net/minecraft/src","1" +"BlockGlowStone","lr","Block","net/minecraft/src","1" +"WorldServer","fp","World","net/minecraft/src","1" +"ServerGuiFocusAdapter","ae","","net/minecraft/src","1" +"GenLayerTemperatureMix","dp","GenLayer","net/minecraft/src","1" +"NBTTagByteArray","ht","NBTBase","net/minecraft/src","1" +"ComponentVillageStartPiece","j","ComponentVillageWell","net/minecraft/src","1" +"ComponentStrongholdLibrary","mg","ComponentStronghold","net/minecraft/src","1" +"ChunkProviderGenerate","xo","","net/minecraft/src","1" +"WorldGenClay","me","WorldGenerator","net/minecraft/src","1" +"BlockLadder","ds","Block","net/minecraft/src","1" +"MinecraftServer","MinecraftServer","","net/minecraft/server","1" diff --git a/forge/conf/client.exc b/forge/conf/client.exc new file mode 100644 index 0000000000..bba0524321 --- /dev/null +++ b/forge/conf/client.exc @@ -0,0 +1,228 @@ +net/minecraft/client/Minecraft.func_6257_q()V=org/lwjgl/LWJGLException +net/minecraft/client/Minecraft.func_6271_a()V=org/lwjgl/LWJGLException +net/minecraft/src/ChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/ChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/ChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_1138_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_1139_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_1141_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_1143_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_35620_b(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_35621_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_35622_a(Ljava/io/File;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_40591_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_40592_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/DataWatcher.func_21125_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/DataWatcher.func_21127_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/DataWatcher.func_21128_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException +net/minecraft/src/DataWatcher.func_21131_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException +net/minecraft/src/GuiMultiplayer.func_35328_b(Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException +net/minecraft/src/GuiMultiplayer.func_35336_a(Lnet/minecraft/src/GuiMultiplayer;Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException +net/minecraft/src/IChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/IChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/IChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/J_CompactJsonFormatter.func_27328_a(Lnet/minecraft/src/J_JsonNode;Ljava/io/Writer;)V=java/io/IOException +net/minecraft/src/J_CompactJsonFormatter.func_27329_a(Lnet/minecraft/src/J_JsonRootNode;Ljava/io/Writer;)V=java/io/IOException +net/minecraft/src/J_JdomParser.func_27366_a(Ljava/io/Reader;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_JdomParser.func_27367_a(Ljava/lang/String;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_PositionTrackingPushbackReader.func_27333_c()I=java/io/IOException +net/minecraft/src/J_PositionTrackingPushbackReader.func_27334_a(C)V=java/io/IOException +net/minecraft/src/J_PositionTrackingPushbackReader.func_27336_b([C)I=java/io/IOException +net/minecraft/src/J_SajParser.func_27448_l(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException +net/minecraft/src/J_SajParser.func_27449_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_SajParser.func_27450_k(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27451_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27452_i(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_SajParser.func_27453_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_SajParser.func_27454_g(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27455_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_SajParser.func_27456_e(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException +net/minecraft/src/J_SajParser.func_27457_j(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27458_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27459_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27460_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27461_h(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException +net/minecraft/src/J_SajParser.func_27462_f(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException +net/minecraft/src/J_SajParser.func_27463_a(Ljava/io/Reader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/J_SajParser.func_27464_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException +net/minecraft/src/NBTBase.func_734_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException +net/minecraft/src/NBTBase.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagCompound.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagCompound.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagEnd.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagEnd.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagList.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NetClientHandler.(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException +net/minecraft/src/NetworkManager.(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException +net/minecraft/src/Packet.func_27048_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException +net/minecraft/src/Packet.func_27049_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_324_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException +net/minecraft/src/Packet.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_328_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_40186_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/Packet.func_40187_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException +net/minecraft/src/Packet.func_40188_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_40189_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet0KeepAlive.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet0KeepAlive.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet100OpenWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet100OpenWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet101CloseWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet101CloseWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet102WindowClick.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet102WindowClick.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet103SetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet103SetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet104WindowItems.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet104WindowItems.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet105UpdateProgressbar.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet105UpdateProgressbar.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet106Transaction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet106Transaction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet107CreativeSetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet107CreativeSetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet108EnchantItem.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet108EnchantItem.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet10Flying.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet10Flying.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet11PlayerPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet11PlayerPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet12PlayerLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet12PlayerLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet130UpdateSign.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet130UpdateSign.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet131MapData.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet131MapData.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet13PlayerLookMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet13PlayerLookMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet14BlockDig.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet14BlockDig.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet15Place.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet15Place.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet16BlockItemSwitch.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet16BlockItemSwitch.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet17Sleep.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet17Sleep.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet18Animation.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet18Animation.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet19EntityAction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet19EntityAction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet1Login.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet1Login.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet200Statistic.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet200Statistic.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet20NamedEntitySpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet21PickupSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet21PickupSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet22Collect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet22Collect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet23VehicleSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet23VehicleSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet24MobSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet24MobSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet254ServerPing.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet254ServerPing.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet255KickDisconnect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet255KickDisconnect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet25EntityPainting.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet25EntityPainting.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet26EntityExpOrb.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet26EntityExpOrb.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet27Position.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet27Position.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet28EntityVelocity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet28EntityVelocity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet29DestroyEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet29DestroyEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet2Handshake.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet2Handshake.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet30Entity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet30Entity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet31RelEntityMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet31RelEntityMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet32EntityLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet32EntityLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet33RelEntityMoveLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet33RelEntityMoveLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet34EntityTeleport.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet34EntityTeleport.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet38EntityStatus.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet38EntityStatus.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet39AttachEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet39AttachEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet3Chat.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet3Chat.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet40EntityMetadata.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet40EntityMetadata.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet41EntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet41EntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet42RemoveEntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet42RemoveEntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet43Experience.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet43Experience.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet4UpdateTime.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet4UpdateTime.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet50PreChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet50PreChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet51MapChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet51MapChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet52MultiBlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet52MultiBlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet53BlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet53BlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet54PlayNoteBlock.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet54PlayNoteBlock.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet5PlayerInventory.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet5PlayerInventory.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet60Explosion.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet60Explosion.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet61DoorChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet61DoorChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet6SpawnPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet6SpawnPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet70Bed.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet70Bed.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet71Weather.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet71Weather.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet7UseEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet7UseEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException +net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException +net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException +net/minecraft/src/RegionFile.func_22208_b(III)V=java/io/IOException +net/minecraft/src/RenderEngine.func_6526_a(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;=java/io/IOException +net/minecraft/src/StatsSyncher.func_27410_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException +net/minecraft/src/StatsSyncher.func_27412_a(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException +net/minecraft/src/TexturePackBase.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException +net/minecraft/src/TexturePackCustom.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException +net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException +net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException +net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv new file mode 100644 index 0000000000..c01a6cada8 --- /dev/null +++ b/forge/conf/fields.csv @@ -0,0 +1,5999 @@ +"searge","name","notch","sig","notchsig","classname","classnotch","package","side" +"field_41032_a","field_41032_a","a","I","I","EntityEnderCrystal","sf","net/minecraft/src","0" +"field_41031_b","field_41031_b","b","I","I","EntityEnderCrystal","sf","net/minecraft/src","0" +"field_1681_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesArmor","xx","net/minecraft/src","0" +"field_1680_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesArmor","xx","net/minecraft/src","0" +"field_39009_a","field_39009_a","a","I","I","ComponentVillage","xf","net/minecraft/src","0" +"field_519_a","protocolVersion","a","I","I","Packet1Login","aj","net/minecraft/src","0" +"field_518_b","username","b","Ljava/lang/String;","Ljava/lang/String;","Packet1Login","aj","net/minecraft/src","0" +"field_4074_d","mapSeed","c","J","J","Packet1Login","aj","net/minecraft/src","0" +"field_35249_d","serverMode","d","I","I","Packet1Login","aj","net/minecraft/src","0" +"field_35250_e","worldType","e","B","B","Packet1Login","aj","net/minecraft/src","0" +"field_35247_f","difficultySetting","f","B","B","Packet1Login","aj","net/minecraft/src","0" +"field_35248_g","worldHeight","g","B","B","Packet1Login","aj","net/minecraft/src","0" +"field_35251_h","maxPlayers","h","B","B","Packet1Login","aj","net/minecraft/src","0" +"field_983_a","netHandler","a","LNetClientHandler;","Labp;","GuiDownloadTerrain","acd","net/minecraft/src","0" +"field_984_h","updateCounter","b","I","I","GuiDownloadTerrain","acd","net/minecraft/src","0" +"field_40157_aB","maxHealth","bI","I","I","EntityDragonBase","adh","net/minecraft/src","0" +"field_818_a","stackResult","a","[LItemStack;","[Ldk;","InventoryCraftResult","iy","net/minecraft/src","0" +"field_670_b","particleTextureIndex","a","I","I","EntityFX","wc","net/minecraft/src","0" +"field_669_c","particleTextureJitterX","b","F","F","EntityFX","wc","net/minecraft/src","0" +"field_668_d","particleTextureJitterY","c","F","F","EntityFX","wc","net/minecraft/src","0" +"field_20923_e","particleAge","d","I","I","EntityFX","wc","net/minecraft/src","0" +"field_666_f","particleMaxAge","e","I","I","EntityFX","wc","net/minecraft/src","0" +"field_665_g","particleScale","f","F","F","EntityFX","wc","net/minecraft/src","0" +"field_664_h","particleGravity","g","F","F","EntityFX","wc","net/minecraft/src","0" +"field_663_i","particleRed","h","F","F","EntityFX","wc","net/minecraft/src","0" +"field_662_j","particleGreen","i","F","F","EntityFX","wc","net/minecraft/src","0" +"field_661_k","particleBlue","aq","F","F","EntityFX","wc","net/minecraft/src","0" +"field_660_l","interpPosX","ar","D","D","EntityFX","wc","net/minecraft/src","0" +"field_659_m","interpPosY","as","D","D","EntityFX","wc","net/minecraft/src","0" +"field_658_n","interpPosZ","at","D","D","EntityFX","wc","net/minecraft/src","0" +"field_21037_a","xLocation","a","I","I","Packet54PlayNoteBlock","agm","net/minecraft/src","0" +"field_21036_b","yLocation","b","I","I","Packet54PlayNoteBlock","agm","net/minecraft/src","0" +"field_21040_c","zLocation","c","I","I","Packet54PlayNoteBlock","agm","net/minecraft/src","0" +"field_21039_d","instrumentType","d","I","I","Packet54PlayNoteBlock","agm","net/minecraft/src","0" +"field_21038_e","pitch","e","I","I","Packet54PlayNoteBlock","agm","net/minecraft/src","0" +"field_6501_o","entityRenderMap","o","Ljava/util/Map;","Ljava/util/Map;","RenderManager","wb","net/minecraft/src","0" +"field_1233_a","instance","a","LRenderManager;","Lwb;","RenderManager","wb","net/minecraft/src","0" +"field_1218_p","fontRenderer","p","LFontRenderer;","Labe;","RenderManager","wb","net/minecraft/src","0" +"field_1232_b","renderPosX","b","D","D","RenderManager","wb","net/minecraft/src","0" +"field_1231_c","renderPosY","c","D","D","RenderManager","wb","net/minecraft/src","0" +"field_1230_d","renderPosZ","d","D","D","RenderManager","wb","net/minecraft/src","0" +"field_1229_e","renderEngine","e","LRenderEngine;","Lzh;","RenderManager","wb","net/minecraft/src","0" +"field_4236_f","itemRenderer","f","LItemRenderer;","Ln;","RenderManager","wb","net/minecraft/src","0" +"field_1227_g","worldObj","g","LWorld;","Lry;","RenderManager","wb","net/minecraft/src","0" +"field_22188_h","livingPlayer","h","LEntityLiving;","Lnq;","RenderManager","wb","net/minecraft/src","0" +"field_1225_i","playerViewY","i","F","F","RenderManager","wb","net/minecraft/src","0" +"field_1224_j","playerViewX","j","F","F","RenderManager","wb","net/minecraft/src","0" +"field_1223_k","options","k","LGameSettings;","Lki;","RenderManager","wb","net/minecraft/src","0" +"field_1222_l","field_1222_l","l","D","D","RenderManager","wb","net/minecraft/src","0" +"field_1221_m","field_1221_m","m","D","D","RenderManager","wb","net/minecraft/src","0" +"field_1220_n","field_1220_n","n","D","D","RenderManager","wb","net/minecraft/src","0" +"field_35186_b","canCarryBlocks","c","[Z","[Z","EntityEnderman","aii","net/minecraft/src","0" +"field_35187_a","isAttacking","b","Z","Z","EntityEnderman","aii","net/minecraft/src","0" +"field_35184_d","teleportDelay","d","I","I","EntityEnderman","aii","net/minecraft/src","0" +"field_35185_e","field_35185_e","e","I","I","EntityEnderman","aii","net/minecraft/src","0" +"field_22024_a","repeaterTorchOffset","a","[D","[D","BlockRedstoneRepeater","mz","net/minecraft/src","0" +"field_22023_b","repeaterState","cb","[I","[I","BlockRedstoneRepeater","mz","net/minecraft/src","0" +"field_22025_c","isRepeaterPowered","cc","Z","Z","BlockRedstoneRepeater","mz","net/minecraft/src","0" +"field_1256_a","sideModels","g","[LModelRenderer;","[Lacf;","ModelMinecart","iv","net/minecraft/src","0" +"field_41038_a","field_41038_a","a","LEntityDragon;","Loo;","RenderDragon","ado","net/minecraft/src","0" +"field_40284_d","field_40284_d","i","I","I","RenderDragon","ado","net/minecraft/src","0" +"field_40285_c","field_40285_c","b","LModelDragon;","Lafo;","RenderDragon","ado","net/minecraft/src","0" +"field_532_a","username","a","Ljava/lang/String;","Ljava/lang/String;","Packet2Handshake","hh","net/minecraft/src","0" +"field_35647_c","field_35647_c","c","I","I","PlayerControllerCreative","uq","net/minecraft/src","0" +"field_1458_a","tileEntities","a","Ljava/util/List;","Ljava/util/List;","RenderGlobal","afv","net/minecraft/src","0" +"field_1448_k","worldObj","i","LWorld;","Lry;","RenderGlobal","afv","net/minecraft/src","0" +"field_1447_l","renderEngine","j","LRenderEngine;","Lzh;","RenderGlobal","afv","net/minecraft/src","0" +"field_1446_m","worldRenderersToUpdate","k","Ljava/util/List;","Ljava/util/List;","RenderGlobal","afv","net/minecraft/src","0" +"field_1445_n","sortedWorldRenderers","l","[LWorldRenderer;","[Lge;","RenderGlobal","afv","net/minecraft/src","0" +"field_1444_o","worldRenderers","m","[LWorldRenderer;","[Lge;","RenderGlobal","afv","net/minecraft/src","0" +"field_1443_p","renderChunksWide","n","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1442_q","renderChunksTall","o","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1441_r","renderChunksDeep","p","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1440_s","glRenderListBase","q","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1439_t","mc","r","LMinecraft;","LMinecraft;","RenderGlobal","afv","net/minecraft/src","0" +"field_1438_u","globalRenderBlocks","s","LRenderBlocks;","Lacr;","RenderGlobal","afv","net/minecraft/src","0" +"field_1437_v","glOcclusionQueryBase","t","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","RenderGlobal","afv","net/minecraft/src","0" +"field_1436_w","occlusionEnabled","u","Z","Z","RenderGlobal","afv","net/minecraft/src","0" +"field_1435_x","cloudOffsetX","v","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1434_y","starGLCallList","w","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1433_z","glSkyList","x","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1432_A","glSkyList2","y","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1431_B","minBlockX","z","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1430_C","minBlockY","A","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1429_D","minBlockZ","B","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1428_E","maxBlockX","C","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1427_F","maxBlockY","D","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1426_G","maxBlockZ","E","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1425_H","renderDistance","F","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1424_I","renderEntitiesStartupCounter","G","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1423_J","countEntitiesTotal","H","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1422_K","countEntitiesRendered","I","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1421_L","countEntitiesHidden","J","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1457_b","dummyBuf50k","b","[I","[I","RenderGlobal","afv","net/minecraft/src","0" +"field_1456_c","occlusionResult","c","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","RenderGlobal","afv","net/minecraft/src","0" +"field_1420_M","renderersLoaded","K","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1419_N","renderersBeingClipped","L","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1418_O","renderersBeingOccluded","M","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1417_P","renderersBeingRendered","N","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1416_Q","renderersSkippingRenderPass","O","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_40194_P","dummyRenderInt","P","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_21156_R","worldRenderersCheckIndex","Q","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_1415_R","glRenderLists","R","Ljava/util/List;","Ljava/util/List;","RenderGlobal","afv","net/minecraft/src","0" +"field_1414_S","allRenderLists","S","[LRenderList;","[Laak;","RenderGlobal","afv","net/minecraft/src","0" +"field_1453_f","prevSortX","d","D","D","RenderGlobal","afv","net/minecraft/src","0" +"field_1452_g","prevSortY","e","D","D","RenderGlobal","afv","net/minecraft/src","0" +"field_1451_h","prevSortZ","f","D","D","RenderGlobal","afv","net/minecraft/src","0" +"field_1450_i","damagePartialTime","g","F","F","RenderGlobal","afv","net/minecraft/src","0" +"field_1449_j","frustrumCheckOffset","h","I","I","RenderGlobal","afv","net/minecraft/src","0" +"field_27242_a","elementBuilders","a","Ljava/util/List;","Ljava/util/List;","J_JsonArrayNodeBuilder","ft","net/minecraft/src","0" +"field_316_a","recordName","a","Ljava/lang/String;","Ljava/lang/String;","ItemRecord","pe","net/minecraft/src","0" +"field_885_a","plantBlockId","a","I","I","WorldGenFlowers","bu","net/minecraft/src","0" +"field_35044_a","field_35044_a","a","LEnumDoor;","Lmj;","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"field_35042_b","field_35042_b","b","Z","Z","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"field_35043_c","field_35043_c","c","Z","Z","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"field_35040_d","field_35040_d","d","Z","Z","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"field_35041_e","field_35041_e","h","Z","Z","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"field_1287_a","boatSides","g","[LModelRenderer;","[Lacf;","ModelBoat","ua","net/minecraft/src","0" +"field_35405_a","chestLid","g","LModelRenderer;","Lacf;","ModelChest","xl","net/minecraft/src","0" +"field_35403_b","chestBelow","h","LModelRenderer;","Lacf;","ModelChest","xl","net/minecraft/src","0" +"field_35404_c","chestKnob","i","LModelRenderer;","Lacf;","ModelChest","xl","net/minecraft/src","0" +"field_40573_a","threadedIOInstance","a","LThreadedFileIOBase;","Lll;","ThreadedFileIOBase","ll","net/minecraft/src","0" +"field_40571_b","threadedIOQueue","b","Ljava/util/List;","Ljava/util/List;","ThreadedFileIOBase","ll","net/minecraft/src","0" +"field_40572_c","writeQueuedCounter","c","J","J","ThreadedFileIOBase","ll","net/minecraft/src","0" +"field_40569_d","savedIOCounter","d","J","J","ThreadedFileIOBase","ll","net/minecraft/src","0" +"field_40570_e","isThreadWaiting","e","Z","Z","ThreadedFileIOBase","ll","net/minecraft/src","0" +"UNDEFINED","UNDEFINED","a","LEnumCreatureAttribute;","Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"UNDEAD","UNDEAD","b","LEnumCreatureAttribute;","Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"ARTHROPOD","ARTHROPOD","c","LEnumCreatureAttribute;","Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"field_40586_d","allCreatureAttributes","d","[LEnumCreatureAttribute;","[Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"field_1729_a","worldObj","a","LWorld;","Lry;","EffectRenderer","f","net/minecraft/src","0" +"field_1728_b","fxLayers","b","[Ljava/util/List;","[Ljava/util/List;","EffectRenderer","f","net/minecraft/src","0" +"field_1731_c","renderer","c","LRenderEngine;","Lzh;","EffectRenderer","f","net/minecraft/src","0" +"field_1730_d","rand","d","Ljava/util/Random;","Ljava/util/Random;","EffectRenderer","f","net/minecraft/src","0" +"field_22283_b","chunkX","b","I","I","RegionFileChunkBuffer","ahg","net/minecraft/src","0" +"field_22285_c","chunkZ","c","I","I","RegionFileChunkBuffer","ahg","net/minecraft/src","0" +"field_22284_a","regionFile","a","LRegionFile;","Las;","RegionFileChunkBuffer","ahg","net/minecraft/src","0" +"field_1661_c","rand","c","Ljava/util/Random;","Ljava/util/Random;","SoundPool","cf","net/minecraft/src","0" +"field_1660_d","nameToSoundPoolEntriesMapping","d","Ljava/util/Map;","Ljava/util/Map;","SoundPool","cf","net/minecraft/src","0" +"field_1659_e","allSoundPoolEntries","e","Ljava/util/List;","Ljava/util/List;","SoundPool","cf","net/minecraft/src","0" +"field_1658_a","numberOfSoundPoolEntries","a","I","I","SoundPool","cf","net/minecraft/src","0" +"field_1657_b","isGetRandomSound","b","Z","Z","SoundPool","cf","net/minecraft/src","0" +"field_27274_a","field_27274_a","a","LGuiStats;","Lin;","GuiSlotStatsBlock","hz","net/minecraft/src","0" +"field_1085_a","netManager","a","LNetworkManager;","Lhc;","NetworkReaderThread","pa","net/minecraft/src","0" +"field_965_a","updateCounter","a","I","I","GuiConflictWarning","ach","net/minecraft/src","0" +"field_20029_a","windowId","a","I","I","Packet106Transaction","ly","net/minecraft/src","0" +"field_20028_b","shortWindowId","b","S","S","Packet106Transaction","ly","net/minecraft/src","0" +"field_20030_c","accepted","c","Z","Z","Packet106Transaction","ly","net/minecraft/src","0" +"field_1167_a","typeOfHit","a","LEnumMovingObjectType;","Lbo;","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1166_b","blockX","b","I","I","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1172_c","blockY","c","I","I","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1171_d","blockZ","d","I","I","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1170_e","sideHit","e","I","I","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1169_f","hitVec","f","LVec3D;","Lfb;","MovingObjectPosition","gv","net/minecraft/src","0" +"field_1168_g","entityHit","g","LEntity;","Lia;","MovingObjectPosition","gv","net/minecraft/src","0" +"field_40111_a","field_40111_a","a","I","I","EntitySpellParticleFX","sq","net/minecraft/src","0" +"field_1337_a","air","a","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_28130_b","grass","b","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1336_b","ground","c","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1335_c","wood","d","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1334_d","rock","e","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1333_e","iron","f","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1332_f","water","g","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1331_g","lava","h","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4265_h","leaves","i","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1329_i","plants","j","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_35495_k","vine","k","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1328_j","sponge","l","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4264_k","cloth","m","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1326_l","fire","n","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1325_m","sand","o","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1324_n","circuits","p","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4263_o","glass","q","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1322_p","tnt","r","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4262_q","unused","s","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1320_r","ice","t","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1319_s","snow","u","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1318_t","craftedSnow","v","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1317_u","cactus","w","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_1316_v","clay","x","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4261_w","pumpkin","y","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_41056_z","dragonEgg","z","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4260_x","portal","A","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_21150_y","cake","B","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_31068_A","web","C","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_31067_B","piston","D","LMaterial;","Lp;","Material","p","net/minecraft/src","0" +"field_4259_y","canBurn","F","Z","Z","Material","p","net/minecraft/src","0" +"field_27285_A","groundCover","G","Z","Z","Material","p","net/minecraft/src","0" +"field_28128_D","isTranslucent","H","Z","Z","Material","p","net/minecraft/src","0" +"field_28129_A","materialMapColor","E","LMapColor;","Laav;","Material","p","net/minecraft/src","0" +"field_31066_G","canHarvest","I","Z","Z","Material","p","net/minecraft/src","0" +"field_31065_H","mobilityFlag","J","I","I","Material","p","net/minecraft/src","0" +"field_1111_a","x","a","I","I","ChunkPosition","am","net/minecraft/src","0" +"field_1110_b","y","b","I","I","ChunkPosition","am","net/minecraft/src","0" +"field_1112_c","z","c","I","I","ChunkPosition","am","net/minecraft/src","0" +"field_6359_a","graphicsLevel","cb","Z","Z","BlockLeavesBase","zt","net/minecraft/src","0" +"field_1363_f","nextTickEntryID","f","J","J","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1361_a","xCoord","a","I","I","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1360_b","yCoord","b","I","I","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1366_c","zCoord","c","I","I","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1365_d","blockID","d","I","I","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1364_e","scheduledTime","e","J","J","NextTickListEntry","ahn","net/minecraft/src","0" +"field_1362_g","tickEntryID","g","J","J","NextTickListEntry","ahn","net/minecraft/src","0" +"field_840_a","stackList","a","[LItemStack;","[Ldk;","InventoryCrafting","lm","net/minecraft/src","0" +"field_21104_b","inventoryWidth","b","I","I","InventoryCrafting","lm","net/minecraft/src","0" +"field_841_c","eventHandler","c","LContainer;","Lpj;","InventoryCrafting","lm","net/minecraft/src","0" +"field_4117_a","angerLevel","b","I","I","EntityPigZombie","jm","net/minecraft/src","0" +"field_4116_b","randomSoundDelay","c","I","I","EntityPigZombie","jm","net/minecraft/src","0" +"field_4118_c","defaultHeldItem","d","LItemStack;","Ldk;","EntityPigZombie","jm","net/minecraft/src","0" +"field_31057_a","field_31057_a","a","[I","[I","Facing","ot","net/minecraft/src","0" +"field_31056_b","offsetsXForSide","b","[I","[I","Facing","ot","net/minecraft/src","0" +"field_31059_c","offsetsYForSide","c","[I","[I","Facing","ot","net/minecraft/src","0" +"field_31058_d","offsetsZForSide","d","[I","[I","Facing","ot","net/minecraft/src","0" +"field_923_k","zLevel","i","F","F","Gui","ht","net/minecraft/src","0" +"field_27018_a","field_27018_a","a","I","I","EntityFootStepFX","nb","net/minecraft/src","0" +"field_27020_o","field_27020_o","au","I","I","EntityFootStepFX","nb","net/minecraft/src","0" +"field_27019_p","currentFootSteps","av","LRenderEngine;","Lzh;","EntityFootStepFX","nb","net/minecraft/src","0" +"field_1307_b","charWidth","d","[I","[I","FontRenderer","abe","net/minecraft/src","0" +"field_1308_a","fontTextureName","a","I","I","FontRenderer","abe","net/minecraft/src","0" +"field_41063_b","FONT_HEIGHT","b","I","I","FontRenderer","abe","net/minecraft/src","0" +"field_1310_c","fontDisplayLists","e","I","I","FontRenderer","abe","net/minecraft/src","0" +"field_1309_d","buffer","f","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","FontRenderer","abe","net/minecraft/src","0" +"field_41064_c","field_41064_c","c","Ljava/util/Random;","Ljava/util/Random;","FontRenderer","abe","net/minecraft/src","0" +"field_944_i","sliderValue","j","F","F","GuiSlider","zd","net/minecraft/src","0" +"field_943_j","dragging","k","Z","Z","GuiSlider","zd","net/minecraft/src","0" +"field_942_l","idFloat","l","LEnumOptions;","Llp;","GuiSlider","zd","net/minecraft/src","0" +"field_201_d","renderBlocks","g","LRenderBlocks;","Lacr;","RenderItem","iw","net/minecraft/src","0" +"field_200_e","random","h","Ljava/util/Random;","Ljava/util/Random;","RenderItem","iw","net/minecraft/src","0" +"field_27004_a","field_27004_a","a","Z","Z","RenderItem","iw","net/minecraft/src","0" +"field_40268_b","zLevel","b","F","F","RenderItem","iw","net/minecraft/src","0" +"field_1615_a","stackSize","a","I","I","ItemStack","dk","net/minecraft/src","0" +"field_1614_b","animationsToGo","b","I","I","ItemStack","dk","net/minecraft/src","0" +"field_1617_c","itemID","c","I","I","ItemStack","dk","net/minecraft/src","0" +"field_40715_d","stackTagCompound","d","LNBTTagCompound;","Lik;","ItemStack","dk","net/minecraft/src","0" +"field_1616_d","itemDamage","e","I","I","ItemStack","dk","net/minecraft/src","0" +"field_40435_a","idEffectNameMap","a","Ljava/util/HashMap;","Ljava/util/HashMap;","ItemPotion","abk","net/minecraft/src","0" +"field_204_f","scale","a","F","F","RenderGiantZombie","ahi","net/minecraft/src","0" +"field_22180_a","savesDirectory","a","Ljava/io/File;","Ljava/io/File;","SaveFormatOld","w","net/minecraft/src","0" +"field_797_bg","sendQueue","a","LNetClientHandler;","Labp;","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9380_bx","inventoryUpdateTickCounter","cj","I","I","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_21093_bH","field_21093_bH","ck","Z","Z","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9379_by","oldPosX","cl","D","D","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9378_bz","field_9378_bz","cm","D","D","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9377_bA","oldPosY","cn","D","D","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9376_bB","oldPosZ","co","D","D","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9385_bC","oldRotationYaw","cp","F","F","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9384_bD","oldRotationPitch","cq","F","F","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9382_bF","field_9382_bF","cr","Z","Z","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_35227_cs","field_35227_cs","cs","Z","Z","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_9381_bG","wasSneaking","ct","Z","Z","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_12242_bI","field_12242_bI","cu","I","I","EntityClientPlayerMP","cx","net/minecraft/src","0" +"field_4083_a","portalParticleScale","a","F","F","EntityPortalFX","afy","net/minecraft/src","0" +"field_4086_p","portalPosX","au","D","D","EntityPortalFX","afy","net/minecraft/src","0" +"field_4085_q","portalPosY","av","D","D","EntityPortalFX","afy","net/minecraft/src","0" +"field_4084_r","portalPosZ","aw","D","D","EntityPortalFX","afy","net/minecraft/src","0" +"field_35967_a","keybindArray","a","Ljava/util/List;","Ljava/util/List;","KeyBinding","aby","net/minecraft/src","0" +"field_35966_b","hash","b","LIntHashMap;","Lob;","KeyBinding","aby","net/minecraft/src","0" +"field_1371_a","keyDescription","c","Ljava/lang/String;","Ljava/lang/String;","KeyBinding","aby","net/minecraft/src","0" +"field_1370_b","keyCode","d","I","I","KeyBinding","aby","net/minecraft/src","0" +"field_35965_e","pressed","e","Z","Z","KeyBinding","aby","net/minecraft/src","0" +"field_35964_f","pressTime","f","I","I","KeyBinding","aby","net/minecraft/src","0" +"field_35631_e","coordMap","d","Ljava/util/HashMap;","Ljava/util/HashMap;","MapGenStructure","hl","net/minecraft/src","0" +"field_463_b","baseIndexInPNG","cc","I","I","BlockLeaves","qo","net/minecraft/src","0" +"field_20017_a","adjacentTreeBlocks","a","[I","[I","BlockLeaves","qo","net/minecraft/src","0" +"field_35607_a","villagePieceClass","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"field_35605_b","villagePieceWeight","b","I","I","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"field_35606_c","villagePiecesSpawned","c","I","I","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"field_35604_d","villagePiecesLimit","d","I","I","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"field_27438_a","isBusy","a","Z","Z","StatsSyncher","jq","net/minecraft/src","0" +"field_27437_b","field_27437_b","b","Ljava/util/Map;","Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"field_27436_c","field_27436_c","c","Ljava/util/Map;","Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"field_27435_d","statFileWriter","d","LStatFileWriter;","Ltk;","StatsSyncher","jq","net/minecraft/src","0" +"field_27434_e","unsentDataFile","e","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27433_f","dataFile","f","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27432_g","unsentTempFile","g","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27431_h","tempFile","h","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27430_i","unsentOldFile","i","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27429_j","oldFile","j","Ljava/io/File;","Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"field_27428_k","theSession","k","LSession;","Ldr;","StatsSyncher","jq","net/minecraft/src","0" +"field_27427_l","field_27427_l","l","I","I","StatsSyncher","jq","net/minecraft/src","0" +"field_27426_m","field_27426_m","m","I","I","StatsSyncher","jq","net/minecraft/src","0" +"field_35619_a","doorEnum","a","[I","[I","EnumDoorHelper","aay","net/minecraft/src","0" +"field_799_a","blockID","a","I","I","EntityFallingSand","uo","net/minecraft/src","0" +"field_798_b","fallTime","b","I","I","EntityFallingSand","uo","net/minecraft/src","0" +"field_22189_a","dataFilenamePattern","a","Ljava/util/regex/Pattern;","Ljava/util/regex/Pattern;","ChunkFilePattern","rm","net/minecraft/src","0" +"field_35407_a","isCarrying","t","Z","Z","ModelEnderman","ta","net/minecraft/src","0" +"field_35406_b","isAttacking","u","Z","Z","ModelEnderman","ta","net/minecraft/src","0" +"field_6367_a","entityId","a","I","I","Packet28EntityVelocity","qm","net/minecraft/src","0" +"field_6366_b","motionX","b","I","I","Packet28EntityVelocity","qm","net/minecraft/src","0" +"field_6369_c","motionY","c","I","I","Packet28EntityVelocity","qm","net/minecraft/src","0" +"field_6368_d","motionZ","d","I","I","Packet28EntityVelocity","qm","net/minecraft/src","0" +"field_35088_a","field_35088_a","a","I","I","ComponentVillagePathGen","ahz","net/minecraft/src","0" +"field_35634_a","allowedBiomeGenBases","e","[LBiomeGenBase;","[Lsr;","MapGenStronghold","dc","net/minecraft/src","0" +"field_35632_f","ranBiomeCheck","f","Z","Z","MapGenStronghold","dc","net/minecraft/src","0" +"field_35633_g","structureCoords","g","[LChunkCoordIntPair;","[Lacm;","MapGenStronghold","dc","net/minecraft/src","0" +"field_28058_a","deadBushID","a","I","I","WorldGenDeadBush","mb","net/minecraft/src","0" +"field_20020_a","xPosition","a","I","I","Packet130UpdateSign","hy","net/minecraft/src","0" +"field_20019_b","yPosition","b","I","I","Packet130UpdateSign","hy","net/minecraft/src","0" +"field_20022_c","zPosition","c","I","I","Packet130UpdateSign","hy","net/minecraft/src","0" +"field_20021_d","signLines","d","[Ljava/lang/String;","[Ljava/lang/String;","Packet130UpdateSign","hy","net/minecraft/src","0" +"field_205_f","scaleAmount","a","LModelBase;","Lal;","RenderSlime","xm","net/minecraft/src","0" +"field_982_j","upperChestInventory","g","LIInventory;","Lde;","GuiChest","gj","net/minecraft/src","0" +"field_981_l","lowerChestInventory","h","LIInventory;","Lde;","GuiChest","gj","net/minecraft/src","0" +"field_980_m","inventoryRows","j","I","I","GuiChest","gj","net/minecraft/src","0" +"field_1356_a","mc","a","LMinecraft;","LMinecraft;","ItemRenderer","n","net/minecraft/src","0" +"field_9451_b","itemToRender","b","LItemStack;","Ldk;","ItemRenderer","n","net/minecraft/src","0" +"field_9453_c","equippedProgress","c","F","F","ItemRenderer","n","net/minecraft/src","0" +"field_9452_d","prevEquippedProgress","d","F","F","ItemRenderer","n","net/minecraft/src","0" +"field_1357_e","renderBlocksInstance","e","LRenderBlocks;","Lacr;","ItemRenderer","n","net/minecraft/src","0" +"field_28131_f","mapItemRenderer","f","LMapItemRenderer;","Lsg;","ItemRenderer","n","net/minecraft/src","0" +"field_20099_f","field_20099_f","g","I","I","ItemRenderer","n","net/minecraft/src","0" +"field_35264_a","sandID","a","I","I","WorldGenSand","fc","net/minecraft/src","0" +"field_35263_b","field_35263_b","b","I","I","WorldGenSand","fc","net/minecraft/src","0" +"field_1781_a","soundName","a","Ljava/lang/String;","Ljava/lang/String;","SoundPoolEntry","lr","net/minecraft/src","0" +"field_1780_b","soundUrl","b","Ljava/net/URL;","Ljava/net/URL;","SoundPoolEntry","lr","net/minecraft/src","0" +"field_20920_e","mainModel","g","LModelBase;","Lal;","RenderLiving","acq","net/minecraft/src","0" +"field_6332_f","renderPassModel","h","LModelBase;","Lal;","RenderLiving","acq","net/minecraft/src","0" +"field_40565_a","field_40565_a","a","Z","Z","PacketCount","lg","net/minecraft/src","0" +"field_40563_b","field_40563_b","b","Ljava/util/Map;","Ljava/util/Map;","PacketCount","lg","net/minecraft/src","0" +"field_40564_c","field_40564_c","c","Ljava/util/Map;","Ljava/util/Map;","PacketCount","lg","net/minecraft/src","0" +"field_40562_d","field_40562_d","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","lg","net/minecraft/src","0" +"field_778_b","inventory","by","LInventoryPlayer;","Lx;","EntityPlayer","vi","net/minecraft/src","0" +"field_20069_g","inventorySlots","bz","LContainer;","Lpj;","EntityPlayer","vi","net/minecraft/src","0" +"field_20068_h","craftingInventory","bA","LContainer;","Lpj;","EntityPlayer","vi","net/minecraft/src","0" +"field_35217_av","foodStats","bB","LFoodStats;","Leq;","EntityPlayer","vi","net/minecraft/src","0" +"field_35216_aw","flyToggleTimer","bC","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_9371_f","unusedByte","bD","B","B","EntityPlayer","vi","net/minecraft/src","0" +"field_9370_g","score","bE","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_775_e","prevCameraYaw","bF","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_774_f","cameraYaw","bG","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_9369_j","isSwinging","bH","Z","Z","EntityPlayer","vi","net/minecraft/src","0" +"field_9368_k","swingProgressInt","bI","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_771_i","username","bJ","Ljava/lang/String;","Ljava/lang/String;","EntityPlayer","vi","net/minecraft/src","0" +"field_4129_m","dimension","bK","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_20067_q","playerCloakUrl","bL","Ljava/lang/String;","Ljava/lang/String;","EntityPlayer","vi","net/minecraft/src","0" +"field_35214_aG","xpCooldown","bM","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_20066_r","field_20066_r","bN","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_20065_s","field_20065_s","bO","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_20064_t","field_20064_t","bP","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_20063_u","field_20063_u","bQ","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_20062_v","field_20062_v","bR","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_20061_w","field_20061_w","bS","D","D","EntityPlayer","vi","net/minecraft/src","0" +"field_21901_a","sleeping","bT","Z","Z","EntityPlayer","vi","net/minecraft/src","0" +"field_21908_b","bedChunkCoordinates","bU","LChunkCoordinates;","Ldh;","EntityPlayer","vi","net/minecraft/src","0" +"field_21907_c","sleepTimer","a","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_22063_x","field_22063_x","bV","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_22062_y","field_22062_y","bW","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_22061_z","field_22061_z","bX","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_24900_bi","playerSpawnCoordinate","b","LChunkCoordinates;","Ldh;","EntityPlayer","vi","net/minecraft/src","0" +"field_26907_d","startMinecartRidingCoordinate","c","LChunkCoordinates;","Ldh;","EntityPlayer","vi","net/minecraft/src","0" +"field_28024_y","timeUntilPortal","bY","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_28023_z","inPortal","bZ","Z","Z","EntityPlayer","vi","net/minecraft/src","0" +"field_28026_A","timeInPortal","ca","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_28025_B","prevTimeInPortal","cb","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_35212_aW","capabilities","cc","LPlayerCapabilities;","Lwq;","EntityPlayer","vi","net/minecraft/src","0" +"field_35210_aY","playerLevel","cd","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_35209_aZ","totalXP","ce","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_35211_aX","currentXP","cf","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_34907_d","itemInUse","d","LItemStack;","Ldk;","EntityPlayer","vi","net/minecraft/src","0" +"field_34906_e","itemInUseCount","e","I","I","EntityPlayer","vi","net/minecraft/src","0" +"field_35215_ba","speedOnGround","cg","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_35213_bb","speedInAir","ch","F","F","EntityPlayer","vi","net/minecraft/src","0" +"field_4128_n","fishEntity","ci","LEntityFishHook;","Lael;","EntityPlayer","vi","net/minecraft/src","0" +"field_35436_a","field_35436_a","a","LBlock;","Lyy;","ItemColored","hf","net/minecraft/src","0" +"field_41034_b","field_41034_b","b","[Ljava/lang/String;","[Ljava/lang/String;","ItemColored","hf","net/minecraft/src","0" +"field_35486_a","biomeList","a","[LBiomeGenBase;","[Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35484_b","ocean","b","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35485_c","plains","c","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_4249_h","desert","d","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35483_e","hills","e","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_4253_d","forest","f","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_4250_g","taiga","g","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_4255_b","swampland","h","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35487_i","river","i","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_4245_l","hell","j","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_28057_m","sky","k","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40259_l","frozenOcean","l","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40260_m","frozenRiver","m","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40257_n","icePlains","n","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40258_o","iceMountains","o","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40262_p","mushroomIsland","p","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_40261_q","mushroomIslandShore","q","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"field_6504_m","biomeName","r","Ljava/lang/String;","Ljava/lang/String;","BiomeGenBase","sr","net/minecraft/src","0" +"field_6503_n","color","s","I","I","BiomeGenBase","sr","net/minecraft/src","0" +"field_4242_o","topBlock","t","B","B","BiomeGenBase","sr","net/minecraft/src","0" +"field_4241_p","fillerBlock","u","B","B","BiomeGenBase","sr","net/minecraft/src","0" +"field_6502_q","field_6502_q","v","I","I","BiomeGenBase","sr","net/minecraft/src","0" +"field_35492_q","minHeight","w","F","F","BiomeGenBase","sr","net/minecraft/src","0" +"field_35491_r","maxHeight","x","F","F","BiomeGenBase","sr","net/minecraft/src","0" +"field_35490_s","temperature","y","F","F","BiomeGenBase","sr","net/minecraft/src","0" +"field_35489_t","rainfall","z","F","F","BiomeGenBase","sr","net/minecraft/src","0" +"field_40256_A","waterColorMultiplier","A","I","I","BiomeGenBase","sr","net/minecraft/src","0" +"field_35488_u","biomeDecorator","B","LBiomeDecorator;","Lql;","BiomeGenBase","sr","net/minecraft/src","0" +"field_25066_r","spawnableMonsterList","C","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","sr","net/minecraft/src","0" +"field_25065_s","spawnableCreatureList","D","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","sr","net/minecraft/src","0" +"field_25064_t","spawnableWaterCreatureList","E","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","sr","net/minecraft/src","0" +"field_27080_u","enableSnow","K","Z","Z","BiomeGenBase","sr","net/minecraft/src","0" +"field_27079_v","enableRain","L","Z","Z","BiomeGenBase","sr","net/minecraft/src","0" +"field_35494_y","biomeID","F","I","I","BiomeGenBase","sr","net/minecraft/src","0" +"field_35493_z","worldGenTrees","G","LWorldGenTrees;","Lgq;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35480_A","worldGenBigTree","H","LWorldGenBigTree;","Lyd;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35481_B","worldGenForest","I","LWorldGenForest;","Ljp;","BiomeGenBase","sr","net/minecraft/src","0" +"field_35482_C","worldGenSwamp","J","LWorldGenSwamp;","Lqj;","BiomeGenBase","sr","net/minecraft/src","0" +"field_1074_c","curBlockX","c","I","I","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1073_d","curBlockY","d","I","I","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1072_e","curBlockZ","e","I","I","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1071_f","curBlockDamage","f","F","F","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1070_g","prevBlockDamage","g","F","F","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1069_h","field_1069_h","h","F","F","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1068_i","blockHitWait","i","I","I","PlayerControllerSP","dm","net/minecraft/src","0" +"field_28109_a","networkManager","a","LNetworkManager;","Lhc;","ThreadCloseConnection","po","net/minecraft/src","0" +"field_40236_a","field_40236_a","a","LIInventory;","Lde;","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40240_h","field_40240_h","h","LWorld;","Lry;","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40241_i","field_40241_i","i","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40238_j","field_40238_j","j","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40239_k","field_40239_k","k","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40237_l","field_40237_l","l","Ljava/util/Random;","Ljava/util/Random;","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40234_b","field_40234_b","b","J","J","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40235_c","field_40235_c","c","[I","[I","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_1004_a","field_1004_a","a","Ljava/lang/String;","Ljava/lang/String;","LoadingScreenRenderer","xw","net/minecraft/src","0" +"field_1003_b","mc","b","LMinecraft;","LMinecraft;","LoadingScreenRenderer","xw","net/minecraft/src","0" +"field_1007_c","currentlyDisplayedText","c","Ljava/lang/String;","Ljava/lang/String;","LoadingScreenRenderer","xw","net/minecraft/src","0" +"field_1006_d","field_1006_d","d","J","J","LoadingScreenRenderer","xw","net/minecraft/src","0" +"field_1005_e","field_1005_e","e","Z","Z","LoadingScreenRenderer","xw","net/minecraft/src","0" +"field_515_a","xPosition","a","I","I","Packet6SpawnPosition","aee","net/minecraft/src","0" +"field_514_b","yPosition","b","I","I","Packet6SpawnPosition","aee","net/minecraft/src","0" +"field_516_c","zPosition","c","I","I","Packet6SpawnPosition","aee","net/minecraft/src","0" +"field_6363_a","localFlag","a","Z","Z","BlockBreakable","aaf","net/minecraft/src","0" +"field_1138_g","field_1138_g","g","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_1137_h","field_1137_h","h","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_1136_i","field_1136_i","i","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_1135_j","field_1135_j","j","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_1134_k","field_1134_k","k","I","I","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_35135_a","field_35135_a","a","F","F","EntityCloudFX","kz","net/minecraft/src","0" +"field_35127_a","xpColor","a","I","I","EntityXPOrb","fk","net/minecraft/src","0" +"field_35124_b","xpOrbAge","b","I","I","EntityXPOrb","fk","net/minecraft/src","0" +"field_35126_c","unusedPickupCooldown","c","I","I","EntityXPOrb","fk","net/minecraft/src","0" +"field_35123_e","xpOrbHealth","d","I","I","EntityXPOrb","fk","net/minecraft/src","0" +"field_35125_ap","xpValue","e","I","I","EntityXPOrb","fk","net/minecraft/src","0" +"field_40015_a","field_40015_a","a","Z","Z","ComponentStrongholdPortalRoom","ir","net/minecraft/src","0" +"field_35753_a","minX","a","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_35751_b","minY","b","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_35752_c","minZ","c","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_35749_d","maxX","d","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_35750_e","maxY","e","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_35748_f","maxZ","f","I","I","StructureBoundingBox","nl","net/minecraft/src","0" +"field_1674_a","worldMap","a","LIBlockAccess;","Lkq;","PathFinder","rw","net/minecraft/src","0" +"field_1673_b","path","b","LPath;","Lzs;","PathFinder","rw","net/minecraft/src","0" +"field_1676_c","pointMap","c","LIntHashMap;","Lob;","PathFinder","rw","net/minecraft/src","0" +"field_1675_d","pathOptions","d","[LPathPoint;","[Lmo;","PathFinder","rw","net/minecraft/src","0" +"field_40167_a","field_40167_a","a","D","D","EntityDragon","oo","net/minecraft/src","0" +"field_40165_b","field_40165_b","b","D","D","EntityDragon","oo","net/minecraft/src","0" +"field_40166_c","field_40166_c","c","D","D","EntityDragon","oo","net/minecraft/src","0" +"field_40162_d","field_40162_d","d","[[D","[[D","EntityDragon","oo","net/minecraft/src","0" +"field_40164_e","field_40164_e","e","I","I","EntityDragon","oo","net/minecraft/src","0" +"field_40176_ao","dragonPartArray","f","[LDragonPart;","[Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40177_ap","field_40177_ap","g","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40171_aq","field_40171_aq","h","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40170_ar","field_40170_ar","i","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40169_as","field_40169_as","by","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40168_at","field_40168_at","bz","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40175_au","field_40175_au","bA","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40174_av","field_40174_av","bB","LDragonPart;","Lvc;","EntityDragon","oo","net/minecraft/src","0" +"field_40173_aw","field_40173_aw","bC","F","F","EntityDragon","oo","net/minecraft/src","0" +"field_40172_ax","field_40172_ax","bD","F","F","EntityDragon","oo","net/minecraft/src","0" +"field_40163_ay","field_40163_ay","bE","Z","Z","EntityDragon","oo","net/minecraft/src","0" +"field_40161_az","field_40161_az","bF","Z","Z","EntityDragon","oo","net/minecraft/src","0" +"field_40179_aC","field_40179_aC","bJ","LEntity;","Lia;","EntityDragon","oo","net/minecraft/src","0" +"field_40178_aA","field_40178_aA","bG","I","I","EntityDragon","oo","net/minecraft/src","0" +"field_41013_bH","field_41013_bH","bH","LEntityEnderCrystal;","Lsf;","EntityDragon","oo","net/minecraft/src","0" +"field_28146_a","mc","a","LMinecraft;","LMinecraft;","ThreadCheckHasPaid","hr","net/minecraft/src","0" +"field_15235_a","blockIndex","a","I","I","WorldGenLakes","qv","net/minecraft/src","0" +"field_35834_a","field_35834_a","a","J","J","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35832_b","field_35832_b","b","Ljava/lang/Object;","Ljava/lang/Object;","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35833_c","field_35833_c","c","LLongHashMapEntry;","Lahc;","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35831_d","field_35831_d","d","I","I","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_1763_a","worldObj","a","LWorld;","Lry;","WorldRenderer","ge","net/minecraft/src","0" +"field_1744_C","glRenderList","C","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1742_D","tessellator","D","LTessellator;","Lcv;","WorldRenderer","ge","net/minecraft/src","0" +"field_1762_b","chunksUpdated","b","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1761_c","posX","c","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1760_d","posY","d","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1759_e","posZ","e","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1758_f","sizeWidth","f","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1757_g","sizeHeight","g","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1756_h","sizeDepth","h","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1755_i","posXMinus","i","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1754_j","posYMinus","j","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1753_k","posZMinus","k","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1752_l","posXClip","l","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1751_m","posYClip","m","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1750_n","posZClip","n","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1749_o","isInFrustum","o","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1748_p","skipRenderPass","p","[Z","[Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1746_q","posXPlus","q","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1743_r","posYPlus","r","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1741_s","posZPlus","s","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1740_t","rendererRadius","t","F","F","WorldRenderer","ge","net/minecraft/src","0" +"field_1738_u","needsUpdate","u","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1736_v","rendererBoundingBox","v","LAxisAlignedBB;","Lc;","WorldRenderer","ge","net/minecraft/src","0" +"field_1735_w","chunkIndex","w","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1734_x","isVisible","x","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1733_y","isWaitingOnOcclusionQuery","y","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1732_z","glOcclusionQuery","z","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_1747_A","isChunkLit","A","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1739_E","isInitialized","E","Z","Z","WorldRenderer","ge","net/minecraft/src","0" +"field_1745_B","tileEntityRenderers","B","Ljava/util/List;","Ljava/util/List;","WorldRenderer","ge","net/minecraft/src","0" +"field_1737_F","tileEntities","F","Ljava/util/List;","Ljava/util/List;","WorldRenderer","ge","net/minecraft/src","0" +"field_40590_G","bytesDrawn","G","I","I","WorldRenderer","ge","net/minecraft/src","0" +"field_4157_a","liquidBlockId","a","I","I","WorldGenLiquids","ib","net/minecraft/src","0" +"field_27231_a","syncher","a","LStatsSyncher;","Ljq;","ThreadStatSyncherReceive","uf","net/minecraft/src","0" +"field_591_a","sndSystem","a","Lpaulscode/sound/SoundSystem;","Lpaulscode/sound/SoundSystem;","SoundManager","ahm","net/minecraft/src","0" +"field_590_b","soundPoolSounds","b","LSoundPool;","Lcf;","SoundManager","ahm","net/minecraft/src","0" +"field_589_c","soundPoolStreaming","c","LSoundPool;","Lcf;","SoundManager","ahm","net/minecraft/src","0" +"field_588_d","soundPoolMusic","d","LSoundPool;","Lcf;","SoundManager","ahm","net/minecraft/src","0" +"field_587_e","latestSoundID","e","I","I","SoundManager","ahm","net/minecraft/src","0" +"field_586_f","options","f","LGameSettings;","Lki;","SoundManager","ahm","net/minecraft/src","0" +"field_585_g","loaded","g","Z","Z","SoundManager","ahm","net/minecraft/src","0" +"field_584_h","rand","h","Ljava/util/Random;","Ljava/util/Random;","SoundManager","ahm","net/minecraft/src","0" +"field_583_i","ticksBeforeMusic","i","I","I","SoundManager","ahm","net/minecraft/src","0" +"field_27244_a","field_27244_a","a","Ljava/lang/String;","Ljava/lang/String;","J_JsonStringNodeBuilder","h","net/minecraft/src","0" +"field_1242_a","field_1242_a","a","I","I","RenderList","aak","net/minecraft/src","0" +"field_1241_b","field_1241_b","b","I","I","RenderList","aak","net/minecraft/src","0" +"field_1240_c","field_1240_c","c","I","I","RenderList","aak","net/minecraft/src","0" +"field_1239_d","field_1239_d","d","D","D","RenderList","aak","net/minecraft/src","0" +"field_1238_e","field_1238_e","e","D","D","RenderList","aak","net/minecraft/src","0" +"field_1237_f","field_1237_f","f","D","D","RenderList","aak","net/minecraft/src","0" +"field_1236_g","field_1236_g","g","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","RenderList","aak","net/minecraft/src","0" +"field_1235_h","field_1235_h","h","Z","Z","RenderList","aak","net/minecraft/src","0" +"field_1234_i","field_1234_i","i","Z","Z","RenderList","aak","net/minecraft/src","0" +"field_28060_a","tallGrassID","a","I","I","WorldGenTallGrass","ahu","net/minecraft/src","0" +"field_28059_b","tallGrassMetadata","b","I","I","WorldGenTallGrass","ahu","net/minecraft/src","0" +"field_1706_a","image","a","Ljava/awt/image/BufferedImage;","Ljava/awt/image/BufferedImage;","ThreadDownloadImageData","aap","net/minecraft/src","0" +"field_1705_b","referenceCount","b","I","I","ThreadDownloadImageData","aap","net/minecraft/src","0" +"field_1708_c","textureName","c","I","I","ThreadDownloadImageData","aap","net/minecraft/src","0" +"field_1707_d","textureSetupComplete","d","Z","Z","ThreadDownloadImageData","aap","net/minecraft/src","0" +"field_35971_a","textureWidth","a","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_35970_b","textureHeight","b","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1399_l","textureOffsetX","o","I","I","ModelRenderer","acf","net/minecraft/src","0" +"field_1398_m","textureOffsetY","p","I","I","ModelRenderer","acf","net/minecraft/src","0" +"field_1410_a","rotationPointX","c","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1409_b","rotationPointY","d","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1408_c","rotationPointZ","e","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1407_d","rotateAngleX","f","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1406_e","rotateAngleY","g","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1405_f","rotateAngleZ","h","F","F","ModelRenderer","acf","net/minecraft/src","0" +"field_1397_n","compiled","q","Z","Z","ModelRenderer","acf","net/minecraft/src","0" +"field_1396_o","displayList","r","I","I","ModelRenderer","acf","net/minecraft/src","0" +"field_1404_g","mirror","i","Z","Z","ModelRenderer","acf","net/minecraft/src","0" +"field_1403_h","showModel","j","Z","Z","ModelRenderer","acf","net/minecraft/src","0" +"field_1402_i","isHidden","k","Z","Z","ModelRenderer","acf","net/minecraft/src","0" +"field_40606_l","cubeList","l","Ljava/util/List;","Ljava/util/List;","ModelRenderer","acf","net/minecraft/src","0" +"field_40607_m","childModels","m","Ljava/util/List;","Ljava/util/List;","ModelRenderer","acf","net/minecraft/src","0" +"field_40605_n","boxName","n","Ljava/lang/String;","Ljava/lang/String;","ModelRenderer","acf","net/minecraft/src","0" +"field_40608_s","baseModel","s","LModelBase;","Lal;","ModelRenderer","acf","net/minecraft/src","0" +"field_829_a","delay","a","I","I","TileEntityMobSpawner","ze","net/minecraft/src","0" +"field_828_b","mobID","k","Ljava/lang/String;","Ljava/lang/String;","TileEntityMobSpawner","ze","net/minecraft/src","0" +"field_831_c","yaw","b","D","D","TileEntityMobSpawner","ze","net/minecraft/src","0" +"field_830_d","yaw2","j","D","D","TileEntityMobSpawner","ze","net/minecraft/src","0" +"field_35236_a","slot","a","I","I","Packet107CreativeSetSlot","dg","net/minecraft/src","0" +"field_40190_b","itemStack","b","LItemStack;","Ldk;","Packet107CreativeSetSlot","dg","net/minecraft/src","0" +"field_1772_a","blockAccess","a","LIBlockAccess;","Lkq;","RenderBlocks","acr","net/minecraft/src","0" +"field_1771_b","overrideBlockTexture","e","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_1774_c","flipTexture","f","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_1773_d","renderAllFaces","g","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_27406_a","fancyGrass","b","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_31088_b","useInventoryTint","c","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_35942_c","catchesLight","d","[Z","[Z","RenderBlocks","acr","net/minecraft/src","0" +"field_31087_g","uvRotateEast","h","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_31086_h","uvRotateWest","i","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_31085_i","uvRotateSouth","j","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_31084_j","uvRotateNorth","k","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_31083_k","uvRotateTop","l","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_31082_l","uvRotateBottom","m","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_22385_e","enableAO","n","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22384_f","lightValueOwn","o","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22383_g","aoLightValueXNeg","p","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22382_h","aoLightValueYNeg","q","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22381_i","aoLightValueZNeg","r","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22380_j","aoLightValueXPos","s","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22379_k","aoLightValueYPos","t","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22378_l","aoLightValueZPos","u","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22377_m","aoLightValueScratchXYZNNN","v","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22376_n","aoLightValueScratchXYNN","w","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22375_o","aoLightValueScratchXYZNNP","x","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22374_p","aoLightValueScratchYZNN","y","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22373_q","aoLightValueScratchYZNP","z","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22372_r","aoLightValueScratchXYZPNN","A","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22371_s","aoLightValueScratchXYPN","B","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22370_t","aoLightValueScratchXYZPNP","C","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22369_u","aoLightValueScratchXYZNPN","D","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22368_v","aoLightValueScratchXYNP","E","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22367_w","aoLightValueScratchXYZNPP","F","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22366_x","aoLightValueScratchYZPN","G","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22365_y","aoLightValueScratchXYZPPN","H","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22364_z","aoLightValueScratchXYPP","I","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22362_A","aoLightValueScratchYZPP","J","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22360_B","aoLightValueScratchXYZPPP","K","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22358_C","aoLightValueScratchXZNN","L","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22356_D","aoLightValueScratchXZPN","M","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22354_E","aoLightValueScratchXZNP","N","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22353_F","aoLightValueScratchXZPP","O","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_35936_P","aoBrightnessXYZNNN","P","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35935_Q","aoBrightnessXYNN","Q","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35938_R","aoBrightnessXYZNNP","R","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35937_S","aoBrightnessYZNN","S","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35932_T","aoBrightnessYZNP","T","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35931_U","aoBrightnessXYZPNN","U","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35934_V","aoBrightnessXYPN","V","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35933_W","aoBrightnessXYZPNP","W","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35940_X","aoBrightnessXYZNPN","X","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35939_Y","aoBrightnessXYNP","Y","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35941_Z","aoBrightnessXYZNPP","Z","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35951_aa","aoBrightnessYZPN","aa","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35952_ab","aoBrightnessXYZPPN","ab","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35949_ac","aoBrightnessXYPP","ac","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35950_ad","aoBrightnessYZPP","ad","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35955_ae","aoBrightnessXYZPPP","ae","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35956_af","aoBrightnessXZNN","af","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35953_ag","aoBrightnessXZPN","ag","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35954_ah","aoBrightnessXZNP","ah","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35945_ai","aoBrightnessXZPP","ai","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35946_aj","aoType","aj","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35943_ak","brightnessTopLeft","ak","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35944_al","brightnessBottomLeft","al","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35947_am","brightnessBottomRight","am","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_35948_an","brightnessTopRight","an","I","I","RenderBlocks","acr","net/minecraft/src","0" +"field_22351_H","colorRedTopLeft","ao","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22350_I","colorRedBottomLeft","ap","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22349_J","colorRedBottomRight","aq","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22348_K","colorRedTopRight","ar","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22347_L","colorGreenTopLeft","as","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22346_M","colorGreenBottomLeft","at","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22345_N","colorGreenBottomRight","au","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22344_O","colorGreenTopRight","av","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22343_P","colorBlueTopLeft","aw","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22342_Q","colorBlueBottomLeft","ax","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22341_R","colorBlueBottomRight","ay","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22340_S","colorBlueTopRight","az","F","F","RenderBlocks","acr","net/minecraft/src","0" +"field_22339_T","aoGrassXYZCPN","aA","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22338_U","aoGrassXYZPPC","aB","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22337_V","aoGrassXYZNPC","aC","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22336_W","aoGrassXYZCPP","aD","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22335_X","aoGrassXYZNCN","aE","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22334_Y","aoGrassXYZPCP","aF","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22333_Z","aoGrassXYZNCP","aG","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22363_aa","aoGrassXYZPCN","aH","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22361_ab","aoGrassXYZCNN","aI","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22359_ac","aoGrassXYZPNC","aJ","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22357_ad","aoGrassXYZNNC","aK","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_22355_ae","aoGrassXYZCNP","aL","Z","Z","RenderBlocks","acr","net/minecraft/src","0" +"field_35038_a","field_35038_a","a","LStructureStrongholdPieceWeight;","Lci;","ComponentStrongholdStairs2","aeh","net/minecraft/src","0" +"field_40009_b","field_40009_b","b","LComponentStrongholdPortalRoom;","Lir;","ComponentStrongholdStairs2","aeh","net/minecraft/src","0" +"field_35037_b","field_35037_b","c","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentStrongholdStairs2","aeh","net/minecraft/src","0" +"field_25049_a","looksWithInterest","a","Z","Z","EntityWolf","aik","net/minecraft/src","0" +"field_25048_b","field_25048_b","b","F","F","EntityWolf","aik","net/minecraft/src","0" +"field_25054_c","field_25054_c","c","F","F","EntityWolf","aik","net/minecraft/src","0" +"field_25053_f","isWolfShaking","d","Z","Z","EntityWolf","aik","net/minecraft/src","0" +"field_25052_g","field_25052_g","e","Z","Z","EntityWolf","aik","net/minecraft/src","0" +"field_25051_h","timeWolfIsShaking","f","F","F","EntityWolf","aik","net/minecraft/src","0" +"field_25050_i","prevTimeWolfIsShaking","g","F","F","EntityWolf","aik","net/minecraft/src","0" +"field_321_a","doorMaterial","a","LMaterial;","Lp;","ItemDoor","zg","net/minecraft/src","0" +"field_6496_e","texturePackZipFile","e","Ljava/util/zip/ZipFile;","Ljava/util/zip/ZipFile;","TexturePackCustom","adw","net/minecraft/src","0" +"field_6495_f","texturePackName","f","I","I","TexturePackCustom","adw","net/minecraft/src","0" +"field_6494_g","texturePackThumbnail","g","Ljava/awt/image/BufferedImage;","Ljava/awt/image/BufferedImage;","TexturePackCustom","adw","net/minecraft/src","0" +"field_6493_h","texturePackFile","h","Ljava/io/File;","Ljava/io/File;","TexturePackCustom","adw","net/minecraft/src","0" +"field_22320_a","randomSeed","a","J","J","WorldInfo","si","net/minecraft/src","0" +"field_22319_b","spawnX","b","I","I","WorldInfo","si","net/minecraft/src","0" +"field_22318_c","spawnY","c","I","I","WorldInfo","si","net/minecraft/src","0" +"field_22317_d","spawnZ","d","I","I","WorldInfo","si","net/minecraft/src","0" +"field_22316_e","worldTime","e","J","J","WorldInfo","si","net/minecraft/src","0" +"field_22315_f","lastTimePlayed","f","J","J","WorldInfo","si","net/minecraft/src","0" +"field_22314_g","sizeOnDisk","g","J","J","WorldInfo","si","net/minecraft/src","0" +"field_22313_h","playerTag","h","LNBTTagCompound;","Lik;","WorldInfo","si","net/minecraft/src","0" +"field_22312_i","dimension","i","I","I","WorldInfo","si","net/minecraft/src","0" +"field_22311_j","levelName","j","Ljava/lang/String;","Ljava/lang/String;","WorldInfo","si","net/minecraft/src","0" +"field_22310_k","saveVersion","k","I","I","WorldInfo","si","net/minecraft/src","0" +"field_27404_l","raining","l","Z","Z","WorldInfo","si","net/minecraft/src","0" +"field_27403_m","rainTime","m","I","I","WorldInfo","si","net/minecraft/src","0" +"field_27402_n","thundering","n","Z","Z","WorldInfo","si","net/minecraft/src","0" +"field_27401_o","thunderTime","o","I","I","WorldInfo","si","net/minecraft/src","0" +"field_35920_p","gameType","p","I","I","WorldInfo","si","net/minecraft/src","0" +"field_35919_q","mapFeaturesEnabled","q","Z","Z","WorldInfo","si","net/minecraft/src","0" +"field_40725_r","hardcore","r","Z","Z","WorldInfo","si","net/minecraft/src","0" +"field_471_a","packetIdToClassMap","j","LIntHashMap;","Lob;","Packet","gt","net/minecraft/src","0" +"field_470_b","packetClassToIdMap","a","Ljava/util/Map;","Ljava/util/Map;","Packet","gt","net/minecraft/src","0" +"field_26906_c","clientPacketIdList","b","Ljava/util/Set;","Ljava/util/Set;","Packet","gt","net/minecraft/src","0" +"field_26905_d","serverPacketIdList","c","Ljava/util/Set;","Ljava/util/Set;","Packet","gt","net/minecraft/src","0" +"field_20018_j","creationTimeMillis","k","J","J","Packet","gt","net/minecraft/src","0" +"field_472_j","isChunkDataPacket","l","Z","Z","Packet","gt","net/minecraft/src","0" +"field_1672_a","logo","a","Ljava/awt/image/BufferedImage;","Ljava/awt/image/BufferedImage;","CanvasMojangLogo","td","net/minecraft/src","0" +"field_40141_a","profession","a","I","I","EntityVillager","ai","net/minecraft/src","0" +"field_864_a","nextEntityID","a","I","I","Entity","ia","net/minecraft/src","0" +"field_620_ab","entityId","j","I","I","Entity","ia","net/minecraft/src","0" +"field_619_ac","renderDistanceWeight","k","D","D","Entity","ia","net/minecraft/src","0" +"field_618_ad","preventEntitySpawning","l","Z","Z","Entity","ia","net/minecraft/src","0" +"field_617_ae","riddenByEntity","m","LEntity;","Lia;","Entity","ia","net/minecraft/src","0" +"field_616_af","ridingEntity","n","LEntity;","Lia;","Entity","ia","net/minecraft/src","0" +"field_615_ag","worldObj","o","LWorld;","Lry;","Entity","ia","net/minecraft/src","0" +"field_9285_at","prevPosX","p","D","D","Entity","ia","net/minecraft/src","0" +"field_9284_au","prevPosY","q","D","D","Entity","ia","net/minecraft/src","0" +"field_9283_av","prevPosZ","r","D","D","Entity","ia","net/minecraft/src","0" +"field_611_ak","posX","s","D","D","Entity","ia","net/minecraft/src","0" +"field_610_al","posY","t","D","D","Entity","ia","net/minecraft/src","0" +"field_609_am","posZ","u","D","D","Entity","ia","net/minecraft/src","0" +"field_608_an","motionX","v","D","D","Entity","ia","net/minecraft/src","0" +"field_607_ao","motionY","w","D","D","Entity","ia","net/minecraft/src","0" +"field_606_ap","motionZ","x","D","D","Entity","ia","net/minecraft/src","0" +"field_605_aq","rotationYaw","y","F","F","Entity","ia","net/minecraft/src","0" +"field_604_ar","rotationPitch","z","F","F","Entity","ia","net/minecraft/src","0" +"field_603_as","prevRotationYaw","A","F","F","Entity","ia","net/minecraft/src","0" +"field_602_at","prevRotationPitch","B","F","F","Entity","ia","net/minecraft/src","0" +"field_601_au","boundingBox","C","LAxisAlignedBB;","Lc;","Entity","ia","net/minecraft/src","0" +"field_9298_aH","onGround","D","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9297_aI","isCollidedHorizontally","E","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9296_aJ","isCollidedVertically","F","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9295_aK","isCollided","G","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9294_aL","velocityChanged","H","Z","Z","Entity","ia","net/minecraft/src","0" +"field_27016_ba","isInWeb","I","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9293_aM","field_9293_aM","J","Z","Z","Entity","ia","net/minecraft/src","0" +"field_646_aA","isDead","K","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9292_aO","yOffset","L","F","F","Entity","ia","net/minecraft/src","0" +"field_644_aC","width","M","F","F","Entity","ia","net/minecraft/src","0" +"field_643_aD","height","N","F","F","Entity","ia","net/minecraft/src","0" +"field_9291_aR","prevDistanceWalkedModified","O","F","F","Entity","ia","net/minecraft/src","0" +"field_9290_aS","distanceWalkedModified","P","F","F","Entity","ia","net/minecraft/src","0" +"field_9288_aU","fallDistance","Q","F","F","Entity","ia","net/minecraft/src","0" +"field_863_b","nextStepDistance","b","I","I","Entity","ia","net/minecraft/src","0" +"field_638_aI","lastTickPosX","R","D","D","Entity","ia","net/minecraft/src","0" +"field_637_aJ","lastTickPosY","S","D","D","Entity","ia","net/minecraft/src","0" +"field_636_aK","lastTickPosZ","T","D","D","Entity","ia","net/minecraft/src","0" +"field_9287_aY","ySize","U","F","F","Entity","ia","net/minecraft/src","0" +"field_9286_aZ","stepHeight","V","F","F","Entity","ia","net/minecraft/src","0" +"field_9314_ba","noClip","W","Z","Z","Entity","ia","net/minecraft/src","0" +"field_632_aO","entityCollisionReduction","X","F","F","Entity","ia","net/minecraft/src","0" +"field_9312_bd","rand","Y","Ljava/util/Random;","Ljava/util/Random;","Entity","ia","net/minecraft/src","0" +"field_9311_be","ticksExisted","Z","I","I","Entity","ia","net/minecraft/src","0" +"field_9310_bf","fireResistance","aa","I","I","Entity","ia","net/minecraft/src","0" +"field_9309_bg","fire","c","I","I","Entity","ia","net/minecraft/src","0" +"field_9307_bi","inWater","ab","Z","Z","Entity","ia","net/minecraft/src","0" +"field_9306_bj","heartsLife","ac","I","I","Entity","ia","net/minecraft/src","0" +"field_862_c","firstUpdate","d","Z","Z","Entity","ia","net/minecraft/src","0" +"field_20047_bv","skinUrl","ad","Ljava/lang/String;","Ljava/lang/String;","Entity","ia","net/minecraft/src","0" +"field_622_aY","cloakUrl","ae","Ljava/lang/String;","Ljava/lang/String;","Entity","ia","net/minecraft/src","0" +"field_9304_bm","isImmuneToFire","af","Z","Z","Entity","ia","net/minecraft/src","0" +"field_21064_bx","dataWatcher","ag","LDataWatcher;","Lcr;","Entity","ia","net/minecraft/src","0" +"field_861_d","entityRiderPitchDelta","e","D","D","Entity","ia","net/minecraft/src","0" +"field_667_e","entityRiderYawDelta","f","D","D","Entity","ia","net/minecraft/src","0" +"field_621_aZ","addedToChunk","ah","Z","Z","Entity","ia","net/minecraft/src","0" +"field_657_ba","chunkCoordX","ai","I","I","Entity","ia","net/minecraft/src","0" +"field_656_bb","chunkCoordY","aj","I","I","Entity","ia","net/minecraft/src","0" +"field_654_bc","chunkCoordZ","ak","I","I","Entity","ia","net/minecraft/src","0" +"field_9303_br","serverPosX","al","I","I","Entity","ia","net/minecraft/src","0" +"field_9302_bs","serverPosY","am","I","I","Entity","ia","net/minecraft/src","0" +"field_9301_bt","serverPosZ","an","I","I","Entity","ia","net/minecraft/src","0" +"field_28016_bK","ignoreFrustumCheck","ao","Z","Z","Entity","ia","net/minecraft/src","0" +"field_35118_ao","isAirBorne","ap","Z","Z","Entity","ia","net/minecraft/src","0" +"field_40699_a","field_40699_a","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"field_40697_b","field_40697_b","b","I","I","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"field_40698_c","field_40698_c","c","I","I","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"field_40695_d","field_40695_d","d","I","I","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"field_40696_e","field_40696_e","e","Z","Z","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"field_41046_a","field_41046_a","a","I","I","GuiWinGame","lt","net/minecraft/src","0" +"field_41044_b","field_41044_b","b","Ljava/util/List;","Ljava/util/List;","GuiWinGame","lt","net/minecraft/src","0" +"field_41045_c","field_41045_c","c","[I","[I","GuiWinGame","lt","net/minecraft/src","0" +"field_41042_d","field_41042_d","d","I","I","GuiWinGame","lt","net/minecraft/src","0" +"field_41043_e","field_41043_e","e","F","F","GuiWinGame","lt","net/minecraft/src","0" +"field_27299_a","statsGUI","a","LGuiStats;","Lin;","SorterStatsBlock","agt","net/minecraft/src","0" +"field_27298_b","slotStatsBlockGUI","b","LGuiSlotStatsBlock;","Lhz;","SorterStatsBlock","agt","net/minecraft/src","0" +"field_468_a","glowing","a","Z","Z","BlockRedstoneOre","oc","net/minecraft/src","0" +"field_35589_a","lootArray","a","[LStructurePieceTreasure;","[Lagq;","StructureMineshaftPieces","aez","net/minecraft/src","0" +"field_27320_a","JSON_FORMATTER","a","LJ_JsonFormatter;","Lwo;","J_JsonNodeDoesNotMatchPathElementsException","xo","net/minecraft/src","0" +"field_4013_a","modelBipedMain","a","LModelBiped;","Lfa;","RenderBiped","tp","net/minecraft/src","0" +"field_40296_d","field_40296_d","b","F","F","RenderBiped","tp","net/minecraft/src","0" +"field_35795_a","name","a","Ljava/lang/String;","Ljava/lang/String;","ServerNBTStorage","lo","net/minecraft/src","0" +"field_35793_b","host","b","Ljava/lang/String;","Ljava/lang/String;","ServerNBTStorage","lo","net/minecraft/src","0" +"field_35794_c","playerCount","c","Ljava/lang/String;","Ljava/lang/String;","ServerNBTStorage","lo","net/minecraft/src","0" +"field_35791_d","motd","d","Ljava/lang/String;","Ljava/lang/String;","ServerNBTStorage","lo","net/minecraft/src","0" +"field_35792_e","lag","e","J","J","ServerNBTStorage","lo","net/minecraft/src","0" +"field_35790_f","polled","f","Z","Z","ServerNBTStorage","lo","net/minecraft/src","0" +"field_1089_a","doubleValue","a","D","D","NBTTagDouble","fg","net/minecraft/src","0" +"field_4287_a","dateFormat","a","Ljava/text/DateFormat;","Ljava/text/DateFormat;","ScreenShotHelper","abx","net/minecraft/src","0" +"field_4286_b","buffer","b","Ljava/nio/ByteBuffer;","Ljava/nio/ByteBuffer;","ScreenShotHelper","abx","net/minecraft/src","0" +"field_4289_c","pixelData","c","[B","[B","ScreenShotHelper","abx","net/minecraft/src","0" +"field_4288_d","imageData","d","[I","[I","ScreenShotHelper","abx","net/minecraft/src","0" +"field_957_h","parentScreen","b","LGuiScreen;","Lxe;","GuiControls","ee","net/minecraft/src","0" +"field_954_a","screenTitle","a","Ljava/lang/String;","Ljava/lang/String;","GuiControls","ee","net/minecraft/src","0" +"field_956_i","options","c","LGameSettings;","Lki;","GuiControls","ee","net/minecraft/src","0" +"field_955_j","buttonId","d","I","I","GuiControls","ee","net/minecraft/src","0" +"field_20157_a","allowedCharacters","a","Ljava/lang/String;","Ljava/lang/String;","ChatAllowedCharacters","age","net/minecraft/src","0" +"field_22286_b","allowedCharactersArray","b","[C","[C","ChatAllowedCharacters","age","net/minecraft/src","0" +"field_1700_g","boundingBoxes","g","Ljava/util/List;","Ljava/util/List;","AxisAlignedBB","c","net/minecraft/src","0" +"field_1699_h","numBoundingBoxesInUse","h","I","I","AxisAlignedBB","c","net/minecraft/src","0" +"field_1698_a","minX","a","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_1697_b","minY","b","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_1704_c","minZ","c","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_1703_d","maxX","d","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_1702_e","maxY","e","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_1701_f","maxZ","f","D","D","AxisAlignedBB","c","net/minecraft/src","0" +"field_884_a","minableBlockId","a","I","I","WorldGenMinable","ky","net/minecraft/src","0" +"field_883_b","numberOfBlocks","b","I","I","WorldGenMinable","ky","net/minecraft/src","0" +"field_1195_a","vertexPositions","a","[LPositionTextureVertex;","[Lfs;","TexturedQuad","pv","net/minecraft/src","0" +"field_1194_b","nVertices","b","I","I","TexturedQuad","pv","net/minecraft/src","0" +"field_1196_c","invertNormal","c","Z","Z","TexturedQuad","pv","net/minecraft/src","0" +"field_35509_b","allowedBiomes","b","[LBiomeGenBase;","[Lsr;","GenLayerVillageLandscape","afa","net/minecraft/src","0" +"field_826_a","signText","a","[Ljava/lang/String;","[Ljava/lang/String;","TileEntitySign","u","net/minecraft/src","0" +"field_825_b","lineBeingEdited","b","I","I","TileEntitySign","u","net/minecraft/src","0" +"field_25062_c","isEditable","j","Z","Z","TileEntitySign","u","net/minecraft/src","0" +"field_35046_a","field_35046_a","a","LEnumDoor;","Lmj;","ComponentStrongholdLeftTurn","hq","net/minecraft/src","0" +"field_20038_a","windowId","a","I","I","Packet100OpenWindow","wm","net/minecraft/src","0" +"field_20037_b","inventoryType","b","I","I","Packet100OpenWindow","wm","net/minecraft/src","0" +"field_20040_c","windowTitle","c","Ljava/lang/String;","Ljava/lang/String;","Packet100OpenWindow","wm","net/minecraft/src","0" +"field_20039_d","slotsCount","d","I","I","Packet100OpenWindow","wm","net/minecraft/src","0" +"field_35094_a","field_35094_a","a","I","I","ComponentVillageWoodHut","wi","net/minecraft/src","0" +"field_35092_b","field_35092_b","b","Z","Z","ComponentVillageWoodHut","wi","net/minecraft/src","0" +"field_35093_c","field_35093_c","c","I","I","ComponentVillageWoodHut","wi","net/minecraft/src","0" +"field_35377_b","field_35377_b","b","LModelChest;","Lxl;","TileEntityChestRenderer","fv","net/minecraft/src","0" +"field_35378_c","field_35378_c","c","LModelChest;","Lxl;","TileEntityChestRenderer","fv","net/minecraft/src","0" +"field_500_a","entityId","a","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_499_b","xPosition","b","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_503_c","yPosition","c","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_502_d","zPosition","d","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28047_e","field_28047_e","e","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28046_f","field_28046_f","f","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28045_g","field_28045_g","g","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_501_e","type","h","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28044_i","field_28044_i","i","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_1718_a","xCoord","a","I","I","PathPoint","mo","net/minecraft/src","0" +"field_1717_b","yCoord","b","I","I","PathPoint","mo","net/minecraft/src","0" +"field_1716_c","zCoord","c","I","I","PathPoint","mo","net/minecraft/src","0" +"field_1715_d","hash","j","I","I","PathPoint","mo","net/minecraft/src","0" +"field_1714_e","index","d","I","I","PathPoint","mo","net/minecraft/src","0" +"field_1713_f","totalPathDistance","e","F","F","PathPoint","mo","net/minecraft/src","0" +"field_1712_g","distanceToNext","f","F","F","PathPoint","mo","net/minecraft/src","0" +"field_1711_h","distanceToTarget","g","F","F","PathPoint","mo","net/minecraft/src","0" +"field_1710_i","previous","h","LPathPoint;","Lmo;","PathPoint","mo","net/minecraft/src","0" +"field_1709_j","isFirst","i","Z","Z","PathPoint","mo","net/minecraft/src","0" +"field_4258_a","body","g","LModelRenderer;","Lacf;","ModelGhast","mu","net/minecraft/src","0" +"field_4257_b","tentacles","h","[LModelRenderer;","[Lacf;","ModelGhast","mu","net/minecraft/src","0" +"field_35375_a","itemList","a","Ljava/util/List;","Ljava/util/List;","ContainerCreative","afp","net/minecraft/src","0" +"field_40139_a","field_40139_a","a","F","F","EntitySlime","aed","net/minecraft/src","0" +"field_768_a","field_768_a","b","F","F","EntitySlime","aed","net/minecraft/src","0" +"field_767_b","field_767_b","c","F","F","EntitySlime","aed","net/minecraft/src","0" +"field_769_d","slimeJumpDelay","d","I","I","EntitySlime","aed","net/minecraft/src","0" +"field_40679_h","field_40679_h","h","[LPositionTextureVertex;","[Lfs;","ModelBox","ad","net/minecraft/src","0" +"field_40680_i","field_40680_i","i","[LTexturedQuad;","[Lpv;","ModelBox","ad","net/minecraft/src","0" +"field_40678_a","field_40678_a","a","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40676_b","field_40676_b","b","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40677_c","field_40677_c","c","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40674_d","field_40674_d","d","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40675_e","field_40675_e","e","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40672_f","field_40672_f","f","F","F","ModelBox","ad","net/minecraft/src","0" +"field_40673_g","field_40673_g","g","Ljava/lang/String;","Ljava/lang/String;","ModelBox","ad","net/minecraft/src","0" +"field_20024_a","window_Id","a","I","I","Packet102WindowClick","aa","net/minecraft/src","0" +"field_20023_b","inventorySlot","b","I","I","Packet102WindowClick","aa","net/minecraft/src","0" +"field_20027_c","mouseClick","c","I","I","Packet102WindowClick","aa","net/minecraft/src","0" +"field_20026_d","action","d","S","S","Packet102WindowClick","aa","net/minecraft/src","0" +"field_20025_e","itemStack","e","LItemStack;","Ldk;","Packet102WindowClick","aa","net/minecraft/src","0" +"field_27050_f","holdingShift","f","Z","Z","Packet102WindowClick","aa","net/minecraft/src","0" +"field_20925_a","modelMinecart","a","LModelBase;","Lal;","RenderMinecart","pg","net/minecraft/src","0" +"field_40345_a","field_40345_a","g","[LModelRenderer;","[Lacf;","ModelMagmaCube","agy","net/minecraft/src","0" +"field_40344_b","field_40344_b","h","LModelRenderer;","Lacf;","ModelMagmaCube","agy","net/minecraft/src","0" +"field_996_h","parentScreen","b","LGuiScreen;","Lxe;","GuiOptions","ex","net/minecraft/src","0" +"field_994_a","screenTitle","a","Ljava/lang/String;","Ljava/lang/String;","GuiOptions","ex","net/minecraft/src","0" +"field_995_i","options","c","LGameSettings;","Lki;","GuiOptions","ex","net/minecraft/src","0" +"field_22135_k","relevantOptions","d","[LEnumOptions;","[Llp;","GuiOptions","ex","net/minecraft/src","0" +"field_35230_a","experience","a","F","F","Packet43Experience","nw","net/minecraft/src","0" +"field_35228_b","experienceTotal","b","I","I","Packet43Experience","nw","net/minecraft/src","0" +"field_35229_c","experienceLevel","c","I","I","Packet43Experience","nw","net/minecraft/src","0" +"field_35410_a","field_35410_a","a","LGuiMultiplayer;","Lxi;","GuiSlotServer","jo","net/minecraft/src","0" +"field_1143_g","field_1143_g","g","[F","[F","TextureLavaFlowFX","ss","net/minecraft/src","0" +"field_1142_h","field_1142_h","h","[F","[F","TextureLavaFlowFX","ss","net/minecraft/src","0" +"field_1141_i","field_1141_i","i","[F","[F","TextureLavaFlowFX","ss","net/minecraft/src","0" +"field_1140_j","field_1140_j","j","[F","[F","TextureLavaFlowFX","ss","net/minecraft/src","0" +"field_1139_k","field_1139_k","k","I","I","TextureLavaFlowFX","ss","net/minecraft/src","0" +"field_6529_a","foliageBuffer","a","[I","[I","ColorizerFoliage","db","net/minecraft/src","0" +"field_972_j","itemRenderer","a","LRenderItem;","Liw;","GuiContainer","mg","net/minecraft/src","0" +"field_971_a","xSize","b","I","I","GuiContainer","mg","net/minecraft/src","0" +"field_974_h","ySize","c","I","I","GuiContainer","mg","net/minecraft/src","0" +"field_973_i","inventorySlots","d","LContainer;","Lpj;","GuiContainer","mg","net/minecraft/src","0" +"field_40216_e","guiLeft","e","I","I","GuiContainer","mg","net/minecraft/src","0" +"field_40215_f","guiTop","f","I","I","GuiContainer","mg","net/minecraft/src","0" +"field_22039_a","strafeMovement","a","F","F","Packet27Position","zi","net/minecraft/src","0" +"field_22038_b","fowardMovement","b","F","F","Packet27Position","zi","net/minecraft/src","0" +"field_22043_c","isSneaking","c","Z","Z","Packet27Position","zi","net/minecraft/src","0" +"field_22042_d","isInJump","d","Z","Z","Packet27Position","zi","net/minecraft/src","0" +"field_22041_e","pitchRotation","e","F","F","Packet27Position","zi","net/minecraft/src","0" +"field_22040_f","yawRotation","f","F","F","Packet27Position","zi","net/minecraft/src","0" +"OPENING","OPENING","a","LEnumDoor;","Lmj;","EnumDoor","mj","net/minecraft/src","0" +"WOOD_DOOR","WOOD_DOOR","b","LEnumDoor;","Lmj;","EnumDoor","mj","net/minecraft/src","0" +"GRATES","GRATES","c","LEnumDoor;","Lmj;","EnumDoor","mj","net/minecraft/src","0" +"IRON_DOOR","IRON_DOOR","d","LEnumDoor;","Lmj;","EnumDoor","mj","net/minecraft/src","0" +"field_35825_e","allDoors","e","[LEnumDoor;","[Lmj;","EnumDoor","mj","net/minecraft/src","0" +"field_20155_a","enumOptionsMappingHelperArray","a","[I","[I","EnumOptionsMappingHelper","ka","net/minecraft/src","0" +"field_978_j","furnaceInventory","g","LTileEntityFurnace;","Loe;","GuiFurnace","aaw","net/minecraft/src","0" +"field_35070_a","field_35070_a","a","Z","Z","ComponentMineshaftCorridor","aba","net/minecraft/src","0" +"field_35068_b","field_35068_b","b","Z","Z","ComponentMineshaftCorridor","aba","net/minecraft/src","0" +"field_35069_c","field_35069_c","c","Z","Z","ComponentMineshaftCorridor","aba","net/minecraft/src","0" +"field_35067_d","field_35067_d","d","I","I","ComponentMineshaftCorridor","aba","net/minecraft/src","0" +"field_4225_g","mc","g","LMinecraft;","LMinecraft;","TextureWatchFX","at","net/minecraft/src","0" +"field_4224_h","watchIconImageData","h","[I","[I","TextureWatchFX","at","net/minecraft/src","0" +"field_4223_i","dialImageData","i","[I","[I","TextureWatchFX","at","net/minecraft/src","0" +"field_4222_j","field_4222_j","j","D","D","TextureWatchFX","at","net/minecraft/src","0" +"field_4221_k","field_4221_k","k","D","D","TextureWatchFX","at","net/minecraft/src","0" +"field_801_a","item","a","LItemStack;","Ldk;","EntityItem","ih","net/minecraft/src","0" +"field_803_e","field_803_e","e","I","I","EntityItem","ih","net/minecraft/src","0" +"field_800_b","age","b","I","I","EntityItem","ih","net/minecraft/src","0" +"field_805_c","delayBeforeCanPickup","c","I","I","EntityItem","ih","net/minecraft/src","0" +"field_802_f","health","f","I","I","EntityItem","ih","net/minecraft/src","0" +"field_804_d","field_804_d","d","F","F","EntityItem","ih","net/minecraft/src","0" +"field_787_a","movementInput","b","LMovementInput;","Lagn;","EntityPlayerSP","di","net/minecraft/src","0" +"field_788_bg","mc","c","LMinecraft;","LMinecraft;","EntityPlayerSP","di","net/minecraft/src","0" +"field_35224_c","sprintToggleTimer","d","I","I","EntityPlayerSP","di","net/minecraft/src","0" +"field_35221_d","sprintingTicksLeft","e","I","I","EntityPlayerSP","di","net/minecraft/src","0" +"field_35222_e","renderArmYaw","f","F","F","EntityPlayerSP","di","net/minecraft/src","0" +"field_35223_ap","renderArmPitch","g","F","F","EntityPlayerSP","di","net/minecraft/src","0" +"field_35226_aq","prevRenderArmYaw","h","F","F","EntityPlayerSP","di","net/minecraft/src","0" +"field_35225_ar","prevRenderArmPitch","i","F","F","EntityPlayerSP","di","net/minecraft/src","0" +"field_21903_bJ","field_21903_bJ","a","LMouseFilter;","Lne;","EntityPlayerSP","di","net/minecraft/src","0" +"field_21904_bK","field_21904_bK","cj","LMouseFilter;","Lne;","EntityPlayerSP","di","net/minecraft/src","0" +"field_21902_bL","field_21902_bL","ck","LMouseFilter;","Lne;","EntityPlayerSP","di","net/minecraft/src","0" +"field_35512_b","field_35512_b","b","LGenLayer;","Ljx;","GenLayerRiverMix","na","net/minecraft/src","0" +"field_35513_c","field_35513_c","c","LGenLayer;","Ljx;","GenLayerRiverMix","na","net/minecraft/src","0" +"field_1088_a","shortValue","a","S","S","NBTTagShort","cg","net/minecraft/src","0" +"WOOD","WOOD","a","LEnumToolMaterial;","Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"STONE","STONE","b","LEnumToolMaterial;","Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"IRON","IRON","c","LEnumToolMaterial;","Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"EMERALD","EMERALD","d","LEnumToolMaterial;","Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"GOLD","GOLD","e","LEnumToolMaterial;","Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"field_21213_f","harvestLevel","f","I","I","EnumToolMaterial","nu","net/minecraft/src","0" +"field_21212_g","maxUses","g","I","I","EnumToolMaterial","nu","net/minecraft/src","0" +"field_21211_h","efficiencyOnProperMaterial","h","F","F","EnumToolMaterial","nu","net/minecraft/src","0" +"field_21210_i","damageVsEntity","i","I","I","EnumToolMaterial","nu","net/minecraft/src","0" +"field_40732_j","enchantability","j","I","I","EnumToolMaterial","nu","net/minecraft/src","0" +"field_21209_j","allToolMaterials","k","[LEnumToolMaterial;","[Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"field_467_a","triggerMobType","a","LEnumMobType;","Lxb;","BlockPressurePlate","wx","net/minecraft/src","0" +"field_28135_a","anaglyphEnable","a","Z","Z","EntityRenderer","adt","net/minecraft/src","0" +"field_28134_b","anaglyphField","b","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_1388_h","mc","r","LMinecraft;","LMinecraft;","EntityRenderer","adt","net/minecraft/src","0" +"field_1387_i","farPlaneDistance","s","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_1395_a","itemRenderer","c","LItemRenderer;","Ln;","EntityRenderer","adt","net/minecraft/src","0" +"field_1386_j","rendererUpdateCount","t","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_1385_k","pointedEntity","u","LEntity;","Lia;","EntityRenderer","adt","net/minecraft/src","0" +"field_22235_l","mouseFilterXAxis","v","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22234_m","mouseFilterYAxis","w","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22233_n","mouseFilterDummy1","x","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22232_o","mouseFilterDummy2","y","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22231_p","mouseFilterDummy3","z","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22229_q","mouseFilterDummy4","A","LMouseFilter;","Lne;","EntityRenderer","adt","net/minecraft/src","0" +"field_22228_r","thirdPersonDistance","B","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22227_s","thirdPersonDistanceTemp","C","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22226_t","debugCamYaw","D","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22225_u","prevDebugCamYaw","E","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22224_v","debugCamPitch","F","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22223_w","prevDebugCamPitch","G","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_40682_H","smoothCamYaw","H","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_40683_I","smoothCamPitch","I","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_40684_J","smoothCamFilterX","J","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_40685_K","smoothCamFilterY","K","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_40681_L","smoothCamPartialTicks","L","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22222_x","debugCamFOV","M","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22221_y","prevDebugCamFOV","N","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22220_z","camRoll","O","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_22230_A","prevCamRoll","P","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35818_d","emptyTexture","d","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_35811_L","lightmapColors","Q","[I","[I","EntityRenderer","adt","net/minecraft/src","0" +"field_35812_M","fovModifierHand","R","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35813_N","fovModifierHandPrev","S","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35814_O","fovMultiplierTemp","T","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_27288_B","cloudFog","U","Z","Z","EntityRenderer","adt","net/minecraft/src","0" +"field_21155_l","cameraZoom","V","D","D","EntityRenderer","adt","net/minecraft/src","0" +"field_21154_m","cameraYaw","W","D","D","EntityRenderer","adt","net/minecraft/src","0" +"field_21153_n","cameraPitch","X","D","D","EntityRenderer","adt","net/minecraft/src","0" +"field_1384_l","prevFrameTime","Y","J","J","EntityRenderer","adt","net/minecraft/src","0" +"field_28133_I","renderEndNanoTime","Z","J","J","EntityRenderer","adt","net/minecraft/src","0" +"field_35815_V","lightmapUpdateNeeded","aa","Z","Z","EntityRenderer","adt","net/minecraft/src","0" +"field_35819_e","torchFlickerX","e","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35816_f","torchFlickerDX","f","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35817_g","torchFlickerY","g","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35821_h","torchFlickerDY","h","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_1383_m","random","ab","Ljava/util/Random;","Ljava/util/Random;","EntityRenderer","adt","net/minecraft/src","0" +"field_27287_H","rainSoundCounter","ac","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_35822_i","rainXCoords","i","[F","[F","EntityRenderer","adt","net/minecraft/src","0" +"field_35820_j","rainYCoords","j","[F","[F","EntityRenderer","adt","net/minecraft/src","0" +"field_1394_b","unusedVolatile0","k","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_1393_c","unusedVolatile1","l","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_1392_d","fogColorBuffer","m","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","EntityRenderer","adt","net/minecraft/src","0" +"field_4270_e","fogColorRed","n","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_4269_f","fogColorGreen","o","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_4268_g","fogColorBlue","p","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_1382_n","fogColor2","ad","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_1381_o","fogColor1","ae","F","F","EntityRenderer","adt","net/minecraft/src","0" +"field_35823_q","debugViewDirection","q","I","I","EntityRenderer","adt","net/minecraft/src","0" +"field_1688_a","frustum","a","[[F","[[F","ClippingHelper","ip","net/minecraft/src","0" +"field_1687_b","projectionMatrix","b","[F","[F","ClippingHelper","ip","net/minecraft/src","0" +"field_1690_c","modelviewMatrix","c","[F","[F","ClippingHelper","ip","net/minecraft/src","0" +"field_1689_d","clippingMatrix","d","[F","[F","ClippingHelper","ip","net/minecraft/src","0" +"field_25212_a","entityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","SpawnListEntry","yx","net/minecraft/src","0" +"field_35591_b","field_35591_b","b","I","I","SpawnListEntry","yx","net/minecraft/src","0" +"field_35592_c","field_35592_c","c","I","I","SpawnListEntry","yx","net/minecraft/src","0" +"field_4119_a","defaultHeldItem","b","LItemStack;","Ldk;","EntitySkeleton","it","net/minecraft/src","0" +"field_40520_w","protectionName","w","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentProtection","ii","net/minecraft/src","0" +"field_40524_x","baseEnchantability","x","[I","[I","EnchantmentProtection","ii","net/minecraft/src","0" +"field_40523_y","levelEnchantability","y","[I","[I","EnchantmentProtection","ii","net/minecraft/src","0" +"field_40522_z","thresholdEnchantability","z","[I","[I","EnchantmentProtection","ii","net/minecraft/src","0" +"field_40521_v","protectionType","a","I","I","EnchantmentProtection","ii","net/minecraft/src","0" +"field_1764_b","points","b","[LPathPoint;","[Lmo;","PathEntity","dw","net/minecraft/src","0" +"field_1765_a","pathLength","a","I","I","PathEntity","dw","net/minecraft/src","0" +"field_1766_c","pathIndex","c","I","I","PathEntity","dw","net/minecraft/src","0" +"field_191_a","renderManager","c","LRenderManager;","Lwb;","Render","rg","net/minecraft/src","0" +"field_195_d","modelBase","a","LModelBase;","Lal;","Render","rg","net/minecraft/src","0" +"field_203_d","renderBlocks","d","LRenderBlocks;","Lacr;","Render","rg","net/minecraft/src","0" +"field_9246_c","shadowSize","e","F","F","Render","rg","net/minecraft/src","0" +"field_194_c","shadowOpaque","f","F","F","Render","rg","net/minecraft/src","0" +"field_40289_c","snowmanModel","a","LModelSnowMan;","Laai;","RenderSnowMan","bh","net/minecraft/src","0" +"field_31021_a","storedBlockID","a","I","I","TileEntityPiston","agb","net/minecraft/src","0" +"field_31019_b","storedMetadata","b","I","I","TileEntityPiston","agb","net/minecraft/src","0" +"field_31025_c","storedOrientation","j","I","I","TileEntityPiston","agb","net/minecraft/src","0" +"field_31024_i","extending","k","Z","Z","TileEntityPiston","agb","net/minecraft/src","0" +"field_31023_j","field_31023_j","l","Z","Z","TileEntityPiston","agb","net/minecraft/src","0" +"field_31022_k","progress","m","F","F","TileEntityPiston","agb","net/minecraft/src","0" +"field_31020_l","lastProgress","n","F","F","TileEntityPiston","agb","net/minecraft/src","0" +"field_31018_m","field_31018_m","o","Ljava/util/List;","Ljava/util/List;","TileEntityPiston","agb","net/minecraft/src","0" +"field_25114_a","wolfHeadMain","g","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25113_b","wolfBody","h","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25112_c","wolfLeg1","i","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25111_d","wolfLeg2","j","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25110_e","wolfLeg3","k","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25109_f","wolfLeg4","l","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25105_j","wolfTail","m","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_25104_k","wolfMane","n","LModelRenderer;","Lacf;","ModelWolf","ei","net/minecraft/src","0" +"field_961_a","parentScreen","a","LGuiScreen;","Lxe;","GuiYesNo","go","net/minecraft/src","0" +"field_964_h","message1","b","Ljava/lang/String;","Ljava/lang/String;","GuiYesNo","go","net/minecraft/src","0" +"field_963_i","message2","c","Ljava/lang/String;","Ljava/lang/String;","GuiYesNo","go","net/minecraft/src","0" +"field_22106_k","buttonText1","d","Ljava/lang/String;","Ljava/lang/String;","GuiYesNo","go","net/minecraft/src","0" +"field_22105_l","buttonText2","e","Ljava/lang/String;","Ljava/lang/String;","GuiYesNo","go","net/minecraft/src","0" +"field_962_j","worldNumber","f","I","I","GuiYesNo","go","net/minecraft/src","0" +"field_35253_a","entityId","a","I","I","Packet42RemoveEntityEffect","af","net/minecraft/src","0" +"field_35252_b","effectId","b","B","B","Packet42RemoveEntityEffect","af","net/minecraft/src","0" +"field_564_a","time","a","J","J","Packet4UpdateTime","cb","net/minecraft/src","0" +"field_4095_d","xTile","d","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4094_e","yTile","e","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4093_f","zTile","f","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4092_g","inTile","g","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4091_h","inGround","h","Z","Z","EntityFishHook","ael","net/minecraft/src","0" +"field_4098_a","shake","a","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4097_b","angler","b","LEntityPlayer;","Lvi;","EntityFishHook","ael","net/minecraft/src","0" +"field_4090_i","ticksInGround","i","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4089_j","ticksInAir","aq","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4088_k","ticksCatchable","ar","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_4096_c","bobber","c","LEntity;","Lia;","EntityFishHook","ael","net/minecraft/src","0" +"field_6388_l","fishPosRotationIncrements","as","I","I","EntityFishHook","ael","net/minecraft/src","0" +"field_6387_m","fishX","at","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6386_n","fishY","au","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6385_o","fishZ","av","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6384_p","fishYaw","aw","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6383_q","fishPitch","ax","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6382_r","velocityX","ay","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6381_s","velocityY","az","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_6380_t","velocityZ","aA","D","D","EntityFishHook","ael","net/minecraft/src","0" +"field_27126_s","guiMapTop","s","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27125_t","guiMapLeft","t","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27124_u","guiMapBottom","u","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27123_v","guiMapRight","v","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27121_a","achievementsPaneWidth","a","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27119_i","achievementsPaneHeight","b","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27118_j","mouseX","c","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27117_l","mouseY","d","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27116_m","field_27116_m","e","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27115_n","field_27115_n","f","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27114_o","guiMapX","g","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27113_p","guiMapY","h","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27112_q","field_27112_q","j","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27111_r","field_27111_r","k","D","D","GuiAchievements","qx","net/minecraft/src","0" +"field_27122_w","isMouseButtonDown","w","I","I","GuiAchievements","qx","net/minecraft/src","0" +"field_27120_x","statFileWriter","x","LStatFileWriter;","Ltk;","GuiAchievements","qx","net/minecraft/src","0" +"field_35552_n","damageSourceEntity","n","LEntity;","Lia;","EntityDamageSource","fq","net/minecraft/src","0" +"Kebab","Kebab","a","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Aztec","Aztec","b","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Alban","Alban","c","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Aztec2","Aztec2","d","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Bomb","Bomb","e","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Plant","Plant","f","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Wasteland","Wasteland","g","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Pool","Pool","h","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Courbet","Courbet","i","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Sea","Sea","j","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Sunset","Sunset","k","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Creebet","Creebet","l","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Wanderer","Wanderer","m","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Graham","Graham","n","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Match","Match","o","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Bust","Bust","p","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Stage","Stage","q","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Void","Void","r","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"SkullAndRoses","SkullAndRoses","s","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Fighters","Fighters","t","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Pointer","Pointer","u","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Pigscene","Pigscene","v","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"BurningSkull","BurningSkull","w","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"Skeleton","Skeleton","x","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"DonkeyKong","DonkeyKong","y","LEnumArt;","Lsv;","EnumArt","sv","net/minecraft/src","0" +"field_27365_z","maxArtTitleLength","z","I","I","EnumArt","sv","net/minecraft/src","0" +"field_1624_y","title","A","Ljava/lang/String;","Ljava/lang/String;","EnumArt","sv","net/minecraft/src","0" +"field_1623_z","sizeX","B","I","I","EnumArt","sv","net/minecraft/src","0" +"field_1636_A","sizeY","C","I","I","EnumArt","sv","net/minecraft/src","0" +"field_1634_B","offsetX","D","I","I","EnumArt","sv","net/minecraft/src","0" +"field_1632_C","offsetY","E","I","I","EnumArt","sv","net/minecraft/src","0" +"field_1630_D","allArt","F","[LEnumArt;","[Lsv;","EnumArt","sv","net/minecraft/src","0" +"field_507_a","entityId","a","I","I","Packet29DestroyEntity","fw","net/minecraft/src","0" +"Sky","Sky","a","LEnumSkyBlock;","Lbn;","EnumSkyBlock","bn","net/minecraft/src","0" +"Block","Block","b","LEnumSkyBlock;","Lbn;","EnumSkyBlock","bn","net/minecraft/src","0" +"field_1722_c","defaultLightValue","c","I","I","EnumSkyBlock","bn","net/minecraft/src","0" +"field_1721_d","allSkyBlocks","d","[LEnumSkyBlock;","[Lbn;","EnumSkyBlock","bn","net/minecraft/src","0" +"field_1127_a","imageData","a","[B","[B","TextureFX","dt","net/minecraft/src","0" +"field_1126_b","iconIndex","b","I","I","TextureFX","dt","net/minecraft/src","0" +"field_1131_c","anaglyphEnabled","c","Z","Z","TextureFX","dt","net/minecraft/src","0" +"field_1130_d","textureId","d","I","I","TextureFX","dt","net/minecraft/src","0" +"field_1129_e","tileSize","e","I","I","TextureFX","dt","net/minecraft/src","0" +"field_1128_f","tileImage","f","I","I","TextureFX","dt","net/minecraft/src","0" +"field_35659_a","temperatureValues","a","[F","[F","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35657_b","rainfallValues","b","[F","[F","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35658_c","biomes","c","[LBiomeGenBase;","[Lsr;","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35655_d","xPosition","d","I","I","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35656_e","zPosition","e","I","I","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35653_f","lastAccessTime","f","J","J","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_35654_g","field_35654_g","g","LBiomeCache;","Lagl;","BiomeCacheBlock","cq","net/minecraft/src","0" +"field_40556_a","pendingChunkList","a","Ljava/util/List;","Ljava/util/List;","ThreadedChunkLoader","tn","net/minecraft/src","0" +"field_40554_b","pendingChunkCoords","b","Ljava/util/Set;","Ljava/util/Set;","ThreadedChunkLoader","tn","net/minecraft/src","0" +"field_40555_c","chunkSaveLock","c","Ljava/lang/Object;","Ljava/lang/Object;","ThreadedChunkLoader","tn","net/minecraft/src","0" +"field_40553_d","chunkSaveLocation","d","Ljava/io/File;","Ljava/io/File;","ThreadedChunkLoader","tn","net/minecraft/src","0" +"field_27268_b","field_27268_b","g","I","I","GuiSlotStats","mx","net/minecraft/src","0" +"field_27273_c","field_27273_c","h","Ljava/util/List;","Ljava/util/List;","GuiSlotStats","mx","net/minecraft/src","0" +"field_27272_d","field_27272_d","i","Ljava/util/Comparator;","Ljava/util/Comparator;","GuiSlotStats","mx","net/minecraft/src","0" +"field_27271_e","field_27271_e","j","I","I","GuiSlotStats","mx","net/minecraft/src","0" +"field_27270_f","field_27270_f","k","I","I","GuiSlotStats","mx","net/minecraft/src","0" +"field_27269_g","field_27269_g","l","LGuiStats;","Lin;","GuiSlotStats","mx","net/minecraft/src","0" +"field_35718_c","hasMoreThanTwoComponents","c","Z","Z","StructureVillageStart","yo","net/minecraft/src","0" +"field_857_h","cargoItems","d","[LItemStack;","[Ldk;","EntityMinecart","vm","net/minecraft/src","0" +"field_9418_e","fuel","e","I","I","EntityMinecart","vm","net/minecraft/src","0" +"field_856_i","field_856_i","f","Z","Z","EntityMinecart","vm","net/minecraft/src","0" +"field_20913_d","minecartType","a","I","I","EntityMinecart","vm","net/minecraft/src","0" +"field_9417_f","pushX","b","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9416_g","pushZ","c","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_855_j","field_855_j","g","[[[I","[[[I","EntityMinecart","vm","net/minecraft/src","0" +"field_9415_k","minecartPosRotationIncrements","h","I","I","EntityMinecart","vm","net/minecraft/src","0" +"field_9414_l","minecartX","i","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9413_m","minecartY","aq","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9412_n","minecartZ","ar","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9411_o","minecartYaw","as","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9410_p","minecartPitch","at","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9409_q","velocityX","au","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9408_r","velocityY","av","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_9407_s","velocityZ","aw","D","D","EntityMinecart","vm","net/minecraft/src","0" +"field_39004_a","inLove","a","I","I","EntityAnimal","fx","net/minecraft/src","0" +"field_39005_b","breeding","b","I","I","EntityAnimal","fx","net/minecraft/src","0" +"field_40089_d","field_40089_d","d","I","I","EntityPotion","ab","net/minecraft/src","0" +"field_1286_a","bipedHead","g","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1285_b","bipedHeadwear","h","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1284_c","bipedBody","i","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1283_d","bipedRightArm","j","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1282_e","bipedLeftArm","k","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1281_f","bipedRightLeg","l","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1280_g","bipedLeftLeg","m","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_20098_h","bipedEars","n","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_20097_i","bipedCloak","o","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" +"field_1279_h","heldItemLeft","p","I","I","ModelBiped","fa","net/minecraft/src","0" +"field_1278_i","heldItemRight","q","I","I","ModelBiped","fa","net/minecraft/src","0" +"field_1277_j","isSneak","r","Z","Z","ModelBiped","fa","net/minecraft/src","0" +"field_40333_u","aimedBow","s","Z","Z","ModelBiped","fa","net/minecraft/src","0" +"field_21164_a","objectType","a","I","I","WatchableObject","afh","net/minecraft/src","0" +"field_21163_b","dataValueId","b","I","I","WatchableObject","afh","net/minecraft/src","0" +"field_21166_c","watchedObject","c","Ljava/lang/Object;","Ljava/lang/Object;","WatchableObject","afh","net/minecraft/src","0" +"field_21165_d","isWatching","d","Z","Z","WatchableObject","afh","net/minecraft/src","0" +"field_1198_a","recipeItems","a","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesIngots","ady","net/minecraft/src","0" +"field_20079_i","enumOptions","j","LEnumOptions;","Llp;","GuiSmallButton","abs","net/minecraft/src","0" +"field_40314_a","head","g","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40312_b","neck","h","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40313_c","jaw","i","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40310_d","body","j","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40311_e","rearLeg","k","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40308_f","frontLeg","l","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40309_g","rearLegTip","m","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40315_n","frontLegTip","n","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40316_o","rearFoot","o","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40320_p","frontFoot","p","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40319_q","wing","q","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40318_r","wingTip","r","LModelRenderer;","Lacf;","ModelDragon","afo","net/minecraft/src","0" +"field_40317_s","field_40317_s","s","F","F","ModelDragon","afo","net/minecraft/src","0" +"field_1678_a","stepSoundName","a","Ljava/lang/String;","Ljava/lang/String;","StepSound","wu","net/minecraft/src","0" +"field_1677_b","stepSoundVolume","b","F","F","StepSound","wu","net/minecraft/src","0" +"field_1679_c","stepSoundPitch","c","F","F","StepSound","wu","net/minecraft/src","0" +"field_1367_b","scaledWidth","d","I","I","ScaledResolution","ef","net/minecraft/src","0" +"field_1369_c","scaledHeight","e","I","I","ScaledResolution","ef","net/minecraft/src","0" +"field_25121_a","scaledWidthD","a","D","D","ScaledResolution","ef","net/minecraft/src","0" +"field_25120_b","scaledHeightD","b","D","D","ScaledResolution","ef","net/minecraft/src","0" +"field_1368_a","scaleFactor","c","I","I","ScaledResolution","ef","net/minecraft/src","0" +"field_9277_a","playerEntityId","a","I","I","Packet7UseEntity","zm","net/minecraft/src","0" +"field_9276_b","targetEntity","b","I","I","Packet7UseEntity","zm","net/minecraft/src","0" +"field_9278_c","isLeftClick","c","I","I","Packet7UseEntity","zm","net/minecraft/src","0" +"field_22110_h","parentGuiScreen","b","LGuiScreen;","Lxe;","GuiVideoSettings","cc","net/minecraft/src","0" +"field_22107_a","screenTitle","a","Ljava/lang/String;","Ljava/lang/String;","GuiVideoSettings","cc","net/minecraft/src","0" +"field_22109_i","guiGameSettings","c","LGameSettings;","Lki;","GuiVideoSettings","cc","net/minecraft/src","0" +"field_40231_d","field_40231_d","d","Z","Z","GuiVideoSettings","cc","net/minecraft/src","0" +"field_22108_k","videoOptions","e","[LEnumOptions;","[Llp;","GuiVideoSettings","cc","net/minecraft/src","0" +"field_27275_a","field_27275_a","a","LGuiStats;","Lin;","GuiSlotStatsItem","xa","net/minecraft/src","0" +"field_674_a","lavaParticleScale","a","F","F","EntityLavaFX","aw","net/minecraft/src","0" +"field_1667_a","registeredBlocksList","a","Ljava/util/List;","Ljava/util/List;","Session","dr","net/minecraft/src","0" +"field_1666_b","username","b","Ljava/lang/String;","Ljava/lang/String;","Session","dr","net/minecraft/src","0" +"field_6543_c","sessionId","c","Ljava/lang/String;","Ljava/lang/String;","Session","dr","net/minecraft/src","0" +"field_6542_d","mpPassParameter","d","Ljava/lang/String;","Ljava/lang/String;","Session","dr","net/minecraft/src","0" +"field_20032_a","windowId","a","I","I","Packet105UpdateProgressbar","gb","net/minecraft/src","0" +"field_20031_b","progressBar","b","I","I","Packet105UpdateProgressbar","gb","net/minecraft/src","0" +"field_20033_c","progressBarValue","c","I","I","Packet105UpdateProgressbar","gb","net/minecraft/src","0" +"field_40330_a","field_40330_a","g","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40328_b","field_40328_b","h","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40329_c","field_40329_c","i","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40326_d","field_40326_d","j","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40327_e","field_40327_e","k","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40324_f","field_40324_f","l","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_40325_g","field_40325_g","m","LModelRenderer;","Lacf;","ModelBook","uj","net/minecraft/src","0" +"field_1125_c","craftMatrix","a","LIInventory;","Lde;","SlotCrafting","afe","net/minecraft/src","0" +"field_25015_e","thePlayer","b","LEntityPlayer;","Lvi;","SlotCrafting","afe","net/minecraft/src","0" +"field_28191_a","saveHandler","a","LISaveHandler;","Lnh;","MapStorage","ew","net/minecraft/src","0" +"field_28190_b","loadedDataMap","b","Ljava/util/Map;","Ljava/util/Map;","MapStorage","ew","net/minecraft/src","0" +"field_28193_c","loadedDataList","c","Ljava/util/List;","Ljava/util/List;","MapStorage","ew","net/minecraft/src","0" +"field_28192_d","idCounts","d","Ljava/util/Map;","Ljava/util/Map;","MapStorage","ew","net/minecraft/src","0" +"field_27066_a","field_27066_a","a","LJ_JsonStringNode;","Loj;","J_JsonFieldNodeSelector","jr","net/minecraft/src","0" +"field_35618_a","pieceClass","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"field_35616_b","pieceWeight","b","I","I","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"field_35617_c","instancesSpawned","c","I","I","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"field_35615_d","instancesLimit","d","I","I","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"field_1516_c","hash","c","I","I","MusInputStream","cm","net/minecraft/src","0" +"field_1515_d","inputStream","d","Ljava/io/InputStream;","Ljava/io/InputStream;","MusInputStream","cm","net/minecraft/src","0" +"field_1514_a","buffer","a","[B","[B","MusInputStream","cm","net/minecraft/src","0" +"field_1513_b","codec","b","LCodecMus;","Lvo;","MusInputStream","cm","net/minecraft/src","0" +"field_22037_a","field_22037_a","a","[Ljava/lang/String;","[Ljava/lang/String;","BlockStep","xs","net/minecraft/src","0" +"field_20922_a","blockType","cb","Z","Z","BlockStep","xs","net/minecraft/src","0" +"field_453_a","wiresProvidePower","a","Z","Z","BlockRedstoneWire","kw","net/minecraft/src","0" +"field_21031_b","blocksNeedingUpdate","cb","Ljava/util/Set;","Ljava/util/Set;","BlockRedstoneWire","kw","net/minecraft/src","0" +"field_12257_a","isFlaming","a","Z","Z","Explosion","xp","net/minecraft/src","0" +"field_12250_h","ExplosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","xp","net/minecraft/src","0" +"field_12249_i","worldObj","i","LWorld;","Lry;","Explosion","xp","net/minecraft/src","0" +"field_12256_b","explosionX","b","D","D","Explosion","xp","net/minecraft/src","0" +"field_12255_c","explosionY","c","D","D","Explosion","xp","net/minecraft/src","0" +"field_12254_d","explosionZ","d","D","D","Explosion","xp","net/minecraft/src","0" +"field_12253_e","exploder","e","LEntity;","Lia;","Explosion","xp","net/minecraft/src","0" +"field_12252_f","explosionSize","f","F","F","Explosion","xp","net/minecraft/src","0" +"field_12251_g","destroyedBlockPositions","g","Ljava/util/Set;","Ljava/util/Set;","Explosion","xp","net/minecraft/src","0" +"field_40457_a","lightmapDisabled","a","I","I","OpenGlHelper","adx","net/minecraft/src","0" +"field_40455_b","lightmapEnabled","b","I","I","OpenGlHelper","adx","net/minecraft/src","0" +"field_40456_c","useMultitextureARB","c","Z","Z","OpenGlHelper","adx","net/minecraft/src","0" +"field_27276_a","field_27276_a","a","LGuiStats;","Lin;","GuiSlotStatsGeneral","b","net/minecraft/src","0" +"field_35064_a","field_35064_a","a","LEnumDoor;","Lmj;","ComponentStrongholdPrison","fj","net/minecraft/src","0" +"field_27045_a","isPowered","a","Z","Z","BlockRail","afr","net/minecraft/src","0" +"field_35098_a","field_35098_a","a","I","I","ComponentVillageChurch","uz","net/minecraft/src","0" +"field_40027_a","field_40027_a","a","Z","Z","ComponentNetherBridgeThrone","kf","net/minecraft/src","0" +"field_35627_a","field_35627_a","d","[F","[F","MapGenRavine","rf","net/minecraft/src","0" +"field_999_a","screenTitle","a","Ljava/lang/String;","Ljava/lang/String;","GuiEditSign","fl","net/minecraft/src","0" +"field_1002_h","entitySign","b","LTileEntitySign;","Lu;","GuiEditSign","fl","net/minecraft/src","0" +"field_4189_i","updateCounter","c","I","I","GuiEditSign","fl","net/minecraft/src","0" +"field_1000_j","editLine","d","I","I","GuiEditSign","fl","net/minecraft/src","0" +"field_20083_l","allowedCharacters","e","Ljava/lang/String;","Ljava/lang/String;","GuiEditSign","fl","net/minecraft/src","0" +"field_945_b","mc","l","LMinecraft;","LMinecraft;","GuiScreen","xe","net/minecraft/src","0" +"field_951_c","width","m","I","I","GuiScreen","xe","net/minecraft/src","0" +"field_950_d","height","n","I","I","GuiScreen","xe","net/minecraft/src","0" +"field_949_e","controlList","o","Ljava/util/List;","Ljava/util/List;","GuiScreen","xe","net/minecraft/src","0" +"field_948_f","allowUserInput","p","Z","Z","GuiScreen","xe","net/minecraft/src","0" +"field_6451_g","fontRenderer","q","LFontRenderer;","Labe;","GuiScreen","xe","net/minecraft/src","0" +"field_25091_h","guiParticles","r","LGuiParticle;","Lvg;","GuiScreen","xe","net/minecraft/src","0" +"field_946_a","selectedButton","a","LGuiButton;","Lct;","GuiScreen","xe","net/minecraft/src","0" +"field_21133_a","dataTypes","a","Ljava/util/HashMap;","Ljava/util/HashMap;","DataWatcher","cr","net/minecraft/src","0" +"field_21132_b","watchedObjects","b","Ljava/util/Map;","Ljava/util/Map;","DataWatcher","cr","net/minecraft/src","0" +"field_21134_c","objectChanged","c","Z","Z","DataWatcher","cr","net/minecraft/src","0" +"field_40367_a","field_40367_a","a","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40365_b","field_40365_b","b","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40366_c","field_40366_c","c","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40363_d","field_40363_d","d","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40364_e","field_40364_e","e","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40361_f","field_40361_f","f","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40362_g","field_40362_g","g","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40374_h","field_40374_h","h","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40375_i","field_40375_i","i","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40372_j","field_40372_j","j","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40373_k","field_40373_k","k","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40370_l","field_40370_l","l","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" +"field_40371_m","field_40371_m","m","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" +"field_40368_n","field_40368_n","n","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" +"field_40369_o","potionPrefixes","o","[Ljava/lang/String;","[Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_534_a","entityId","a","I","I","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_533_b","name","b","Ljava/lang/String;","Ljava/lang/String;","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_540_c","xPosition","c","I","I","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_539_d","yPosition","d","I","I","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_538_e","zPosition","e","I","I","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_537_f","rotation","f","B","B","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_536_g","pitch","g","B","B","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_535_h","currentItem","h","I","I","Packet20NamedEntitySpawn","ph","net/minecraft/src","0" +"field_40442_a","field_40442_a","a","LContainerBrewingStand;","Lok;","SlotBrewingStandIngredient","aer","net/minecraft/src","0" +"field_1178_g","gameSettings","f","LGameSettings;","Lki;","MovementInputFromOptions","wa","net/minecraft/src","0" +"field_41074_a","objectX","a","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41072_b","objectY","b","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41073_c","objectZ","c","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41079_i","viewport","i","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41076_j","modelview","j","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41077_k","projection","k","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41075_l","objectCoords","l","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41070_d","rotationX","d","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41071_e","rotationXZ","e","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41068_f","rotationZ","f","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41069_g","rotationYZ","g","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_41078_h","rotationXY","h","F","F","ActiveRenderInfo","abz","net/minecraft/src","0" +"field_40096_a","field_40096_a","a","I","I","EntityEnderEye","bs","net/minecraft/src","0" +"field_40094_b","field_40094_b","b","D","D","EntityEnderEye","bs","net/minecraft/src","0" +"field_40095_c","field_40095_c","c","D","D","EntityEnderEye","bs","net/minecraft/src","0" +"field_40091_d","field_40091_d","d","D","D","EntityEnderEye","bs","net/minecraft/src","0" +"field_40092_e","field_40092_e","e","I","I","EntityEnderEye","bs","net/minecraft/src","0" +"field_40093_ao","field_40093_ao","f","Z","Z","EntityEnderEye","bs","net/minecraft/src","0" +"field_517_a","message","a","Ljava/lang/String;","Ljava/lang/String;","Packet3Chat","abb","net/minecraft/src","0" +"field_40058_a","brewingItemStacks","a","[LItemStack;","[Ldk;","TileEntityBrewingStand","tt","net/minecraft/src","0" +"field_40056_b","brewTime","b","I","I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"field_40057_c","filledSlots","j","I","I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"field_40055_d","ingredientID","k","I","I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"field_22265_a","parentTexturePackGui","a","LGuiTexturePacks;","Llb;","GuiTexturePackSlot","ju","net/minecraft/src","0" +"field_1696_a","mcApplet","a","LMinecraftApplet;","LMinecraftApplet;","CanvasMinecraftApplet","ep","net/minecraft/src","0" +"linux","linux","a","LEnumOS2;","Lqe;","EnumOS2","qe","net/minecraft/src","0" +"solaris","solaris","b","LEnumOS2;","Lqe;","EnumOS2","qe","net/minecraft/src","0" +"windows","windows","c","LEnumOS2;","Lqe;","EnumOS2","qe","net/minecraft/src","0" +"macos","macos","d","LEnumOS2;","Lqe;","EnumOS2","qe","net/minecraft/src","0" +"unknown","unknown","e","LEnumOS2;","Lqe;","EnumOS2","qe","net/minecraft/src","0" +"field_6511_f","allOSes","f","[LEnumOS2;","[Lqe;","EnumOS2","qe","net/minecraft/src","0" +"field_9274_a","entityId","a","I","I","Packet38EntityStatus","bf","net/minecraft/src","0" +"field_9273_b","entityStatus","b","B","B","Packet38EntityStatus","bf","net/minecraft/src","0" +"field_314_bb","maxDamageArray","bS","[I","[I","ItemArmor","agi","net/minecraft/src","0" +"field_313_aX","armorType","a","I","I","ItemArmor","agi","net/minecraft/src","0" +"field_312_aY","damageReduceAmount","b","I","I","ItemArmor","agi","net/minecraft/src","0" +"field_311_aZ","renderIndex","bR","I","I","ItemArmor","agi","net/minecraft/src","0" +"field_40437_bT","material","bT","LEnumArmorMaterial;","Ldj;","ItemArmor","agi","net/minecraft/src","0" +"none","none","a","LEnumAction;","Lps;","EnumAction","ps","net/minecraft/src","0" +"eat","eat","b","LEnumAction;","Lps;","EnumAction","ps","net/minecraft/src","0" +"drink","drink","c","LEnumAction;","Lps;","EnumAction","ps","net/minecraft/src","0" +"block","block","d","LEnumAction;","Lps;","EnumAction","ps","net/minecraft/src","0" +"bow","bow","e","LEnumAction;","Lps;","EnumAction","ps","net/minecraft/src","0" +"field_35873_e","allActions","f","[LEnumAction;","[Lps;","EnumAction","ps","net/minecraft/src","0" +"field_25090_a","particles","a","Ljava/util/List;","Ljava/util/List;","GuiParticle","vg","net/minecraft/src","0" +"field_25089_b","mc","b","LMinecraft;","LMinecraft;","GuiParticle","vg","net/minecraft/src","0" +"field_35036_a","field_35036_a","a","Z","Z","ComponentStrongholdStairs","vl","net/minecraft/src","0" +"field_35035_b","doorType","b","LEnumDoor;","Lmj;","ComponentStrongholdStairs","vl","net/minecraft/src","0" +"field_35319_a","guiScreen","a","LGuiScreen;","Lxe;","GuiScreenServerList","nn","net/minecraft/src","0" +"field_35317_b","serverTextField","b","LGuiTextField;","Ldv;","GuiScreenServerList","nn","net/minecraft/src","0" +"field_35318_c","field_35318_c","c","LServerNBTStorage;","Llo;","GuiScreenServerList","nn","net/minecraft/src","0" +"field_1158_g","field_1158_g","g","[F","[F","TextureWaterFX","gk","net/minecraft/src","0" +"field_1157_h","field_1157_h","h","[F","[F","TextureWaterFX","gk","net/minecraft/src","0" +"field_1156_i","field_1156_i","i","[F","[F","TextureWaterFX","gk","net/minecraft/src","0" +"field_1155_j","field_1155_j","j","[F","[F","TextureWaterFX","gk","net/minecraft/src","0" +"field_1154_k","tickCounter","k","I","I","TextureWaterFX","gk","net/minecraft/src","0" +"field_25210_a","instance","a","LAchievementMap;","Lkp;","AchievementMap","kp","net/minecraft/src","0" +"field_25209_b","guidMap","b","Ljava/util/Map;","Ljava/util/Map;","AchievementMap","kp","net/minecraft/src","0" +"field_35678_a","potionTypes","a","[LPotion;","[Labg;","Potion","abg","net/minecraft/src","0" +"field_35676_b","field_35676_b","b","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35677_c","moveSpeed","c","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35674_d","moveSlowdown","d","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35675_e","digSpeed","e","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35672_f","digSlowdown","f","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35673_g","damageBoost","g","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35685_h","potionHeal","h","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35686_i","harm","i","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35683_j","jump","j","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35684_k","confusion","k","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35681_l","regeneration","l","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35682_m","resistance","m","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35679_n","fireResistance","n","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35680_o","waterBreathing","o","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35694_p","invisibility","p","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35693_q","blindness","q","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35692_r","nightVision","r","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35691_s","hunger","s","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35690_t","weakness","t","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35689_u","poison","u","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35688_v","field_35688_v","v","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35687_w","field_35687_w","w","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35697_x","field_35697_x","x","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35696_y","field_35696_y","y","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35695_z","field_35695_z","z","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35667_A","field_35667_A","A","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35668_B","field_35668_B","B","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35669_C","field_35669_C","C","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35663_D","field_35663_D","D","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35664_E","field_35664_E","E","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35665_F","field_35665_F","F","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35666_G","field_35666_G","G","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35670_H","id","H","I","I","Potion","abg","net/minecraft/src","0" +"field_35671_I","name","I","Ljava/lang/String;","Ljava/lang/String;","Potion","abg","net/minecraft/src","0" +"field_40627_J","statusIconIndex","J","I","I","Potion","abg","net/minecraft/src","0" +"field_40628_K","field_40628_K","K","Z","Z","Potion","abg","net/minecraft/src","0" +"field_40624_L","field_40624_L","L","D","D","Potion","abg","net/minecraft/src","0" +"field_40625_M","field_40625_M","M","Z","Z","Potion","abg","net/minecraft/src","0" +"field_40626_N","field_40626_N","N","I","I","Potion","abg","net/minecraft/src","0" +"field_35100_a","field_35100_a","a","I","I","ComponentVillageTorch","abj","net/minecraft/src","0" +"field_40734_a","field_40734_a","a","I","I","TextureOffset","sx","net/minecraft/src","0" +"field_40733_b","field_40733_b","b","I","I","TextureOffset","sx","net/minecraft/src","0" +"field_466_a","fallInstantly","a","Z","Z","BlockSand","cj","net/minecraft/src","0" +"field_1094_a","tagMap","a","Ljava/util/Map;","Ljava/util/Map;","NBTTagCompound","ik","net/minecraft/src","0" +"field_35261_a","entityId","a","I","I","Packet41EntityEffect","ij","net/minecraft/src","0" +"field_35259_b","effectId","b","B","B","Packet41EntityEffect","ij","net/minecraft/src","0" +"field_35260_c","effectAmp","c","B","B","Packet41EntityEffect","ij","net/minecraft/src","0" +"field_35258_d","duration","d","S","S","Packet41EntityEffect","ij","net/minecraft/src","0" +"field_35073_a","field_35073_a","a","I","I","ComponentMineshaftCross","id","net/minecraft/src","0" +"field_35072_b","field_35072_b","b","Z","Z","ComponentMineshaftCross","id","net/minecraft/src","0" +"field_976_l","xSize_lo","g","F","F","GuiInventory","hw","net/minecraft/src","0" +"field_975_m","ySize_lo","h","F","F","GuiInventory","hw","net/minecraft/src","0" +"field_21089_a","field_21089_a","a","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21088_b","field_21088_b","b","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21087_c","field_21087_c","c","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21086_f","field_21086_f","d","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21085_g","field_21085_g","e","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21084_h","field_21084_h","f","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21083_i","field_21083_i","g","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21082_j","field_21082_j","bz","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21081_k","randomMotionSpeed","bA","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21080_l","field_21080_l","bB","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21079_m","field_21079_m","bC","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21078_n","randomMotionVecX","bD","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21077_o","randomMotionVecY","bE","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21076_p","randomMotionVecZ","bF","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_22102_i","dateFormatter","c","Ljava/text/DateFormat;","Ljava/text/DateFormat;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_958_a","parentScreen","a","LGuiScreen;","Lxe;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_960_h","screenTitle","b","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_959_i","selected","d","Z","Z","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22101_l","selectedWorld","e","I","I","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22100_m","saveList","f","Ljava/util/List;","Ljava/util/List;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22099_n","worldSlotContainer","g","LGuiWorldSlot;","Lpb;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22098_o","field_22098_o","h","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22097_p","field_22097_p","j","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_35316_k","localizedGameModeText","k","[Ljava/lang/String;","[Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22096_q","deleting","s","Z","Z","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22095_r","buttonRename","t","LGuiButton;","Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22104_s","buttonSelect","u","LGuiButton;","Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22103_t","buttonDelete","v","LGuiButton;","Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_966_a","updateCounter2","a","I","I","GuiIngameMenu","nd","net/minecraft/src","0" +"field_967_h","updateCounter","b","I","I","GuiIngameMenu","nd","net/minecraft/src","0" +"field_887_a","blankChunk","a","LChunk;","Lzx;","ChunkProviderClient","er","net/minecraft/src","0" +"field_886_b","chunkMapping","b","LLongHashMap;","Lwv;","ChunkProviderClient","er","net/minecraft/src","0" +"field_889_c","field_889_c","c","Ljava/util/List;","Ljava/util/List;","ChunkProviderClient","er","net/minecraft/src","0" +"field_888_d","worldObj","d","LWorld;","Lry;","ChunkProviderClient","er","net/minecraft/src","0" +"field_1097_a","floatValue","a","F","F","NBTTagFloat","vd","net/minecraft/src","0" +"field_35805_a","potionID","a","I","I","PotionEffect","s","net/minecraft/src","0" +"field_35803_b","duration","b","I","I","PotionEffect","s","net/minecraft/src","0" +"field_35804_c","amplifier","c","I","I","PotionEffect","s","net/minecraft/src","0" +"field_35050_a","field_35050_a","a","LEnumDoor;","Lmj;","ComponentStrongholdStraight","gp","net/minecraft/src","0" +"field_35048_b","field_35048_b","b","Z","Z","ComponentStrongholdStraight","gp","net/minecraft/src","0" +"field_35049_c","field_35049_c","c","Z","Z","ComponentStrongholdStraight","gp","net/minecraft/src","0" +"field_833_a","furnaceItemStacks","k","[LItemStack;","[Ldk;","TileEntityFurnace","oe","net/minecraft/src","0" +"field_832_b","furnaceBurnTime","a","I","I","TileEntityFurnace","oe","net/minecraft/src","0" +"field_835_c","currentItemBurnTime","b","I","I","TileEntityFurnace","oe","net/minecraft/src","0" +"field_834_d","furnaceCookTime","j","I","I","TileEntityFurnace","oe","net/minecraft/src","0" +"field_9366_o","heartsHalvesLife","aq","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9365_p","field_9365_p","ar","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9363_r","field_9363_r","as","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_735_n","renderYawOffset","at","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_734_o","prevRenderYawOffset","au","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9362_u","field_9362_u","av","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9361_v","field_9361_v","aw","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9360_w","field_9360_w","ax","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9359_x","field_9359_x","ay","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9358_y","field_9358_y","az","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_9357_z","texture","aA","Ljava/lang/String;","Ljava/lang/String;","EntityLiving","nq","net/minecraft/src","0" +"field_9355_A","field_9355_A","aB","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_9353_B","field_9353_B","aC","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9351_C","entityType","aD","Ljava/lang/String;","Ljava/lang/String;","EntityLiving","nq","net/minecraft/src","0" +"field_9349_D","field_9349_D","aE","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9347_E","scoreValue","aF","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9345_F","field_9345_F","aG","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9343_G","isMultiplayerEntity","aH","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_35169_bv","landMovementFactor","aI","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_35168_bw","jumpMovementFactor","aJ","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9341_H","prevSwingProgress","aK","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9339_I","swingProgress","aL","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9337_J","health","aM","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9335_K","prevHealth","aN","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_40129_bA","field_40129_bA","aO","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_4121_a","livingSoundTime","a","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_715_G","hurtTime","aP","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9332_M","maxHurtTime","aQ","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9331_N","attackedAtYaw","aR","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_712_J","deathTime","aS","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9330_P","attackTime","aT","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9329_Q","prevCameraPitch","aU","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9328_R","cameraPitch","aV","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9327_S","unused_flag","aW","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_35171_bJ","experienceValue","aX","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9326_T","field_9326_T","aY","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9325_U","field_9325_U","aZ","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_705_Q","field_705_Q","ba","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_704_R","field_704_R","bb","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_703_S","field_703_S","bc","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_34904_b","field_34904_b","bd","LEntityPlayer;","Lvi;","EntityLiving","nq","net/minecraft/src","0" +"field_34905_c","field_34905_c","be","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_35172_bP","field_35172_bP","bf","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_35173_bQ","field_35173_bQ","bg","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_35170_bR","activePotionsMap","bh","Ljava/util/HashMap;","Ljava/util/HashMap;","EntityLiving","nq","net/minecraft/src","0" +"field_39001_b","field_39001_b","b","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_39002_c","field_39002_c","c","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9324_Y","newPosRotationIncrements","bi","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9323_Z","newPosX","bj","D","D","EntityLiving","nq","net/minecraft/src","0" +"field_9356_aa","newPosY","bk","D","D","EntityLiving","nq","net/minecraft/src","0" +"field_9354_ab","newPosZ","bl","D","D","EntityLiving","nq","net/minecraft/src","0" +"field_9352_ac","newRotationYaw","bm","D","D","EntityLiving","nq","net/minecraft/src","0" +"field_9350_ad","newRotationPitch","bn","D","D","EntityLiving","nq","net/minecraft/src","0" +"field_9348_ae","field_9348_ae","bo","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9346_af","naturalArmorRating","bp","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9344_ag","entityAge","bq","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_9342_ah","moveStrafing","br","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9340_ai","moveForward","bs","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9338_aj","randomYawVelocity","bt","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9336_ak","isJumping","bu","Z","Z","EntityLiving","nq","net/minecraft/src","0" +"field_9334_al","defaultPitch","bv","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_9333_am","moveSpeed","bw","F","F","EntityLiving","nq","net/minecraft/src","0" +"field_39003_d","field_39003_d","d","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_4120_b","currentTarget","e","LEntity;","Lia;","EntityLiving","nq","net/minecraft/src","0" +"field_4127_c","numTicksToChaseTarget","bx","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_40068_a","field_40068_a","a","I","I","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40063_b","field_40063_b","b","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40065_c","field_40065_c","j","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40061_d","field_40061_d","k","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40062_e","field_40062_e","l","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40059_f","field_40059_f","m","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40060_g","field_40060_g","n","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40069_h","field_40069_h","o","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40067_p","field_40067_p","p","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40066_q","field_40066_q","q","F","F","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_40064_r","field_40064_r","r","Ljava/util/Random;","Ljava/util/Random;","TileEntityEnchantmentTable","rq","net/minecraft/src","0" +"field_1655_a","vector3D","a","LVec3D;","Lfb;","PositionTextureVertex","fs","net/minecraft/src","0" +"field_1654_b","texturePositionX","b","F","F","PositionTextureVertex","fs","net/minecraft/src","0" +"field_1656_c","texturePositionY","c","F","F","PositionTextureVertex","fs","net/minecraft/src","0" +"field_1200_a","saveDir","a","Ljava/io/File;","Ljava/io/File;","ChunkLoader","gy","net/minecraft/src","0" +"field_1199_b","createIfNecessary","b","Z","Z","ChunkLoader","gy","net/minecraft/src","0" +"field_40323_a","field_40323_a","g","[LModelRenderer;","[Lacf;","ModelBlaze","adm","net/minecraft/src","0" +"field_40322_b","field_40322_b","h","LModelRenderer;","Lacf;","ModelBlaze","adm","net/minecraft/src","0" +"field_28098_a","field_28098_a","a","I","I","GuiErrorScreen","ov","net/minecraft/src","0" +"field_1244_k","onGround","a","F","F","ModelBase","al","net/minecraft/src","0" +"field_1243_l","isRiding","b","Z","Z","ModelBase","al","net/minecraft/src","0" +"field_35394_j","boxList","c","Ljava/util/List;","Ljava/util/List;","ModelBase","al","net/minecraft/src","0" +"field_40301_k","field_40301_k","d","Z","Z","ModelBase","al","net/minecraft/src","0" +"field_39000_a","field_39000_a","g","Ljava/util/Map;","Ljava/util/Map;","ModelBase","al","net/minecraft/src","0" +"field_40299_l","textureWidth","e","I","I","ModelBase","al","net/minecraft/src","0" +"field_40300_m","textureHeight","f","I","I","ModelBase","al","net/minecraft/src","0" +"field_930_d","itemRenderer","d","LRenderItem;","Liw;","GuiIngame","qd","net/minecraft/src","0" +"field_929_e","chatMessageList","e","Ljava/util/List;","Ljava/util/List;","GuiIngame","qd","net/minecraft/src","0" +"field_9423_f","rand","f","Ljava/util/Random;","Ljava/util/Random;","GuiIngame","qd","net/minecraft/src","0" +"field_9422_g","mc","g","LMinecraft;","LMinecraft;","GuiIngame","qd","net/minecraft/src","0" +"field_933_a","field_933_a","a","Ljava/lang/String;","Ljava/lang/String;","GuiIngame","qd","net/minecraft/src","0" +"field_9421_h","updateCounter","h","I","I","GuiIngame","qd","net/minecraft/src","0" +"field_9420_i","recordPlaying","j","Ljava/lang/String;","Ljava/lang/String;","GuiIngame","qd","net/minecraft/src","0" +"field_9419_j","recordPlayingUpFor","k","I","I","GuiIngame","qd","net/minecraft/src","0" +"field_22065_l","recordIsPlaying","l","Z","Z","GuiIngame","qd","net/minecraft/src","0" +"field_6446_b","damageGuiPartialTime","b","F","F","GuiIngame","qd","net/minecraft/src","0" +"field_931_c","prevVignetteBrightness","c","F","F","GuiIngame","qd","net/minecraft/src","0" +"field_35081_a","field_35081_a","a","I","I","ComponentVillageField","ec","net/minecraft/src","0" +"field_35090_a","field_35090_a","a","I","I","ComponentVillageField2","agr","net/minecraft/src","0" +"field_6461_a","guiScreen","a","LGuiScreen;","Lxe;","GuiTexturePacks","lb","net/minecraft/src","0" +"field_6454_o","field_6454_o","b","I","I","GuiTexturePacks","lb","net/minecraft/src","0" +"field_6453_p","fileLocation","c","Ljava/lang/String;","Ljava/lang/String;","GuiTexturePacks","lb","net/minecraft/src","0" +"field_22128_k","guiTexturePackSlot","d","LGuiTexturePackSlot;","Lju;","GuiTexturePacks","lb","net/minecraft/src","0" +"field_1098_a","stringValue","a","Ljava/lang/String;","Ljava/lang/String;","NBTTagString","yt","net/minecraft/src","0" +"field_897_c","blankChunk","c","LChunk;","Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_896_d","chunkProvider","d","LIChunkProvider;","Lej;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_895_e","chunkLoader","e","LIChunkLoader;","Ld;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_894_f","chunks","f","[LChunk;","[Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_893_g","worldObj","g","LWorld;","Lry;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_891_a","lastQueriedChunkXPos","a","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_890_b","lastQueriedChunkZPos","b","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_892_h","lastQueriedChunk","h","LChunk;","Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_21113_i","curChunkX","i","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_21112_j","curChunkY","j","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"field_26003_a","field_26003_a","a","[B","[B","ChunkBlockMap","aig","net/minecraft/src","0" +"field_22156_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","SaveHandler","e","net/minecraft/src","0" +"field_22155_b","saveDirectory","b","Ljava/io/File;","Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" +"field_22158_c","playersDirectory","c","Ljava/io/File;","Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" +"field_28114_d","mapDataDir","d","Ljava/io/File;","Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" +"field_22157_d","now","e","J","J","SaveHandler","e","net/minecraft/src","0" +"field_40531_f","saveDirectoryName","f","Ljava/lang/String;","Ljava/lang/String;","SaveHandler","e","net/minecraft/src","0" +"field_21144_a","recipeOutput","a","LItemStack;","Ldk;","ShapelessRecipes","bc","net/minecraft/src","0" +"field_21143_b","recipeItems","b","Ljava/util/List;","Ljava/util/List;","ShapelessRecipes","bc","net/minecraft/src","0" +"field_1133_g","field_1133_g","g","[F","[F","TextureFlamesFX","agp","net/minecraft/src","0" +"field_1132_h","field_1132_h","h","[F","[F","TextureFlamesFX","agp","net/minecraft/src","0" +"field_35297_a","field_35297_a","a","LBlock;","Lyy;","BlockStem","pu","net/minecraft/src","0" +"field_317_a","minecartType","a","I","I","ItemMinecart","aex","net/minecraft/src","0" +"field_35241_a","entityId","a","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" +"field_35239_b","posX","b","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" +"field_35240_c","posY","c","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" +"field_35237_d","posZ","d","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" +"field_35238_e","count","e","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" +"field_35635_a","villageSpawnBiomes","e","Ljava/util/List;","Ljava/util/List;","MapGenVillage","xn","net/minecraft/src","0" +"field_35257_a","playerName","a","Ljava/lang/String;","Ljava/lang/String;","Packet201PlayerInfo","oz","net/minecraft/src","0" +"field_35255_b","isConnected","b","Z","Z","Packet201PlayerInfo","oz","net/minecraft/src","0" +"field_35256_c","ping","c","I","I","Packet201PlayerInfo","oz","net/minecraft/src","0" +"field_749_a","pathToEntity","a","LPathEntity;","Ldw;","EntityCreature","ww","net/minecraft/src","0" +"field_751_f","entityToAttack","h","LEntity;","Lia;","EntityCreature","ww","net/minecraft/src","0" +"field_750_g","hasAttacked","i","Z","Z","EntityCreature","ww","net/minecraft/src","0" +"field_35174_at","fleeingTick","by","I","I","EntityCreature","ww","net/minecraft/src","0" +"field_4232_a","random","a","Ljava/util/Random;","Ljava/util/Random;","Teleporter","aim","net/minecraft/src","0" +"field_28213_a","mapColorArray","a","[LMapColor;","[Laav;","MapColor","aav","net/minecraft/src","0" +"field_28212_b","airColor","b","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28211_c","grassColor","c","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28210_d","sandColor","d","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28209_e","clothColor","e","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28208_f","tntColor","f","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28207_g","iceColor","g","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28206_h","ironColor","h","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28205_i","foliageColor","i","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28204_j","snowColor","j","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28203_k","clayColor","k","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28202_l","dirtColor","l","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28201_m","stoneColor","m","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28200_n","waterColor","n","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28199_o","woodColor","o","LMapColor;","Laav;","MapColor","aav","net/minecraft/src","0" +"field_28198_p","colorValue","p","I","I","MapColor","aav","net/minecraft/src","0" +"field_28197_q","colorIndex","q","I","I","MapColor","aav","net/minecraft/src","0" +"field_35855_b","pieceWeightArray","b","[LStructureStrongholdPieceWeight;","[Lci;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"field_35856_c","structurePieceList","c","Ljava/util/List;","Ljava/util/List;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"field_40752_d","field_40752_d","d","Ljava/lang/Class;","Ljava/lang/Class;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"field_35857_a","totalWeight","a","I","I","StructureStrongholdPieces","tc","net/minecraft/src","0" +"field_35854_d","field_35854_d","e","LStructureStrongholdStones;","Lqa;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"field_1159_b","worldObj","b","LWorld;","Lry;","RailLogic","aiq","net/minecraft/src","0" +"field_1165_c","trackX","c","I","I","RailLogic","aiq","net/minecraft/src","0" +"field_1164_d","trackY","d","I","I","RailLogic","aiq","net/minecraft/src","0" +"field_1163_e","trackZ","e","I","I","RailLogic","aiq","net/minecraft/src","0" +"field_27212_f","isPoweredRail","f","Z","Z","RailLogic","aiq","net/minecraft/src","0" +"field_1161_g","connectedTracks","g","Ljava/util/List;","Ljava/util/List;","RailLogic","aiq","net/minecraft/src","0" +"field_1160_a","rail","a","LBlockRail;","Lafr;","RailLogic","aiq","net/minecraft/src","0" +"field_28217_a","field_28217_a","a","B","B","MapCoord","aar","net/minecraft/src","0" +"field_28216_b","field_28216_b","b","B","B","MapCoord","aar","net/minecraft/src","0" +"field_28220_c","field_28220_c","c","B","B","MapCoord","aar","net/minecraft/src","0" +"field_28219_d","field_28219_d","d","B","B","MapCoord","aar","net/minecraft/src","0" +"field_28218_e","field_28218_e","e","LMapData;","Lkl;","MapCoord","aar","net/minecraft/src","0" +"field_25075_a","displayColumn","h","I","I","Achievement","ws","net/minecraft/src","0" +"field_25074_b","displayRow","i","I","I","Achievement","ws","net/minecraft/src","0" +"field_25076_c","parentAchievement","j","LAchievement;","Lws;","Achievement","ws","net/minecraft/src","0" +"field_27096_l","achievementDescription","l","Ljava/lang/String;","Ljava/lang/String;","Achievement","ws","net/minecraft/src","0" +"field_27095_m","statStringFormatter","m","LIStatStringFormat;","Laal;","Achievement","ws","net/minecraft/src","0" +"field_27097_d","theItemStack","k","LItemStack;","Ldk;","Achievement","ws","net/minecraft/src","0" +"field_27098_n","isSpecial","n","Z","Z","Achievement","ws","net/minecraft/src","0" +"field_27326_a","failedNode","a","LJ_Functor;","Lgz;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"field_27325_b","failPath","b","Ljava/util/List;","Ljava/util/List;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"field_27210_a","stack","a","Ljava/util/Stack;","Ljava/util/Stack;","J_JsonListenerToJdomAdapter","es","net/minecraft/src","0" +"field_27209_b","root","b","LJ_JsonNodeBuilder;","Lrv;","J_JsonListenerToJdomAdapter","es","net/minecraft/src","0" +"field_28017_a","record","a","I","I","TileEntityRecordPlayer","agc","net/minecraft/src","0" +"field_1343_a","imageData","a","[I","[I","ImageBufferDownload","vt","net/minecraft/src","0" +"field_1342_b","imageWidth","b","I","I","ImageBufferDownload","vt","net/minecraft/src","0" +"field_1344_c","imageHeight","c","I","I","ImageBufferDownload","vt","net/minecraft/src","0" +"field_35096_a","averageGroundLevel","a","I","I","ComponentVillageHouse1","gs","net/minecraft/src","0" +"field_27226_a","PATTERN","a","Ljava/util/regex/Pattern;","Ljava/util/regex/Pattern;","J_JsonNumberNode","ds","net/minecraft/src","0" +"field_27225_b","value","b","Ljava/lang/String;","Ljava/lang/String;","J_JsonNumberNode","ds","net/minecraft/src","0" +"field_1117_c","windowComponent","c","Ljava/awt/Component;","Ljava/awt/Component;","MouseHelper","hs","net/minecraft/src","0" +"field_1116_d","cursor","d","Lorg/lwjgl/input/Cursor;","Lorg/lwjgl/input/Cursor;","MouseHelper","hs","net/minecraft/src","0" +"field_1114_a","deltaX","a","I","I","MouseHelper","hs","net/minecraft/src","0" +"field_1113_b","deltaY","b","I","I","MouseHelper","hs","net/minecraft/src","0" +"field_1115_e","field_1115_e","e","I","I","MouseHelper","hs","net/minecraft/src","0" +"field_25102_a","field_25102_a","a","Ljava/util/Map;","Ljava/util/Map;","StatFileWriter","tk","net/minecraft/src","0" +"field_25101_b","field_25101_b","b","Ljava/util/Map;","Ljava/util/Map;","StatFileWriter","tk","net/minecraft/src","0" +"field_27189_c","field_27189_c","c","Z","Z","StatFileWriter","tk","net/minecraft/src","0" +"field_27188_d","statsSyncher","d","LStatsSyncher;","Ljq;","StatFileWriter","tk","net/minecraft/src","0" +"MUSIC","MUSIC","a","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"SOUND","SOUND","b","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"INVERT_MOUSE","INVERT_MOUSE","c","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"SENSITIVITY","SENSITIVITY","d","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"FOV","FOV","e","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"GAMMA","GAMMA","f","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"RENDER_DISTANCE","RENDER_DISTANCE","g","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"VIEW_BOBBING","VIEW_BOBBING","h","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"ANAGLYPH","ANAGLYPH","i","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"ADVANCED_OPENGL","ADVANCED_OPENGL","j","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"FRAMERATE_LIMIT","FRAMERATE_LIMIT","k","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"DIFFICULTY","DIFFICULTY","l","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"GRAPHICS","GRAPHICS","m","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"AMBIENT_OCCLUSION","AMBIENT_OCCLUSION","n","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"GUI_SCALE","GUI_SCALE","o","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"RENDER_CLOUDS","RENDER_CLOUDS","p","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"PARTICLES","PARTICLES","q","LEnumOptions;","Llp;","EnumOptions","lp","net/minecraft/src","0" +"field_20144_k","enumFloat","r","Z","Z","EnumOptions","lp","net/minecraft/src","0" +"field_20143_l","enumBoolean","s","Z","Z","EnumOptions","lp","net/minecraft/src","0" +"field_20142_m","enumString","t","Ljava/lang/String;","Ljava/lang/String;","EnumOptions","lp","net/minecraft/src","0" +"field_20141_n","allOptions","u","[LEnumOptions;","[Llp;","EnumOptions","lp","net/minecraft/src","0" +"field_1057_z","blocksToReceive","J","Ljava/util/LinkedList;","Ljava/util/LinkedList;","WorldClient","ma","net/minecraft/src","0" +"field_1052_A","sendQueue","K","LNetClientHandler;","Labp;","WorldClient","ma","net/minecraft/src","0" +"field_20915_C","field_20915_C","L","LChunkProviderClient;","Ler;","WorldClient","ma","net/minecraft/src","0" +"field_1055_D","entityHashSet","M","LIntHashMap;","Lob;","WorldClient","ma","net/minecraft/src","0" +"field_20914_E","entityList","N","Ljava/util/Set;","Ljava/util/Set;","WorldClient","ma","net/minecraft/src","0" +"field_1053_F","entitySpawnQueue","O","Ljava/util/Set;","Ljava/util/Set;","WorldClient","ma","net/minecraft/src","0" +"field_35889_B","currentWorld","a","LWorld;","Lry;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35890_C","randomGenerator","b","Ljava/util/Random;","Ljava/util/Random;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35885_D","chunk_X","c","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35886_E","chunk_Z","d","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35887_F","biome","e","LBiomeGenBase;","Lsr;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35897_a","clayGen","f","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35895_b","sandGen","g","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35896_c","gravelAsSandGen","h","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35893_d","dirtGen","i","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35894_e","gravelGen","j","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35891_f","coalGen","k","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35892_g","ironGen","l","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35904_h","goldGen","m","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35905_i","redstoneGen","n","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35902_j","diamondGen","o","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35903_k","lapisGen","p","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35900_l","plantYellowGen","q","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35901_m","plantRedGen","r","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35898_n","mushroomBrownGen","s","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35899_o","mushroomRedGen","t","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_40720_u","bigMushroomGen","u","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35913_p","reedGen","v","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_35912_q","cactusGen","w","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_40722_x","waterlilyGen","x","LWorldGenerator;","Lig;","BiomeDecorator","ql","net/minecraft/src","0" +"field_40721_y","waterlilyPerChunk","y","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35911_r","treesPerChunk","z","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35910_s","flowersPerChunk","A","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35909_t","grassPerChunk","B","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35908_u","deadBushPerChunk","C","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35907_v","mushroomsPerChunk","D","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35906_w","reedsPerChunk","E","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35916_x","cactiPerChunk","F","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35915_y","sandPerChunk","G","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35914_z","sandPerChunk2","H","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_35888_A","clayPerChunk","I","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_40718_J","bigMushroomsPerChunk","J","I","I","BiomeDecorator","ql","net/minecraft/src","0" +"field_40719_K","generateLakes","K","Z","Z","BiomeDecorator","ql","net/minecraft/src","0" +"field_20919_a","mcFrame","a","Ljava/awt/Frame;","Ljava/awt/Frame;","MinecraftImpl","ahy","net/minecraft/src","0" +"field_1556_a","pathPoints","a","[LPathPoint;","[Lmo;","Path","zs","net/minecraft/src","0" +"field_1555_b","count","b","I","I","Path","zs","net/minecraft/src","0" +"field_27306_a","key","a","LJ_JsonNodeBuilder;","Lrv;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"field_27305_b","valueBuilder","b","LJ_JsonNodeBuilder;","Lrv;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"field_4015_b","itemRand","c","Ljava/util/Random;","Ljava/util/Random;","Item","acy","net/minecraft/src","0" +"field_233_c","itemsList","d","[LItem;","[Lacy;","Item","acy","net/minecraft/src","0" +"field_232_d","shovelSteel","e","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_231_e","pickaxeSteel","f","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_230_f","axeSteel","g","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4014_g","flintAndSteel","h","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_228_h","appleRed","i","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_227_i","bow","j","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_226_j","arrow","k","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_225_k","coal","l","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_224_l","diamond","m","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_223_m","ingotIron","n","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_222_n","ingotGold","o","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_221_o","swordSteel","p","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_220_p","swordWood","q","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_219_q","shovelWood","r","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_218_r","pickaxeWood","s","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_217_s","axeWood","t","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_216_t","swordStone","u","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_215_u","shovelStone","v","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_214_v","pickaxeStone","w","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_213_w","axeStone","x","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_212_x","swordDiamond","y","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_211_y","shovelDiamond","z","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_210_z","pickaxeDiamond","A","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_268_A","axeDiamond","B","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_266_B","stick","C","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_264_C","bowlEmpty","D","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_263_D","bowlSoup","E","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_261_E","swordGold","F","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_259_F","shovelGold","G","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_257_G","pickaxeGold","H","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_255_H","axeGold","I","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_253_I","silk","J","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_251_J","feather","K","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_250_K","gunpowder","L","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_249_L","hoeWood","M","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_248_M","hoeStone","N","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_247_N","hoeSteel","O","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_246_O","hoeDiamond","P","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_245_P","hoeGold","Q","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_244_Q","seeds","R","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_243_R","wheat","S","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_242_S","bread","T","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_241_T","helmetLeather","U","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_240_U","plateLeather","V","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_239_V","legsLeather","W","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_238_W","bootsLeather","X","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_237_X","helmetChain","Y","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_236_Y","plateChain","Z","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_235_Z","legsChain","aa","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_286_aa","bootsChain","ab","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_285_ab","helmetSteel","ac","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_284_ac","plateSteel","ad","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_283_ad","legsSteel","ae","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_282_ae","bootsSteel","af","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_281_af","helmetDiamond","ag","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_280_ag","plateDiamond","ah","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_279_ah","legsDiamond","ai","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_278_ai","bootsDiamond","aj","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_277_aj","helmetGold","ak","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_276_ak","plateGold","al","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_275_al","legsGold","am","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_274_am","bootsGold","an","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_273_an","flint","ao","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_272_ao","porkRaw","ap","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4017_ap","porkCooked","aq","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_270_aq","painting","ar","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_269_ar","appleGold","as","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_267_as","sign","at","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_265_at","doorWood","au","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_262_au","bucketEmpty","av","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4016_av","bucketWater","aw","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_258_aw","bucketLava","ax","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_256_ax","minecartEmpty","ay","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_254_ay","saddle","az","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_252_az","doorSteel","aA","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_309_aA","redstone","aB","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_308_aB","snowball","aC","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4031_aC","boat","aD","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_306_aD","leather","aE","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_305_aE","bucketMilk","aF","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4030_aF","brick","aG","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_303_aG","clay","aH","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_302_aH","reed","aI","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4029_aI","paper","aJ","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4028_aJ","book","aK","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_299_aK","slimeBall","aL","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4027_aL","minecartCrate","aM","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4026_aM","minecartPowered","aN","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_296_aN","egg","aO","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4025_aO","compass","aP","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4024_aP","fishingRod","aQ","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4023_aQ","pocketSundial","aR","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4022_aR","lightStoneDust","aS","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4021_aS","fishRaw","aT","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4020_aT","fishCooked","aU","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_21021_aU","dyePowder","aV","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_21020_aV","bone","aW","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_21019_aW","sugar","aX","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_21022_aX","cake","aY","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_22019_aY","bed","aZ","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_22018_aZ","redstoneRepeater","ba","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_25010_ba","cookie","bb","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_28010_bb","map","bc","LItemMap;","Lbv;","Item","acy","net/minecraft/src","0" +"field_31001_bc","shears","bd","LItemShears;","Labo;","Item","acy","net/minecraft/src","0" +"field_35421_bg","melon","be","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35422_bh","pumpkinSeeds","bf","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35423_bi","melonSeeds","bg","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35417_bj","beefRaw","bh","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35418_bk","beefCooked","bi","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35419_bl","chickenRaw","bj","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35420_bm","chickenCooked","bk","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35415_bn","rottenFlesh","bl","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_35416_bo","enderPearl","bm","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40417_bo","blazeRod","bn","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40418_bp","ghastTear","bo","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40419_bq","goldNugget","bp","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40414_br","netherStalkSeeds","bq","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40413_bs","potion","br","LItemPotion;","Labk;","Item","acy","net/minecraft/src","0" +"field_40416_bt","glassBottle","bs","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40415_bu","spiderEye","bt","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40410_bv","fermentedSpiderEye","bu","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40409_bw","blazePowder","bv","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40412_bx","magmaCream","bw","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40411_by","brewingStand","bx","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40408_bz","cauldron","by","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40420_bA","eyeOfEnder","bz","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40426_bB","speckledMelon","bA","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_293_aQ","record13","bB","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_4019_aV","recordCat","bC","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40425_bE","recordBlocks","bD","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40429_bF","recordChirp","bE","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40430_bG","recordFar","bF","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40427_bH","recordMall","bG","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40428_bI","recordMellohi","bH","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40423_bJ","recordStal","bI","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40424_bK","recordStrad","bJ","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40421_bL","recordWard","bK","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_40422_bM","record11","bL","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_291_aS","shiftedIndex","bM","I","I","Item","acy","net/minecraft/src","0" +"field_290_aT","maxStackSize","bN","I","I","Item","acy","net/minecraft/src","0" +"field_289_aU","maxDamage","a","I","I","Item","acy","net/minecraft/src","0" +"field_4018_aZ","iconIndex","bO","I","I","Item","acy","net/minecraft/src","0" +"field_287_aW","bFull3D","bP","Z","Z","Item","acy","net/minecraft/src","0" +"field_21018_bf","hasSubtypes","bQ","Z","Z","Item","acy","net/minecraft/src","0" +"field_20926_a","containerItem","b","LItem;","Lacy;","Item","acy","net/minecraft/src","0" +"field_39010_c","field_39010_c","bR","Ljava/lang/String;","Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"field_332_a","itemName","bS","Ljava/lang/String;","Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"field_27308_a","nodeBuilder","a","LJ_JsonObjectNodeBuilder;","Labq;","J_JsonObjectNodeList","nv","net/minecraft/src","0" +"field_820_a","nameToClassMap","a","Ljava/util/Map;","Ljava/util/Map;","TileEntity","bq","net/minecraft/src","0" +"field_819_b","classToNameMap","b","Ljava/util/Map;","Ljava/util/Map;","TileEntity","bq","net/minecraft/src","0" +"field_824_e","worldObj","c","LWorld;","Lry;","TileEntity","bq","net/minecraft/src","0" +"field_823_f","xCoord","d","I","I","TileEntity","bq","net/minecraft/src","0" +"field_822_g","yCoord","e","I","I","TileEntity","bq","net/minecraft/src","0" +"field_821_h","zCoord","f","I","I","TileEntity","bq","net/minecraft/src","0" +"field_31007_h","tileEntityInvalid","g","Z","Z","TileEntity","bq","net/minecraft/src","0" +"field_35145_n","blockMetadata","h","I","I","TileEntity","bq","net/minecraft/src","0" +"field_35146_o","field_35146_o","i","LBlock;","Lyy;","TileEntity","bq","net/minecraft/src","0" +"field_460_a","numAdjacentSources","a","I","I","BlockFlowing","ahx","net/minecraft/src","0" +"field_459_b","isOptimalFlowDirection","cb","[Z","[Z","BlockFlowing","ahx","net/minecraft/src","0" +"field_461_c","flowCost","cc","[I","[I","BlockFlowing","ahx","net/minecraft/src","0" +"field_1585_a","enumOSMappingArray","a","[I","[I","EnumOSMappingHelper","qr","net/minecraft/src","0" +"field_40013_a","field_40013_a","a","[LStructurePieceTreasure;","[Lagq;","ComponentStrongholdChestCorridor","ys","net/minecraft/src","0" +"field_40011_b","field_40011_b","b","LEnumDoor;","Lmj;","ComponentStrongholdChestCorridor","ys","net/minecraft/src","0" +"field_40012_c","field_40012_c","c","Z","Z","ComponentStrongholdChestCorridor","ys","net/minecraft/src","0" +"field_843_a","mainInventory","a","[LItemStack;","[Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"field_842_b","armorInventory","b","[LItemStack;","[Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"field_847_d","currentItem","c","I","I","InventoryPlayer","x","net/minecraft/src","0" +"field_844_g","player","d","LEntityPlayer;","Lvi;","InventoryPlayer","x","net/minecraft/src","0" +"field_20077_f","itemStack","f","LItemStack;","Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"field_845_f","inventoryChanged","e","Z","Z","InventoryPlayer","x","net/minecraft/src","0" +"field_1119_a","slotIndex","a","I","I","Slot","vv","net/minecraft/src","0" +"field_1118_b","inventory","c","LIInventory;","Lde;","Slot","vv","net/minecraft/src","0" +"field_20007_a","slotNumber","d","I","I","Slot","vv","net/minecraft/src","0" +"field_20006_b","xDisplayPosition","e","I","I","Slot","vv","net/minecraft/src","0" +"field_20008_c","yDisplayPosition","f","I","I","Slot","vv","net/minecraft/src","0" +"field_35871_a","field_35871_a","a","[I","[I","Direction","lz","net/minecraft/src","0" +"field_35870_b","field_35870_b","b","[I","[I","Direction","lz","net/minecraft/src","0" +"field_22280_a","headInvisibleFace","c","[I","[I","Direction","lz","net/minecraft/src","0" +"field_35869_d","field_35869_d","d","[I","[I","Direction","lz","net/minecraft/src","0" +"field_22279_b","footInvisibleFaceRemap","e","[I","[I","Direction","lz","net/minecraft/src","0" +"field_35867_f","field_35867_f","f","[I","[I","Direction","lz","net/minecraft/src","0" +"field_35868_g","field_35868_g","g","[I","[I","Direction","lz","net/minecraft/src","0" +"field_22281_c","bedDirection","h","[[I","[[I","Direction","lz","net/minecraft/src","0" +"field_40340_a","field_40340_a","g","LModelRenderer;","Lacf;","ModelVillager","zf","net/minecraft/src","0" +"field_40338_b","field_40338_b","h","LModelRenderer;","Lacf;","ModelVillager","zf","net/minecraft/src","0" +"field_40339_c","field_40339_c","i","LModelRenderer;","Lacf;","ModelVillager","zf","net/minecraft/src","0" +"field_40336_d","field_40336_d","j","LModelRenderer;","Lacf;","ModelVillager","zf","net/minecraft/src","0" +"field_40337_e","field_40337_e","k","LModelRenderer;","Lacf;","ModelVillager","zf","net/minecraft/src","0" +"field_40334_f","field_40334_f","l","I","I","ModelVillager","zf","net/minecraft/src","0" +"field_40335_g","field_40335_g","m","I","I","ModelVillager","zf","net/minecraft/src","0" +"field_40341_n","field_40341_n","n","Z","Z","ModelVillager","zf","net/minecraft/src","0" +"field_40342_o","field_40342_o","o","Z","Z","ModelVillager","zf","net/minecraft/src","0" +"field_40192_a","windowId","a","I","I","Packet108EnchantItem","acv","net/minecraft/src","0" +"field_40191_b","enchantment","b","I","I","Packet108EnchantItem","acv","net/minecraft/src","0" +"field_764_a","timeSinceIgnited","b","I","I","EntityCreeper","abh","net/minecraft/src","0" +"field_763_b","lastActiveTime","c","I","I","EntityCreeper","abh","net/minecraft/src","0" +"field_20034_a","windowId","a","I","I","Packet101CloseWindow","hi","net/minecraft/src","0" +"field_547_a","entityId","a","I","I","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_546_b","type","b","B","B","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_552_c","xPosition","c","I","I","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_551_d","yPosition","d","I","I","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_550_e","zPosition","e","I","I","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_549_f","yaw","f","B","B","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_548_g","pitch","g","B","B","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_21055_h","metaData","h","LDataWatcher;","Lcr;","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_21054_i","receivedMetadata","i","Ljava/util/List;","Ljava/util/List;","Packet24MobSpawn","mn","net/minecraft/src","0" +"field_27191_a","column","a","I","I","J_InvalidSyntaxException","zz","net/minecraft/src","0" +"field_27190_b","row","b","I","I","J_InvalidSyntaxException","zz","net/minecraft/src","0" +"field_40739_a","field_40739_a","a","LChunkCoordIntPair;","Lacm;","ThreadedChunkLoaderPending","vp","net/minecraft/src","0" +"field_40738_b","field_40738_b","b","LNBTTagCompound;","Lik;","ThreadedChunkLoaderPending","vp","net/minecraft/src","0" +"field_542_a","xPosition","a","I","I","Packet14BlockDig","sm","net/minecraft/src","0" +"field_541_b","yPosition","b","I","I","Packet14BlockDig","sm","net/minecraft/src","0" +"field_545_c","zPosition","c","I","I","Packet14BlockDig","sm","net/minecraft/src","0" +"field_544_d","face","d","I","I","Packet14BlockDig","sm","net/minecraft/src","0" +"field_543_e","status","e","I","I","Packet14BlockDig","sm","net/minecraft/src","0" +"field_1770_a","tryCheckOcclusionCapable","a","Z","Z","OpenGlCapsChecker","mm","net/minecraft/src","0" +"field_27224_a","value","a","Ljava/lang/String;","Ljava/lang/String;","J_JsonStringNode","oj","net/minecraft/src","0" +"field_28120_a","entityplayerObj","a","LEntityPlayer;","Lvi;","MapInfo","sa","net/minecraft/src","0" +"field_28119_b","field_28119_b","b","[I","[I","MapInfo","sa","net/minecraft/src","0" +"field_28124_c","field_28124_c","c","[I","[I","MapInfo","sa","net/minecraft/src","0" +"field_28122_e","field_28122_e","e","I","I","MapInfo","sa","net/minecraft/src","0" +"field_28121_f","field_28121_f","f","I","I","MapInfo","sa","net/minecraft/src","0" +"field_28123_d","mapDataObj","d","LMapData;","Lkl;","MapInfo","sa","net/minecraft/src","0" +"field_1214_c","disconnected","f","Z","Z","NetClientHandler","abp","net/minecraft/src","0" +"field_1213_d","netManager","g","LNetworkManager;","Lhc;","NetClientHandler","abp","net/minecraft/src","0" +"field_1209_a","field_1209_a","a","Ljava/lang/String;","Ljava/lang/String;","NetClientHandler","abp","net/minecraft/src","0" +"field_1212_e","mc","h","LMinecraft;","LMinecraft;","NetClientHandler","abp","net/minecraft/src","0" +"field_1211_f","worldClient","i","LWorldClient;","Lma;","NetClientHandler","abp","net/minecraft/src","0" +"field_1210_g","field_1210_g","j","Z","Z","NetClientHandler","abp","net/minecraft/src","0" +"field_28118_b","mapStorage","b","LMapStorage;","Lew;","NetClientHandler","abp","net/minecraft/src","0" +"field_35787_k","playerInfoMap","k","Ljava/util/Map;","Ljava/util/Map;","NetClientHandler","abp","net/minecraft/src","0" +"field_35786_c","playerNames","c","Ljava/util/List;","Ljava/util/List;","NetClientHandler","abp","net/minecraft/src","0" +"field_35785_d","currentServerMaxPlayers","d","I","I","NetClientHandler","abp","net/minecraft/src","0" +"field_1208_b","rand","e","Ljava/util/Random;","Ljava/util/Random;","NetClientHandler","abp","net/minecraft/src","0" +"field_325_aX","blocksEffectiveAgainst","bR","[LBlock;","[Lyy;","ItemTool","ads","net/minecraft/src","0" +"field_324_aY","efficiencyOnProperMaterial","a","F","F","ItemTool","ads","net/minecraft/src","0" +"field_323_aZ","damageVsEntity","bS","I","I","ItemTool","ads","net/minecraft/src","0" +"field_20927_a","toolMaterial","b","LEnumToolMaterial;","Lnu;","ItemTool","ads","net/minecraft/src","0" +"field_20123_d","inventoryItemStacks","d","Ljava/util/List;","Ljava/util/List;","Container","pj","net/minecraft/src","0" +"field_20122_e","inventorySlots","e","Ljava/util/List;","Ljava/util/List;","Container","pj","net/minecraft/src","0" +"field_1618_c","windowId","f","I","I","Container","pj","net/minecraft/src","0" +"field_20917_a","field_20917_a","a","S","S","Container","pj","net/minecraft/src","0" +"field_20121_g","crafters","g","Ljava/util/List;","Ljava/util/List;","Container","pj","net/minecraft/src","0" +"field_20918_b","field_20918_b","b","Ljava/util/Set;","Ljava/util/Set;","Container","pj","net/minecraft/src","0" +"field_35624_a","name","a","Ljava/lang/String;","Ljava/lang/String;","GuiSavingLevelString","ao","net/minecraft/src","0" +"field_35623_b","responseTime","b","I","I","GuiSavingLevelString","ao","net/minecraft/src","0" +"field_27239_a","field_27239_a","a","LJ_JsonNode;","Lan;","J_JsonNumberNodeBuilder","ms","net/minecraft/src","0" +"field_35311_f","inventory","g","LInventoryBasic;","Lbb;","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35312_g","field_35312_g","h","F","F","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35313_h","field_35313_h","j","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35314_i","field_35314_i","k","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" +"field_571_a","entityID","a","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" +"field_21056_b","slot","b","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" +"field_570_b","itemID","c","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" +"field_20044_c","itemDamage","d","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" +"field_40214_a","field_40214_a","a","Ljava/util/Random;","Ljava/util/Random;","BlockBrewingStand","ahp","net/minecraft/src","0" +"field_1192_a","generatorCollection","a","[LNoiseGeneratorPerlin;","[Lagk;","NoiseGeneratorOctaves","eb","net/minecraft/src","0" +"field_1191_b","octaves","b","I","I","NoiseGeneratorOctaves","eb","net/minecraft/src","0" +"field_330_a","blockID","a","I","I","ItemBlock","uw","net/minecraft/src","0" +"field_4072_a","blockType","a","Z","Z","BlockPumpkin","nf","net/minecraft/src","0" +"field_485_a","entityId","a","I","I","Packet30Entity","rd","net/minecraft/src","0" +"field_484_b","xPosition","b","B","B","Packet30Entity","rd","net/minecraft/src","0" +"field_490_c","yPosition","c","B","B","Packet30Entity","rd","net/minecraft/src","0" +"field_489_d","zPosition","d","B","B","Packet30Entity","rd","net/minecraft/src","0" +"field_488_e","yaw","e","B","B","Packet30Entity","rd","net/minecraft/src","0" +"field_487_f","pitch","f","B","B","Packet30Entity","rd","net/minecraft/src","0" +"field_486_g","rotating","g","Z","Z","Packet30Entity","rd","net/minecraft/src","0" +"field_27373_a","statsGUI","a","LGuiStats;","Lin;","SorterStatsItem","gf","net/minecraft/src","0" +"field_27372_b","slotStatsItemGUI","b","LGuiSlotStatsItem;","Lxa;","SorterStatsItem","gf","net/minecraft/src","0" +"field_40692_a","field_40692_a","a","[LStructureNetherBridgePieceWeight;","[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"field_40691_b","field_40691_b","b","[LStructureNetherBridgePieceWeight;","[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"field_20072_a","inventoryTitle","a","Ljava/lang/String;","Ljava/lang/String;","InventoryBasic","bb","net/minecraft/src","0" +"field_20071_b","slotsCount","b","I","I","InventoryBasic","bb","net/minecraft/src","0" +"field_20074_c","inventoryContents","c","[LItemStack;","[Ldk;","InventoryBasic","bb","net/minecraft/src","0" +"field_20073_d","field_20073_d","d","Ljava/util/List;","Ljava/util/List;","InventoryBasic","bb","net/minecraft/src","0" +"field_35430_a","field_35430_a","a","I","I","ItemFood","agu","net/minecraft/src","0" +"field_20921_a","healAmount","b","I","I","ItemFood","agu","net/minecraft/src","0" +"field_35428_c","saturationModifier","bR","F","F","ItemFood","agu","net/minecraft/src","0" +"field_25013_bi","isWolfsFavoriteMeat","bS","Z","Z","ItemFood","agu","net/minecraft/src","0" +"field_35431_bw","alwaysEdible","bT","Z","Z","ItemFood","agu","net/minecraft/src","0" +"field_35433_bx","potionId","bU","I","I","ItemFood","agu","net/minecraft/src","0" +"field_35432_by","potionDuration","bV","I","I","ItemFood","agu","net/minecraft/src","0" +"field_35427_bz","potionAmplifier","bW","I","I","ItemFood","agu","net/minecraft/src","0" +"field_35429_bA","potionEffectProbability","bX","F","F","ItemFood","agu","net/minecraft/src","0" +"field_6515_a","description","a","Ljava/lang/String;","Ljava/lang/String;","UnexpectedThrowable","oq","net/minecraft/src","0" +"field_6514_b","exception","b","Ljava/lang/Throwable;","Ljava/lang/Throwable;","UnexpectedThrowable","oq","net/minecraft/src","0" +"field_27344_a","mc","a","LMinecraft;","LMinecraft;","StatStringFormatKeyInv","qb","net/minecraft/src","0" +"field_40079_d","xTile","d","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40080_e","yTile","e","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40082_ao","zTile","f","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40084_ap","inTile","g","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40085_a","inGround","a","Z","Z","EntityThrowable","fm","net/minecraft/src","0" +"field_40081_b","throwableShake","b","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40083_c","throwingEntity","c","LEntityLiving;","Lnq;","EntityThrowable","fm","net/minecraft/src","0" +"field_40087_aq","ticksInGround","h","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_40086_ar","ticksInAir","i","I","I","EntityThrowable","fm","net/minecraft/src","0" +"field_582_a","reason","a","Ljava/lang/String;","Ljava/lang/String;","Packet255KickDisconnect","sw","net/minecraft/src","0" +"field_25073_a","field_25073_a","h","I","I","StatCrafting","yl","net/minecraft/src","0" +"field_882_a","otherCoordPairs","a","[B","[B","WorldGenBigTree","yd","net/minecraft/src","0" +"field_881_b","rand","b","Ljava/util/Random;","Ljava/util/Random;","WorldGenBigTree","yd","net/minecraft/src","0" +"field_880_c","worldObj","c","LWorld;","Lry;","WorldGenBigTree","yd","net/minecraft/src","0" +"field_879_d","basePos","d","[I","[I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_878_e","heightLimit","e","I","I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_877_f","height","f","I","I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_876_g","heightAttenuation","g","D","D","WorldGenBigTree","yd","net/minecraft/src","0" +"field_875_h","field_875_h","h","D","D","WorldGenBigTree","yd","net/minecraft/src","0" +"field_874_i","field_874_i","i","D","D","WorldGenBigTree","yd","net/minecraft/src","0" +"field_873_j","field_873_j","j","D","D","WorldGenBigTree","yd","net/minecraft/src","0" +"field_872_k","field_872_k","k","D","D","WorldGenBigTree","yd","net/minecraft/src","0" +"field_871_l","trunkSize","l","I","I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_870_m","heightLimitLimit","m","I","I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_869_n","leafDistanceLimit","n","I","I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_868_o","leafNodes","o","[[I","[[I","WorldGenBigTree","yd","net/minecraft/src","0" +"field_318_a","blockType","a","I","I","ItemSeeds","adf","net/minecraft/src","0" +"field_40438_b","field_40438_b","b","I","I","ItemSeeds","adf","net/minecraft/src","0" +"field_40440_f","field_40440_f","b","LEntityPlayer;","Lvi;","SlotBrewingStandPotion","aeb","net/minecraft/src","0" +"field_40441_a","field_40441_a","a","LContainerBrewingStand;","Lok;","SlotBrewingStandPotion","aeb","net/minecraft/src","0" +"field_671_a","smokeParticleScale","a","F","F","EntitySmokeFX","aca","net/minecraft/src","0" +"field_675_a","field_675_a","a","LEntity;","Lia;","EntityPickupFX","acw","net/minecraft/src","0" +"field_679_o","field_679_o","au","LEntity;","Lia;","EntityPickupFX","acw","net/minecraft/src","0" +"field_678_p","age","av","I","I","EntityPickupFX","acw","net/minecraft/src","0" +"field_677_q","maxAge","aw","I","I","EntityPickupFX","acw","net/minecraft/src","0" +"field_676_r","field_676_r","ax","F","F","EntityPickupFX","acw","net/minecraft/src","0" +"field_21149_a","tileEntityDispenser","a","LTileEntityDispenser;","Lbp;","ContainerDispenser","qu","net/minecraft/src","0" +"field_40306_a","field_40306_a","g","LModelRenderer;","Lacf;","ModelSnowMan","aai","net/minecraft/src","0" +"field_40304_b","field_40304_b","h","LModelRenderer;","Lacf;","ModelSnowMan","aai","net/minecraft/src","0" +"field_40305_c","field_40305_c","i","LModelRenderer;","Lacf;","ModelSnowMan","aai","net/minecraft/src","0" +"field_40302_d","field_40302_d","j","LModelRenderer;","Lacf;","ModelSnowMan","aai","net/minecraft/src","0" +"field_40303_e","field_40303_e","k","LModelRenderer;","Lacf;","ModelSnowMan","aai","net/minecraft/src","0" +"field_20901_a","courseChangeCooldown","a","I","I","EntityGhast","is","net/minecraft/src","0" +"field_20900_b","waypointX","b","D","D","EntityGhast","is","net/minecraft/src","0" +"field_20902_c","waypointY","c","D","D","EntityGhast","is","net/minecraft/src","0" +"field_4126_d","waypointZ","d","D","D","EntityGhast","is","net/minecraft/src","0" +"field_4123_g","targetedEntity","g","LEntity;","Lia;","EntityGhast","is","net/minecraft/src","0" +"field_4122_h","aggroCooldown","h","I","I","EntityGhast","is","net/minecraft/src","0" +"field_4125_e","prevAttackCounter","e","I","I","EntityGhast","is","net/minecraft/src","0" +"field_4124_f","attackCounter","f","I","I","EntityGhast","is","net/minecraft/src","0" +"field_1095_a","longValue","a","J","J","NBTTagLong","vw","net/minecraft/src","0" +"field_28055_a","itemID","a","S","S","Packet131MapData","aej","net/minecraft/src","0" +"field_28054_b","uniqueID","b","S","S","Packet131MapData","aej","net/minecraft/src","0" +"field_28056_c","itemData","c","[B","[B","Packet131MapData","aej","net/minecraft/src","0" +"field_40024_a","field_40024_a","a","I","I","StructureNetherBridgeEnd","ld","net/minecraft/src","0" +"field_25128_s","rand","s","Ljava/util/Random;","Ljava/util/Random;","Particle","dy","net/minecraft/src","0" +"field_25146_a","posX","a","D","D","Particle","dy","net/minecraft/src","0" +"field_25145_b","posY","b","D","D","Particle","dy","net/minecraft/src","0" +"field_25144_c","prevPosX","c","D","D","Particle","dy","net/minecraft/src","0" +"field_25143_d","prevPosY","d","D","D","Particle","dy","net/minecraft/src","0" +"field_25142_e","velocityX","e","D","D","Particle","dy","net/minecraft/src","0" +"field_25141_f","velocityY","f","D","D","Particle","dy","net/minecraft/src","0" +"field_25140_g","accelScale","g","D","D","Particle","dy","net/minecraft/src","0" +"field_25139_h","isDead","h","Z","Z","Particle","dy","net/minecraft/src","0" +"field_25138_i","timeTick","i","I","I","Particle","dy","net/minecraft/src","0" +"field_25137_j","timeLimit","j","I","I","Particle","dy","net/minecraft/src","0" +"field_25136_k","tintRed","k","D","D","Particle","dy","net/minecraft/src","0" +"field_25135_l","tintGreen","l","D","D","Particle","dy","net/minecraft/src","0" +"field_25134_m","tintBlue","m","D","D","Particle","dy","net/minecraft/src","0" +"field_25133_n","tintAlpha","n","D","D","Particle","dy","net/minecraft/src","0" +"field_25132_o","prevTintRed","o","D","D","Particle","dy","net/minecraft/src","0" +"field_25131_p","prevTintGreen","p","D","D","Particle","dy","net/minecraft/src","0" +"field_25130_q","prevTintBlue","q","D","D","Particle","dy","net/minecraft/src","0" +"field_25129_r","prevTintAlpha","r","D","D","Particle","dy","net/minecraft/src","0" +"field_9319_c","xTile","e","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_9318_d","yTile","f","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_9317_e","zTile","g","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_9316_f","inTile","h","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_28019_h","inData","i","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_9315_g","inGround","aq","Z","Z","EntityArrow","ro","net/minecraft/src","0" +"field_28020_a","doesArrowBelongToPlayer","a","Z","Z","EntityArrow","ro","net/minecraft/src","0" +"field_688_a","arrowShake","b","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_682_g","shootingEntity","c","LEntity;","Lia;","EntityArrow","ro","net/minecraft/src","0" +"field_681_h","ticksInGround","ar","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_680_i","ticksInAir","as","I","I","EntityArrow","ro","net/minecraft/src","0" +"field_35140_d","arrowCritical","d","Z","Z","EntityArrow","ro","net/minecraft/src","0" +"field_22213_a","emptySector","a","[B","[B","RegionFile","as","net/minecraft/src","0" +"field_22212_b","fileName","b","Ljava/io/File;","Ljava/io/File;","RegionFile","as","net/minecraft/src","0" +"field_22219_c","dataFile","c","Ljava/io/RandomAccessFile;","Ljava/io/RandomAccessFile;","RegionFile","as","net/minecraft/src","0" +"field_22218_d","offsets","d","[I","[I","RegionFile","as","net/minecraft/src","0" +"field_22217_e","chunkTimestamps","e","[I","[I","RegionFile","as","net/minecraft/src","0" +"field_22216_f","sectorFree","f","Ljava/util/ArrayList;","Ljava/util/ArrayList;","RegionFile","as","net/minecraft/src","0" +"field_22215_g","sizeDelta","g","I","I","RegionFile","as","net/minecraft/src","0" +"field_22214_h","lastModified","h","J","J","RegionFile","as","net/minecraft/src","0" +"field_27153_j","renderItem","c","LRenderItem;","Liw;","GuiStats","in","net/minecraft/src","0" +"field_27152_a","parentGui","a","LGuiScreen;","Lxe;","GuiStats","in","net/minecraft/src","0" +"field_27154_i","statsTitle","b","Ljava/lang/String;","Ljava/lang/String;","GuiStats","in","net/minecraft/src","0" +"field_27151_l","slotGeneral","d","LGuiSlotStatsGeneral;","Lb;","GuiStats","in","net/minecraft/src","0" +"field_27150_m","slotItem","e","LGuiSlotStatsItem;","Lxa;","GuiStats","in","net/minecraft/src","0" +"field_27157_n","slotBlock","f","LGuiSlotStatsBlock;","Lhz;","GuiStats","in","net/minecraft/src","0" +"field_27156_o","statFileWriter","g","LStatFileWriter;","Ltk;","GuiStats","in","net/minecraft/src","0" +"field_27155_p","selectedSlot","h","LGuiSlot;","Ljn;","GuiStats","in","net/minecraft/src","0" +"field_6487_a","texturePackFileName","a","Ljava/lang/String;","Ljava/lang/String;","TexturePackBase","afs","net/minecraft/src","0" +"field_6486_b","firstDescriptionLine","b","Ljava/lang/String;","Ljava/lang/String;","TexturePackBase","afs","net/minecraft/src","0" +"field_6489_c","secondDescriptionLine","c","Ljava/lang/String;","Ljava/lang/String;","TexturePackBase","afs","net/minecraft/src","0" +"field_6488_d","texturePackID","d","Ljava/lang/String;","Ljava/lang/String;","TexturePackBase","afs","net/minecraft/src","0" +"field_451_a","torchActive","a","Z","Z","BlockRedstoneTorch","ku","net/minecraft/src","0" +"field_450_b","torchUpdates","cb","Ljava/util/List;","Ljava/util/List;","BlockRedstoneTorch","ku","net/minecraft/src","0" +"field_22033_a","headBlockToFootBlockMap","a","[[I","[[I","BlockBed","aab","net/minecraft/src","0" +"field_1189_d","permutations","d","[I","[I","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"field_1188_a","xCoord","a","D","D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"field_1187_b","yCoord","b","D","D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"field_1190_c","zCoord","c","D","D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"field_25201_a","localizedName","a","LStringTranslate;","Lqp;","StatCollector","hj","net/minecraft/src","0" +"field_27294_a","nodeBuilder","a","LJ_JsonArrayNodeBuilder;","Lft;","J_ArrayNodeContainer","tl","net/minecraft/src","0" +"field_27293_b","field_27293_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ArrayNodeContainer","tl","net/minecraft/src","0" +"field_35502_b","worldGenSeed","b","J","J","GenLayer","jx","net/minecraft/src","0" +"field_35504_a","parent","a","LGenLayer;","Ljx;","GenLayer","jx","net/minecraft/src","0" +"field_35503_c","chunkSeed","c","J","J","GenLayer","jx","net/minecraft/src","0" +"field_35501_d","baseSeed","d","J","J","GenLayer","jx","net/minecraft/src","0" +"field_40269_a","field_40269_a","a","F","F","RenderFireball","ke","net/minecraft/src","0" +"field_1216_a","location","a","Ljava/lang/String;","Ljava/lang/String;","ThreadDownloadImage","cw","net/minecraft/src","0" +"field_1215_b","buffer","b","LImageBuffer;","Laaj;","ThreadDownloadImage","cw","net/minecraft/src","0" +"field_1217_c","imageData","c","LThreadDownloadImageData;","Laap;","ThreadDownloadImage","cw","net/minecraft/src","0" +"field_35136_ay","field_35136_ay","au","Z","Z","EntityCritFX","afj","net/minecraft/src","0" +"field_35137_a","field_35137_a","a","F","F","EntityCritFX","afj","net/minecraft/src","0" +"field_22195_a","regionsByFilename","a","Ljava/util/Map;","Ljava/util/Map;","RegionFileCache","wl","net/minecraft/src","0" +"field_326_aX","blocksEffectiveAgainst","bR","[LBlock;","[Lyy;","ItemSpade","adb","net/minecraft/src","0" +"field_27341_a","enumJsonNodeTypeMappingArray","a","[I","[I","EnumJsonNodeTypeMappingHelper","ux","net/minecraft/src","0" +"field_35065_a","field_35065_a","a","Ljava/util/LinkedList;","Ljava/util/LinkedList;","ComponentMineshaftRoom","uk","net/minecraft/src","0" +"CLOTH","CLOTH","a","LEnumArmorMaterial;","Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"CHAIN","CHAIN","b","LEnumArmorMaterial;","Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"IRON","IRON","c","LEnumArmorMaterial;","Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"GOLD","GOLD","d","LEnumArmorMaterial;","Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"DIAMOND","DIAMOND","e","LEnumArmorMaterial;","Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"field_40577_f","maxDamageFactor","f","I","I","EnumArmorMaterial","dj","net/minecraft/src","0" +"field_40578_g","damageReductionAmountArray","g","[I","[I","EnumArmorMaterial","dj","net/minecraft/src","0" +"field_40584_h","enchantability","h","I","I","EnumArmorMaterial","dj","net/minecraft/src","0" +"field_40585_i","allArmorMaterials","i","[LEnumArmorMaterial;","[Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"field_35084_a","field_35084_a","a","I","I","ComponentVillageHouse4_Garden","uy","net/minecraft/src","0" +"field_35083_b","field_35083_b","b","Z","Z","ComponentVillageHouse4_Garden","uy","net/minecraft/src","0" +"field_22264_a","mc","a","LMinecraft;","LMinecraft;","GuiSlot","jn","net/minecraft/src","0" +"field_22263_b","width","g","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22262_c","height","h","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22261_d","top","b","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22260_e","bottom","c","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22259_f","right","i","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22258_g","left","j","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22257_h","slotHeight","d","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22256_i","scrollUpButtonID","k","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22255_j","scrollDownButtonID","l","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_35409_k","field_35409_k","e","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_35408_l","field_35408_l","f","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22254_k","initialClickY","m","F","F","GuiSlot","jn","net/minecraft/src","0" +"field_22253_l","scrollMultiplier","n","F","F","GuiSlot","jn","net/minecraft/src","0" +"field_22252_m","amountScrolled","o","F","F","GuiSlot","jn","net/minecraft/src","0" +"field_22251_n","selectedElement","p","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_22250_o","lastClicked","q","J","J","GuiSlot","jn","net/minecraft/src","0" +"field_25123_p","field_25123_p","r","Z","Z","GuiSlot","jn","net/minecraft/src","0" +"field_27262_q","field_27262_q","s","Z","Z","GuiSlot","jn","net/minecraft/src","0" +"field_27261_r","field_27261_r","t","I","I","GuiSlot","jn","net/minecraft/src","0" +"field_28159_a","intArray","a","[I","[I","MapItemRenderer","sg","net/minecraft/src","0" +"field_28158_b","bufferedImage","b","I","I","MapItemRenderer","sg","net/minecraft/src","0" +"field_28161_c","gameSettings","c","LGameSettings;","Lki;","MapItemRenderer","sg","net/minecraft/src","0" +"field_28160_d","fontRenderer","d","LFontRenderer;","Labe;","MapItemRenderer","sg","net/minecraft/src","0" +"field_27221_a","elements","a","Ljava/util/List;","Ljava/util/List;","J_JsonArray","kx","net/minecraft/src","0" +"field_40264_a","field_40264_a","a","LEnchantment;","Laef;","EnchantmentData","vs","net/minecraft/src","0" +"field_40263_b","field_40263_b","b","I","I","EnchantmentData","vs","net/minecraft/src","0" +"field_22131_a","parentGuiScreen","a","LGuiScreen;","Lxe;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_22134_h","textboxWorldName","b","LGuiTextField;","Ldv;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_22133_i","textboxSeed","c","LGuiTextField;","Ldv;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_22132_k","folderName","d","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35364_f","gameMode","e","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35365_g","field_35365_g","f","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" +"field_40232_h","field_40232_h","g","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" +"field_22130_l","createClicked","h","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35368_i","field_35368_i","j","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35366_j","gameModeButton","k","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35367_k","moreWorldOptions","s","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35372_s","generateStructuresButton","t","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35371_t","worldTypeButton","u","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35370_u","gameModeDescriptionLine1","v","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35369_v","gameModeDescriptionLine2","w","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_41048_x","field_41048_x","x","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_41047_y","field_41047_y","y","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_199_d","rand","a","Ljava/util/Random;","Ljava/util/Random;","RenderPainting","zv","net/minecraft/src","0" +"field_31049_a","isSticky","a","Z","Z","BlockPistonBase","abr","net/minecraft/src","0" +"field_31048_b","ignoreUpdates","cb","Z","Z","BlockPistonBase","abr","net/minecraft/src","0" +"field_9275_a","healthMP","a","I","I","Packet8UpdateHealth","qg","net/minecraft/src","0" +"field_35231_b","food","b","I","I","Packet8UpdateHealth","qg","net/minecraft/src","0" +"field_35232_c","foodSaturation","c","F","F","Packet8UpdateHealth","qg","net/minecraft/src","0" +"field_6541_a","instance","a","LCraftingManager;","Lsl;","CraftingManager","sl","net/minecraft/src","0" +"field_1662_b","recipes","b","Ljava/util/List;","Ljava/util/List;","CraftingManager","sl","net/minecraft/src","0" +"field_21202_a","smeltingBase","a","LFurnaceRecipes;","Lmt;","FurnaceRecipes","mt","net/minecraft/src","0" +"field_21201_b","smeltingList","b","Ljava/util/Map;","Ljava/util/Map;","FurnaceRecipes","mt","net/minecraft/src","0" +"field_35054_a","field_35054_a","a","LEnumDoor;","Lmj;","ComponentStrongholdStairsStraight","so","net/minecraft/src","0" +"field_40220_w","field_40220_w","w","LModelBook;","Luj;","GuiEnchantment","zw","net/minecraft/src","0" +"field_40230_x","field_40230_x","x","Ljava/util/Random;","Ljava/util/Random;","GuiEnchantment","zw","net/minecraft/src","0" +"field_40228_y","field_40228_y","y","LContainerEnchantment;","Lahk;","GuiEnchantment","zw","net/minecraft/src","0" +"field_40227_h","field_40227_h","g","I","I","GuiEnchantment","zw","net/minecraft/src","0" +"field_40229_i","field_40229_i","h","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40225_j","field_40225_j","j","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40226_k","field_40226_k","k","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40223_l","field_40223_l","s","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40224_m","field_40224_m","t","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40221_n","field_40221_n","u","F","F","GuiEnchantment","zw","net/minecraft/src","0" +"field_40222_o","field_40222_o","v","LItemStack;","Ldk;","GuiEnchantment","zw","net/minecraft/src","0" +"TILE","TILE","a","LEnumMovingObjectType;","Lbo;","EnumMovingObjectType","bo","net/minecraft/src","0" +"ENTITY","ENTITY","b","LEnumMovingObjectType;","Lbo;","EnumMovingObjectType","bo","net/minecraft/src","0" +"field_21178_c","allMovingObjectTypes","c","[LEnumMovingObjectType;","[Lbo;","EnumMovingObjectType","bo","net/minecraft/src","0" +"field_1768_a","resourcesFolder","a","Ljava/io/File;","Ljava/io/File;","ThreadDownloadResources","ng","net/minecraft/src","0" +"field_1767_b","mc","b","LMinecraft;","LMinecraft;","ThreadDownloadResources","ng","net/minecraft/src","0" +"field_1769_c","closing","c","Z","Z","ThreadDownloadResources","ng","net/minecraft/src","0" +"field_27069_a","index","a","I","I","J_JsonElementNodeSelector","da","net/minecraft/src","0" +"field_1092_a","byteValue","a","B","B","NBTTagByte","xq","net/minecraft/src","0" +"field_35024_g","boundingBox","e","LStructureBoundingBox;","Lnl;","StructureComponent","nk","net/minecraft/src","0" +"field_35025_h","coordBaseMode","f","I","I","StructureComponent","nk","net/minecraft/src","0" +"field_35026_i","field_35026_i","g","I","I","StructureComponent","nk","net/minecraft/src","0" +"field_20003_a","itemIconIndex","a","I","I","RenderSnowball","cd","net/minecraft/src","0" +"field_35601_a","server","a","LServerNBTStorage;","Llo;","ThreadPollServers","yb","net/minecraft/src","0" +"field_35600_b","serverSlotContainer","b","LGuiSlotServer;","Ljo;","ThreadPollServers","yb","net/minecraft/src","0" +"field_35542_a","inFire","a","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35540_b","onFire","b","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35541_c","lava","c","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35538_d","inWall","d","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35539_e","drown","e","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35536_f","starve","f","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35537_g","cactus","g","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35549_h","fall","h","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35550_i","outOfWorld","i","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35547_j","generic","j","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35548_k","explosion","k","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35545_l","magic","l","LDamageSource;","Lpm;","DamageSource","pm","net/minecraft/src","0" +"field_35543_n","isUnblockable","n","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_35544_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_35551_p","hungerDamage","p","F","F","DamageSource","pm","net/minecraft/src","0" +"field_40549_q","isFireDamage","q","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_40548_r","isProjectile","r","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_35546_m","damageType","m","Ljava/lang/String;","Ljava/lang/String;","DamageSource","pm","net/minecraft/src","0" +"field_1695_a","colorBuffer","a","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","RenderHelper","rt","net/minecraft/src","0" +"field_22166_a","fileName","a","Ljava/lang/String;","Ljava/lang/String;","SaveFormatComparator","rr","net/minecraft/src","0" +"field_22165_b","displayName","b","Ljava/lang/String;","Ljava/lang/String;","SaveFormatComparator","rr","net/minecraft/src","0" +"field_22169_c","lastTimePlayed","c","J","J","SaveFormatComparator","rr","net/minecraft/src","0" +"field_22168_d","sizeOnDisk","d","J","J","SaveFormatComparator","rr","net/minecraft/src","0" +"field_22167_e","field_22167_e","e","Z","Z","SaveFormatComparator","rr","net/minecraft/src","0" +"field_35720_f","gameType","f","I","I","SaveFormatComparator","rr","net/minecraft/src","0" +"field_40595_g","field_40595_g","g","Z","Z","SaveFormatComparator","rr","net/minecraft/src","0" +"field_566_a","xPosition","a","I","I","Packet15Place","em","net/minecraft/src","0" +"field_565_b","yPosition","b","I","I","Packet15Place","em","net/minecraft/src","0" +"field_569_c","zPosition","c","I","I","Packet15Place","em","net/minecraft/src","0" +"field_568_d","direction","d","I","I","Packet15Place","em","net/minecraft/src","0" +"field_567_e","itemStack","e","LItemStack;","Ldk;","Packet15Place","em","net/minecraft/src","0" +"field_522_a","entityId","a","I","I","Packet18Animation","abu","net/minecraft/src","0" +"field_521_b","animate","b","I","I","Packet18Animation","abu","net/minecraft/src","0" +"field_196_d","blockRenderer","a","LRenderBlocks;","Lacr;","RenderTNTPrimed","nt","net/minecraft/src","0" +"field_197_d","renderBlocks","a","LRenderBlocks;","Lacr;","RenderFallingSand","agh","net/minecraft/src","0" +"field_1147_g","field_1147_g","g","[F","[F","TextureLavaFX","yu","net/minecraft/src","0" +"field_1146_h","field_1146_h","h","[F","[F","TextureLavaFX","yu","net/minecraft/src","0" +"field_1145_i","field_1145_i","i","[F","[F","TextureLavaFX","yu","net/minecraft/src","0" +"field_1144_j","field_1144_j","j","[F","[F","TextureLavaFX","yu","net/minecraft/src","0" +"field_21097_a","note","a","B","B","TileEntityNote","nj","net/minecraft/src","0" +"field_21096_b","previousRedstoneState","b","Z","Z","TileEntityNote","nj","net/minecraft/src","0" +"field_21138_b","recipeWidth","b","I","I","ShapedRecipes","aga","net/minecraft/src","0" +"field_21142_c","recipeHeight","c","I","I","ShapedRecipes","aga","net/minecraft/src","0" +"field_21141_d","recipeItems","d","[LItemStack;","[Ldk;","ShapedRecipes","aga","net/minecraft/src","0" +"field_21140_e","recipeOutput","e","LItemStack;","Ldk;","ShapedRecipes","aga","net/minecraft/src","0" +"field_21139_a","recipeOutputItemID","a","I","I","ShapedRecipes","aga","net/minecraft/src","0" +"field_35523_a","worldSeed","a","J","J","WorldSettings","yw","net/minecraft/src","0" +"field_35521_b","worldType","b","I","I","WorldSettings","yw","net/minecraft/src","0" +"field_35522_c","mapFeaturesEnabled","c","Z","Z","WorldSettings","yw","net/minecraft/src","0" +"field_40558_d","hardcoreEnabled","d","Z","Z","WorldSettings","yw","net/minecraft/src","0" +"field_6463_h","rand","a","Ljava/util/Random;","Ljava/util/Random;","GuiMainMenu","eh","net/minecraft/src","0" +"field_989_j","updateCounter","b","F","F","GuiMainMenu","eh","net/minecraft/src","0" +"field_6462_l","splashText","c","Ljava/lang/String;","Ljava/lang/String;","GuiMainMenu","eh","net/minecraft/src","0" +"field_25096_l","multiplayerButton","d","LGuiButton;","Lct;","GuiMainMenu","eh","net/minecraft/src","0" +"field_35357_f","field_35357_f","e","I","I","GuiMainMenu","eh","net/minecraft/src","0" +"field_35358_g","viewportTexture","f","I","I","GuiMainMenu","eh","net/minecraft/src","0" +"OK","OK","a","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"NOT_POSSIBLE_HERE","NOT_POSSIBLE_HERE","b","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"NOT_POSSIBLE_NOW","NOT_POSSIBLE_NOW","c","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"TOO_FAR_AWAY","TOO_FAR_AWAY","d","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"OTHER_PROBLEM","OTHER_PROBLEM","e","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"NOT_SAFE","NOT_SAFE","f","LEnumStatus;","Lqy;","EnumStatus","qy","net/minecraft/src","0" +"field_25204_f","allStatuses","g","[LEnumStatus;","[Lqy;","EnumStatus","qy","net/minecraft/src","0" +"field_27028_b","lightningState","b","I","I","EntityLightningBolt","su","net/minecraft/src","0" +"field_27029_a","boltVertex","a","J","J","EntityLightningBolt","su","net/minecraft/src","0" +"field_27030_c","boltLivingTime","c","I","I","EntityLightningBolt","su","net/minecraft/src","0" +"field_35596_a","field_35596_a","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35594_b","field_35594_b","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35595_c","field_35595_c","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35593_e","field_35593_e","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_1202_a","posX","a","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1201_b","posY","b","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1207_c","posZ","c","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1206_d","acceptCountdown","d","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1205_e","blockID","e","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1204_f","metadata","f","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_1203_g","worldClient","g","LWorldClient;","Lma;","WorldBlockPositionType","agf","net/minecraft/src","0" +"field_20042_a","windowId","a","I","I","Packet103SetSlot","iu","net/minecraft/src","0" +"field_20041_b","itemSlot","b","I","I","Packet103SetSlot","iu","net/minecraft/src","0" +"field_20043_c","myItemStack","c","LItemStack;","Ldk;","Packet103SetSlot","iu","net/minecraft/src","0" +"field_509_a","entityId","a","I","I","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_508_b","xPosition","b","I","I","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_513_c","yPosition","c","I","I","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_512_d","zPosition","d","I","I","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_511_e","yaw","e","B","B","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_510_f","pitch","f","B","B","Packet34EntityTeleport","be","net/minecraft/src","0" +"field_1093_a","intValue","a","I","I","NBTTagInt","hx","net/minecraft/src","0" +"field_492_a","xPosition","a","I","I","Packet53BlockChange","ack","net/minecraft/src","0" +"field_491_b","yPosition","b","I","I","Packet53BlockChange","ack","net/minecraft/src","0" +"field_495_c","zPosition","c","I","I","Packet53BlockChange","ack","net/minecraft/src","0" +"field_494_d","type","d","I","I","Packet53BlockChange","ack","net/minecraft/src","0" +"field_493_e","metadata","e","I","I","Packet53BlockChange","ack","net/minecraft/src","0" +"field_1124_c","armorType","a","I","I","SlotArmor","pi","net/minecraft/src","0" +"field_1123_d","inventory","b","LContainerPlayer;","Lgd;","SlotArmor","pi","net/minecraft/src","0" +"field_40107_a","field_40107_a","a","F","F","EntityEnchantmentTableParticleFX","afn","net/minecraft/src","0" +"field_40109_aw","field_40109_aw","au","D","D","EntityEnchantmentTableParticleFX","afn","net/minecraft/src","0" +"field_40108_ax","field_40108_ax","av","D","D","EntityEnchantmentTableParticleFX","afn","net/minecraft/src","0" +"field_40106_ay","field_40106_ay","aw","D","D","EntityEnchantmentTableParticleFX","afn","net/minecraft/src","0" +"field_40276_c","field_40276_c","a","I","I","RenderMagmaCube","m","net/minecraft/src","0" +"field_40669_a","profilingEnabled","a","Z","Z","Profiler","pf","net/minecraft/src","0" +"field_40667_b","sectionList","b","Ljava/util/List;","Ljava/util/List;","Profiler","pf","net/minecraft/src","0" +"field_40668_c","timestampList","c","Ljava/util/List;","Ljava/util/List;","Profiler","pf","net/minecraft/src","0" +"field_40665_d","profilingSection","d","Ljava/lang/String;","Ljava/lang/String;","Profiler","pf","net/minecraft/src","0" +"field_40666_e","profilingMap","e","Ljava/util/Map;","Ljava/util/Map;","Profiler","pf","net/minecraft/src","0" +"field_35473_a","heightShift","a","I","I","World","ry","net/minecraft/src","0" +"field_35471_b","xShift","b","I","I","World","ry","net/minecraft/src","0" +"field_35472_c","worldYMax","c","I","I","World","ry","net/minecraft/src","0" +"field_35469_d","worldMaxY","d","I","I","World","ry","net/minecraft/src","0" +"field_35470_e","seaLevel","e","I","I","World","ry","net/minecraft/src","0" +"field_4214_a","scheduledUpdatesAreImmediate","f","Z","Z","World","ry","net/minecraft/src","0" +"field_1050_a","loadedEntityList","g","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1024_A","unloadedEntityList","J","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1058_B","scheduledTickTreeSet","K","Ljava/util/TreeSet;","Ljava/util/TreeSet;","World","ry","net/minecraft/src","0" +"field_1056_C","scheduledTickSet","L","Ljava/util/Set;","Ljava/util/Set;","World","ry","net/minecraft/src","0" +"field_1049_b","loadedTileEntityList","h","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_30900_E","addedTileEntityList","M","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_34900_Q","entityRemoval","N","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1040_k","playerEntities","i","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_27173_e","weatherEffects","j","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1019_F","cloudColour","O","J","J","World","ry","net/minecraft/src","0" +"field_1046_e","skylightSubtracted","k","I","I","World","ry","net/minecraft/src","0" +"field_9437_g","updateLCG","l","I","I","World","ry","net/minecraft/src","0" +"field_9436_h","DIST_HASH_MAGIC","m","I","I","World","ry","net/minecraft/src","0" +"field_26901_B","prevRainingStrength","n","F","F","World","ry","net/minecraft/src","0" +"field_27171_C","rainingStrength","o","F","F","World","ry","net/minecraft/src","0" +"field_27170_D","prevThunderingStrength","p","F","F","World","ry","net/minecraft/src","0" +"field_27169_E","thunderingStrength","q","F","F","World","ry","net/minecraft/src","0" +"field_27168_F","lastLightningBolt","r","I","I","World","ry","net/minecraft/src","0" +"field_27172_i","lightningFlash","s","I","I","World","ry","net/minecraft/src","0" +"field_1043_h","editingBlocks","t","Z","Z","World","ry","net/minecraft/src","0" +"field_1054_E","lockTimestamp","P","J","J","World","ry","net/minecraft/src","0" +"field_9435_j","autosavePeriod","u","I","I","World","ry","net/minecraft/src","0" +"field_1039_l","difficultySetting","v","I","I","World","ry","net/minecraft/src","0" +"field_1037_n","rand","w","Ljava/util/Random;","Ljava/util/Random;","World","ry","net/minecraft/src","0" +"field_1033_r","isNewWorld","x","Z","Z","World","ry","net/minecraft/src","0" +"field_4209_q","worldProvider","y","LWorldProvider;","Lk;","World","ry","net/minecraft/src","0" +"field_9434_r","worldAccesses","z","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1017_H","chunkProvider","A","LIChunkProvider;","Lej;","World","ry","net/minecraft/src","0" +"field_22147_p","saveHandler","B","LISaveHandler;","Lnh;","World","ry","net/minecraft/src","0" +"field_22145_q","worldInfo","C","LWorldInfo;","Lsi;","World","ry","net/minecraft/src","0" +"field_9430_x","findingSpawnPoint","D","Z","Z","World","ry","net/minecraft/src","0" +"field_22146_A","allPlayersSleeping","Q","Z","Z","World","ry","net/minecraft/src","0" +"field_28108_z","mapStorage","E","LMapStorage;","Lew;","World","ry","net/minecraft/src","0" +"field_9428_I","collidingBoundingBoxes","R","Ljava/util/ArrayList;","Ljava/util/ArrayList;","World","ry","net/minecraft/src","0" +"field_31055_L","scanningTileEntities","S","Z","Z","World","ry","net/minecraft/src","0" +"field_21121_K","spawnHostileMobs","F","Z","Z","World","ry","net/minecraft/src","0" +"field_21120_L","spawnPeacefulMobs","G","Z","Z","World","ry","net/minecraft/src","0" +"field_9427_K","positionsToUpdate","T","Ljava/util/Set;","Ljava/util/Set;","World","ry","net/minecraft/src","0" +"field_9426_L","soundCounter","U","I","I","World","ry","net/minecraft/src","0" +"field_35466_H","lightUpdateBlockList","H","[I","[I","World","ry","net/minecraft/src","0" +"field_1012_M","field_1012_M","V","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1026_y","multiplayerWorld","I","Z","Z","World","ry","net/minecraft/src","0" +"field_1346_a","signBoard","g","LModelRenderer;","Lacf;","SignModel","rb","net/minecraft/src","0" +"field_1345_b","signStick","h","LModelRenderer;","Lacf;","SignModel","rb","net/minecraft/src","0" +"field_27062_a","parentJsonNodeSelector","a","LJ_JsonNodeSelector;","Ldx;","J_ChainedFunctor","zk","net/minecraft/src","0" +"field_27061_b","childJsonNodeSelector","b","LJ_JsonNodeSelector;","Ldx;","J_ChainedFunctor","zk","net/minecraft/src","0" +"field_198_d","modelBoat","a","LModelBase;","Lal;","RenderBoat","ru","net/minecraft/src","0" +"field_31071_b","field_31071_b","b","LRenderBlocks;","Lacr;","TileEntityRendererPiston","xd","net/minecraft/src","0" +"field_21075_a","fleeceColorTable","a","[[F","[[F","EntitySheep","hm","net/minecraft/src","0" +"field_1060_a","chunkX","a","I","I","ChunkCache","xk","net/minecraft/src","0" +"field_1059_b","chunkZ","b","I","I","ChunkCache","xk","net/minecraft/src","0" +"field_1062_c","chunkArray","c","[[LChunk;","[[Lzx;","ChunkCache","xk","net/minecraft/src","0" +"field_1061_d","worldObj","d","LWorld;","Lry;","ChunkCache","xk","net/minecraft/src","0" +"field_21051_a","entityId","a","I","I","Packet19EntityAction","ag","net/minecraft/src","0" +"field_21050_b","state","b","I","I","Packet19EntityAction","ag","net/minecraft/src","0" +"field_1671_a","displayLists","a","Ljava/util/List;","Ljava/util/List;","GLAllocation","bt","net/minecraft/src","0" +"field_1670_b","textureNames","b","Ljava/util/List;","Ljava/util/List;","GLAllocation","bt","net/minecraft/src","0" +"field_35273_a","intCacheSize","a","I","I","IntCache","bm","net/minecraft/src","0" +"field_35271_b","field_35271_b","b","Ljava/util/List;","Ljava/util/List;","IntCache","bm","net/minecraft/src","0" +"field_35272_c","field_35272_c","c","Ljava/util/List;","Ljava/util/List;","IntCache","bm","net/minecraft/src","0" +"field_35269_d","field_35269_d","d","Ljava/util/List;","Ljava/util/List;","IntCache","bm","net/minecraft/src","0" +"field_35270_e","field_35270_e","e","Ljava/util/List;","Ljava/util/List;","IntCache","bm","net/minecraft/src","0" +"field_189_a","chunkXPos","a","I","I","ChunkCoordIntPair","acm","net/minecraft/src","0" +"field_188_b","chunkZPos","b","I","I","ChunkCoordIntPair","acm","net/minecraft/src","0" +"field_35450_c","field_35450_c","a","I","I","RenderSilverfish","xt","net/minecraft/src","0" +"field_35086_a","field_35086_a","a","I","I","ComponentVillageHouse2","ko","net/minecraft/src","0" +"field_320_a","spawnID","a","I","I","ItemReed","to","net/minecraft/src","0" +"field_27292_a","fieldBuilder","a","LJ_JsonFieldBuilder;","Laax;","J_FieldNodeContainer","co","net/minecraft/src","0" +"field_27291_b","field_27291_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_FieldNodeContainer","co","net/minecraft/src","0" +"field_35362_a","field_35362_a","a","LGuiScreen;","Lxe;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35360_b","field_35360_b","b","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35361_c","field_35361_c","c","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35359_d","field_35359_d","d","LServerNBTStorage;","Llo;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_186_a","mainFrame","a","LMinecraftApplet;","LMinecraftApplet;","MinecraftAppletImpl","nm","net/minecraft/src","0" +"field_479_a","xPosition","a","I","I","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_478_b","zPosition","b","I","I","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_483_c","coordinateArray","c","[S","[S","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_482_d","typeArray","d","[B","[B","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_481_e","metadataArray","e","[B","[B","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_480_f","size","f","I","I","Packet52MultiBlockChange","np","net/minecraft/src","0" +"field_1086_a","netManager","a","LNetworkManager;","Lhc;","NetworkMasterThread","acx","net/minecraft/src","0" +"field_457_a","random","a","Ljava/util/Random;","Ljava/util/Random;","BlockChest","au","net/minecraft/src","0" +"field_40248_a","livingModifier","a","I","I","EnchantmentModifierLiving","aen","net/minecraft/src","0" +"field_40247_b","entityLiving","b","LEntityLiving;","Lnq;","EnchantmentModifierLiving","aen","net/minecraft/src","0" +"field_1694_e","instance","e","LClippingHelperImpl;","Lqs;","ClippingHelperImpl","qs","net/minecraft/src","0" +"field_1693_f","projectionMatrixBuffer","f","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ClippingHelperImpl","qs","net/minecraft/src","0" +"field_1692_g","modelviewMatrixBuffer","g","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ClippingHelperImpl","qs","net/minecraft/src","0" +"field_1691_h","field_1691_h","h","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","ClippingHelperImpl","qs","net/minecraft/src","0" +"field_452_a","modelBlock","a","LBlock;","Lyy;","BlockStairs","ahh","net/minecraft/src","0" +"field_531_a","entityId","a","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_530_b","xPosition","b","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_529_c","yPosition","c","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_528_d","zPosition","d","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_527_e","rotation","e","B","B","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_526_f","pitch","f","B","B","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_525_g","roll","g","B","B","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_524_h","itemID","h","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_523_i","count","i","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_21052_l","itemDamage","m","I","I","Packet21PickupSpawn","ts","net/minecraft/src","0" +"field_40070_a","field_40070_a","a","LContainerEnchantment;","Lahk;","SlotEnchantmentTable","li","net/minecraft/src","0" +"field_35611_a","instance","a","LChestItemRenderHelper;","Lacl;","ChestItemRenderHelper","acl","net/minecraft/src","0" +"field_35610_b","field_35610_b","b","LTileEntityChest;","Ltu;","ChestItemRenderHelper","acl","net/minecraft/src","0" +"field_27405_a","field_27405_a","a","Ljava/lang/Iterable;","Ljava/lang/Iterable;","J_JsonNodeList","abn","net/minecraft/src","0" +"field_1557_a","craftingManager","a","LCraftingManager;","Lsl;","RecipeSorter","ga","net/minecraft/src","0" +"field_1778_d","vectorList","d","Ljava/util/List;","Ljava/util/List;","Vec3D","fb","net/minecraft/src","0" +"field_1777_e","nextVector","e","I","I","Vec3D","fb","net/minecraft/src","0" +"field_1776_a","xCoord","a","D","D","Vec3D","fb","net/minecraft/src","0" +"field_1775_b","yCoord","b","D","D","Vec3D","fb","net/minecraft/src","0" +"field_1779_c","zCoord","c","D","D","Vec3D","fb","net/minecraft/src","0" +"field_41037_a","field_41037_a","a","I","I","RenderEnderCrystal","ti","net/minecraft/src","0" +"field_41036_b","field_41036_b","b","LModelBase;","Lal;","RenderEnderCrystal","ti","net/minecraft/src","0" +"field_30008_a","entityPosX","a","D","D","EntitySorter","oy","net/minecraft/src","0" +"field_30007_b","entityPosY","b","D","D","EntitySorter","oy","net/minecraft/src","0" +"field_30009_c","entityPosZ","c","D","D","EntitySorter","oy","net/minecraft/src","0" +"field_21042_a","entityId","a","I","I","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_21041_b","xPosition","b","I","I","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_21046_c","yPosition","c","I","I","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_21045_d","zPosition","d","I","I","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_21044_e","direction","e","I","I","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_21043_f","title","f","Ljava/lang/String;","Ljava/lang/String;","Packet25EntityPainting","yr","net/minecraft/src","0" +"field_562_b","id","a","I","I","Packet16BlockItemSwitch","aio","net/minecraft/src","0" +"field_1087_a","key","a","Ljava/lang/String;","Ljava/lang/String;","NBTBase","um","net/minecraft/src","0" +"field_40243_a","tileBrewingStand","a","LTileEntityBrewingStand;","Ltt;","ContainerBrewingStand","ok","net/minecraft/src","0" +"field_40242_b","brewTime","b","I","I","ContainerBrewingStand","ok","net/minecraft/src","0" +"field_40295_c","field_40295_c","a","LModelVillager;","Lzf;","RenderVillager","ch","net/minecraft/src","0" +"field_21023_a","dyeColorNames","a","[Ljava/lang/String;","[Ljava/lang/String;","ItemDye","xv","net/minecraft/src","0" +"field_31002_bk","dyeColors","b","[I","[I","ItemDye","xv","net/minecraft/src","0" +"field_20036_a","windowId","a","I","I","Packet104WindowItems","yh","net/minecraft/src","0" +"field_20035_b","itemStack","b","[LItemStack;","[Ldk;","Packet104WindowItems","yh","net/minecraft/src","0" +"field_1258_a","slimeBodies","g","LModelRenderer;","Lacf;","ModelSlime","fy","net/minecraft/src","0" +"field_1257_b","slimeRightEye","h","LModelRenderer;","Lacf;","ModelSlime","fy","net/minecraft/src","0" +"field_1260_c","slimeLeftEye","i","LModelRenderer;","Lacf;","ModelSlime","fy","net/minecraft/src","0" +"field_1259_d","slimeMouth","j","LModelRenderer;","Lacf;","ModelSlime","fy","net/minecraft/src","0" +"field_27228_a","NULL","a","LJ_JsonConstants;","Lgw;","J_JsonConstants","gw","net/minecraft/src","0" +"field_27227_b","TRUE","b","LJ_JsonConstants;","Lgw;","J_JsonConstants","gw","net/minecraft/src","0" +"field_27230_c","FALSE","c","LJ_JsonConstants;","Lgw;","J_JsonConstants","gw","net/minecraft/src","0" +"field_27229_d","jsonNodeType","d","LEnumJsonNodeType;","Lpp;","J_JsonConstants","gw","net/minecraft/src","0" +"field_1380_a","ticksPerSecond","a","F","F","Timer","aij","net/minecraft/src","0" +"field_1375_f","lastHRTime","f","D","D","Timer","aij","net/minecraft/src","0" +"field_1379_b","elapsedTicks","b","I","I","Timer","aij","net/minecraft/src","0" +"field_1378_c","renderPartialTicks","c","F","F","Timer","aij","net/minecraft/src","0" +"field_1377_d","timerSpeed","d","F","F","Timer","aij","net/minecraft/src","0" +"field_1376_e","elapsedPartialTicks","e","F","F","Timer","aij","net/minecraft/src","0" +"field_1374_g","lastSyncSysClock","g","J","J","Timer","aij","net/minecraft/src","0" +"field_1373_h","lastSyncHRClock","h","J","J","Timer","aij","net/minecraft/src","0" +"field_28132_i","field_28132_i","i","J","J","Timer","aij","net/minecraft/src","0" +"field_1372_i","timeSyncAdjustment","j","D","D","Timer","aij","net/minecraft/src","0" +"field_449_a","chanceToEncourageFire","a","[I","[I","BlockFire","wj","net/minecraft/src","0" +"field_448_b","abilityToCatchFire","cb","[I","[I","BlockFire","wj","net/minecraft/src","0" +"field_35731_a","chunkmanager","a","LWorldChunkManager;","Lvh;","BiomeCache","agl","net/minecraft/src","0" +"field_35729_b","lastCleanupTime","b","J","J","BiomeCache","agl","net/minecraft/src","0" +"field_35730_c","cacheMap","c","LLongHashMap;","Lwv;","BiomeCache","agl","net/minecraft/src","0" +"field_35728_d","cache","d","Ljava/util/List;","Ljava/util/List;","BiomeCache","agl","net/minecraft/src","0" +"field_35134_a","field_35134_a","a","LEntity;","Lia;","EntityCrit2FX","hu","net/minecraft/src","0" +"field_35133_ay","field_35133_ay","au","I","I","EntityCrit2FX","hu","net/minecraft/src","0" +"field_35132_az","field_35132_az","av","I","I","EntityCrit2FX","hu","net/minecraft/src","0" +"field_40105_ay","field_40105_ay","aw","Ljava/lang/String;","Ljava/lang/String;","EntityCrit2FX","hu","net/minecraft/src","0" +"field_35052_a","field_35052_a","a","I","I","ComponentStrongholdCorridor","vn","net/minecraft/src","0" +"field_40217_h","field_40217_h","g","LTileEntityBrewingStand;","Ltt;","GuiBrewingStand","cy","net/minecraft/src","0" +"field_40525_w","protectionName","w","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentDamage","ap","net/minecraft/src","0" +"field_40529_x","baseEnchantability","x","[I","[I","EnchantmentDamage","ap","net/minecraft/src","0" +"field_40528_y","levelEnchantability","y","[I","[I","EnchantmentDamage","ap","net/minecraft/src","0" +"field_40527_z","thresholdEnchantability","z","[I","[I","EnchantmentDamage","ap","net/minecraft/src","0" +"field_40526_v","damageType","a","I","I","EnchantmentDamage","ap","net/minecraft/src","0" +"field_40723_L","spikeGen","L","LWorldGenerator;","Lig;","BiomeEndDecorator","uu","net/minecraft/src","0" +"field_1588_a","mc","a","LMinecraft;","LMinecraft;","ThreadSleepForever","yk","net/minecraft/src","0" +"field_22388_a","field_22388_a","a","F","F","MouseFilter","ne","net/minecraft/src","0" +"field_22387_b","field_22387_b","b","F","F","MouseFilter","ne","net/minecraft/src","0" +"field_22389_c","field_22389_c","c","F","F","MouseFilter","ne","net/minecraft/src","0" +"field_41061_a","field_41061_a","a","Z","Z","WorldGenerator","ig","net/minecraft/src","0" +"field_40037_a","field_40037_a","a","LStructureNetherBridgePieceWeight;","Laaz;","ComponentNetherBridgeStartPiece","gc","net/minecraft/src","0" +"field_40035_b","field_40035_b","b","Ljava/util/List;","Ljava/util/List;","ComponentNetherBridgeStartPiece","gc","net/minecraft/src","0" +"field_40036_c","field_40036_c","c","Ljava/util/List;","Ljava/util/List;","ComponentNetherBridgeStartPiece","gc","net/minecraft/src","0" +"field_40034_d","field_40034_d","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentNetherBridgeStartPiece","gc","net/minecraft/src","0" +"field_672_a","field_672_a","a","F","F","EntityFlameFX","o","net/minecraft/src","0" +"field_35189_a","field_35189_a","b","I","I","EntitySilverfish","gl","net/minecraft/src","0" +"field_6365_a","entityId","a","I","I","Packet39AttachEntity","agx","net/minecraft/src","0" +"field_6364_b","vehicleEntityId","b","I","I","Packet39AttachEntity","agx","net/minecraft/src","0" +"field_40278_c","field_40278_c","a","I","I","RenderBlaze","aq","net/minecraft/src","0" +"field_505_a","xPosition","a","I","I","Packet50PreChunk","t","net/minecraft/src","0" +"field_504_b","yPosition","b","I","I","Packet50PreChunk","t","net/minecraft/src","0" +"field_506_c","mode","c","Z","Z","Packet50PreChunk","t","net/minecraft/src","0" +"field_21123_a","squidBody","g","LModelRenderer;","Lacf;","ModelSquid","op","net/minecraft/src","0" +"field_21122_b","squidTentacles","h","[LModelRenderer;","[Lacf;","ModelSquid","op","net/minecraft/src","0" +"field_35218_b","field_35218_b","b","Z","Z","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_785_bg","otherPlayerMPPosRotationIncrements","c","I","I","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_784_bh","otherPlayerMPX","d","D","D","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_783_bi","otherPlayerMPY","e","D","D","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_782_bj","otherPlayerMPZ","f","D","D","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_780_bk","otherPlayerMPYaw","g","D","D","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_786_bl","otherPlayerMPPitch","h","D","D","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"field_20924_a","field_20924_a","a","F","F","EntityOtherPlayerMP","zb","net/minecraft/src","0" +"monster","monster","a","LEnumCreatureType;","Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"creature","creature","b","LEnumCreatureType;","Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"waterCreature","waterCreature","c","LEnumCreatureType;","Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"field_4278_c","creatureClass","d","Ljava/lang/Class;","Ljava/lang/Class;","EnumCreatureType","jf","net/minecraft/src","0" +"field_4277_d","maxNumberOfCreature","e","I","I","EnumCreatureType","jf","net/minecraft/src","0" +"field_21173_f","creatureMaterial","f","LMaterial;","Lp;","EnumCreatureType","jf","net/minecraft/src","0" +"field_21172_g","isPeacefulCreature","g","Z","Z","EnumCreatureType","jf","net/minecraft/src","0" +"field_6518_e","allCreatureTypes","h","[LEnumCreatureType;","[Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"field_1412_b","entityHashMap","b","Ljava/util/Map;","Ljava/util/Map;","TileEntityMobSpawnerRenderer","on","net/minecraft/src","0" +"field_35130_a","field_35130_a","a","I","I","EntityLargeExplodeFX","ail","net/minecraft/src","0" +"field_35129_ay","field_35129_ay","au","I","I","EntityLargeExplodeFX","ail","net/minecraft/src","0" +"field_35128_az","field_35128_az","av","LRenderEngine;","Lzh;","EntityLargeExplodeFX","ail","net/minecraft/src","0" +"field_35131_aA","field_35131_aA","aw","F","F","EntityLargeExplodeFX","ail","net/minecraft/src","0" +"field_27011_d","thePlayer","a","LEntityPlayer;","Lvi;","SlotFurnace","ie","net/minecraft/src","0" +"field_25169_C","oneShotStats","a","Ljava/util/Map;","Ljava/util/Map;","StatList","ny","net/minecraft/src","0" +"field_25188_a","field_25188_a","b","Ljava/util/List;","Ljava/util/List;","StatList","ny","net/minecraft/src","0" +"field_25187_b","generalStats","c","Ljava/util/List;","Ljava/util/List;","StatList","ny","net/minecraft/src","0" +"field_25186_c","itemStats","d","Ljava/util/List;","Ljava/util/List;","StatList","ny","net/minecraft/src","0" +"field_25185_d","objectMineStats","e","Ljava/util/List;","Ljava/util/List;","StatList","ny","net/minecraft/src","0" +"field_25184_e","startGameStat","f","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25183_f","createWorldStat","g","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25182_g","loadWorldStat","h","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25181_h","joinMultiplayerStat","i","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25180_i","leaveGameStat","j","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25179_j","minutesPlayedStat","k","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25178_k","distanceWalkedStat","l","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25177_l","distanceSwumStat","m","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25176_m","distanceFallenStat","n","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25175_n","distanceClimbedStat","o","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25174_o","distanceFlownStat","p","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25173_p","distanceDoveStat","q","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_27364_r","distanceByMinecartStat","r","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_27363_s","distanceByBoatStat","s","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_27362_t","distanceByPigStat","t","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25171_q","jumpStat","u","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25168_r","dropStat","v","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25167_s","damageDealtStat","w","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25165_t","damageTakenStat","x","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25163_u","deathsStat","y","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25162_v","mobKillsStat","z","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25161_w","playerKillsStat","A","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25160_x","fishCaughtStat","B","LStatBase;","Lpx;","StatList","ny","net/minecraft/src","0" +"field_25159_y","mineBlockStatArray","C","[LStatBase;","[Lpx;","StatList","ny","net/minecraft/src","0" +"field_25158_z","objectCraftStats","D","[LStatBase;","[Lpx;","StatList","ny","net/minecraft/src","0" +"field_25172_A","objectUseStats","E","[LStatBase;","[Lpx;","StatList","ny","net/minecraft/src","0" +"field_25170_B","objectBreakStats","F","[LStatBase;","[Lpx;","StatList","ny","net/minecraft/src","0" +"field_25166_D","blockStatsInitialized","G","Z","Z","StatList","ny","net/minecraft/src","0" +"field_25164_E","itemStatsInitialized","H","Z","Z","StatList","ny","net/minecraft/src","0" +"field_25020_a","bedChat","a","[Ljava/lang/String;","[Ljava/lang/String;","Packet70Bed","ho","net/minecraft/src","0" +"field_25019_b","bedState","b","I","I","Packet70Bed","ho","net/minecraft/src","0" +"field_35262_c","gameMode","c","I","I","Packet70Bed","ho","net/minecraft/src","0" +"field_25082_a","theGame","a","LMinecraft;","LMinecraft;","GuiAchievement","lk","net/minecraft/src","0" +"field_25081_b","achievementWindowWidth","b","I","I","GuiAchievement","lk","net/minecraft/src","0" +"field_25086_c","achievementWindowHeight","c","I","I","GuiAchievement","lk","net/minecraft/src","0" +"field_25085_d","achievementGetLocalText","d","Ljava/lang/String;","Ljava/lang/String;","GuiAchievement","lk","net/minecraft/src","0" +"field_25084_e","achievementStatName","e","Ljava/lang/String;","Ljava/lang/String;","GuiAchievement","lk","net/minecraft/src","0" +"field_27105_f","theAchievement","f","LAchievement;","Lws;","GuiAchievement","lk","net/minecraft/src","0" +"field_25083_f","achievementTime","g","J","J","GuiAchievement","lk","net/minecraft/src","0" +"field_27104_h","itemRender","h","LRenderItem;","Liw;","GuiAchievement","lk","net/minecraft/src","0" +"field_27103_i","haveAchiement","j","Z","Z","GuiAchievement","lk","net/minecraft/src","0" +"field_673_a","reddustParticleScale","a","F","F","EntityReddustFX","aao","net/minecraft/src","0" +"field_22326_a","chunkFile","a","Ljava/io/File;","Ljava/io/File;","ChunkFile","ck","net/minecraft/src","0" +"field_22325_b","xChunk","b","I","I","ChunkFile","ck","net/minecraft/src","0" +"field_22327_c","yChunk","c","I","I","ChunkFile","ck","net/minecraft/src","0" +"field_4158_a","hellLavaID","a","I","I","WorldGenHellLava","ey","net/minecraft/src","0" +"field_35439_b","field_35439_b","b","LRenderBlocks;","Lacr;","RenderXPOrb","pw","net/minecraft/src","0" +"field_35440_a","field_35440_a","a","Z","Z","RenderXPOrb","pw","net/minecraft/src","0" +"field_1653_a","SIN_TABLE","a","[F","[F","MathHelper","me","net/minecraft/src","0" +"field_762_e","attackStrength","a","I","I","EntityMob","zo","net/minecraft/src","0" +"field_21102_a","dispenserContents","a","[LItemStack;","[Ldk;","TileEntityDispenser","bp","net/minecraft/src","0" +"field_21101_b","dispenserRandom","b","Ljava/util/Random;","Ljava/util/Random;","TileEntityDispenser","bp","net/minecraft/src","0" +"field_25022_a","particleScaleOverTime","a","F","F","EntityHeartFX","ff","net/minecraft/src","0" +"field_985_a","message","a","Ljava/lang/String;","Ljava/lang/String;","GuiChat","gx","net/minecraft/src","0" +"field_986_h","updateCounter","b","I","I","GuiChat","gx","net/minecraft/src","0" +"field_20082_i","allowedCharacters","c","Ljava/lang/String;","Ljava/lang/String;","GuiChat","gx","net/minecraft/src","0" +"field_997_a","message1","a","Ljava/lang/String;","Ljava/lang/String;","GuiUnused","aff","net/minecraft/src","0" +"field_998_h","message2","b","Ljava/lang/String;","Ljava/lang/String;","GuiUnused","aff","net/minecraft/src","0" +"field_41057_g","field_41057_g","g","LModelRenderer;","Lacf;","ModelEnderCrystal","afb","net/minecraft/src","0" +"field_41058_h","field_41058_h","h","LModelRenderer;","Lacf;","ModelEnderCrystal","afb","net/minecraft/src","0" +"field_41059_i","field_41059_i","i","LModelRenderer;","Lacf;","ModelEnderCrystal","afb","net/minecraft/src","0" +"field_20125_a","lowerChestInventory","a","LIInventory;","Lde;","ContainerChest","ak","net/minecraft/src","0" +"field_27282_b","numRows","b","I","I","ContainerChest","ak","net/minecraft/src","0" +"field_6533_b","availableTexturePacks","b","Ljava/util/List;","Ljava/util/List;","TexturePackList","adk","net/minecraft/src","0" +"field_6539_c","defaultTexturePack","c","LTexturePackBase;","Lafs;","TexturePackList","adk","net/minecraft/src","0" +"field_6534_a","selectedTexturePack","a","LTexturePackBase;","Lafs;","TexturePackList","adk","net/minecraft/src","0" +"field_6538_d","field_6538_d","d","Ljava/util/Map;","Ljava/util/Map;","TexturePackList","adk","net/minecraft/src","0" +"field_6537_e","mc","e","LMinecraft;","LMinecraft;","TexturePackList","adk","net/minecraft/src","0" +"field_6536_f","texturePackDir","f","Ljava/io/File;","Ljava/io/File;","TexturePackList","adk","net/minecraft/src","0" +"field_6535_g","currentTexturePack","g","Ljava/lang/String;","Ljava/lang/String;","TexturePackList","adk","net/minecraft/src","0" +"field_4227_g","portalTickCounter","g","I","I","TexturePortalFX","vr","net/minecraft/src","0" +"field_4226_h","portalTextureData","h","[[B","[[B","TexturePortalFX","vr","net/minecraft/src","0" +"field_40103_a","field_40103_a","a","LMaterial;","Lp;","EntityDropParticleFX","st","net/minecraft/src","0" +"field_40104_aw","field_40104_aw","au","I","I","EntityDropParticleFX","st","net/minecraft/src","0" +"field_1540_a","isLit","a","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1539_b","blocks","b","[B","[B","Chunk","zx","net/minecraft/src","0" +"field_35845_c","precipitationHeightMap","c","[I","[I","Chunk","zx","net/minecraft/src","0" +"field_35844_d","updateSkylightColumns","d","[Z","[Z","Chunk","zx","net/minecraft/src","0" +"field_1538_c","isChunkLoaded","e","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1537_d","worldObj","f","LWorld;","Lry;","Chunk","zx","net/minecraft/src","0" +"field_1536_e","data","g","LNibbleArray;","Lup;","Chunk","zx","net/minecraft/src","0" +"field_1535_f","skylightMap","h","LNibbleArray;","Lup;","Chunk","zx","net/minecraft/src","0" +"field_1534_g","blocklightMap","i","LNibbleArray;","Lup;","Chunk","zx","net/minecraft/src","0" +"field_1533_h","heightMap","j","[B","[B","Chunk","zx","net/minecraft/src","0" +"field_1532_i","lowestBlockHeight","k","I","I","Chunk","zx","net/minecraft/src","0" +"field_1531_j","xPosition","l","I","I","Chunk","zx","net/minecraft/src","0" +"field_1530_k","zPosition","m","I","I","Chunk","zx","net/minecraft/src","0" +"field_40741_v","field_40741_v","v","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1529_l","chunkTileEntityMap","n","Ljava/util/Map;","Ljava/util/Map;","Chunk","zx","net/minecraft/src","0" +"field_1528_m","entities","o","[Ljava/util/List;","[Ljava/util/List;","Chunk","zx","net/minecraft/src","0" +"field_1527_n","isTerrainPopulated","p","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1526_o","isModified","q","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1525_p","neverSave","r","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1523_r","hasEntities","s","Z","Z","Chunk","zx","net/minecraft/src","0" +"field_1522_s","lastSaveTime","t","J","J","Chunk","zx","net/minecraft/src","0" +"field_35846_u","field_35846_u","u","Z","Z","Chunk","zx","net/minecraft/src","0" +"everything","everything","a","LEnumMobType;","Lxb;","EnumMobType","xb","net/minecraft/src","0" +"mobs","mobs","b","LEnumMobType;","Lxb;","EnumMobType","xb","net/minecraft/src","0" +"players","players","c","LEnumMobType;","Lxb;","EnumMobType","xb","net/minecraft/src","0" +"field_1340_d","allMobTypes","d","[LEnumMobType;","[Lxb;","EnumMobType","xb","net/minecraft/src","0" +"field_1091_a","tagList","a","Ljava/util/List;","Ljava/util/List;","NBTTagList","yi","net/minecraft/src","0" +"field_1090_b","tagType","b","B","B","NBTTagList","yi","net/minecraft/src","0" +"field_40246_a","damageModifier","a","I","I","EnchantmentModifierDamage","cp","net/minecraft/src","0" +"field_40245_b","damageSource","b","LDamageSource;","Lpm;","EnchantmentModifierDamage","cp","net/minecraft/src","0" +"field_319_a","weaponDamage","a","I","I","ItemSword","zp","net/minecraft/src","0" +"field_40439_b","field_40439_b","b","LEnumToolMaterial;","Lnu;","ItemSword","zp","net/minecraft/src","0" +"field_827_a","chestContents","p","[LItemStack;","[Ldk;","TileEntityChest","tu","net/minecraft/src","0" +"field_35155_a","field_35155_a","a","Z","Z","TileEntityChest","tu","net/minecraft/src","0" +"field_35152_b","field_35152_b","b","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35153_c","field_35153_c","j","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35150_d","field_35150_d","k","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35151_e","field_35151_e","l","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35148_f","field_35148_f","m","F","F","TileEntityChest","tu","net/minecraft/src","0" +"field_35149_g","field_35149_g","n","F","F","TileEntityChest","tu","net/minecraft/src","0" +"field_35156_h","field_35156_h","o","I","I","TileEntityChest","tu","net/minecraft/src","0" +"field_35154_q","field_35154_q","q","I","I","TileEntityChest","tu","net/minecraft/src","0" +"field_35266_a","field_35266_a","a","I","I","WorldGenBigMushroom","acp","net/minecraft/src","0" +"field_27054_a","entityID","a","I","I","Packet71Weather","abf","net/minecraft/src","0" +"field_27053_b","posX","b","I","I","Packet71Weather","abf","net/minecraft/src","0" +"field_27057_c","posY","c","I","I","Packet71Weather","abf","net/minecraft/src","0" +"field_27056_d","posZ","d","I","I","Packet71Weather","abf","net/minecraft/src","0" +"field_27055_e","isLightningBolt","e","I","I","Packet71Weather","abf","net/minecraft/src","0" +"field_35717_a","components","a","Ljava/util/LinkedList;","Ljava/util/LinkedList;","StructureStart","oa","net/minecraft/src","0" +"field_35716_b","boundingBox","b","LStructureBoundingBox;","Lnl;","StructureStart","oa","net/minecraft/src","0" +"field_35444_c","endermanModel","a","LModelEnderman;","Lta;","RenderEnderman","aae","net/minecraft/src","0" +"field_35445_h","rnd","b","Ljava/util/Random;","Ljava/util/Random;","RenderEnderman","aae","net/minecraft/src","0" +"field_20127_a","furnace","a","LTileEntityFurnace;","Loe;","ContainerFurnace","eg","net/minecraft/src","0" +"field_20126_b","lastCookTime","b","I","I","ContainerFurnace","eg","net/minecraft/src","0" +"field_20129_c","lastBurnTime","c","I","I","ContainerFurnace","eg","net/minecraft/src","0" +"field_20128_h","lastItemBurnTime","h","I","I","ContainerFurnace","eg","net/minecraft/src","0" +"field_1063_a","netManager","a","LNetworkManager;","Lhc;","NetworkWriterThread","agv","net/minecraft/src","0" +"field_35507_b","field_35507_b","b","LGenLayer;","Ljx;","GenLayerDownfallMix","mh","net/minecraft/src","0" +"field_35508_c","field_35508_c","c","I","I","GenLayerDownfallMix","mh","net/minecraft/src","0" +"OBJECT","OBJECT","a","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"ARRAY","ARRAY","b","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"STRING","STRING","c","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"NUMBER","NUMBER","d","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"TRUE","TRUE","e","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"FALSE","FALSE","f","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"NULL","NULL","g","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"field_27442_h","allJsonNodeTypes","h","[LEnumJsonNodeType;","[Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"field_27296_a","nodeBuilder","a","LJ_JsonObjectNodeBuilder;","Labq;","J_ObjectNodeContainer","lc","net/minecraft/src","0" +"field_27295_b","field_27295_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ObjectNodeContainer","lc","net/minecraft/src","0" +"field_331_a","isFull","a","I","I","ItemBucket","en","net/minecraft/src","0" +"field_25071_d","statId","a","I","I","StatBase","px","net/minecraft/src","0" +"field_25070_e","statName","b","Ljava/lang/String;","Ljava/lang/String;","StatBase","px","net/minecraft/src","0" +"field_27088_g","isIndependent","c","Z","Z","StatBase","px","net/minecraft/src","0" +"field_25069_f","statGuid","d","Ljava/lang/String;","Ljava/lang/String;","StatBase","px","net/minecraft/src","0" +"field_26902_a","type","h","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0" +"field_26903_b","numberFormat","i","Ljava/text/NumberFormat;","Ljava/text/NumberFormat;","StatBase","px","net/minecraft/src","0" +"field_27087_i","simpleStatType","e","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0" +"field_26904_c","decimalFormat","j","Ljava/text/DecimalFormat;","Ljava/text/DecimalFormat;","StatBase","px","net/minecraft/src","0" +"field_27086_j","timeStatType","f","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0" +"field_27085_k","distanceStatType","g","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0" +"field_40073_a","entityDragonObj","a","LEntityDragonBase;","Ladh;","DragonPart","vc","net/minecraft/src","0" +"field_40072_b","name","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","vc","net/minecraft/src","0" +"field_35590_d","field_35590_d","d","I","I","WeightedRandomChoice","abt","net/minecraft/src","0" +"field_1100_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","kj","net/minecraft/src","0" +"field_1099_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","kj","net/minecraft/src","0" +"field_40704_a","sectionPercentage","a","D","D","ProfilerResult","afx","net/minecraft/src","0" +"field_40702_b","globalPercentage","b","D","D","ProfilerResult","afx","net/minecraft/src","0" +"field_40703_c","name","c","Ljava/lang/String;","Ljava/lang/String;","ProfilerResult","afx","net/minecraft/src","0" +"field_6491_e","texturePackName","e","I","I","TexturePackDefault","ax","net/minecraft/src","0" +"field_6490_f","texturePackThumbnail","f","Ljava/awt/image/BufferedImage;","Ljava/awt/image/BufferedImage;","TexturePackDefault","ax","net/minecraft/src","0" +"field_35102_a","field_35102_a","a","I","I","ComponentVillageHouse3","tf","net/minecraft/src","0" +"field_1065_a","mc","a","LMinecraft;","LMinecraft;","PlayerController","aes","net/minecraft/src","0" +"field_1064_b","isInTestMode","b","Z","Z","PlayerController","aes","net/minecraft/src","0" +"field_21065_a","noteParticleScale","a","F","F","EntityNoteFX","ae","net/minecraft/src","0" +"field_753_a","field_753_a","a","Z","Z","EntityChicken","qh","net/minecraft/src","0" +"field_752_b","field_752_b","b","F","F","EntityChicken","qh","net/minecraft/src","0" +"field_758_c","destPos","c","F","F","EntityChicken","qh","net/minecraft/src","0" +"field_757_d","field_757_d","d","F","F","EntityChicken","qh","net/minecraft/src","0" +"field_756_e","field_756_e","e","F","F","EntityChicken","qh","net/minecraft/src","0" +"field_755_h","field_755_h","f","F","F","EntityChicken","qh","net/minecraft/src","0" +"field_754_i","timeUntilNextEgg","g","I","I","EntityChicken","qh","net/minecraft/src","0" +"field_35759_a","disableDamage","a","Z","Z","PlayerCapabilities","wq","net/minecraft/src","0" +"field_35757_b","isFlying","b","Z","Z","PlayerCapabilities","wq","net/minecraft/src","0" +"field_35758_c","allowFlying","c","Z","Z","PlayerCapabilities","wq","net/minecraft/src","0" +"field_35756_d","depleteBuckets","d","Z","Z","PlayerCapabilities","wq","net/minecraft/src","0" +"field_329_aX","blocksEffectiveAgainst","bR","[LBlock;","[Lyy;","ItemPickaxe","zu","net/minecraft/src","0" +"field_35400_a","silverfishBodyParts","g","[LModelRenderer;","[Lacf;","ModelSilverfish","aaq","net/minecraft/src","0" +"field_35398_b","silverfishWings","h","[LModelRenderer;","[Lacf;","ModelSilverfish","aaq","net/minecraft/src","0" +"field_35399_c","field_35399_c","i","[F","[F","ModelSilverfish","aaq","net/minecraft/src","0" +"field_35396_d","silverfishBoxLength","j","[[I","[[I","ModelSilverfish","aaq","net/minecraft/src","0" +"field_35397_e","silverfishTexturePositions","k","[[I","[[I","ModelSilverfish","aaq","net/minecraft/src","0" +"field_1609_a","useMipmaps","a","Z","Z","RenderEngine","zh","net/minecraft/src","0" +"field_6528_b","textureMap","d","Ljava/util/HashMap;","Ljava/util/HashMap;","RenderEngine","zh","net/minecraft/src","0" +"field_28151_c","textureContentsMap","e","Ljava/util/HashMap;","Ljava/util/HashMap;","RenderEngine","zh","net/minecraft/src","0" +"field_1607_c","textureNameToImageMap","f","LIntHashMap;","Lob;","RenderEngine","zh","net/minecraft/src","0" +"field_1606_d","singleIntBuffer","g","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","RenderEngine","zh","net/minecraft/src","0" +"field_1605_e","imageData","h","Ljava/nio/ByteBuffer;","Ljava/nio/ByteBuffer;","RenderEngine","zh","net/minecraft/src","0" +"field_1604_f","textureList","i","Ljava/util/List;","Ljava/util/List;","RenderEngine","zh","net/minecraft/src","0" +"field_1603_g","urlToImageDataMap","j","Ljava/util/Map;","Ljava/util/Map;","RenderEngine","zh","net/minecraft/src","0" +"field_1602_h","options","k","LGameSettings;","Lki;","RenderEngine","zh","net/minecraft/src","0" +"field_4281_i","clampTexture","b","Z","Z","RenderEngine","zh","net/minecraft/src","0" +"field_4280_j","blurTexture","c","Z","Z","RenderEngine","zh","net/minecraft/src","0" +"field_6527_k","texturePack","l","LTexturePackList;","Ladk;","RenderEngine","zh","net/minecraft/src","0" +"field_25189_l","missingTextureImage","m","Ljava/awt/image/BufferedImage;","Ljava/awt/image/BufferedImage;","RenderEngine","zh","net/minecraft/src","0" +"field_1511_b","convertQuadsToTriangles","b","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1510_c","tryVBO","c","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1509_d","byteBuffer","d","Ljava/nio/ByteBuffer;","Ljava/nio/ByteBuffer;","Tessellator","cv","net/minecraft/src","0" +"field_1508_e","intBuffer","e","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","Tessellator","cv","net/minecraft/src","0" +"field_1507_f","floatBuffer","f","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","Tessellator","cv","net/minecraft/src","0" +"field_35836_g","shortBuffer","g","Ljava/nio/ShortBuffer;","Ljava/nio/ShortBuffer;","Tessellator","cv","net/minecraft/src","0" +"field_1506_g","rawBuffer","h","[I","[I","Tessellator","cv","net/minecraft/src","0" +"field_1505_h","vertexCount","i","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1504_i","textureU","j","D","D","Tessellator","cv","net/minecraft/src","0" +"field_1503_j","textureV","k","D","D","Tessellator","cv","net/minecraft/src","0" +"field_35837_l","brightness","l","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1502_k","color","m","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1501_l","hasColor","n","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1500_m","hasTexture","o","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_35838_p","hasBrightness","p","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1499_n","hasNormals","q","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1498_o","rawBufferIndex","r","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1497_p","addedVertices","s","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1495_q","isColorDisabled","t","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1493_r","drawMode","u","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1492_s","xOffset","v","D","D","Tessellator","cv","net/minecraft/src","0" +"field_1491_t","yOffset","w","D","D","Tessellator","cv","net/minecraft/src","0" +"field_1490_u","zOffset","x","D","D","Tessellator","cv","net/minecraft/src","0" +"field_1489_v","normal","y","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1512_a","instance","a","LTessellator;","Lcv;","Tessellator","cv","net/minecraft/src","0" +"field_1488_w","isDrawing","z","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1487_x","useVBO","A","Z","Z","Tessellator","cv","net/minecraft/src","0" +"field_1486_y","vertexBuffers","B","Ljava/nio/IntBuffer;","Ljava/nio/IntBuffer;","Tessellator","cv","net/minecraft/src","0" +"field_1485_z","vboIndex","C","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1496_A","vboCount","D","I","I","Tessellator","cv","net/minecraft/src","0" +"field_1494_B","bufferSize","E","I","I","Tessellator","cv","net/minecraft/src","0" +"field_4274_a","baseEntity","a","LEntityLiving;","Lnq;","RenderSorter","jy","net/minecraft/src","0" +"field_22395_a","posX","a","I","I","ChunkCoordinates","dh","net/minecraft/src","0" +"field_22394_b","posY","b","I","I","ChunkCoordinates","dh","net/minecraft/src","0" +"field_22396_c","posZ","c","I","I","ChunkCoordinates","dh","net/minecraft/src","0" +"field_1297_a","message","a","Ljava/lang/String;","Ljava/lang/String;","ChatLine","ahe","net/minecraft/src","0" +"field_1296_b","updateCounter","b","I","I","ChatLine","ahe","net/minecraft/src","0" +"field_22392_a","folderRegexPattern","a","Ljava/util/regex/Pattern;","Ljava/util/regex/Pattern;","ChunkFolderPattern","agj","net/minecraft/src","0" +"field_27392_a","minDisplayColumn","a","I","I","AchievementList","ut","net/minecraft/src","0" +"field_27391_b","minDisplayRow","b","I","I","AchievementList","ut","net/minecraft/src","0" +"field_27390_c","maxDisplayColumn","c","I","I","AchievementList","ut","net/minecraft/src","0" +"field_27389_d","maxDisplayRow","d","I","I","AchievementList","ut","net/minecraft/src","0" +"field_27388_e","achievementList","e","Ljava/util/List;","Ljava/util/List;","AchievementList","ut","net/minecraft/src","0" +"field_25195_b","openInventory","f","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_25198_c","mineWood","g","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_25197_d","buildWorkBench","h","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27387_i","buildPickaxe","i","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27386_j","buildFurnace","j","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27385_k","acquireIron","k","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27384_l","buildHoe","l","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27383_m","makeBread","m","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27382_n","bakeCake","n","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27381_o","buildBetterPickaxe","o","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27380_p","cookFish","p","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27379_q","onARail","q","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27378_r","buildSword","r","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27377_s","killEnemy","s","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27376_t","killCow","t","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27375_u","flyPig","u","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_35608_v","snipeSkeleton","v","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40464_w","diamonds","w","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40467_x","portal","x","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40466_y","ghast","y","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40465_z","blazeRod","z","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40461_A","potion","A","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40462_B","theEnd","B","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40463_C","theEnd2","C","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40458_D","enchantments","D","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40459_E","overkill","E","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_40460_F","bookcase","F","LAchievement;","Lws;","AchievementList","ut","net/minecraft/src","0" +"field_27370_a","field_27370_a","a","Ljava/lang/String;","Ljava/lang/String;","MD5String","vz","net/minecraft/src","0" +"field_1587_a","mc","a","LMinecraft;","LMinecraft;","GameWindowListener","sj","net/minecraft/src","0" +"field_1586_b","mcThread","b","Ljava/lang/Thread;","Ljava/lang/Thread;","GameWindowListener","sj","net/minecraft/src","0" +"field_6540_a","grassBuffer","a","[I","[I","ColorizerGrass","ha","net/minecraft/src","0" +"field_4170_h","hellRNG","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4169_i","field_4169_i","j","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4168_j","field_4168_j","k","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4167_k","field_4167_k","l","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4166_l","field_4166_l","m","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4165_m","field_4165_m","n","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4177_a","field_4177_a","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4176_b","field_4176_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4164_n","worldObj","o","LWorld;","Lry;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4163_o","field_4163_o","p","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_40378_c","field_40378_c","c","LMapGenNetherBridge;","Led;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4162_p","field_4162_p","q","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4161_q","gravelNoise","r","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4160_r","field_4160_r","s","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4159_s","field_4159_s","t","LMapGenBase;","Lbz;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4175_c","field_4175_c","d","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4174_d","field_4174_d","e","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4173_e","field_4173_e","f","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4172_f","field_4172_f","g","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4171_g","field_4171_g","h","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4201_e","field_4201_e","c","LBiomeGenBase;","Lsr;","WorldChunkManagerHell","bx","net/minecraft/src","0" +"field_4200_f","hellTemperature","d","F","F","WorldChunkManagerHell","bx","net/minecraft/src","0" +"field_4199_g","field_4199_g","e","F","F","WorldChunkManagerHell","bx","net/minecraft/src","0" +"field_35437_a","field_35437_a","a","LBlock;","Lyy;","ItemMetadata","afm","net/minecraft/src","0" +"field_40448_a","field_40448_a","b","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","RenderEndPortal","abi","net/minecraft/src","0" +"field_27238_a","fieldBuilders","a","Ljava/util/List;","Ljava/util/List;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" +"field_327_aX","blocksEffectiveAgainst","bR","[LBlock;","[Lyy;","ItemAxe","ago","net/minecraft/src","0" +"field_1413_b","signModel","b","LSignModel;","Lrb;","TileEntitySignRenderer","aeu","net/minecraft/src","0" +"field_28065_a","droppedChunksSet","a","Ljava/util/Set;","Ljava/util/Set;","ChunkProvider","jz","net/minecraft/src","0" +"field_28064_b","emptyChunk","b","LChunk;","Lzx;","ChunkProvider","jz","net/minecraft/src","0" +"field_28070_c","chunkProvider","c","LIChunkProvider;","Lej;","ChunkProvider","jz","net/minecraft/src","0" +"field_28069_d","chunkLoader","d","LIChunkLoader;","Ld;","ChunkProvider","jz","net/minecraft/src","0" +"field_28068_e","chunkMap","e","LLongHashMap;","Lwv;","ChunkProvider","jz","net/minecraft/src","0" +"field_28067_f","chunkList","f","Ljava/util/List;","Ljava/util/List;","ChunkProvider","jz","net/minecraft/src","0" +"field_28066_g","worldObj","g","LWorld;","Lry;","ChunkProvider","jz","net/minecraft/src","0" +"field_35392_h","field_35392_h","h","I","I","ChunkProvider","jz","net/minecraft/src","0" +"all","all","a","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"armor","armor","b","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"armor_feet","armor_feet","c","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"armor_legs","armor_legs","d","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"armor_torso","armor_torso","e","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"armor_head","armor_head","f","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"weapon","weapon","g","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"digger","digger","h","LEnumEnchantmentType;","Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"field_40659_i","allEnchantmentTypes","i","[LEnumEnchantmentType;","[Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"field_1266_d","head","g","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_1265_e","body","h","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_1264_f","leg1","i","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_1263_g","leg2","j","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_1262_h","leg3","k","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_1261_i","leg4","l","LModelRenderer;","Lacf;","ModelQuadruped","fh","net/minecraft/src","0" +"field_40331_g","field_40331_g","m","F","F","ModelQuadruped","fh","net/minecraft/src","0" +"field_40332_n","field_40332_n","n","F","F","ModelQuadruped","fh","net/minecraft/src","0" +"field_22045_a","entityID","a","I","I","Packet17Sleep","aft","net/minecraft/src","0" +"field_22044_b","bedX","b","I","I","Packet17Sleep","aft","net/minecraft/src","0" +"field_22048_c","bedY","c","I","I","Packet17Sleep","aft","net/minecraft/src","0" +"field_22047_d","bedZ","d","I","I","Packet17Sleep","aft","net/minecraft/src","0" +"field_22046_e","field_22046_e","e","I","I","Packet17Sleep","aft","net/minecraft/src","0" +"field_992_a","errorMessage","a","Ljava/lang/String;","Ljava/lang/String;","GuiDisconnected","aam","net/minecraft/src","0" +"field_993_h","errorDetail","b","Ljava/lang/String;","Ljava/lang/String;","GuiDisconnected","aam","net/minecraft/src","0" +"field_1289_a","head","g","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1288_b","body","h","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1295_c","rightLeg","i","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1294_d","leftLeg","j","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1293_e","rightWing","k","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1292_f","leftWing","l","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1291_g","bill","m","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_1290_h","chin","n","LModelRenderer;","Lacf;","ModelChicken","adq","net/minecraft/src","0" +"field_27031_a","escapedString","a","Ljava/lang/String;","Ljava/lang/String;","J_JsonEscapedString","aek","net/minecraft/src","0" +"field_22080_c","fontRenderer","c","LFontRenderer;","Labe;","GuiTextField","dv","net/minecraft/src","0" +"field_22079_d","xPos","d","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22078_e","yPos","e","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22077_f","width","f","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22076_g","height","g","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22075_h","text","h","Ljava/lang/String;","Ljava/lang/String;","GuiTextField","dv","net/minecraft/src","0" +"field_22074_i","maxStringLength","j","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22073_k","cursorCounter","k","I","I","GuiTextField","dv","net/minecraft/src","0" +"field_22082_a","isFocused","a","Z","Z","GuiTextField","dv","net/minecraft/src","0" +"field_22081_b","isEnabled","b","Z","Z","GuiTextField","dv","net/minecraft/src","0" +"field_27107_l","parentGuiScreen","l","LGuiScreen;","Lxe;","GuiTextField","dv","net/minecraft/src","0" +"field_35139_a","field_35139_a","a","I","I","EntityHugeExplodeFX","adc","net/minecraft/src","0" +"field_35138_ay","field_35138_ay","au","I","I","EntityHugeExplodeFX","adc","net/minecraft/src","0" +"field_9445_c","currentBlockX","c","I","I","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9444_d","currentBlockY","d","I","I","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9443_e","currentblockZ","e","I","I","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9442_f","curBlockDamageMP","f","F","F","PlayerControllerMP","zn","net/minecraft/src","0" +"field_1080_g","prevBlockDamageMP","g","F","F","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9441_h","stepSoundTickCounter","h","F","F","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9440_i","blockHitDelay","i","I","I","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9439_j","isHittingBlock","j","Z","Z","PlayerControllerMP","zn","net/minecraft/src","0" +"field_35649_k","creativeMode","k","Z","Z","PlayerControllerMP","zn","net/minecraft/src","0" +"field_9438_k","netClientHandler","l","LNetClientHandler;","Labp;","PlayerControllerMP","zn","net/minecraft/src","0" +"field_1075_l","currentPlayerItem","m","I","I","PlayerControllerMP","zn","net/minecraft/src","0" +"field_27233_a","field_27233_a","a","Ljava/util/Map;","Ljava/util/Map;","ThreadStatSyncherSend","mi","net/minecraft/src","0" +"field_27232_b","syncher","b","LStatsSyncher;","Ljq;","ThreadStatSyncherSend","mi","net/minecraft/src","0" +"field_27359_a","valueGetter","a","LJ_Functor;","Lgz;","J_JsonNodeSelector","dx","net/minecraft/src","0" +"field_689_a","fuse","a","I","I","EntityTNTPrimed","dd","net/minecraft/src","0" +"field_695_c","tickCounter1","f","I","I","EntityPainting","tj","net/minecraft/src","0" +"field_691_a","direction","a","I","I","EntityPainting","tj","net/minecraft/src","0" +"field_9322_d","xPosition","b","I","I","EntityPainting","tj","net/minecraft/src","0" +"field_9321_e","yPosition","c","I","I","EntityPainting","tj","net/minecraft/src","0" +"field_9320_f","zPosition","d","I","I","EntityPainting","tj","net/minecraft/src","0" +"field_690_b","art","e","LEnumArt;","Lsv;","EntityPainting","tj","net/minecraft/src","0" +"field_581_a","collectedEntityId","a","I","I","Packet22Collect","rc","net/minecraft/src","0" +"field_580_b","collectorEntityId","b","I","I","Packet22Collect","rc","net/minecraft/src","0" +"field_6517_m","specialRendererMap","m","Ljava/util/Map;","Ljava/util/Map;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1554_a","instance","a","LTileEntityRenderer;","Lah;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1541_n","fontRenderer","n","LFontRenderer;","Labe;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1553_b","staticPlayerX","b","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1552_c","staticPlayerY","c","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1551_d","staticPlayerZ","d","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1550_e","renderEngine","e","LRenderEngine;","Lzh;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1549_f","worldObj","f","LWorld;","Lry;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_22270_g","entityLivingPlayer","g","LEntityLiving;","Lnq;","TileEntityRenderer","ah","net/minecraft/src","0" +"field_22269_h","playerYaw","h","F","F","TileEntityRenderer","ah","net/minecraft/src","0" +"field_22268_i","playerPitch","i","F","F","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1545_j","playerX","j","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1544_k","playerY","k","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_1543_l","playerZ","l","D","D","TileEntityRenderer","ah","net/minecraft/src","0" +"field_28036_a","furnaceRand","a","Ljava/util/Random;","Ljava/util/Random;","BlockFurnace","eu","net/minecraft/src","0" +"field_456_a","isActive","cb","Z","Z","BlockFurnace","eu","net/minecraft/src","0" +"field_28037_c","keepFurnaceInventory","cc","Z","Z","BlockFurnace","eu","net/minecraft/src","0" +"field_4216_a","worldObj","a","LWorld;","Lry;","WorldProvider","k","net/minecraft/src","0" +"field_4215_b","worldChunkMgr","b","LWorldChunkManager;","Lvh;","WorldProvider","k","net/minecraft/src","0" +"field_4220_c","isNether","c","Z","Z","WorldProvider","k","net/minecraft/src","0" +"field_6479_d","isHellWorld","d","Z","Z","WorldProvider","k","net/minecraft/src","0" +"field_6478_e","hasNoSky","e","Z","Z","WorldProvider","k","net/minecraft/src","0" +"field_4219_d","lightBrightnessTable","f","[F","[F","WorldProvider","k","net/minecraft/src","0" +"field_4218_e","worldType","g","I","I","WorldProvider","k","net/minecraft/src","0" +"field_4217_f","colorsSunriseSunset","h","[F","[F","WorldProvider","k","net/minecraft/src","0" +"field_27338_a","pushbackReader","a","Ljava/io/PushbackReader;","Ljava/io/PushbackReader;","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"field_27337_b","characterCount","b","I","I","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"field_27340_c","lineCount","c","I","I","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"field_27339_d","lastCharacterWasCarriageReturn","d","Z","Z","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"field_561_a","xPosition","a","D","D","Packet10Flying","hk","net/minecraft/src","0" +"field_560_b","yPosition","b","D","D","Packet10Flying","hk","net/minecraft/src","0" +"field_559_c","zPosition","c","D","D","Packet10Flying","hk","net/minecraft/src","0" +"field_558_d","stance","d","D","D","Packet10Flying","hk","net/minecraft/src","0" +"field_557_e","yaw","e","F","F","Packet10Flying","hk","net/minecraft/src","0" +"field_556_f","pitch","f","F","F","Packet10Flying","hk","net/minecraft/src","0" +"field_555_g","onGround","g","Z","Z","Packet10Flying","hk","net/minecraft/src","0" +"field_554_h","moving","h","Z","Z","Packet10Flying","hk","net/minecraft/src","0" +"field_553_i","rotating","i","Z","Z","Packet10Flying","hk","net/minecraft/src","0" +"field_27017_a","snowDigParticleScale","a","F","F","EntitySnowShovelFX","zj","net/minecraft/src","0" +"field_1665_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesTools","zq","net/minecraft/src","0" +"field_1664_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesTools","zq","net/minecraft/src","0" +"field_837_a","name","a","Ljava/lang/String;","Ljava/lang/String;","InventoryLargeChest","adv","net/minecraft/src","0" +"field_836_b","upperChest","b","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0" +"field_838_c","lowerChest","c","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0" +"field_1306_a","field_1306_a","a","I","I","MapGenBase","bz","net/minecraft/src","0" +"field_1305_b","rand","b","Ljava/util/Random;","Ljava/util/Random;","MapGenBase","bz","net/minecraft/src","0" +"field_35625_d","worldObj","c","LWorld;","Lry;","MapGenBase","bz","net/minecraft/src","0" +"field_455_a","signEntityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","BlockSign","mr","net/minecraft/src","0" +"field_454_b","isFreestanding","cb","Z","Z","BlockSign","mr","net/minecraft/src","0" +"field_27222_a","fields","a","Ljava/util/Map;","Ljava/util/Map;","J_JsonObject","g","net/minecraft/src","0" +"field_35292_a","field_35292_a","a","I","I","BlockMushroomCap","wd","net/minecraft/src","0" +"field_35061_c","field_35061_c","c","[LStructurePieceTreasure;","[Lagq;","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" +"field_35062_a","field_35062_a","a","LEnumDoor;","Lmj;","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" +"field_35060_b","field_35060_b","b","I","I","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" +"field_1174_a","moveStrafe","a","F","F","MovementInput","agn","net/minecraft/src","0" +"field_1173_b","moveForward","b","F","F","MovementInput","agn","net/minecraft/src","0" +"field_1177_c","field_1177_c","c","Z","Z","MovementInput","agn","net/minecraft/src","0" +"field_1176_d","jump","d","Z","Z","MovementInput","agn","net/minecraft/src","0" +"field_1175_e","sneak","e","Z","Z","MovementInput","agn","net/minecraft/src","0" +"field_27052_a","statisticId","a","I","I","Packet200Statistic","zl","net/minecraft/src","0" +"field_27051_b","amount","b","I","I","Packet200Statistic","zl","net/minecraft/src","0" +"field_6544_a","eligibleChunksForSpawning","b","Ljava/util/HashMap;","Ljava/util/HashMap;","SpawnerAnimals","we","net/minecraft/src","0" +"field_22391_a","nightSpawnEntities","a","[Ljava/lang/Class;","[Ljava/lang/Class;","SpawnerAnimals","we","net/minecraft/src","0" +"field_4082_a","blockInstance","a","LBlock;","Lyy;","EntityDiggingFX","mp","net/minecraft/src","0" +"field_1622_a","craftMatrix","a","LInventoryCrafting;","Llm;","ContainerWorkbench","ace","net/minecraft/src","0" +"field_1621_b","craftResult","b","LIInventory;","Lde;","ContainerWorkbench","ace","net/minecraft/src","0" +"field_20133_c","worldObj","c","LWorld;","Lry;","ContainerWorkbench","ace","net/minecraft/src","0" +"field_20132_h","posX","h","I","I","ContainerWorkbench","ace","net/minecraft/src","0" +"field_20131_i","posY","i","I","I","ContainerWorkbench","ace","net/minecraft/src","0" +"field_20130_j","posZ","j","I","I","ContainerWorkbench","ace","net/minecraft/src","0" +"field_1478_a","threadSyncObject","a","Ljava/lang/Object;","Ljava/lang/Object;","NetworkManager","hc","net/minecraft/src","0" +"field_1477_b","numReadThreads","b","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_1476_c","numWriteThreads","c","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_1475_d","sendQueueLock","g","Ljava/lang/Object;","Ljava/lang/Object;","NetworkManager","hc","net/minecraft/src","0" +"field_12258_e","networkSocket","h","Ljava/net/Socket;","Ljava/net/Socket;","NetworkManager","hc","net/minecraft/src","0" +"field_1474_e","remoteSocketAddress","i","Ljava/net/SocketAddress;","Ljava/net/SocketAddress;","NetworkManager","hc","net/minecraft/src","0" +"field_1473_f","socketInputStream","j","Ljava/io/DataInputStream;","Ljava/io/DataInputStream;","NetworkManager","hc","net/minecraft/src","0" +"field_1472_g","socketOutputStream","k","Ljava/io/DataOutputStream;","Ljava/io/DataOutputStream;","NetworkManager","hc","net/minecraft/src","0" +"field_1471_h","isRunning","l","Z","Z","NetworkManager","hc","net/minecraft/src","0" +"field_1470_i","readPackets","m","Ljava/util/List;","Ljava/util/List;","NetworkManager","hc","net/minecraft/src","0" +"field_1469_j","dataPackets","n","Ljava/util/List;","Ljava/util/List;","NetworkManager","hc","net/minecraft/src","0" +"field_1468_k","chunkDataPackets","o","Ljava/util/List;","Ljava/util/List;","NetworkManager","hc","net/minecraft/src","0" +"field_1467_l","netHandler","p","LNetHandler;","Lfe;","NetworkManager","hc","net/minecraft/src","0" +"field_1466_m","isServerTerminating","q","Z","Z","NetworkManager","hc","net/minecraft/src","0" +"field_1465_n","writeThread","r","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkManager","hc","net/minecraft/src","0" +"field_1464_o","readThread","s","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkManager","hc","net/minecraft/src","0" +"field_1463_p","isTerminating","t","Z","Z","NetworkManager","hc","net/minecraft/src","0" +"field_1462_q","terminationReason","u","Ljava/lang/String;","Ljava/lang/String;","NetworkManager","hc","net/minecraft/src","0" +"field_20101_t","field_20101_t","v","[Ljava/lang/Object;","[Ljava/lang/Object;","NetworkManager","hc","net/minecraft/src","0" +"field_1461_r","timeSinceLastRead","w","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_1460_s","sendQueueByteLength","x","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_28145_d","field_28145_d","d","[I","[I","NetworkManager","hc","net/minecraft/src","0" +"field_28144_e","field_28144_e","e","[I","[I","NetworkManager","hc","net/minecraft/src","0" +"field_1459_t","chunkDataSendCounter","f","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_20100_w","field_20100_w","y","I","I","NetworkManager","hc","net/minecraft/src","0" +"field_4231_g","mc","g","LMinecraft;","LMinecraft;","TextureCompassFX","aih","net/minecraft/src","0" +"field_4230_h","compassIconImageData","h","[I","[I","TextureCompassFX","aih","net/minecraft/src","0" +"field_4229_i","field_4229_i","i","D","D","TextureCompassFX","aih","net/minecraft/src","0" +"field_4228_j","field_4228_j","j","D","D","TextureCompassFX","aih","net/minecraft/src","0" +"field_35104_a","field_35104_a","a","Z","Z","ComponentVillageWell","aia","net/minecraft/src","0" +"field_35103_b","field_35103_b","b","I","I","ComponentVillageWell","aia","net/minecraft/src","0" +"field_1620_a","craftMatrix","a","LInventoryCrafting;","Llm;","ContainerPlayer","gd","net/minecraft/src","0" +"field_1619_b","craftResult","b","LIInventory;","Lde;","ContainerPlayer","gd","net/minecraft/src","0" +"field_20124_c","isSinglePlayer","c","Z","Z","ContainerPlayer","gd","net/minecraft/src","0" +"field_35344_a","threadsPending","a","I","I","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35343_b","lock","b","Ljava/lang/Object;","Ljava/lang/Object;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_968_a","parentScreen","c","LGuiScreen;","Lxe;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35342_d","serverSlotContainer","d","LGuiSlotServer;","Ljo;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35340_f","serverList","e","Ljava/util/List;","Ljava/util/List;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35341_g","selectedServer","f","I","I","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35347_h","buttonEdit","g","LGuiButton;","Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35348_i","buttonSelect","h","LGuiButton;","Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35345_j","buttonDelete","j","LGuiButton;","Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35346_k","deleteClicked","k","Z","Z","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35353_s","addClicked","s","Z","Z","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35352_t","editClicked","t","Z","Z","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35351_u","directClicked","u","Z","Z","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35350_v","field_35350_v","v","Ljava/lang/String;","Ljava/lang/String;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_35349_w","tempServer","w","LServerNBTStorage;","Llo;","GuiMultiplayer","xi","net/minecraft/src","0" +"field_9402_e","xTile","e","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9401_f","yTile","f","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9400_g","zTile","g","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9399_h","inTile","h","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9398_i","inGround","i","Z","Z","EntityFireball","aad","net/minecraft/src","0" +"field_9397_j","shootingEntity","a","LEntityLiving;","Lnq;","EntityFireball","aad","net/minecraft/src","0" +"field_9396_k","ticksAlive","aq","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9395_l","ticksInAir","ar","I","I","EntityFireball","aad","net/minecraft/src","0" +"field_9405_b","accelerationX","b","D","D","EntityFireball","aad","net/minecraft/src","0" +"field_9404_c","accelerationY","c","D","D","EntityFireball","aad","net/minecraft/src","0" +"field_9403_d","accelerationZ","d","D","D","EntityFireball","aad","net/minecraft/src","0" +"field_34903_b","field_34903_b","c","LGenLayer;","Ljx;","WorldChunkManager","vh","net/minecraft/src","0" +"field_34902_c","field_34902_c","d","LGenLayer;","Ljx;","WorldChunkManager","vh","net/minecraft/src","0" +"field_34901_d","temperatureLayer","e","LGenLayer;","Ljx;","WorldChunkManager","vh","net/minecraft/src","0" +"field_35565_e","rainfallLayer","f","LGenLayer;","Ljx;","WorldChunkManager","vh","net/minecraft/src","0" +"field_35563_f","biomeCache","g","LBiomeCache;","Lagl;","WorldChunkManager","vh","net/minecraft/src","0" +"field_35564_g","biomesToSpawnIn","h","Ljava/util/List;","Ljava/util/List;","WorldChunkManager","vh","net/minecraft/src","0" +"field_4195_d","field_4195_d","a","[LBiomeGenBase;","[Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"field_40541_b","field_40541_b","b","[F","[F","WorldChunkManager","vh","net/minecraft/src","0" +"field_35079_a","field_35079_a","a","I","I","ComponentVillageHall","acz","net/minecraft/src","0" +"field_40649_a","enchantmentRand","a","Ljava/util/Random;","Ljava/util/Random;","EnchantmentHelper","ml","net/minecraft/src","0" +"field_40647_b","enchantmentModifierDamage","b","LEnchantmentModifierDamage;","Lcp;","EnchantmentHelper","ml","net/minecraft/src","0" +"field_40648_c","enchantmentModifierLiving","c","LEnchantmentModifierLiving;","Laen;","EnchantmentHelper","ml","net/minecraft/src","0" +"field_28050_a","sfxID","a","I","I","Packet61DoorChange","sh","net/minecraft/src","0" +"field_28049_b","auxData","b","I","I","Packet61DoorChange","sh","net/minecraft/src","0" +"field_28053_c","posX","c","I","I","Packet61DoorChange","sh","net/minecraft/src","0" +"field_28052_d","posY","d","I","I","Packet61DoorChange","sh","net/minecraft/src","0" +"field_28051_e","posZ","e","I","I","Packet61DoorChange","sh","net/minecraft/src","0" +"field_22266_a","parentWorldGui","a","LGuiSelectWorld;","Lxz;","GuiWorldSlot","pb","net/minecraft/src","0" +"field_40504_a","enchantmentsList","b","[LEnchantment;","[Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40502_b","protection","c","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40503_c","fireProtection","d","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40500_d","featherFalling","e","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40501_e","blastProtection","f","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40498_f","projectileProtection","g","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40499_g","respiration","h","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40511_h","aquaAffinity","i","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40512_i","sharpness","j","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40509_j","smite","k","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40510_k","baneOfArthropods","l","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40507_l","knockback","m","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40508_m","fireAspect","n","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40505_n","looting","o","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40506_o","efficiency","p","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40519_p","silkTouch","q","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40518_q","unbreaking","r","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40517_r","fortune","s","LEnchantment;","Laef;","Enchantment","aef","net/minecraft/src","0" +"field_40516_s","effectId","t","I","I","Enchantment","aef","net/minecraft/src","0" +"field_40513_v","weight","a","I","I","Enchantment","aef","net/minecraft/src","0" +"field_40515_t","type","u","LEnumEnchantmentType;","Lq;","Enchantment","aef","net/minecraft/src","0" +"field_40514_u","name","v","Ljava/lang/String;","Ljava/lang/String;","Enchantment","aef","net/minecraft/src","0" +"field_40486_a","field_40486_a","e","Ljava/util/List;","Ljava/util/List;","MapGenNetherBridge","ed","net/minecraft/src","0" +"field_6509_a","tileEntityRenderer","a","LTileEntityRenderer;","Lah;","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"field_28035_a","random","a","Ljava/util/Random;","Ljava/util/Random;","BlockDispenser","cu","net/minecraft/src","0" +"common","common","a","LEnumRarity;","Lja;","EnumRarity","ja","net/minecraft/src","0" +"uncommon","uncommon","b","LEnumRarity;","Lja;","EnumRarity","ja","net/minecraft/src","0" +"rare","rare","c","LEnumRarity;","Lja;","EnumRarity","ja","net/minecraft/src","0" +"epic","epic","d","LEnumRarity;","Lja;","EnumRarity","ja","net/minecraft/src","0" +"field_40535_e","field_40535_e","e","I","I","EnumRarity","ja","net/minecraft/src","0" +"field_40532_f","field_40532_f","f","Ljava/lang/String;","Ljava/lang/String;","EnumRarity","ja","net/minecraft/src","0" +"field_40533_g","allRarities","g","[LEnumRarity;","[Lja;","EnumRarity","ja","net/minecraft/src","0" +"field_35300_a","field_35300_a","a","I","I","BlockPane","uh","net/minecraft/src","0" +"field_40213_b","field_40213_b","cb","Z","Z","BlockPane","uh","net/minecraft/src","0" +"field_1102_a","mc","a","LMinecraft;","LMinecraft;","ThreadConnectToServer","pn","net/minecraft/src","0" +"field_1101_b","hostName","b","Ljava/lang/String;","Ljava/lang/String;","ThreadConnectToServer","pn","net/minecraft/src","0" +"field_1104_c","port","c","I","I","ThreadConnectToServer","pn","net/minecraft/src","0" +"field_1103_d","connectingGui","d","LGuiConnecting;","Lri;","ThreadConnectToServer","pn","net/minecraft/src","0" +"field_41051_a","field_41051_a","a","Z","Z","BlockEndPortal","aid","net/minecraft/src","0" +"field_573_a","xPosition","a","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_572_b","yPosition","b","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_579_c","zPosition","c","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_578_d","xSize","d","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_577_e","ySize","e","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_576_f","zSize","f","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_575_g","chunk","g","[B","[B","Packet51MapChunk","kh","net/minecraft/src","0" +"field_574_h","chunkSize","h","I","I","Packet51MapChunk","kh","net/minecraft/src","0" +"field_35246_a","mapSeed","a","J","J","Packet9Respawn","aep","net/minecraft/src","0" +"field_35244_b","respawnDimension","b","I","I","Packet9Respawn","aep","net/minecraft/src","0" +"field_35245_c","difficulty","c","I","I","Packet9Respawn","aep","net/minecraft/src","0" +"field_35242_d","worldHeight","d","I","I","Packet9Respawn","aep","net/minecraft/src","0" +"field_35243_e","creativeMode","e","I","I","Packet9Respawn","aep","net/minecraft/src","0" +"field_27008_a","field_27008_a","a","LModelBase;","Lal;","RenderCreeper","hb","net/minecraft/src","0" +"field_1106_a","hashEntry","a","I","I","IntHashMapEntry","aei","net/minecraft/src","0" +"field_1105_b","valueEntry","b","Ljava/lang/Object;","Ljava/lang/Object;","IntHashMapEntry","aei","net/minecraft/src","0" +"field_1108_c","nextEntry","c","LIntHashMapEntry;","Laei;","IntHashMapEntry","aei","net/minecraft/src","0" +"field_1107_d","slotHash","d","I","I","IntHashMapEntry","aei","net/minecraft/src","0" +"field_1590_a","slots","a","[LIntHashMapEntry;","[Laei;","IntHashMap","ob","net/minecraft/src","0" +"field_1589_b","count","b","I","I","IntHashMap","ob","net/minecraft/src","0" +"field_1593_c","threshold","c","I","I","IntHashMap","ob","net/minecraft/src","0" +"field_1592_d","growFactor","d","F","F","IntHashMap","ob","net/minecraft/src","0" +"field_1591_e","versionStamp","e","I","I","IntHashMap","ob","net/minecraft/src","0" +"field_35861_f","keySet","f","Ljava/util/Set;","Ljava/util/Set;","IntHashMap","ob","net/minecraft/src","0" +"field_1109_a","data","a","[B","[B","NibbleArray","up","net/minecraft/src","0" +"field_35754_b","chunkSizeYShift","b","I","I","NibbleArray","up","net/minecraft/src","0" +"field_35755_c","chunkSizeYZShift","c","I","I","NibbleArray","up","net/minecraft/src","0" +"field_9394_d","boatPosRotationIncrements","a","I","I","EntityBoat","no","net/minecraft/src","0" +"field_9393_e","boatX","b","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9392_f","boatY","c","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9391_g","boatZ","d","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9390_h","boatYaw","e","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9389_i","boatPitch","f","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9388_j","velocityX","g","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9387_k","velocityY","h","D","D","EntityBoat","no","net/minecraft/src","0" +"field_9386_l","velocityZ","i","D","D","EntityBoat","no","net/minecraft/src","0" +"field_354_e","soundPowderFootstep","b","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9254_e","soundWoodFootstep","c","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9253_f","soundGravelFootstep","d","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9252_g","soundGrassFootstep","e","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9251_h","soundStoneFootstep","f","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9250_i","soundMetalFootstep","g","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9249_j","soundGlassFootstep","h","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9248_k","soundClothFootstep","i","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_9247_l","soundSandFootstep","j","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_345_n","blocksList","k","[LBlock;","[Lyy;","Block","yy","net/minecraft/src","0" +"field_344_o","tickOnLoad","l","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_343_p","opaqueCubeLookup","m","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_342_q","isBlockContainer","n","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_341_r","lightOpacity","o","[I","[I","Block","yy","net/minecraft/src","0" +"field_340_s","canBlockGrass","p","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_339_t","lightValue","q","[I","[I","Block","yy","net/minecraft/src","0" +"field_28032_t","requiresSelfNotify","r","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_40201_bL","useNeighborBrightness","s","[Z","[Z","Block","yy","net/minecraft/src","0" +"field_338_u","stone","t","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_337_v","grass","u","LBlockGrass;","Ljb;","Block","yy","net/minecraft/src","0" +"field_336_w","dirt","v","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_335_x","cobblestone","w","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_334_y","planks","x","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_333_z","sapling","y","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_403_A","bedrock","z","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_401_B","waterMoving","A","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_399_C","waterStill","B","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_397_D","lavaMoving","C","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_395_E","lavaStill","D","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_393_F","sand","E","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_392_G","gravel","F","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_390_H","oreGold","G","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_388_I","oreIron","H","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_386_J","oreCoal","I","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_385_K","wood","J","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_384_L","leaves","K","LBlockLeaves;","Lqo;","Block","yy","net/minecraft/src","0" +"field_383_M","sponge","L","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_382_N","glass","M","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9267_N","oreLapis","N","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9266_O","blockLapis","O","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9265_P","dispenser","P","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9264_Q","sandStone","Q","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9263_R","music","R","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9262_S","bed","S","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9261_T","railPowered","T","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9260_U","railDetector","U","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9259_V","pistonStickyBase","V","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9258_W","web","W","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9257_X","tallGrass","X","LBlockTallGrass;","Lkv;","Block","yy","net/minecraft/src","0" +"field_9256_Y","deadBush","Y","LBlockDeadBush;","Ljl;","Block","yy","net/minecraft/src","0" +"field_9255_Z","pistonBase","Z","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9269_aa","pistonExtension","aa","LBlockPistonExtension;","Lacu;","Block","yy","net/minecraft/src","0" +"field_419_ac","cloth","ab","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_9268_ac","pistonMoving","ac","LBlockPistonMoving;","Lqz;","Block","yy","net/minecraft/src","0" +"field_417_ae","plantYellow","ad","LBlockFlower;","Lwg;","Block","yy","net/minecraft/src","0" +"field_416_af","plantRed","ae","LBlockFlower;","Lwg;","Block","yy","net/minecraft/src","0" +"field_415_ag","mushroomBrown","af","LBlockFlower;","Lwg;","Block","yy","net/minecraft/src","0" +"field_414_ah","mushroomRed","ag","LBlockFlower;","Lwg;","Block","yy","net/minecraft/src","0" +"field_413_ai","blockGold","ah","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_412_aj","blockSteel","ai","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_411_ak","stairDouble","aj","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_410_al","stairSingle","ak","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_409_am","brick","al","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_408_an","tnt","am","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_407_ao","bookShelf","an","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_406_ap","cobblestoneMossy","ao","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_405_aq","obsidian","ap","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_404_ar","torchWood","aq","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_402_as","fire","ar","LBlockFire;","Lwj;","Block","yy","net/minecraft/src","0" +"field_400_at","mobSpawner","as","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4059_au","stairCompactPlanks","at","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_396_av","chest","au","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_394_aw","redstoneWire","av","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_391_ax","oreDiamond","aw","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_389_ay","blockDiamond","ax","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_387_az","workbench","ay","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_447_aA","crops","az","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_446_aB","tilledField","aA","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_445_aC","stoneOvenIdle","aB","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_444_aD","stoneOvenActive","aC","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_443_aE","signPost","aD","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_442_aF","doorWood","aE","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_441_aG","ladder","aF","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_440_aH","rail","aG","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4069_aI","stairCompactCobblestone","aH","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4068_aJ","signWall","aI","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4067_aK","lever","aJ","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4066_aL","pressurePlateStone","aK","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_435_aM","doorSteel","aL","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4065_aN","pressurePlatePlanks","aM","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_433_aO","oreRedstone","aN","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_432_aP","oreRedstoneGlowing","aO","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_431_aQ","torchRedstoneIdle","aP","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_430_aR","torchRedstoneActive","aQ","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4064_aS","button","aR","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_428_aT","snow","aS","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4063_aU","ice","aT","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_426_aV","blockSnow","aU","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_425_aW","cactus","aV","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_424_aX","blockClay","aW","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_423_aY","reed","aX","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_422_aZ","jukebox","aY","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4057_ba","fence","aZ","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4055_bb","pumpkin","ba","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4053_bc","netherrack","bb","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4051_bd","slowSand","bc","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4049_be","glowStone","bd","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_4047_bf","portal","be","LBlockPortal;","Lsc;","Block","yy","net/minecraft/src","0" +"field_4045_bg","pumpkinLantern","bf","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_21026_bg","cake","bg","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_22021_bh","redstoneRepeaterIdle","bh","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_22020_bi","redstoneRepeaterActive","bi","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_25017_bj","lockedChest","bj","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_28033_bl","trapdoor","bk","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35289_bm","silverfish","bl","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35285_bn","stoneBrick","bm","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35286_bo","mushroomCapBrown","bn","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35287_bp","mushroomCapRed","bo","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35288_bq","fenceIron","bp","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35282_br","thinGlass","bq","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35281_bs","melon","br","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35284_bt","pumpkinStem","bs","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35283_bu","melonStem","bt","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35278_bv","vine","bu","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35277_bw","fenceGate","bv","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35280_bx","stairsBrick","bw","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_35279_by","stairsStoneBrickSmooth","bx","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40199_bz","mycelium","by","LBlockMycelium;","Lez;","Block","yy","net/minecraft/src","0" +"field_40200_bA","waterlily","bz","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40206_bB","netherBrick","bA","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40207_bC","netherFence","bB","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40204_bD","stairsNetherBrick","bC","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40205_bE","netherStalk","bD","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40210_bF","enchantmentTable","bE","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40211_bG","brewingStand","bF","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40208_bH","cauldron","bG","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40209_bI","endPortal","bH","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40202_bJ","endPortalFrame","bI","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_40203_bK","whiteStone","bJ","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_41050_bK","dragonEgg","bK","LBlock;","Lyy;","Block","yy","net/minecraft/src","0" +"field_378_bb","blockIndexInTexture","bL","I","I","Block","yy","net/minecraft/src","0" +"field_376_bc","blockID","bM","I","I","Block","yy","net/minecraft/src","0" +"field_374_bd","blockHardness","bN","F","F","Block","yy","net/minecraft/src","0" +"field_372_be","blockResistance","bO","F","F","Block","yy","net/minecraft/src","0" +"field_27035_bo","blockConstructorCalled","bP","Z","Z","Block","yy","net/minecraft/src","0" +"field_27034_bp","enableStats","bQ","Z","Z","Block","yy","net/minecraft/src","0" +"field_370_bf","minX","bR","D","D","Block","yy","net/minecraft/src","0" +"field_368_bg","minY","bS","D","D","Block","yy","net/minecraft/src","0" +"field_366_bh","minZ","bT","D","D","Block","yy","net/minecraft/src","0" +"field_364_bi","maxX","bU","D","D","Block","yy","net/minecraft/src","0" +"field_362_bj","maxY","bV","D","D","Block","yy","net/minecraft/src","0" +"field_360_bk","maxZ","bW","D","D","Block","yy","net/minecraft/src","0" +"field_358_bl","stepSound","bX","LStepSound;","Lwu;","Block","yy","net/minecraft/src","0" +"field_357_bm","blockParticleGravity","bY","F","F","Block","yy","net/minecraft/src","0" +"field_356_bn","blockMaterial","bZ","LMaterial;","Lp;","Block","yy","net/minecraft/src","0" +"field_355_bo","slipperiness","ca","F","F","Block","yy","net/minecraft/src","0" +"field_469_a","blockName","a","Ljava/lang/String;","Ljava/lang/String;","Block","yy","net/minecraft/src","0" +"field_935_a","width","a","I","I","GuiButton","ct","net/minecraft/src","0" +"field_934_b","height","b","I","I","GuiButton","ct","net/minecraft/src","0" +"field_941_c","xPosition","c","I","I","GuiButton","ct","net/minecraft/src","0" +"field_940_d","yPosition","d","I","I","GuiButton","ct","net/minecraft/src","0" +"field_939_e","displayString","e","Ljava/lang/String;","Ljava/lang/String;","GuiButton","ct","net/minecraft/src","0" +"field_938_f","id","f","I","I","GuiButton","ct","net/minecraft/src","0" +"field_937_g","enabled","g","Z","Z","GuiButton","ct","net/minecraft/src","0" +"field_936_h","drawButton","h","Z","Z","GuiButton","ct","net/minecraft/src","0" +"field_35584_a","hashArray","a","[LLongHashMapEntry;","[Lahc;","LongHashMap","wv","net/minecraft/src","0" +"field_35582_b","numHashElements","b","I","I","LongHashMap","wv","net/minecraft/src","0" +"field_35583_c","capacity","c","I","I","LongHashMap","wv","net/minecraft/src","0" +"field_35580_d","percent","d","F","F","LongHashMap","wv","net/minecraft/src","0" +"field_35581_e","modCount","e","I","I","LongHashMap","wv","net/minecraft/src","0" +"field_21049_a","entityId","a","I","I","Packet40EntityMetadata","se","net/minecraft/src","0" +"field_21048_b","metadata","b","Ljava/util/List;","Ljava/util/List;","Packet40EntityMetadata","se","net/minecraft/src","0" +"field_40253_a","field_40253_a","a","LEnchantmentNameParts;","Lea;","EnchantmentNameParts","ea","net/minecraft/src","0" +"field_40251_b","field_40251_b","b","Ljava/util/Random;","Ljava/util/Random;","EnchantmentNameParts","ea","net/minecraft/src","0" +"field_40252_c","field_40252_c","c","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentNameParts","ea","net/minecraft/src","0" +"field_40154_a","field_40154_a","b","F","F","EntityBlaze","qf","net/minecraft/src","0" +"field_40153_b","field_40153_b","c","I","I","EntityBlaze","qf","net/minecraft/src","0" +"field_40152_d","field_40152_d","d","I","I","EntityBlaze","qf","net/minecraft/src","0" +"field_28180_b","xCenter","a","I","I","MapData","kl","net/minecraft/src","0" +"field_28179_c","zCenter","b","I","I","MapData","kl","net/minecraft/src","0" +"field_28178_d","dimension","c","B","B","MapData","kl","net/minecraft/src","0" +"field_28177_e","scale","d","B","B","MapData","kl","net/minecraft/src","0" +"field_28176_f","colors","e","[B","[B","MapData","kl","net/minecraft/src","0" +"field_28175_g","field_28175_g","f","I","I","MapData","kl","net/minecraft/src","0" +"field_28174_h","field_28174_h","g","Ljava/util/List;","Ljava/util/List;","MapData","kl","net/minecraft/src","0" +"field_28172_j","field_28172_j","j","Ljava/util/Map;","Ljava/util/Map;","MapData","kl","net/minecraft/src","0" +"field_28173_i","playersVisibleOnMap","h","Ljava/util/List;","Ljava/util/List;","MapData","kl","net/minecraft/src","0" +"field_20165_a","instance","a","LStringTranslate;","Lqp;","StringTranslate","qp","net/minecraft/src","0" +"field_20164_b","translateTable","b","Ljava/util/Properties;","Ljava/util/Properties;","StringTranslate","qp","net/minecraft/src","0" +"field_20105_z","RENDER_DISTANCES","Q","[Ljava/lang/String;","[Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_20106_A","DIFFICULTIES","R","[Ljava/lang/String;","[Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_25147_K","GUISCALES","S","[Ljava/lang/String;","[Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_41086_T","PARTICLES","T","[Ljava/lang/String;","[Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_30006_M","LIMIT_FRAMERATES","U","[Ljava/lang/String;","[Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_1584_a","musicVolume","a","F","F","GameSettings","ki","net/minecraft/src","0" +"field_1583_b","soundVolume","b","F","F","GameSettings","ki","net/minecraft/src","0" +"field_1582_c","mouseSensitivity","c","F","F","GameSettings","ki","net/minecraft/src","0" +"field_1581_d","invertMouse","d","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_1580_e","renderDistance","e","I","I","GameSettings","ki","net/minecraft/src","0" +"field_1579_f","viewBobbing","f","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_1578_g","anaglyph","g","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_27342_h","advancedOpengl","h","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_1577_h","limitFramerate","i","I","I","GameSettings","ki","net/minecraft/src","0" +"field_1576_i","fancyGraphics","j","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_22278_j","ambientOcclusion","k","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_40445_l","clouds","l","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_6524_j","skin","m","Ljava/lang/String;","Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_1575_j","keyBindForward","n","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1574_k","keyBindLeft","o","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1573_l","keyBindBack","p","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1572_m","keyBindRight","q","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1571_n","keyBindJump","r","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1570_o","keyBindInventory","s","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_6523_q","keyBindDrop","t","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_6521_r","keyBindChat","u","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1565_s","keyBindSneak","v","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_35382_v","keyBindAttack","w","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_35381_w","keyBindUseItem","x","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_35384_x","keyBindPlayerList","y","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_35383_y","keyBindPickBlock","z","LKeyBinding;","Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1564_t","keyBindings","A","[LKeyBinding;","[Laby;","GameSettings","ki","net/minecraft/src","0" +"field_1563_u","mc","B","LMinecraft;","LMinecraft;","GameSettings","ki","net/minecraft/src","0" +"field_6522_B","optionsFile","V","Ljava/io/File;","Ljava/io/File;","GameSettings","ki","net/minecraft/src","0" +"field_1561_w","difficulty","C","I","I","GameSettings","ki","net/minecraft/src","0" +"field_22277_y","hideGUI","D","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_1560_x","thirdPersonView","E","I","I","GameSettings","ki","net/minecraft/src","0" +"field_22276_A","showDebugInfo","F","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_12259_z","lastServer","G","Ljava/lang/String;","Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"field_22275_C","noclip","H","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_22274_D","smoothCamera","I","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_22273_E","debugCamEnable","J","Z","Z","GameSettings","ki","net/minecraft/src","0" +"field_22272_F","noclipRate","K","F","F","GameSettings","ki","net/minecraft/src","0" +"field_22271_G","debugCamRate","L","F","F","GameSettings","ki","net/minecraft/src","0" +"field_35379_L","fovSetting","M","F","F","GameSettings","ki","net/minecraft/src","0" +"field_35380_M","gammaSetting","N","F","F","GameSettings","ki","net/minecraft/src","0" +"field_25148_H","guiScale","O","I","I","GameSettings","ki","net/minecraft/src","0" +"field_41087_P","particles","P","I","I","GameSettings","ki","net/minecraft/src","0" +"field_593_a","clippingHelper","a","LClippingHelper;","Lip;","Frustrum","ev","net/minecraft/src","0" +"field_592_b","xPosition","b","D","D","Frustrum","ev","net/minecraft/src","0" +"field_595_c","yPosition","c","D","D","Frustrum","ev","net/minecraft/src","0" +"field_594_d","zPosition","d","D","D","Frustrum","ev","net/minecraft/src","0" +"field_35254_a","randomId","a","I","I","Packet0KeepAlive","wf","net/minecraft/src","0" +"field_12236_a","explosionX","a","D","D","Packet60Explosion","km","net/minecraft/src","0" +"field_12235_b","explosionY","b","D","D","Packet60Explosion","km","net/minecraft/src","0" +"field_12239_c","explosionZ","c","D","D","Packet60Explosion","km","net/minecraft/src","0" +"field_12238_d","explosionSize","d","F","F","Packet60Explosion","km","net/minecraft/src","0" +"field_12237_e","destroyedBlockPositions","e","Ljava/util/Set;","Ljava/util/Set;","Packet60Explosion","km","net/minecraft/src","0" +"field_28168_a","mapName","i","Ljava/lang/String;","Ljava/lang/String;","WorldSavedData","afz","net/minecraft/src","0" +"field_28167_b","dirty","a","Z","Z","WorldSavedData","afz","net/minecraft/src","0" +"field_35776_a","foodLevel","a","I","I","FoodStats","eq","net/minecraft/src","0" +"field_35774_b","foodSaturationLevel","b","F","F","FoodStats","eq","net/minecraft/src","0" +"field_35775_c","foodExhaustionLevel","c","F","F","FoodStats","eq","net/minecraft/src","0" +"field_35772_d","foodTickTimer","d","I","I","FoodStats","eq","net/minecraft/src","0" +"field_35773_e","prevFoodLevel","e","I","I","FoodStats","eq","net/minecraft/src","0" +"field_22112_a","parentGuiScreen","a","LGuiScreen;","Lxe;","GuiRenameWorld","or","net/minecraft/src","0" +"field_22114_h","theGuiTextField","b","LGuiTextField;","Ldv;","GuiRenameWorld","or","net/minecraft/src","0" +"field_22113_i","worldName","c","Ljava/lang/String;","Ljava/lang/String;","GuiRenameWorld","or","net/minecraft/src","0" +"field_40197_a","field_40197_a","a","I","I","WorldGenSpikes","oh","net/minecraft/src","0" +"field_1009_a","x","a","I","I","RedstoneUpdateInfo","lf","net/minecraft/src","0" +"field_1008_b","y","b","I","I","RedstoneUpdateInfo","lf","net/minecraft/src","0" +"field_1011_c","z","c","I","I","RedstoneUpdateInfo","lf","net/minecraft/src","0" +"field_1010_d","updateTime","d","J","J","RedstoneUpdateInfo","lf","net/minecraft/src","0" +"field_40443_a","field_40443_a","a","LContainerEnchantment;","Lahk;","SlotEnchantment","ur","net/minecraft/src","0" +"field_35553_n","damageSourceProjectile","n","LEntity;","Lia;","EntityDamageSourceIndirect","qq","net/minecraft/src","0" +"field_35710_a","selectedBlockId","a","I","I","StructurePieceBlockSelector","ox","net/minecraft/src","0" +"field_35709_b","selectedBlockMetaData","b","I","I","StructurePieceBlockSelector","ox","net/minecraft/src","0" +"field_40450_a","field_40450_a","b","LModelBook;","Luj;","RenderEnchantmentTable","wn","net/minecraft/src","0" +"field_1611_a","stringToClassMapping","a","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" +"field_1610_b","classToStringMapping","b","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" +"field_1613_c","IDtoClassMapping","c","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" +"field_1612_d","classToIDMapping","d","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" +"field_31053_a","field_31053_a","a","I","I","BlockPistonExtension","acu","net/minecraft/src","0" +"field_40396_i","field_40396_i","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40393_j","field_40393_j","j","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40394_k","field_40394_k","k","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40391_l","field_40391_l","l","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40388_a","field_40388_a","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40386_b","field_40386_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40392_m","field_40392_m","m","LWorld;","Lry;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40389_n","field_40389_n","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40390_o","field_40390_o","o","[LBiomeGenBase;","[Lsr;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40387_c","field_40387_c","c","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40384_d","field_40384_d","d","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40385_e","field_40385_e","e","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40382_f","field_40382_f","f","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40383_g","field_40383_g","g","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40395_h","field_40395_h","h","[[I","[[I","ChunkProviderEnd","a","net/minecraft/src","0" +"field_1255_a","spiderHead","g","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1254_b","spiderNeck","h","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1253_c","spiderBody","i","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1252_d","spiderLeg1","j","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1251_e","spiderLeg2","k","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1250_f","spiderLeg3","l","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1249_g","spiderLeg4","m","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1248_h","spiderLeg5","n","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1247_i","spiderLeg6","o","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1246_j","spiderLeg7","p","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_1245_m","spiderLeg8","q","LModelRenderer;","Lacf;","ModelSpider","lv","net/minecraft/src","0" +"field_35505_b","field_35505_b","b","LGenLayer;","Ljx;","GenLayerTemperatureMix","rk","net/minecraft/src","0" +"field_35506_c","field_35506_c","c","I","I","GenLayerTemperatureMix","rk","net/minecraft/src","0" +"field_28183_a","waterBuffer","a","[I","[I","ColorizerWater","ya","net/minecraft/src","0" +"field_1096_a","byteArray","a","[B","[B","NBTTagByteArray","ca","net/minecraft/src","0" +"field_35111_a","worldChunkMngr","a","LWorldChunkManager;","Lvh;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_35109_b","field_35109_b","b","I","I","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_35110_c","structVillagePieceWeight","c","LStructureVillagePieceWeight;","Laan;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_35107_d","structureVillageWeightedPieceList","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_35108_e","field_35108_e","h","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_35106_f","field_35106_f","i","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"field_1271_a","head","g","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1270_b","unusedCreeperHeadwear","h","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1276_c","body","i","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1275_d","leg1","j","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1274_e","leg2","k","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1273_f","leg3","l","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_1272_g","leg4","m","LModelRenderer;","Lacf;","ModelCreeper","aac","net/minecraft/src","0" +"field_35056_b","field_35056_b","b","[LStructurePieceTreasure;","[Lagq;","ComponentStrongholdLibrary","zc","net/minecraft/src","0" +"field_35058_a","field_35058_a","a","LEnumDoor;","Lmj;","ComponentStrongholdLibrary","zc","net/minecraft/src","0" +"field_35057_c","field_35057_c","c","Z","Z","ComponentStrongholdLibrary","zc","net/minecraft/src","0" +"field_913_j","rand","n","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_912_k","noiseGen1","o","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_911_l","noiseGen2","p","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_910_m","noiseGen3","q","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_908_o","noiseGen4","r","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_922_a","noiseGen5","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_921_b","noiseGen6","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_920_c","mobSpawnerNoise","c","LNoiseGeneratorOctaves;","Leb;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_907_p","worldObj","s","LWorld;","Lry;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35389_t","mapFeaturesEnabled","t","Z","Z","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4180_q","field_4180_q","u","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_903_t","stoneNoise","v","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_902_u","caveGenerator","w","LMapGenBase;","Lbz;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35386_d","strongholdGenerator","d","LMapGenStronghold;","Ldc;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35387_e","villageGenerator","e","LMapGenVillage;","Lxn;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35385_f","mineshaftGenerator","f","LMapGenMineshaft;","Lkd;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35390_x","ravineGenerator","x","LMapGenBase;","Lbz;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4179_v","biomesForGeneration","y","[LBiomeGenBase;","[Lsr;","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4185_d","noise3","g","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4184_e","noise1","h","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4183_f","noise2","i","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4182_g","noise5","j","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_4181_h","noise6","k","[D","[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_35388_l","field_35388_l","l","[F","[F","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_914_i","unusedIntArray32x32","m","[[I","[[I","ChunkProviderGenerate","xj","net/minecraft/src","0" +"field_867_a","clayBlockId","a","I","I","WorldGenClay","adp","net/minecraft/src","0" +"field_866_b","numberOfBlocks","b","I","I","WorldGenClay","adp","net/minecraft/src","0" +"field_209_f","modelBipedMain","a","LModelBiped;","Lfa;","RenderPlayer","zr","net/minecraft/src","0" +"field_208_g","modelArmorChestplate","b","LModelBiped;","Lfa;","RenderPlayer","zr","net/minecraft/src","0" +"field_207_h","modelArmor","i","LModelBiped;","Lfa;","RenderPlayer","zr","net/minecraft/src","0" +"field_206_i","armorFilenamePrefix","j","[Ljava/lang/String;","[Ljava/lang/String;","RenderPlayer","zr","net/minecraft/src","0" +"field_952_a","clientHandler","a","LNetClientHandler;","Labp;","GuiConnecting","ri","net/minecraft/src","0" +"field_953_h","cancelled","b","Z","Z","GuiConnecting","ri","net/minecraft/src","0" +"field_6235_a","mcCanvas","a","Ljava/awt/Canvas;","Ljava/awt/Canvas;","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"field_6234_b","mc","b","LMinecraft;","LMinecraft;","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"field_6236_c","mcThread","c","Ljava/lang/Thread;","Ljava/lang/Thread;","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"field_28006_b","field_28006_b","b","[B","[B","Minecraft","Minecraft","net/minecraft/client","0" +"field_21900_a","theMinecraft","a","LMinecraft;","LMinecraft;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6327_b","playerController","c","LPlayerController;","Laes;","Minecraft","Minecraft","net/minecraft/client","0" +"field_185_a","fullscreen","U","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_28004_R","hasCrashed","V","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6326_c","displayWidth","d","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_6325_d","displayHeight","e","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_6286_O","glCapabilities","W","LOpenGlCapsChecker;","Lmm;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9237_P","timer","X","LTimer;","Laij;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6324_e","theWorld","f","LWorld;","Lry;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6323_f","renderGlobal","g","LRenderGlobal;","Lafv;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6322_g","thePlayer","h","LEntityPlayerSP;","Ldi;","Minecraft","Minecraft","net/minecraft/client","0" +"field_22009_h","renderViewEntity","i","LEntityLiving;","Lnq;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6321_h","effectRenderer","j","LEffectRenderer;","Lf;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6320_i","session","k","LSession;","Ldr;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6319_j","minecraftUri","l","Ljava/lang/String;","Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9244_k","mcCanvas","m","Ljava/awt/Canvas;","Ljava/awt/Canvas;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6317_l","hideQuitButton","n","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6316_m","isGamePaused","o","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6315_n","renderEngine","p","LRenderEngine;","Lzh;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6314_o","fontRenderer","q","LFontRenderer;","Labe;","Minecraft","Minecraft","net/minecraft/client","0" +"field_40007_r","standardGalacticFontRenderer","r","LFontRenderer;","Labe;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6313_p","currentScreen","s","LGuiScreen;","Lxe;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6312_q","loadingScreen","t","LLoadingScreenRenderer;","Lxw;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9243_r","entityRenderer","u","LEntityRenderer;","Ladt;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6284_Q","downloadResourcesThread","Y","LThreadDownloadResources;","Lng;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6283_R","ticksRan","Z","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_6282_S","leftClickCounter","aa","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_9236_T","tempDisplayWidth","ab","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_9235_U","tempDisplayHeight","ac","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_25002_t","guiAchievement","v","LGuiAchievement;","Llk;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6308_u","ingameGUI","w","LGuiIngame;","Lqd;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6307_v","skipRenderWorld","x","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_9242_w","playerModelBiped","y","LModelBiped;","Lfa;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6305_x","objectMouseOver","z","LMovingObjectPosition;","Lgv;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6304_y","gameSettings","A","LGameSettings;","Lki;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9241_z","mcApplet","B","LMinecraftApplet;","LMinecraftApplet;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6301_A","sndManager","C","LSoundManager;","Lahm;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6299_B","mouseHelper","D","LMouseHelper;","Lhs;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6298_C","texturePackList","E","LTexturePackList;","Ladk;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6297_D","mcDataDir","F","Ljava/io/File;","Ljava/io/File;","Minecraft","Minecraft","net/minecraft/client","0" +"field_22008_V","saveLoader","ad","LISaveFormat;","Ltq;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9240_E","frameTimes","G","[J","[J","Minecraft","Minecraft","net/minecraft/client","0" +"field_9239_F","tickTimes","H","[J","[J","Minecraft","Minecraft","net/minecraft/client","0" +"field_9238_G","numRecordedFrameTimes","I","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_28005_H","hasPaidCheckTime","J","J","J","Minecraft","Minecraft","net/minecraft/client","0" +"field_35001_ab","rightClickDelayTimer","ae","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_25001_G","statFileWriter","K","LStatFileWriter;","Ltk;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9234_V","serverName","af","Ljava/lang/String;","Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9233_W","serverPort","ag","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_9232_X","textureWaterFX","ah","LTextureWaterFX;","Lgk;","Minecraft","Minecraft","net/minecraft/client","0" +"field_9231_Y","textureLavaFX","ai","LTextureLavaFX;","Lyu;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6275_Z","minecraftDir","aj","Ljava/io/File;","Ljava/io/File;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6293_H","running","L","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6292_I","debug","M","Ljava/lang/String;","Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"field_40004_N","debugUpdateTime","N","J","J","Minecraft","Minecraft","net/minecraft/client","0" +"field_40005_O","fpsCounter","O","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_6291_J","isTakingScreenshot","P","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6290_K","prevFrameTime","Q","J","J","Minecraft","Minecraft","net/minecraft/client","0" +"field_40006_ak","debugProfilerName","ak","Ljava/lang/String;","Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"field_6289_L","inGameHasFocus","R","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6288_M","isRaining","S","Z","Z","Minecraft","Minecraft","net/minecraft/client","0" +"field_6287_N","systemTime","T","J","J","Minecraft","Minecraft","net/minecraft/client","0" +"field_6300_ab","joinPlayerCounter","al","I","I","Minecraft","Minecraft","net/minecraft/client","0" +"field_41023_a","field_41023_a","a","I","I","EntityEnderCrystal","gb","net/minecraft/src","1" +"field_41022_b","field_41022_b","b","I","I","EntityEnderCrystal","gb","net/minecraft/src","1" +"field_20174_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesArmor","z","net/minecraft/src","1" +"field_20173_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesArmor","z","net/minecraft/src","1" +"field_39005_a","field_39005_a","a","I","I","ComponentVillage","sr","net/minecraft/src","1" +"field_4024_a","protocolVersion","a","I","I","Packet1Login","nl","net/minecraft/src","1" +"field_113_b","username","b","Ljava/lang/String;","Ljava/lang/String;","Packet1Login","nl","net/minecraft/src","1" +"field_4026_d","mapSeed","c","J","J","Packet1Login","nl","net/minecraft/src","1" +"field_35131_d","serverMode","d","I","I","Packet1Login","nl","net/minecraft/src","1" +"field_35132_e","worldType","e","B","B","Packet1Login","nl","net/minecraft/src","1" +"field_35129_f","difficultySetting","f","B","B","Packet1Login","nl","net/minecraft/src","1" +"field_35130_g","worldHeight","g","B","B","Packet1Login","nl","net/minecraft/src","1" +"field_35133_h","maxPlayers","h","B","B","Packet1Login","nl","net/minecraft/src","1" +"field_40138_s","field_40138_s","t","I","I","EntityDragonBase","ui","net/minecraft/src","1" +"field_20071_a","stackResult","a","[LItemStack;","[Ljb;","InventoryCraftResult","vu","net/minecraft/src","1" +"field_21008_a","xLocation","a","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" +"field_21007_b","yLocation","b","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" +"field_21011_c","zLocation","c","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" +"field_21010_d","instrumentType","d","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" +"field_21009_e","pitch","e","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" +"field_35234_b","canCarryBlocks","b","[Z","[Z","EntityEnderman","mb","net/minecraft/src","1" +"field_35235_a","isAttacking","a","Z","Z","EntityEnderman","mb","net/minecraft/src","1" +"field_35233_g","teleportDelay","g","I","I","EntityEnderman","mb","net/minecraft/src","1" +"field_35236_h","field_35236_h","h","I","I","EntityEnderman","mb","net/minecraft/src","1" +"field_22014_a","repeaterTorchOffset","a","[D","[D","BlockRedstoneRepeater","wa","net/minecraft/src","1" +"field_22013_b","repeaterState","b","[I","[I","BlockRedstoneRepeater","wa","net/minecraft/src","1" +"field_22015_c","isRepeaterPowered","c","Z","Z","BlockRedstoneRepeater","wa","net/minecraft/src","1" +"field_141_a","username","a","Ljava/lang/String;","Ljava/lang/String;","Packet2Handshake","ma","net/minecraft/src","1" +"field_261_a","recordName","a","Ljava/lang/String;","Ljava/lang/String;","ItemRecord","sn","net/minecraft/src","1" +"field_765_a","plantBlockId","a","I","I","WorldGenFlowers","bg","net/minecraft/src","1" +"field_35355_a","field_35355_a","a","LEnumDoor;","Lpt;","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"field_35353_b","field_35353_b","b","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"field_35354_c","field_35354_c","c","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"field_35351_d","field_35351_d","d","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"field_35352_e","field_35352_e","e","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"field_40514_a","field_40514_a","a","LThreadedFileIOBase;","Lct;","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40512_b","field_40512_b","b","Ljava/util/List;","Ljava/util/List;","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40513_c","field_40513_c","c","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40510_d","field_40510_d","d","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40511_e","field_40511_e","e","Z","Z","ThreadedFileIOBase","ct","net/minecraft/src","1" +"UNDEFINED","UNDEFINED","a","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"UNDEAD","UNDEAD","b","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"ARTHROPOD","ARTHROPOD","c","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"field_40489_d","allCreatureAttributes","d","[LEnumCreatureAttribute;","[Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"field_22156_b","chunkX","b","I","I","RegionFileChunkBuffer","id","net/minecraft/src","1" +"field_22158_c","chunkZ","c","I","I","RegionFileChunkBuffer","id","net/minecraft/src","1" +"field_22157_a","regionFile","a","LRegionFile;","Lpj;","RegionFileChunkBuffer","id","net/minecraft/src","1" +"field_827_a","netManager","a","LNetworkManager;","Loo;","NetworkReaderThread","wu","net/minecraft/src","1" +"field_20034_a","windowId","a","I","I","Packet106Transaction","nv","net/minecraft/src","1" +"field_20033_b","shortWindowId","b","S","S","Packet106Transaction","nv","net/minecraft/src","1" +"field_20035_c","accepted","c","Z","Z","Packet106Transaction","nv","net/minecraft/src","1" +"field_927_a","typeOfHit","a","LEnumMovingObjectType;","Lji;","MovingObjectPosition","uc","net/minecraft/src","1" +"field_926_b","blockX","b","I","I","MovingObjectPosition","uc","net/minecraft/src","1" +"field_932_c","blockY","c","I","I","MovingObjectPosition","uc","net/minecraft/src","1" +"field_931_d","blockZ","d","I","I","MovingObjectPosition","uc","net/minecraft/src","1" +"field_930_e","sideHit","e","I","I","MovingObjectPosition","uc","net/minecraft/src","1" +"field_929_f","hitVec","f","LVec3D;","Lbx;","MovingObjectPosition","uc","net/minecraft/src","1" +"field_928_g","entityHit","g","LEntity;","Lrn;","MovingObjectPosition","uc","net/minecraft/src","1" +"field_526_a","air","a","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_28132_b","grass","b","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_525_b","ground","c","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_524_c","wood","d","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_523_d","rock","e","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_522_e","iron","f","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_521_f","water","g","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_520_g","lava","h","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4218_h","leaves","i","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_518_i","plants","j","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_35574_k","vine","k","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_517_j","sponge","l","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4217_k","cloth","m","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_515_l","fire","n","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_514_m","sand","o","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_513_n","circuits","p","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4216_o","glass","q","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_511_p","tnt","r","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4215_q","unused","s","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_509_r","ice","t","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_508_s","snow","u","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_507_t","craftedSnow","v","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4214_u","cactus","w","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_505_v","clay","x","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4213_w","pumpkin","y","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_41042_z","dragonEgg","z","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4212_x","portal","A","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_21100_y","cake","B","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_31063_A","web","C","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_31062_B","piston","D","LMaterial;","Llg;","Material","lg","net/minecraft/src","1" +"field_4211_y","canBurn","F","Z","Z","Material","lg","net/minecraft/src","1" +"field_27091_A","groundCover","G","Z","Z","Material","lg","net/minecraft/src","1" +"field_28130_D","isTranslucent","H","Z","Z","Material","lg","net/minecraft/src","1" +"field_28131_A","materialMapColor","E","LMapColor;","Lec;","Material","lg","net/minecraft/src","1" +"field_31061_G","canHarvest","I","Z","Z","Material","lg","net/minecraft/src","1" +"field_31060_H","mobilityFlag","J","I","I","Material","lg","net/minecraft/src","1" +"field_846_a","x","a","I","I","ChunkPosition","vo","net/minecraft/src","1" +"field_845_b","y","b","I","I","ChunkPosition","vo","net/minecraft/src","1" +"field_847_c","z","c","I","I","ChunkPosition","vo","net/minecraft/src","1" +"field_6088_a","graphicsLevel","b","Z","Z","BlockLeavesBase","nb","net/minecraft/src","1" +"field_1020_f","nextTickEntryID","f","J","J","NextTickListEntry","qa","net/minecraft/src","1" +"field_1018_a","xCoord","a","I","I","NextTickListEntry","qa","net/minecraft/src","1" +"field_1017_b","yCoord","b","I","I","NextTickListEntry","qa","net/minecraft/src","1" +"field_1023_c","zCoord","c","I","I","NextTickListEntry","qa","net/minecraft/src","1" +"field_1022_d","blockID","d","I","I","NextTickListEntry","qa","net/minecraft/src","1" +"field_1021_e","scheduledTime","e","J","J","NextTickListEntry","qa","net/minecraft/src","1" +"field_1019_g","tickEntryID","g","J","J","NextTickListEntry","qa","net/minecraft/src","1" +"field_20076_a","stackList","a","[LItemStack;","[Ljb;","InventoryCrafting","mc","net/minecraft/src","1" +"field_21085_b","inventoryWidth","b","I","I","InventoryCrafting","mc","net/minecraft/src","1" +"field_20077_c","eventHandler","c","LContainer;","Lea;","InventoryCrafting","mc","net/minecraft/src","1" +"field_4106_a","angerLevel","a","I","I","EntityPigZombie","xj","net/minecraft/src","1" +"field_4105_b","randomSoundDelay","b","I","I","EntityPigZombie","xj","net/minecraft/src","1" +"field_4107_c","defaultHeldItem","g","LItemStack;","Ljb;","EntityPigZombie","xj","net/minecraft/src","1" +"field_31052_a","field_31052_a","a","[I","[I","Facing","vs","net/minecraft/src","1" +"field_31051_b","offsetsXForSide","b","[I","[I","Facing","vs","net/minecraft/src","1" +"field_31054_c","offsetsYForSide","c","[I","[I","Facing","vs","net/minecraft/src","1" +"field_31053_d","offsetsZForSide","d","[I","[I","Facing","vs","net/minecraft/src","1" +"field_853_a","stackSize","a","I","I","ItemStack","jb","net/minecraft/src","1" +"field_852_b","animationsToGo","b","I","I","ItemStack","jb","net/minecraft/src","1" +"field_855_c","itemID","c","I","I","ItemStack","jb","net/minecraft/src","1" +"field_40611_d","itemNBT","d","LNBTTagCompound;","Lng;","ItemStack","jb","net/minecraft/src","1" +"field_854_d","itemDamage","e","I","I","ItemStack","jb","net/minecraft/src","1" +"field_40257_a","effectCache","a","Ljava/util/HashMap;","Ljava/util/HashMap;","ItemPotion","ft","net/minecraft/src","1" +"field_22106_a","field_22106_a","a","Ljava/io/File;","Ljava/io/File;","SaveFormatOld","sl","net/minecraft/src","1" +"field_35534_e","field_35534_e","e","Ljava/util/HashMap;","Ljava/util/HashMap;","MapGenStructure","qp","net/minecraft/src","1" +"field_663_c","baseIndexInPNG","c","I","I","BlockLeaves","bm","net/minecraft/src","1" +"field_20041_b","adjacentTreeBlocks","a","[I","[I","BlockLeaves","bm","net/minecraft/src","1" +"field_35496_a","villageComponentClass","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"field_35494_b","villagePieceWeight","b","I","I","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"field_35495_c","villagePiecesSpawned","c","I","I","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"field_35493_d","villagePiecesLimit","d","I","I","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"field_35581_a","doorEnum","a","[I","[I","EnumDoorHelper","au","net/minecraft/src","1" +"field_427_a","blockID","a","I","I","EntityFallingSand","jt","net/minecraft/src","1" +"field_426_b","fallTime","b","I","I","EntityFallingSand","jt","net/minecraft/src","1" +"field_22119_a","dataFilenamePattern","a","Ljava/util/regex/Pattern;","Ljava/util/regex/Pattern;","ChunkFilePattern","qs","net/minecraft/src","1" +"field_6040_a","entityId","a","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" +"field_6039_b","motionX","b","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" +"field_6042_c","motionY","c","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" +"field_6041_d","motionZ","d","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" +"field_35379_a","field_35379_a","a","I","I","ComponentVillagePathGen","so","net/minecraft/src","1" +"field_35537_a","field_35537_a","a","[LBiomeGenBase;","[Lkb;","MapGenStronghold","fz","net/minecraft/src","1" +"field_35535_f","field_35535_f","f","Z","Z","MapGenStronghold","fz","net/minecraft/src","1" +"field_35536_g","field_35536_g","g","[LChunkCoordIntPair;","[Lyi;","MapGenStronghold","fz","net/minecraft/src","1" +"field_997_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ServerWindowAdapter","ab","net/minecraft/src","1" +"field_28055_a","field_28055_a","a","I","I","WorldGenDeadBush","kj","net/minecraft/src","1" +"field_20020_a","xPosition","a","I","I","Packet130UpdateSign","td","net/minecraft/src","1" +"field_20019_b","yPosition","b","I","I","Packet130UpdateSign","td","net/minecraft/src","1" +"field_20022_c","zPosition","c","I","I","Packet130UpdateSign","td","net/minecraft/src","1" +"field_20021_d","signLines","d","[Ljava/lang/String;","[Ljava/lang/String;","Packet130UpdateSign","td","net/minecraft/src","1" +"field_35291_a","field_35291_a","a","I","I","WorldGenSand","gl","net/minecraft/src","1" +"field_35290_b","field_35290_b","b","I","I","WorldGenSand","gl","net/minecraft/src","1" +"field_40619_a","field_40619_a","a","Z","Z","PacketCount","vn","net/minecraft/src","1" +"field_40617_b","field_40617_b","b","Ljava/util/Map;","Ljava/util/Map;","PacketCount","vn","net/minecraft/src","1" +"field_40618_c","field_40618_c","c","Ljava/util/Map;","Ljava/util/Map;","PacketCount","vn","net/minecraft/src","1" +"field_40616_d","field_40616_d","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","vn","net/minecraft/src","1" +"field_416_aj","inventory","k","LInventoryPlayer;","Lja;","EntityPlayer","gz","net/minecraft/src","1" +"field_20053_ao","personalCraftingInventory","l","LContainer;","Lea;","EntityPlayer","gz","net/minecraft/src","1" +"field_20052_ap","currentCraftingInventory","m","LContainer;","Lea;","EntityPlayer","gz","net/minecraft/src","1" +"field_35217_m","foodStats","n","LFoodStats;","Lrd;","EntityPlayer","gz","net/minecraft/src","1" +"field_35216_n","field_35216_n","o","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_9152_am","field_9152_am","p","B","B","EntityPlayer","gz","net/minecraft/src","1" +"field_9151_an","score","q","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_9150_ao","prevCameraYaw","r","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_9149_ap","cameraYaw","s","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_9148_aq","isSwinging","t","Z","Z","EntityPlayer","gz","net/minecraft/src","1" +"field_9147_ar","swingProgressInt","u","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_409_aq","username","v","Ljava/lang/String;","Ljava/lang/String;","EntityPlayer","gz","net/minecraft/src","1" +"field_4110_as","dimension","w","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35218_w","field_35218_w","x","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_20047_ay","field_20047_ay","y","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_20046_az","field_20046_az","z","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_20051_aA","field_20051_aA","A","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_20050_aB","field_20050_aB","B","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_20049_aC","field_20049_aC","C","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_20048_aD","field_20048_aD","D","D","D","EntityPlayer","gz","net/minecraft/src","1" +"field_21900_a","sleeping","E","Z","Z","EntityPlayer","gz","net/minecraft/src","1" +"field_21901_b","playerLocation","F","LChunkCoordinates;","Lbu;","EntityPlayer","gz","net/minecraft/src","1" +"field_21902_c","sleepTimer","a","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_22066_z","field_22066_z","G","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_22067_A","field_22067_A","H","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_24900_d","spawnChunk","b","LChunkCoordinates;","Lbu;","EntityPlayer","gz","net/minecraft/src","1" +"field_27995_d","startMinecartRidingCoordinate","c","LChunkCoordinates;","Lbu;","EntityPlayer","gz","net/minecraft/src","1" +"field_28016_C","timeUntilPortal","I","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_28015_D","inPortal","J","Z","Z","EntityPlayer","gz","net/minecraft/src","1" +"field_28014_E","timeInPortal","K","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_35214_K","field_35214_K","L","LPlayerCapabilities;","Lvv;","EntityPlayer","gz","net/minecraft/src","1" +"field_35211_M","experienceLevel","M","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35212_N","experienceTotal","N","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35210_L","experience","O","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_34908_d","field_34908_d","d","LItemStack;","Ljb;","EntityPlayer","gz","net/minecraft/src","1" +"field_34909_e","field_34909_e","e","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35213_O","field_35213_O","P","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_35215_P","field_35215_P","Q","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_6124_at","fishEntity","R","LEntityFishHook;","Llq;","EntityPlayer","gz","net/minecraft/src","1" +"field_35421_a","field_35421_a","a","LBlock;","Ltl;","ItemColored","wm","net/minecraft/src","1" +"field_41041_b","field_41041_b","b","[Ljava/lang/String;","[Ljava/lang/String;","ItemColored","wm","net/minecraft/src","1" +"field_35521_a","biomeList","a","[LBiomeGenBase;","[Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35519_b","ocean","b","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35520_c","plains","c","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_4293_h","desert","d","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35518_e","extremeHills","e","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_4297_d","forest","f","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_4294_g","taiga","g","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_4299_b","swampland","h","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35522_i","river","i","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_4289_l","hell","j","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_28054_m","sky","k","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40464_l","frozenOcean","l","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40465_m","frozenRiver","m","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40462_n","icePlains","n","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40463_o","iceMountains","o","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40467_p","mushroomIsland","p","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40466_q","mushroomIslandShore","q","LBiomeGenBase;","Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"field_6163_m","biomeName","r","Ljava/lang/String;","Ljava/lang/String;","BiomeGenBase","kb","net/minecraft/src","1" +"field_6162_n","color","s","I","I","BiomeGenBase","kb","net/minecraft/src","1" +"field_4286_o","topBlock","t","B","B","BiomeGenBase","kb","net/minecraft/src","1" +"field_4285_p","fillerBlock","u","B","B","BiomeGenBase","kb","net/minecraft/src","1" +"field_6161_q","field_6161_q","v","I","I","BiomeGenBase","kb","net/minecraft/src","1" +"field_35527_q","minHeight","w","F","F","BiomeGenBase","kb","net/minecraft/src","1" +"field_35526_r","maxHeight","x","F","F","BiomeGenBase","kb","net/minecraft/src","1" +"field_35525_s","temperature","y","F","F","BiomeGenBase","kb","net/minecraft/src","1" +"field_35524_t","rainfall","z","F","F","BiomeGenBase","kb","net/minecraft/src","1" +"field_40461_A","waterColorMultiplier","A","I","I","BiomeGenBase","kb","net/minecraft/src","1" +"field_35523_u","decorator","B","LBiomeDecorator;","Lgo;","BiomeGenBase","kb","net/minecraft/src","1" +"field_25058_r","spawnableMonsterList","C","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1" +"field_25057_s","spawnableCreatureList","D","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1" +"field_25056_t","spawnableWaterCreatureList","E","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1" +"field_27051_u","enableSnow","K","Z","Z","BiomeGenBase","kb","net/minecraft/src","1" +"field_27050_v","enableRain","L","Z","Z","BiomeGenBase","kb","net/minecraft/src","1" +"field_35529_y","biomeID","F","I","I","BiomeGenBase","kb","net/minecraft/src","1" +"field_35528_z","treeGenerator","G","LWorldGenTrees;","Lxs;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35515_A","bigTreeGenerator","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35516_B","forestGenerator","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1" +"field_35517_C","swampTreeGenerator","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1" +"field_40334_a","field_40334_a","a","LIInventory;","Llp;","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40338_h","field_40338_h","h","LWorld;","Lfi;","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40339_i","field_40339_i","i","I","I","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40336_j","field_40336_j","j","I","I","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40337_k","field_40337_k","k","I","I","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40335_l","field_40335_l","l","Ljava/util/Random;","Ljava/util/Random;","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40332_b","field_40332_b","b","J","J","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40333_c","field_40333_c","c","[I","[I","ContainerEnchantment","iq","net/minecraft/src","1" +"field_139_a","xPosition","a","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" +"field_138_b","yPosition","b","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" +"field_140_c","zPosition","c","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" +"field_6084_a","localFlag","a","Z","Z","BlockBreakable","jo","net/minecraft/src","1" +"field_35159_a","xpColor","a","I","I","EntityXPOrb","cn","net/minecraft/src","1" +"field_35157_b","xpOrbAge","b","I","I","EntityXPOrb","cn","net/minecraft/src","1" +"field_35158_c","unusedPickupCooldown","c","I","I","EntityXPOrb","cn","net/minecraft/src","1" +"field_35156_e","xpOrbHealth","d","I","I","EntityXPOrb","cn","net/minecraft/src","1" +"field_35154_f","xpValue","e","I","I","EntityXPOrb","cn","net/minecraft/src","1" +"field_40316_a","field_40316_a","a","Z","Z","ComponentStrongholdPortalRoom","lf","net/minecraft/src","1" +"field_35678_a","x1","a","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_35676_b","y1","b","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_35677_c","z1","c","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_35674_d","x2","d","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_35675_e","y2","e","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_35673_f","z2","f","I","I","StructureBoundingBox","vb","net/minecraft/src","1" +"field_941_a","worldMap","a","LIBlockAccess;","Lwy;","PathFinder","ge","net/minecraft/src","1" +"field_940_b","path","b","LPath;","Lkv;","PathFinder","ge","net/minecraft/src","1" +"field_943_c","pointMap","c","LIntHashMap;","Ljw;","PathFinder","ge","net/minecraft/src","1" +"field_942_d","pathOptions","d","[LPathPoint;","[Le;","PathFinder","ge","net/minecraft/src","1" +"field_40148_a","field_40148_a","a","D","D","EntityDragon","sy","net/minecraft/src","1" +"field_40146_b","field_40146_b","b","D","D","EntityDragon","sy","net/minecraft/src","1" +"field_40147_c","field_40147_c","c","D","D","EntityDragon","sy","net/minecraft/src","1" +"field_40144_d","field_40144_d","d","[[D","[[D","EntityDragon","sy","net/minecraft/src","1" +"field_40145_e","field_40145_e","e","I","I","EntityDragon","sy","net/minecraft/src","1" +"field_40142_f","field_40142_f","f","[LDragonPart;","[Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40143_g","field_40143_g","g","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40155_h","field_40155_h","h","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40156_i","field_40156_i","i","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40153_j","field_40153_j","j","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40154_k","field_40154_k","k","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40151_l","field_40151_l","l","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40152_m","field_40152_m","m","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40149_n","field_40149_n","n","F","F","EntityDragon","sy","net/minecraft/src","1" +"field_40150_o","field_40150_o","o","F","F","EntityDragon","sy","net/minecraft/src","1" +"field_40160_p","field_40160_p","p","Z","Z","EntityDragon","sy","net/minecraft/src","1" +"field_40159_q","field_40159_q","q","Z","Z","EntityDragon","sy","net/minecraft/src","1" +"field_40157_t","field_40157_t","u","LEntity;","Lrn;","EntityDragon","sy","net/minecraft/src","1" +"field_40158_r","field_40158_r","r","I","I","EntityDragon","sy","net/minecraft/src","1" +"field_41039_t","field_41039_t","s","LEntityEnderCrystal;","Lgb;","EntityDragon","sy","net/minecraft/src","1" +"field_15005_a","blockIndex","a","I","I","WorldGenLakes","dm","net/minecraft/src","1" +"field_1025_a","key","a","J","J","LongHashMapEntry","pv","net/minecraft/src","1" +"field_1024_b","value","b","Ljava/lang/Object;","Ljava/lang/Object;","LongHashMapEntry","pv","net/minecraft/src","1" +"field_1027_c","nextEntry","c","LLongHashMapEntry;","Lpv;","LongHashMapEntry","pv","net/minecraft/src","1" +"field_1026_d","field_1026_d","d","I","I","LongHashMapEntry","pv","net/minecraft/src","1" +"field_40419_a","running","a","Z","Z","RConThreadBase","uu","net/minecraft/src","1" +"field_40417_b","server","b","LIServer;","Lvp;","RConThreadBase","uu","net/minecraft/src","1" +"field_40418_c","rconThread","c","Ljava/lang/Thread;","Ljava/lang/Thread;","RConThreadBase","uu","net/minecraft/src","1" +"field_40415_d","field_40415_d","d","I","I","RConThreadBase","uu","net/minecraft/src","1" +"field_40416_e","socketList","e","Ljava/util/List;","Ljava/util/List;","RConThreadBase","uu","net/minecraft/src","1" +"field_40414_f","serverSocketList","f","Ljava/util/List;","Ljava/util/List;","RConThreadBase","uu","net/minecraft/src","1" +"field_4249_a","liquidBlockId","a","I","I","WorldGenLiquids","wx","net/minecraft/src","1" +"field_28057_a","field_28057_a","a","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" +"field_28056_b","field_28056_b","b","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" +"field_493_e","delay","a","I","I","TileEntityMobSpawner","de","net/minecraft/src","1" +"field_492_f","mobID","d","Ljava/lang/String;","Ljava/lang/String;","TileEntityMobSpawner","de","net/minecraft/src","1" +"field_491_g","yaw","b","D","D","TileEntityMobSpawner","de","net/minecraft/src","1" +"field_490_h","yaw2","c","D","D","TileEntityMobSpawner","de","net/minecraft/src","1" +"field_35108_a","slot","a","I","I","Packet107CreativeSetSlot","dy","net/minecraft/src","1" +"field_40263_b","itemStack","b","LItemStack;","Ljb;","Packet107CreativeSetSlot","dy","net/minecraft/src","1" +"field_1072_b","players","b","Ljava/util/List;","Ljava/util/List;","PlayerInstance","al","net/minecraft/src","1" +"field_1071_c","chunkX","c","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1070_d","chunkZ","d","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1069_e","currentChunk","e","LChunkCoordIntPair;","Lyi;","PlayerInstance","al","net/minecraft/src","1" +"field_1068_f","blocksToUpdate","f","[S","[S","PlayerInstance","al","net/minecraft/src","1" +"field_1067_g","numBlocksToUpdate","g","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1066_h","minX","h","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1065_i","maxX","i","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1064_j","minY","j","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1063_k","maxY","k","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1062_l","minZ","l","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1061_m","maxZ","m","I","I","PlayerInstance","al","net/minecraft/src","1" +"field_1073_a","playerManager","a","LPlayerManager;","Lwi;","PlayerInstance","al","net/minecraft/src","1" +"field_35329_a","field_35329_a","a","LStructureStrongholdPieceWeight;","Lrl;","ComponentStrongholdStairs2","w","net/minecraft/src","1" +"field_40317_b","field_40317_b","b","LComponentStrongholdPortalRoom;","Llf;","ComponentStrongholdStairs2","w","net/minecraft/src","1" +"field_35328_b","field_35328_b","c","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentStrongholdStairs2","w","net/minecraft/src","1" +"field_25039_a","looksWithInterest","a","Z","Z","EntityWolf","gs","net/minecraft/src","1" +"field_25038_b","field_25038_b","b","F","F","EntityWolf","gs","net/minecraft/src","1" +"field_25044_c","field_25044_c","c","F","F","EntityWolf","gs","net/minecraft/src","1" +"field_25043_f","isWet","g","Z","Z","EntityWolf","gs","net/minecraft/src","1" +"field_25042_g","field_25042_g","h","Z","Z","EntityWolf","gs","net/minecraft/src","1" +"field_25041_h","timeWolfIsShaking","i","F","F","EntityWolf","gs","net/minecraft/src","1" +"field_25040_i","prevTimeWolfIsShaking","j","F","F","EntityWolf","gs","net/minecraft/src","1" +"field_260_a","doorMaterial","a","LMaterial;","Llg;","ItemDoor","ia","net/minecraft/src","1" +"field_22202_a","randomSeed","a","J","J","WorldInfo","eo","net/minecraft/src","1" +"field_22201_b","spawnX","b","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_22200_c","spawnY","c","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_22199_d","spawnZ","d","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_22198_e","worldTime","e","J","J","WorldInfo","eo","net/minecraft/src","1" +"field_22197_f","lastTimePlayed","f","J","J","WorldInfo","eo","net/minecraft/src","1" +"field_22196_g","sizeOnDisk","g","J","J","WorldInfo","eo","net/minecraft/src","1" +"field_22195_h","playerTag","h","LNBTTagCompound;","Lng;","WorldInfo","eo","net/minecraft/src","1" +"field_22194_i","dimension","i","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_22193_j","levelName","j","Ljava/lang/String;","Ljava/lang/String;","WorldInfo","eo","net/minecraft/src","1" +"field_22192_k","saveVersion","k","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_27126_l","raining","l","Z","Z","WorldInfo","eo","net/minecraft/src","1" +"field_27125_m","rainTime","m","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_27124_n","thundering","n","Z","Z","WorldInfo","eo","net/minecraft/src","1" +"field_27123_o","thunderTime","o","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_35503_p","gameType","p","I","I","WorldInfo","eo","net/minecraft/src","1" +"field_35502_q","enableMapFeatures","q","Z","Z","WorldInfo","eo","net/minecraft/src","1" +"field_40471_r","hardcore","r","Z","Z","WorldInfo","eo","net/minecraft/src","1" +"field_39_a","packetIdToClassMap","j","LIntHashMap;","Ljw;","Packet","kf","net/minecraft/src","1" +"field_38_b","packetClassToIdMap","a","Ljava/util/Map;","Ljava/util/Map;","Packet","kf","net/minecraft/src","1" +"field_27994_c","clientPacketIdList","b","Ljava/util/Set;","Ljava/util/Set;","Packet","kf","net/minecraft/src","1" +"field_27993_d","serverPacketIdList","c","Ljava/util/Set;","Ljava/util/Set;","Packet","kf","net/minecraft/src","1" +"field_20009_j","creationTimeMillis","k","J","J","Packet","kf","net/minecraft/src","1" +"field_40_j","isChunkDataPacket","l","Z","Z","Packet","kf","net/minecraft/src","1" +"field_40112_a","profession","a","I","I","EntityVillager","fm","net/minecraft/src","1" +"field_384_a","nextEntityID","a","I","I","Entity","rn","net/minecraft/src","1" +"field_331_c","entityId","ba","I","I","Entity","rn","net/minecraft/src","1" +"field_9094_h","renderDistanceWeight","bb","D","D","Entity","rn","net/minecraft/src","1" +"field_329_e","preventEntitySpawning","bc","Z","Z","Entity","rn","net/minecraft/src","1" +"field_328_f","riddenByEntity","bd","LEntity;","Lrn;","Entity","rn","net/minecraft/src","1" +"field_327_g","ridingEntity","be","LEntity;","Lrn;","Entity","rn","net/minecraft/src","1" +"field_9093_l","worldObj","bf","LWorld;","Lfi;","Entity","rn","net/minecraft/src","1" +"field_9092_m","prevPosX","bg","D","D","Entity","rn","net/minecraft/src","1" +"field_9091_n","prevPosY","bh","D","D","Entity","rn","net/minecraft/src","1" +"field_9090_o","prevPosZ","bi","D","D","Entity","rn","net/minecraft/src","1" +"field_322_l","posX","bj","D","D","Entity","rn","net/minecraft/src","1" +"field_321_m","posY","bk","D","D","Entity","rn","net/minecraft/src","1" +"field_320_n","posZ","bl","D","D","Entity","rn","net/minecraft/src","1" +"field_319_o","motionX","bm","D","D","Entity","rn","net/minecraft/src","1" +"field_318_p","motionY","bn","D","D","Entity","rn","net/minecraft/src","1" +"field_317_q","motionZ","bo","D","D","Entity","rn","net/minecraft/src","1" +"field_316_r","rotationYaw","bp","F","F","Entity","rn","net/minecraft/src","1" +"field_315_s","rotationPitch","bq","F","F","Entity","rn","net/minecraft/src","1" +"field_9089_x","prevRotationYaw","br","F","F","Entity","rn","net/minecraft/src","1" +"field_9088_y","prevRotationPitch","bs","F","F","Entity","rn","net/minecraft/src","1" +"field_312_v","boundingBox","bt","LAxisAlignedBB;","Leu;","Entity","rn","net/minecraft/src","1" +"field_9086_A","onGround","bu","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9084_B","isCollidedHorizontally","bv","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9082_C","isCollidedVertically","bw","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9080_D","isCollided","bx","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9078_E","velocityChanged","by","Z","Z","Entity","rn","net/minecraft/src","1" +"field_27012_bb","isInWeb","bz","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9077_F","field_9077_F","bA","Z","Z","Entity","rn","net/minecraft/src","1" +"field_304_B","isDead","bB","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9076_H","yOffset","bC","F","F","Entity","rn","net/minecraft/src","1" +"field_300_D","width","bD","F","F","Entity","rn","net/minecraft/src","1" +"field_298_E","height","bE","F","F","Entity","rn","net/minecraft/src","1" +"field_9075_K","prevDistanceWalkedModified","bF","F","F","Entity","rn","net/minecraft/src","1" +"field_9074_L","distanceWalkedModified","bG","F","F","Entity","rn","net/minecraft/src","1" +"field_9072_N","fallDistance","bH","F","F","Entity","rn","net/minecraft/src","1" +"field_6151_b","nextStepDistance","b","I","I","Entity","rn","net/minecraft/src","1" +"field_9071_O","lastTickPosX","bI","D","D","Entity","rn","net/minecraft/src","1" +"field_9070_P","lastTickPosY","bJ","D","D","Entity","rn","net/minecraft/src","1" +"field_9069_Q","lastTickPosZ","bK","D","D","Entity","rn","net/minecraft/src","1" +"field_9068_R","ySize","bL","F","F","Entity","rn","net/minecraft/src","1" +"field_9067_S","stepHeight","bM","F","F","Entity","rn","net/minecraft/src","1" +"field_9066_T","noClip","bN","Z","Z","Entity","rn","net/minecraft/src","1" +"field_286_P","entityCollisionReduction","bO","F","F","Entity","rn","net/minecraft/src","1" +"field_9064_W","rand","bP","Ljava/util/Random;","Ljava/util/Random;","Entity","rn","net/minecraft/src","1" +"field_9063_X","ticksExisted","bQ","I","I","Entity","rn","net/minecraft/src","1" +"field_9062_Y","fireResistance","bR","I","I","Entity","rn","net/minecraft/src","1" +"field_9061_Z","fire","c","I","I","Entity","rn","net/minecraft/src","1" +"field_9085_ab","inWater","bS","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9083_ac","heartsLife","bT","I","I","Entity","rn","net/minecraft/src","1" +"field_4131_c","firstUpdate","d","Z","Z","Entity","rn","net/minecraft/src","1" +"field_9079_ae","isImmuneToFire","bU","Z","Z","Entity","rn","net/minecraft/src","1" +"field_21045_af","dataWatcher","bV","LDataWatcher;","Lsu;","Entity","rn","net/minecraft/src","1" +"field_4130_d","entityRiderPitchDelta","e","D","D","Entity","rn","net/minecraft/src","1" +"field_4128_e","entityRiderYawDelta","f","D","D","Entity","rn","net/minecraft/src","1" +"field_276_Z","addedToChunk","bW","Z","Z","Entity","rn","net/minecraft/src","1" +"field_307_aa","chunkCoordX","bX","I","I","Entity","rn","net/minecraft/src","1" +"field_305_ab","chunkCoordY","bY","I","I","Entity","rn","net/minecraft/src","1" +"field_303_ac","chunkCoordZ","bZ","I","I","Entity","rn","net/minecraft/src","1" +"field_28008_bI","ignoreFrustrumCheck","ca","Z","Z","Entity","rn","net/minecraft/src","1" +"field_35151_ca","isAirBorne","cb","Z","Z","Entity","rn","net/minecraft/src","1" +"field_40655_a","field_40655_a","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"field_40653_b","field_40653_b","b","I","I","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"field_40654_c","field_40654_c","c","I","I","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"field_40651_d","field_40651_d","d","I","I","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"field_40652_e","field_40652_e","e","Z","Z","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"field_665_a","glowing","a","Z","Z","BlockRedstoneOre","bw","net/minecraft/src","1" +"field_35436_a","lootArray","a","[LStructurePieceTreasure;","[Lib;","StructureMineshaftPieces","iv","net/minecraft/src","1" +"field_735_a","doubleValue","a","D","D","NBTTagDouble","rv","net/minecraft/src","1" +"field_20162_a","allowedCharacters","a","Ljava/lang/String;","Ljava/lang/String;","ChatAllowedCharacters","fx","net/minecraft/src","1" +"field_22175_b","allowedCharactersArray","b","[C","[C","ChatAllowedCharacters","fx","net/minecraft/src","1" +"field_966_g","boundingBoxes","g","Ljava/util/List;","Ljava/util/List;","AxisAlignedBB","eu","net/minecraft/src","1" +"field_965_h","numBoundingBoxesInUse","h","I","I","AxisAlignedBB","eu","net/minecraft/src","1" +"field_964_a","minX","a","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_963_b","minY","b","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_970_c","minZ","c","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_969_d","maxX","d","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_968_e","maxY","e","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_967_f","maxZ","f","D","D","AxisAlignedBB","eu","net/minecraft/src","1" +"field_762_a","minableBlockId","a","I","I","WorldGenMinable","fr","net/minecraft/src","1" +"field_761_b","numberOfBlocks","b","I","I","WorldGenMinable","fr","net/minecraft/src","1" +"field_35029_b","field_35029_b","b","[LBiomeGenBase;","[Lkb;","GenLayerVillageLandscape","sg","net/minecraft/src","1" +"field_485_e","signText","a","[Ljava/lang/String;","[Ljava/lang/String;","TileEntitySign","xu","net/minecraft/src","1" +"field_484_f","lineBeingEdited","b","I","I","TileEntitySign","xu","net/minecraft/src","1" +"field_25053_c","isEditable","c","Z","Z","TileEntitySign","xu","net/minecraft/src","1" +"field_35331_a","field_35331_a","a","LEnumDoor;","Lpt;","ComponentStrongholdLeftTurn","sh","net/minecraft/src","1" +"field_20013_a","windowId","a","I","I","Packet100OpenWindow","iz","net/minecraft/src","1" +"field_20012_b","inventoryType","b","I","I","Packet100OpenWindow","iz","net/minecraft/src","1" +"field_20015_c","windowTitle","c","Ljava/lang/String;","Ljava/lang/String;","Packet100OpenWindow","iz","net/minecraft/src","1" +"field_20014_d","slotsCount","d","I","I","Packet100OpenWindow","iz","net/minecraft/src","1" +"field_35396_a","field_35396_a","a","I","I","ComponentVillageWoodHut","yd","net/minecraft/src","1" +"field_35394_b","field_35394_b","b","Z","Z","ComponentVillageWoodHut","yd","net/minecraft/src","1" +"field_35395_c","field_35395_c","c","I","I","ComponentVillageWoodHut","yd","net/minecraft/src","1" +"field_98_a","entityId","a","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_97_b","xPosition","b","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_101_c","yPosition","c","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_100_d","zPosition","d","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28044_e","field_28044_e","e","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28043_f","field_28043_f","f","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28042_g","field_28042_g","g","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_99_e","type","h","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28041_i","field_28041_i","i","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_1016_a","xCoord","a","I","I","PathPoint","e","net/minecraft/src","1" +"field_1015_b","yCoord","b","I","I","PathPoint","e","net/minecraft/src","1" +"field_1014_c","zCoord","c","I","I","PathPoint","e","net/minecraft/src","1" +"field_1013_d","hash","j","I","I","PathPoint","e","net/minecraft/src","1" +"field_1012_e","index","d","I","I","PathPoint","e","net/minecraft/src","1" +"field_1011_f","totalPathDistance","e","F","F","PathPoint","e","net/minecraft/src","1" +"field_1010_g","distanceToNext","f","F","F","PathPoint","e","net/minecraft/src","1" +"field_1009_h","distanceToTarget","g","F","F","PathPoint","e","net/minecraft/src","1" +"field_1008_i","previous","h","LPathPoint;","Le;","PathPoint","e","net/minecraft/src","1" +"field_1007_j","isFirst","i","Z","Z","PathPoint","e","net/minecraft/src","1" +"field_40122_a","field_40122_a","a","F","F","EntitySlime","tn","net/minecraft/src","1" +"field_401_a","field_401_a","b","F","F","EntitySlime","tn","net/minecraft/src","1" +"field_400_b","field_400_b","c","F","F","EntitySlime","tn","net/minecraft/src","1" +"field_402_ae","ticksTillJump","d","I","I","EntitySlime","tn","net/minecraft/src","1" +"field_20024_a","window_Id","a","I","I","Packet102WindowClick","pw","net/minecraft/src","1" +"field_20023_b","inventorySlot","b","I","I","Packet102WindowClick","pw","net/minecraft/src","1" +"field_20027_c","mouseClick","c","I","I","Packet102WindowClick","pw","net/minecraft/src","1" +"field_20026_d","action","d","S","S","Packet102WindowClick","pw","net/minecraft/src","1" +"field_20025_e","itemStack","e","LItemStack;","Ljb;","Packet102WindowClick","pw","net/minecraft/src","1" +"field_27039_f","holdingShift","f","Z","Z","Packet102WindowClick","pw","net/minecraft/src","1" +"field_972_a","loginPacket","a","LPacket1Login;","Lnl;","ThreadLoginVerifier","eq","net/minecraft/src","1" +"field_971_b","loginHandler","b","LNetLoginHandler;","Lgq;","ThreadLoginVerifier","eq","net/minecraft/src","1" +"field_40266_a","experience","a","F","F","Packet43Experience","ky","net/minecraft/src","1" +"field_35134_b","experienceTotal","b","I","I","Packet43Experience","ky","net/minecraft/src","1" +"field_35135_c","experienceLevel","c","I","I","Packet43Experience","ky","net/minecraft/src","1" +"field_22035_a","strafeMovement","a","F","F","Packet27Position","pl","net/minecraft/src","1" +"field_22034_b","fowardMovement","b","F","F","Packet27Position","pl","net/minecraft/src","1" +"field_22039_c","isSneaking","c","Z","Z","Packet27Position","pl","net/minecraft/src","1" +"field_22038_d","isInJump","d","Z","Z","Packet27Position","pl","net/minecraft/src","1" +"field_22037_e","pitchRotation","e","F","F","Packet27Position","pl","net/minecraft/src","1" +"field_22036_f","yawRotation","f","F","F","Packet27Position","pl","net/minecraft/src","1" +"OPENING","OPENING","a","LEnumDoor;","Lpt;","EnumDoor","pt","net/minecraft/src","1" +"WOOD_DOOR","WOOD_DOOR","b","LEnumDoor;","Lpt;","EnumDoor","pt","net/minecraft/src","1" +"GRATES","GRATES","c","LEnumDoor;","Lpt;","EnumDoor","pt","net/minecraft/src","1" +"IRON_DOOR","IRON_DOOR","d","LEnumDoor;","Lpt;","EnumDoor","pt","net/minecraft/src","1" +"field_35598_e","allDoors","e","[LEnumDoor;","[Lpt;","EnumDoor","pt","net/minecraft/src","1" +"field_35361_a","field_35361_a","a","Z","Z","ComponentMineshaftCorridor","rz","net/minecraft/src","1" +"field_35359_b","field_35359_b","b","Z","Z","ComponentMineshaftCorridor","rz","net/minecraft/src","1" +"field_35360_c","field_35360_c","c","Z","Z","ComponentMineshaftCorridor","rz","net/minecraft/src","1" +"field_35358_d","field_35358_d","d","I","I","ComponentMineshaftCorridor","rz","net/minecraft/src","1" +"field_429_a","item","a","LItemStack;","Ljb;","EntityItem","hp","net/minecraft/src","1" +"field_9170_e","field_9170_e","e","I","I","EntityItem","hp","net/minecraft/src","1" +"field_9169_b","age","b","I","I","EntityItem","hp","net/minecraft/src","1" +"field_433_ad","delayBeforeCanPickup","c","I","I","EntityItem","hp","net/minecraft/src","1" +"field_430_ag","health","f","I","I","EntityItem","hp","net/minecraft/src","1" +"field_432_ae","field_432_ae","d","F","F","EntityItem","hp","net/minecraft/src","1" +"field_35033_b","field_35033_b","b","LGenLayer;","Lel;","GenLayerRiverMix","vw","net/minecraft/src","1" +"field_35034_c","field_35034_c","c","LGenLayer;","Lel;","GenLayerRiverMix","vw","net/minecraft/src","1" +"field_734_a","shortValue","a","S","S","NBTTagShort","tg","net/minecraft/src","1" +"WOOD","WOOD","a","LEnumToolMaterial;","Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"STONE","STONE","b","LEnumToolMaterial;","Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"IRON","IRON","c","LEnumToolMaterial;","Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"EMERALD","EMERALD","d","LEnumToolMaterial;","Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"GOLD","GOLD","e","LEnumToolMaterial;","Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"field_21186_f","harvestLevel","f","I","I","EnumToolMaterial","by","net/minecraft/src","1" +"field_21185_g","maxUses","g","I","I","EnumToolMaterial","by","net/minecraft/src","1" +"field_21184_h","efficiencyOnProperMaterial","h","F","F","EnumToolMaterial","by","net/minecraft/src","1" +"field_21183_i","damageVsEntity","i","I","I","EnumToolMaterial","by","net/minecraft/src","1" +"field_40488_j","enchantability","j","I","I","EnumToolMaterial","by","net/minecraft/src","1" +"field_21182_j","allToolMaterials","k","[LEnumToolMaterial;","[Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"field_664_a","triggerMobType","a","LEnumMobType;","Lqu;","BlockPressurePlate","bz","net/minecraft/src","1" +"field_25145_a","entityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","SpawnListEntry","bl","net/minecraft/src","1" +"field_35484_b","field_35484_b","b","I","I","SpawnListEntry","bl","net/minecraft/src","1" +"field_35485_c","field_35485_c","c","I","I","SpawnListEntry","bl","net/minecraft/src","1" +"field_4108_a","defaultHeldItem","a","LItemStack;","Ljb;","EntitySkeleton","ga","net/minecraft/src","1" +"field_40378_w","protectionName","w","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentProtection","qg","net/minecraft/src","1" +"field_40382_x","baseEnchantability","x","[I","[I","EnchantmentProtection","qg","net/minecraft/src","1" +"field_40381_y","levelEnchantability","y","[I","[I","EnchantmentProtection","qg","net/minecraft/src","1" +"field_40380_z","thresholdEnchantability","z","[I","[I","EnchantmentProtection","qg","net/minecraft/src","1" +"field_40379_a","protectionType","a","I","I","EnchantmentProtection","qg","net/minecraft/src","1" +"field_1004_b","points","b","[LPathPoint;","[Le;","PathEntity","dk","net/minecraft/src","1" +"field_1005_a","pathLength","a","I","I","PathEntity","dk","net/minecraft/src","1" +"field_1006_c","pathIndex","c","I","I","PathEntity","dk","net/minecraft/src","1" +"field_31016_a","storedBlockID","a","I","I","TileEntityPiston","tf","net/minecraft/src","1" +"field_31014_b","storedMetadata","b","I","I","TileEntityPiston","tf","net/minecraft/src","1" +"field_31020_c","storedOrientation","c","I","I","TileEntityPiston","tf","net/minecraft/src","1" +"field_31019_i","extending","d","Z","Z","TileEntityPiston","tf","net/minecraft/src","1" +"field_31018_j","field_31018_j","e","Z","Z","TileEntityPiston","tf","net/minecraft/src","1" +"field_31017_k","progress","f","F","F","TileEntityPiston","tf","net/minecraft/src","1" +"field_31015_l","lastProgress","g","F","F","TileEntityPiston","tf","net/minecraft/src","1" +"field_31013_m","field_31013_m","h","Ljava/util/List;","Ljava/util/List;","TileEntityPiston","tf","net/minecraft/src","1" +"field_35128_a","entityId","a","I","I","Packet42RemoveEntityEffect","mx","net/minecraft/src","1" +"field_35127_b","effectId","b","B","B","Packet42RemoveEntityEffect","mx","net/minecraft/src","1" +"field_76_a","time","a","J","J","Packet4UpdateTime","hn","net/minecraft/src","1" +"field_20906_d","xTile","d","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_20905_e","yTile","e","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_4126_f","zTile","f","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_4132_ai","inTile","g","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_4129_aj","inGround","h","Z","Z","EntityFishHook","lq","net/minecraft/src","1" +"field_4134_a","shake","a","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_20909_b","angler","b","LEntityPlayer;","Lgz;","EntityFishHook","lq","net/minecraft/src","1" +"field_6150_ak","ticksInGround","i","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_4125_al","ticksInAir","j","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_4124_am","ticksCatchable","k","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_20907_c","bobber","c","LEntity;","Lrn;","EntityFishHook","lq","net/minecraft/src","1" +"field_6149_an","field_6149_an","l","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_6148_ao","field_6148_ao","m","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6147_ap","field_6147_ap","n","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6146_aq","field_6146_aq","o","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6145_ar","field_6145_ar","p","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6144_as","field_6144_as","q","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_35101_n","damageSourceEntity","n","LEntity;","Lrn;","EntityDamageSource","hi","net/minecraft/src","1" +"Kebab","Kebab","a","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Aztec","Aztec","b","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Alban","Alban","c","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Aztec2","Aztec2","d","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Bomb","Bomb","e","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Plant","Plant","f","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Wasteland","Wasteland","g","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Pool","Pool","h","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Courbet","Courbet","i","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Sea","Sea","j","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Sunset","Sunset","k","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Creebet","Creebet","l","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Wanderer","Wanderer","m","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Graham","Graham","n","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Match","Match","o","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Bust","Bust","p","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Stage","Stage","q","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Void","Void","r","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"SkullAndRoses","SkullAndRoses","s","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Fighters","Fighters","t","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Pointer","Pointer","u","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Pigscene","Pigscene","v","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"BurningSkull","BurningSkull","w","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"Skeleton","Skeleton","x","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"DonkeyKong","DonkeyKong","y","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" +"field_27096_z","maxArtTitleLength","z","I","I","EnumArt","it","net/minecraft/src","1" +"field_857_y","title","A","Ljava/lang/String;","Ljava/lang/String;","EnumArt","it","net/minecraft/src","1" +"field_856_z","sizeX","B","I","I","EnumArt","it","net/minecraft/src","1" +"field_869_A","sizeY","C","I","I","EnumArt","it","net/minecraft/src","1" +"field_867_B","offsetX","D","I","I","EnumArt","it","net/minecraft/src","1" +"field_865_C","offsetY","E","I","I","EnumArt","it","net/minecraft/src","1" +"field_863_D","allArt","F","[LEnumArt;","[Lit;","EnumArt","it","net/minecraft/src","1" +"field_116_a","entityId","a","I","I","Packet29DestroyEntity","qw","net/minecraft/src","1" +"Sky","Sky","a","LEnumSkyBlock;","Lei;","EnumSkyBlock","ei","net/minecraft/src","1" +"Block","Block","b","LEnumSkyBlock;","Lei;","EnumSkyBlock","ei","net/minecraft/src","1" +"field_984_c","defaultLightValue","c","I","I","EnumSkyBlock","ei","net/minecraft/src","1" +"field_983_d","allSkyBlocks","d","[LEnumSkyBlock;","[Lei;","EnumSkyBlock","ei","net/minecraft/src","1" +"field_40573_a","field_40573_a","a","Ljava/text/DecimalFormat;","Ljava/text/DecimalFormat;","GuiStatsComponent","kp","net/minecraft/src","1" +"field_767_a","memoryUse","b","[I","[I","GuiStatsComponent","kp","net/minecraft/src","1" +"field_766_b","updateCounter","c","I","I","GuiStatsComponent","kp","net/minecraft/src","1" +"field_768_c","displayStrings","d","[Ljava/lang/String;","[Ljava/lang/String;","GuiStatsComponent","kp","net/minecraft/src","1" +"field_40572_e","field_40572_e","e","LMinecraftServer;","LMinecraftServer;","GuiStatsComponent","kp","net/minecraft/src","1" +"field_35707_a","field_35707_a","a","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35705_b","field_35705_b","b","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35706_c","field_35706_c","c","[LBiomeGenBase;","[Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35703_d","field_35703_d","d","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35704_e","field_35704_e","e","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35701_f","field_35701_f","f","J","J","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35702_g","field_35702_g","g","LBiomeCache;","Ltz;","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_40330_a","field_40330_a","a","Ljava/util/List;","Ljava/util/List;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40328_b","field_40328_b","b","Ljava/util/Set;","Ljava/util/Set;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40329_c","field_40329_c","c","Ljava/lang/Object;","Ljava/lang/Object;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40327_d","field_40327_d","d","Ljava/io/File;","Ljava/io/File;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_35548_c","hasMoreThanTwoComponents","c","Z","Z","StructureVillageStart","gg","net/minecraft/src","1" +"field_470_ai","cargoItems","d","[LItemStack;","[Ljb;","EntityMinecart","xv","net/minecraft/src","1" +"field_9165_e","fuel","e","I","I","EntityMinecart","xv","net/minecraft/src","1" +"field_469_aj","field_469_aj","f","Z","Z","EntityMinecart","xv","net/minecraft/src","1" +"field_476_ae","minecartType","a","I","I","EntityMinecart","xv","net/minecraft/src","1" +"field_9164_f","pushX","b","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9166_aj","pushZ","c","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_468_ak","field_468_ak","g","[[[I","[[[I","EntityMinecart","xv","net/minecraft/src","1" +"field_9163_an","field_9163_an","h","I","I","EntityMinecart","xv","net/minecraft/src","1" +"field_9162_ao","field_9162_ao","i","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9161_ap","field_9161_ap","j","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9160_aq","field_9160_aq","k","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9159_ar","field_9159_ar","l","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9158_as","field_9158_as","m","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_39000_a","inLove","a","I","I","EntityAnimal","bi","net/minecraft/src","1" +"field_39001_b","breeding","b","I","I","EntityAnimal","bi","net/minecraft/src","1" +"field_40055_d","potionDamage","d","I","I","EntityPotion","bs","net/minecraft/src","1" +"field_21175_a","objectType","a","I","I","WatchableObject","lt","net/minecraft/src","1" +"field_21174_b","dataValueId","b","I","I","WatchableObject","lt","net/minecraft/src","1" +"field_21177_c","watchedObject","c","Ljava/lang/Object;","Ljava/lang/Object;","WatchableObject","lt","net/minecraft/src","1" +"field_21176_d","isWatching","d","Z","Z","WatchableObject","lt","net/minecraft/src","1" +"field_20160_a","recipeItems","a","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesIngots","sk","net/minecraft/src","1" +"field_1029_a","stepSoundName","a","Ljava/lang/String;","Ljava/lang/String;","StepSound","db","net/minecraft/src","1" +"field_1028_b","stepSoundVolume","b","F","F","StepSound","db","net/minecraft/src","1" +"field_1030_c","stepSoundPitch","c","F","F","StepSound","db","net/minecraft/src","1" +"field_9019_a","playerEntityId","a","I","I","Packet7UseEntity","a","net/minecraft/src","1" +"field_9018_b","targetEntity","b","I","I","Packet7UseEntity","a","net/minecraft/src","1" +"field_9020_c","isLeftClick","c","I","I","Packet7UseEntity","a","net/minecraft/src","1" +"field_40587_a","hexDigits","a","[C","[C","RConUtils","io","net/minecraft/src","1" +"field_20030_a","windowId","a","I","I","Packet105UpdateProgressbar","mj","net/minecraft/src","1" +"field_20029_b","progressBar","b","I","I","Packet105UpdateProgressbar","mj","net/minecraft/src","1" +"field_20031_c","progressBarValue","c","I","I","Packet105UpdateProgressbar","mj","net/minecraft/src","1" +"field_20103_a","craftMatrix","a","LIInventory;","Llp;","SlotCrafting","yg","net/minecraft/src","1" +"field_25004_e","thePlayer","f","LEntityPlayer;","Lgz;","SlotCrafting","yg","net/minecraft/src","1" +"field_28180_a","saveHandler","a","LISaveHandler;","Lwg;","MapStorage","hf","net/minecraft/src","1" +"field_28179_b","loadedDataMap","b","Ljava/util/Map;","Ljava/util/Map;","MapStorage","hf","net/minecraft/src","1" +"field_28182_c","loadedDataList","c","Ljava/util/List;","Ljava/util/List;","MapStorage","hf","net/minecraft/src","1" +"field_28181_d","idCounts","d","Ljava/util/Map;","Ljava/util/Map;","MapStorage","hf","net/minecraft/src","1" +"field_40005_a","instance","a","LRConConsoleSource;","Lvj;","RConConsoleSource","vj","net/minecraft/src","1" +"field_40004_b","buffer","b","Ljava/lang/StringBuffer;","Ljava/lang/StringBuffer;","RConConsoleSource","vj","net/minecraft/src","1" +"field_35580_a","pieceClass","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"field_35578_b","pieceWeight","b","I","I","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"field_35579_c","instancesSpawned","c","I","I","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"field_35577_d","instancesLimit","d","I","I","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"field_35062_a","blockStepTypes","a","[Ljava/lang/String;","[Ljava/lang/String;","BlockStep","ya","net/minecraft/src","1" +"field_20910_a","blockType","b","Z","Z","BlockStep","ya","net/minecraft/src","1" +"field_1032_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ThreadCommandReader","cy","net/minecraft/src","1" +"field_652_a","wiresProvidePower","a","Z","Z","BlockRedstoneWire","rm","net/minecraft/src","1" +"field_21032_b","blocksNeedingUpdate","b","Ljava/util/Set;","Ljava/util/Set;","BlockRedstoneWire","rm","net/minecraft/src","1" +"field_12031_a","isFlaming","a","Z","Z","Explosion","py","net/minecraft/src","1" +"field_12024_h","ExplosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","py","net/minecraft/src","1" +"field_4310_a","worldObj","i","LWorld;","Lfi;","Explosion","py","net/minecraft/src","1" +"field_12030_b","explosionX","b","D","D","Explosion","py","net/minecraft/src","1" +"field_12029_c","explosionY","c","D","D","Explosion","py","net/minecraft/src","1" +"field_12028_d","explosionZ","d","D","D","Explosion","py","net/minecraft/src","1" +"field_12027_e","exploder","e","LEntity;","Lrn;","Explosion","py","net/minecraft/src","1" +"field_12026_f","explosionSize","f","F","F","Explosion","py","net/minecraft/src","1" +"field_12025_g","destroyedBlockPositions","g","Ljava/util/Set;","Ljava/util/Set;","Explosion","py","net/minecraft/src","1" +"field_35333_a","field_35333_a","a","LEnumDoor;","Lpt;","ComponentStrongholdPrison","og","net/minecraft/src","1" +"field_27034_a","isPowered","a","Z","Z","BlockRail","ok","net/minecraft/src","1" +"field_35381_a","field_35381_a","a","I","I","ComponentVillageChurch","ob","net/minecraft/src","1" +"field_40305_a","field_40305_a","a","Z","Z","ComponentNetherBridgeThrone","vd","net/minecraft/src","1" +"field_35540_a","field_35540_a","a","[F","[F","MapGenRavine","wo","net/minecraft/src","1" +"field_21158_a","dataTypes","a","Ljava/util/HashMap;","Ljava/util/HashMap;","DataWatcher","su","net/minecraft/src","1" +"field_21157_b","watchedObjects","b","Ljava/util/Map;","Ljava/util/Map;","DataWatcher","su","net/minecraft/src","1" +"field_21159_c","objectChanged","c","Z","Z","DataWatcher","su","net/minecraft/src","1" +"field_40562_a","field_40562_a","a","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40560_b","sugarEffect","b","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40561_c","ghastTearEffect","c","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40558_d","spiderEyeEffect","d","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40559_e","fermentedSpiderEyeEffect","e","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40556_f","speckledMelonEffect","f","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40557_g","blazePowderEffect","g","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40569_h","magmaCreamEffect","h","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40570_i","redstoneEffect","i","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40567_j","glowstoneEffect","j","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40568_k","gunpowderEffect","k","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_40565_l","field_40565_l","l","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","km","net/minecraft/src","1" +"field_40566_m","field_40566_m","m","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","km","net/minecraft/src","1" +"field_40563_n","field_40563_n","n","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","km","net/minecraft/src","1" +"field_40564_o","potionPrefixList","o","[Ljava/lang/String;","[Ljava/lang/String;","PotionHelper","km","net/minecraft/src","1" +"field_143_a","entityId","a","I","I","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_142_b","name","b","Ljava/lang/String;","Ljava/lang/String;","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_149_c","xPosition","c","I","I","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_148_d","yPosition","d","I","I","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_147_e","zPosition","e","I","I","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_146_f","rotation","f","B","B","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_145_g","pitch","g","B","B","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_144_h","currentItem","h","I","I","Packet20NamedEntitySpawn","lw","net/minecraft/src","1" +"field_40267_a","field_40267_a","a","LContainerBrewingStand;","Lje;","SlotBrewingStandIngredient","dd","net/minecraft/src","1" +"field_40062_a","field_40062_a","a","I","I","EntityEnderEye","ck","net/minecraft/src","1" +"field_40060_b","field_40060_b","b","D","D","EntityEnderEye","ck","net/minecraft/src","1" +"field_40061_c","field_40061_c","c","D","D","EntityEnderEye","ck","net/minecraft/src","1" +"field_40058_d","field_40058_d","d","D","D","EntityEnderEye","ck","net/minecraft/src","1" +"field_40059_e","field_40059_e","e","I","I","EntityEnderEye","ck","net/minecraft/src","1" +"field_40057_f","field_40057_f","f","Z","Z","EntityEnderEye","ck","net/minecraft/src","1" +"field_150_a","message","a","Ljava/lang/String;","Ljava/lang/String;","Packet3Chat","op","net/minecraft/src","1" +"field_40083_a","field_40083_a","a","[LItemStack;","[Ljb;","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40081_b","field_40081_b","b","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40082_c","field_40082_c","c","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40080_d","field_40080_d","d","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40437_g","lastAuthCheckTime","g","J","J","RConThreadQuery","sv","net/minecraft/src","1" +"field_40444_h","queryPort","h","I","I","RConThreadQuery","sv","net/minecraft/src","1" +"field_40445_i","serverPort","i","I","I","RConThreadQuery","sv","net/minecraft/src","1" +"field_40442_j","maxPlayers","j","I","I","RConThreadQuery","sv","net/minecraft/src","1" +"field_40443_k","serverMotd","k","Ljava/lang/String;","Ljava/lang/String;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40440_l","worldName","l","Ljava/lang/String;","Ljava/lang/String;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40441_m","querySocket","m","Ljava/net/DatagramSocket;","Ljava/net/DatagramSocket;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40438_n","buffer","n","[B","[B","RConThreadQuery","sv","net/minecraft/src","1" +"field_40439_o","incomingPacket","o","Ljava/net/DatagramPacket;","Ljava/net/DatagramPacket;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40452_p","field_40452_p","p","Ljava/util/HashMap;","Ljava/util/HashMap;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40451_q","queryHostname","q","Ljava/lang/String;","Ljava/lang/String;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40450_r","serverHostname","r","Ljava/lang/String;","Ljava/lang/String;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40449_s","queryClients","s","Ljava/util/HashMap;","Ljava/util/HashMap;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40448_t","field_40448_t","t","J","J","RConThreadQuery","sv","net/minecraft/src","1" +"field_40447_u","output","u","LRConOutputStream;","Lez;","RConThreadQuery","sv","net/minecraft/src","1" +"field_40446_v","lastQueryResponseTime","v","J","J","RConThreadQuery","sv","net/minecraft/src","1" +"field_9016_a","entityId","a","I","I","Packet38EntityStatus","jg","net/minecraft/src","1" +"field_9015_b","entityStatus","b","B","B","Packet38EntityStatus","jg","net/minecraft/src","1" +"field_258_bb","maxDamageArray","bS","[I","[I","ItemArmor","vf","net/minecraft/src","1" +"field_257_aX","armorType","a","I","I","ItemArmor","vf","net/minecraft/src","1" +"field_256_aY","damageReduceAmount","b","I","I","ItemArmor","vf","net/minecraft/src","1" +"field_40252_bR","field_40252_bR","bR","I","I","ItemArmor","vf","net/minecraft/src","1" +"field_40251_bT","field_40251_bT","bT","LEnumArmorMaterial;","Lcx;","ItemArmor","vf","net/minecraft/src","1" +"none","none","a","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" +"eat","eat","b","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" +"drink","drink","c","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" +"block","block","d","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" +"bow","bow","e","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" +"field_35603_e","allActions","f","[LEnumAction;","[Ljf;","EnumAction","jf","net/minecraft/src","1" +"field_674_b","thisWorld","a","LWorld;","Lfi;","ItemInWorldManager","to","net/minecraft/src","1" +"field_675_a","thisPlayer","b","LEntityPlayer;","Lgz;","ItemInWorldManager","to","net/minecraft/src","1" +"field_35699_c","gameType","c","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_672_d","field_672_d","d","F","F","ItemInWorldManager","to","net/minecraft/src","1" +"field_22055_d","initialDamage","e","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22054_g","curBlockX","f","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22053_h","curBlockY","g","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22052_i","curBlockZ","h","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22051_j","curblockDamage","i","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22050_k","field_22050_k","j","Z","Z","ItemInWorldManager","to","net/minecraft/src","1" +"field_22049_l","field_22049_l","k","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22048_m","field_22048_m","l","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22047_n","field_22047_n","m","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_22046_o","field_22046_o","n","I","I","ItemInWorldManager","to","net/minecraft/src","1" +"field_35327_a","field_35327_a","a","Z","Z","ComponentStrongholdStairs","ig","net/minecraft/src","1" +"field_35326_b","field_35326_b","b","LEnumDoor;","Lpt;","ComponentStrongholdStairs","ig","net/minecraft/src","1" +"field_25134_a","instance","a","LAchievementMap;","Lb;","AchievementMap","b","net/minecraft/src","1" +"field_25133_b","guidMap","b","Ljava/util/Map;","Ljava/util/Map;","AchievementMap","b","net/minecraft/src","1" +"field_35455_a","potionTypes","a","[LPotion;","[Lir;","Potion","ir","net/minecraft/src","1" +"field_35453_b","field_35453_b","b","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35454_c","moveSpeed","c","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35451_d","moveSlowdown","d","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35452_e","digSpeed","e","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35449_f","digSlowdown","f","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35450_g","damageBoost","g","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35462_h","heal","h","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35463_i","harm","i","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35460_j","jump","j","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35461_k","confusion","k","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35458_l","regeneration","l","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35459_m","resistance","m","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35456_n","fireResistance","n","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35457_o","waterBreathing","o","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35471_p","invisibility","p","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35470_q","blindness","q","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35469_r","nightVision","r","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35468_s","hunger","s","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35467_t","weakness","t","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35466_u","poison","u","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35465_v","field_35465_v","v","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35464_w","field_35464_w","w","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35474_x","field_35474_x","x","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35473_y","field_35473_y","y","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35472_z","field_35472_z","z","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35444_A","field_35444_A","A","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35445_B","field_35445_B","B","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35446_C","field_35446_C","C","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35440_D","field_35440_D","D","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35441_E","field_35441_E","E","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35442_F","field_35442_F","F","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35443_G","field_35443_G","G","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" +"field_35447_H","potionId","H","I","I","Potion","ir","net/minecraft/src","1" +"field_35448_I","potionName","I","Ljava/lang/String;","Ljava/lang/String;","Potion","ir","net/minecraft/src","1" +"field_40601_J","statusIconIndex","J","I","I","Potion","ir","net/minecraft/src","1" +"field_40602_K","field_40602_K","K","Z","Z","Potion","ir","net/minecraft/src","1" +"field_40598_L","field_40598_L","L","D","D","Potion","ir","net/minecraft/src","1" +"field_40599_M","field_40599_M","M","Z","Z","Potion","ir","net/minecraft/src","1" +"field_40600_N","field_40600_N","N","I","I","Potion","ir","net/minecraft/src","1" +"field_35383_a","field_35383_a","a","I","I","ComponentVillageTorch","oe","net/minecraft/src","1" +"field_650_a","fallInstantly","a","Z","Z","BlockSand","gv","net/minecraft/src","1" +"field_738_a","tagMap","a","Ljava/util/Map;","Ljava/util/Map;","NBTTagCompound","ng","net/minecraft/src","1" +"field_35116_a","entityId","a","I","I","Packet41EntityEffect","dx","net/minecraft/src","1" +"field_35114_b","effectId","b","B","B","Packet41EntityEffect","dx","net/minecraft/src","1" +"field_35115_c","effectAmp","c","B","B","Packet41EntityEffect","dx","net/minecraft/src","1" +"field_35113_d","duration","d","S","S","Packet41EntityEffect","dx","net/minecraft/src","1" +"field_35364_a","field_35364_a","a","I","I","ComponentMineshaftCross","my","net/minecraft/src","1" +"field_35363_b","field_35363_b","b","Z","Z","ComponentMineshaftCross","my","net/minecraft/src","1" +"field_21063_a","field_21063_a","a","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21062_b","field_21062_b","b","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21061_c","field_21061_c","c","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21059_f","field_21059_f","g","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21060_ak","field_21060_ak","h","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21058_al","field_21058_al","i","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21057_am","field_21057_am","j","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21056_an","field_21056_an","k","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21055_ao","randomMotionSpeed","l","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21054_ap","field_21054_ap","m","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21053_aq","field_21053_aq","n","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21052_ar","randomMotionVecX","o","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21051_as","randomMotionVecY","p","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21050_at","randomMotionVecZ","q","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_739_a","floatValue","a","F","F","NBTTagFloat","q","net/minecraft/src","1" +"field_35656_a","potionID","a","I","I","PotionEffect","ww","net/minecraft/src","1" +"field_35654_b","duration","b","I","I","PotionEffect","ww","net/minecraft/src","1" +"field_35655_c","amplifier","c","I","I","PotionEffect","ww","net/minecraft/src","1" +"field_35341_a","field_35341_a","a","LEnumDoor;","Lpt;","ComponentStrongholdStraight","nu","net/minecraft/src","1" +"field_35339_b","field_35339_b","b","Z","Z","ComponentStrongholdStraight","nu","net/minecraft/src","1" +"field_35340_c","field_35340_c","c","Z","Z","ComponentStrongholdStraight","nu","net/minecraft/src","1" +"field_489_e","furnaceItemStacks","d","[LItemStack;","[Ljb;","TileEntityFurnace","rj","net/minecraft/src","1" +"field_488_f","furnaceBurnTime","a","I","I","TileEntityFurnace","rj","net/minecraft/src","1" +"field_487_g","currentItemBurnTime","b","I","I","TileEntityFurnace","rj","net/minecraft/src","1" +"field_486_h","furnaceCookTime","c","I","I","TileEntityFurnace","rj","net/minecraft/src","1" +"field_9099_av","heartsHalvesLife","S","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9098_aw","field_9098_aw","T","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9096_ay","field_9096_ay","U","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9095_az","renderYawOffset","V","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9125_aA","prevRenderYawOffset","W","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9124_aB","field_9124_aB","X","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9123_aC","field_9123_aC","Y","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9122_aD","field_9122_aD","Z","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9121_aE","field_9121_aE","aa","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9120_aF","field_9120_aF","ab","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_9119_aG","texture","ac","Ljava/lang/String;","Ljava/lang/String;","EntityLiving","lk","net/minecraft/src","1" +"field_9118_aH","field_9118_aH","ad","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_9117_aI","field_9117_aI","ae","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9116_aJ","entityType","af","Ljava/lang/String;","Ljava/lang/String;","EntityLiving","lk","net/minecraft/src","1" +"field_9115_aK","field_9115_aK","ag","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9114_aL","scoreValue","ah","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9113_aM","field_9113_aM","ai","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9112_aN","isMultiplayerEntity","aj","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_35194_aj","field_35194_aj","ak","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_35193_ak","field_35193_ak","al","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9111_aO","prevSwingProgress","am","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9110_aP","swingProgress","an","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9109_aQ","health","ao","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9108_aR","prevHealth","ap","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_40105_ap","field_40105_ap","aq","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_4099_a","livingSoundTime","a","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9107_aS","hurtTime","ar","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9106_aT","maxHurtTime","as","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9105_aU","attackedAtYaw","at","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9104_aV","deathTime","au","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9103_aW","attackTime","av","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9102_aX","prevCameraPitch","aw","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9101_aY","cameraPitch","ax","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9100_aZ","unused_flag","ay","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_35192_ax","experienceValue","az","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9144_ba","field_9144_ba","aA","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9143_bb","field_9143_bb","aB","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9142_bc","field_9142_bc","aC","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9141_bd","field_9141_bd","aD","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_386_ba","field_386_ba","aE","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_34903_b","field_34903_b","aF","LEntityPlayer;","Lgz;","EntityLiving","lk","net/minecraft/src","1" +"field_34904_c","field_34904_c","aG","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_35189_aD","field_35189_aD","aH","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_35190_aE","field_35190_aE","aI","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_35191_aF","activePotionsMap","aJ","Ljava/util/HashMap;","Ljava/util/HashMap;","EntityLiving","lk","net/minecraft/src","1" +"field_39002_b","field_39002_b","b","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_39003_c","field_39003_c","c","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9140_bf","newPosRotationIncrements","aK","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9139_bg","newPosX","aL","D","D","EntityLiving","lk","net/minecraft/src","1" +"field_9138_bh","newPosY","aM","D","D","EntityLiving","lk","net/minecraft/src","1" +"field_9137_bi","newPosZ","aN","D","D","EntityLiving","lk","net/minecraft/src","1" +"field_9136_bj","newRotationYaw","aO","D","D","EntityLiving","lk","net/minecraft/src","1" +"field_9135_bk","newRotationPitch","aP","D","D","EntityLiving","lk","net/minecraft/src","1" +"field_9134_bl","field_9134_bl","aQ","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9133_bm","naturalArmorRating","aR","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9132_bn","entityAge","aS","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_9131_bo","moveStrafing","aT","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9130_bp","moveForward","aU","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9129_bq","randomYawVelocity","aV","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9128_br","isJumping","aW","Z","Z","EntityLiving","lk","net/minecraft/src","1" +"field_9127_bs","defaultPitch","aX","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_9126_bt","moveSpeed","aY","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_39004_d","field_39004_d","d","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_4098_b","currentTarget","e","LEntity;","Lrn;","EntityLiving","lk","net/minecraft/src","1" +"field_4104_c","numTicksToChaseTarget","aZ","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_925_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_924_b","playerEntities","b","Ljava/util/List;","Ljava/util/List;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_923_c","mcServer","c","LMinecraftServer;","LMinecraftServer;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_922_d","playerManagerObj","d","[LPlayerManager;","[Lwi;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_9253_e","maxPlayers","e","I","I","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_9252_f","bannedPlayers","f","Ljava/util/Set;","Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_919_g","bannedIPs","g","Ljava/util/Set;","Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_918_h","ops","h","Ljava/util/Set;","Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_22174_i","whiteListedIPs","i","Ljava/util/Set;","Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_917_i","bannedPlayersFile","j","Ljava/io/File;","Ljava/io/File;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_9251_j","ipBanFile","k","Ljava/io/File;","Ljava/io/File;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_9250_k","opFile","l","Ljava/io/File;","Ljava/io/File;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_22173_m","whitelistPlayersFile","m","Ljava/io/File;","Ljava/io/File;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_914_l","playerNBTManagerObj","n","LIPlayerFileData;","Lii;","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_22172_o","whiteListEnforced","o","Z","Z","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_35482_p","field_35482_p","p","I","I","ServerConfigurationManager","hv","net/minecraft/src","1" +"field_40071_a","field_40071_a","a","I","I","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40068_b","field_40068_b","b","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40070_c","field_40070_c","c","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40066_d","field_40066_d","d","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40067_e","field_40067_e","e","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40064_f","field_40064_f","f","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40065_g","field_40065_g","g","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40073_h","field_40073_h","h","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40074_i","field_40074_i","i","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40072_j","field_40072_j","j","F","F","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_40069_r","field_40069_r","r","Ljava/util/Random;","Ljava/util/Random;","TileEntityEnchantmentTable","cj","net/minecraft/src","1" +"field_945_a","saveDir","a","Ljava/io/File;","Ljava/io/File;","ChunkLoader","sj","net/minecraft/src","1" +"field_944_b","createIfNecessary","b","Z","Z","ChunkLoader","sj","net/minecraft/src","1" +"field_35371_a","field_35371_a","a","I","I","ComponentVillageField","p","net/minecraft/src","1" +"field_1033_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ThreadServerApplication","cu","net/minecraft/src","1" +"field_35400_a","field_35400_a","a","I","I","ComponentVillageField2","vc","net/minecraft/src","1" +"field_732_a","stringValue","a","Ljava/lang/String;","Ljava/lang/String;","NBTTagString","wq","net/minecraft/src","1" +"field_26002_a","field_26002_a","a","[B","[B","ChunkBlockMap","uj","net/minecraft/src","1" +"field_21138_a","recipeOutput","a","LItemStack;","Ljb;","ShapelessRecipes","sp","net/minecraft/src","1" +"field_21137_b","recipeItems","b","Ljava/util/List;","Ljava/util/List;","ShapelessRecipes","sp","net/minecraft/src","1" +"field_35068_a","fruitType","a","LBlock;","Ltl;","BlockStem","np","net/minecraft/src","1" +"field_270_a","minecartType","a","I","I","ItemMinecart","qn","net/minecraft/src","1" +"field_35125_a","xpOrbId","a","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" +"field_35123_b","posX","b","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" +"field_35124_c","posY","c","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" +"field_35121_d","posZ","d","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" +"field_35122_e","xpOrbValue","e","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" +"field_35538_a","field_35538_a","a","Ljava/util/List;","Ljava/util/List;","MapGenVillage","ao","net/minecraft/src","1" +"field_35111_a","name","a","Ljava/lang/String;","Ljava/lang/String;","Packet201PlayerInfo","ef","net/minecraft/src","1" +"field_35109_b","isConnected","b","Z","Z","Packet201PlayerInfo","ef","net/minecraft/src","1" +"field_35110_c","ping","c","I","I","Packet201PlayerInfo","ef","net/minecraft/src","1" +"field_388_a","pathToEntity","a","LPathEntity;","Ldk;","EntityCreature","il","net/minecraft/src","1" +"field_389_ag","entityToAttack","d","LEntity;","Lrn;","EntityCreature","il","net/minecraft/src","1" +"field_387_ah","hasAttacked","e","Z","Z","EntityCreature","il","net/minecraft/src","1" +"field_35223_f","fleeingTick","f","I","I","EntityCreature","il","net/minecraft/src","1" +"field_28117_a","random","a","Ljava/util/Random;","Ljava/util/Random;","Teleporter","ti","net/minecraft/src","1" +"field_28200_a","mapColorArray","a","[LMapColor;","[Lec;","MapColor","ec","net/minecraft/src","1" +"field_28199_b","airColor","b","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28198_c","grassColor","c","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28197_d","sandColor","d","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28196_e","clothColor","e","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28195_f","tntColor","f","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28194_g","iceColor","g","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28193_h","ironColor","h","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28192_i","foliageColor","i","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28191_j","snowColor","j","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28190_k","clayColor","k","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28189_l","dirtColor","l","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28188_m","stoneColor","m","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28187_n","waterColor","n","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28186_o","woodColor","o","LMapColor;","Lec;","MapColor","ec","net/minecraft/src","1" +"field_28185_p","colorValue","p","I","I","MapColor","ec","net/minecraft/src","1" +"field_28184_q","colorIndex","q","I","I","MapColor","ec","net/minecraft/src","1" +"field_35628_b","pieceWeightArray","b","[LStructureStrongholdPieceWeight;","[Lrl;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"field_35629_c","structurePieceList","c","Ljava/util/List;","Ljava/util/List;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"field_40542_d","field_40542_d","d","Ljava/lang/Class;","Ljava/lang/Class;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"field_35630_a","totalWeight","a","I","I","StructureStrongholdPieces","jn","net/minecraft/src","1" +"field_35627_d","field_35627_d","e","LStructureStrongholdStones;","Lue;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"field_887_b","worldObj","b","LWorld;","Lfi;","RailLogic","uo","net/minecraft/src","1" +"field_893_c","trackX","c","I","I","RailLogic","uo","net/minecraft/src","1" +"field_892_d","trackY","d","I","I","RailLogic","uo","net/minecraft/src","1" +"field_891_e","trackZ","e","I","I","RailLogic","uo","net/minecraft/src","1" +"field_27084_f","isPoweredRail","f","Z","Z","RailLogic","uo","net/minecraft/src","1" +"field_889_g","connectedTracks","g","Ljava/util/List;","Ljava/util/List;","RailLogic","uo","net/minecraft/src","1" +"field_888_a","rail","a","LBlockRail;","Lok;","RailLogic","uo","net/minecraft/src","1" +"field_28202_a","field_28202_a","a","B","B","MapCoord","bb","net/minecraft/src","1" +"field_28201_b","field_28201_b","b","B","B","MapCoord","bb","net/minecraft/src","1" +"field_28205_c","field_28205_c","c","B","B","MapCoord","bb","net/minecraft/src","1" +"field_28204_d","field_28204_d","d","B","B","MapCoord","bb","net/minecraft/src","1" +"field_28203_e","field_28203_e","e","LMapData;","Liy;","MapCoord","bb","net/minecraft/src","1" +"field_25067_a","displayColumn","a","I","I","Achievement","ni","net/minecraft/src","1" +"field_27991_b","displayRow","b","I","I","Achievement","ni","net/minecraft/src","1" +"field_27992_c","parentAchievement","c","LAchievement;","Lni;","Achievement","ni","net/minecraft/src","1" +"field_27063_l","achievementDescription","l","Ljava/lang/String;","Ljava/lang/String;","Achievement","ni","net/minecraft/src","1" +"field_27064_d","theItemStack","d","LItemStack;","Ljb;","Achievement","ni","net/minecraft/src","1" +"field_27062_m","isSpecial","m","Z","Z","Achievement","ni","net/minecraft/src","1" +"field_28009_a","record","a","I","I","TileEntityRecordPlayer","en","net/minecraft/src","1" +"field_35398_a","field_35398_a","a","I","I","ComponentVillageHouse1","ve","net/minecraft/src","1" +"field_20_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","NetServerHandler","kt","net/minecraft/src","1" +"field_19_b","netManager","b","LNetworkManager;","Loo;","NetServerHandler","kt","net/minecraft/src","1" +"field_18_c","connectionClosed","c","Z","Z","NetServerHandler","kt","net/minecraft/src","1" +"field_17_d","mcServer","d","LMinecraftServer;","LMinecraftServer;","NetServerHandler","kt","net/minecraft/src","1" +"field_16_e","playerEntity","e","LEntityPlayerMP;","Lfl;","NetServerHandler","kt","net/minecraft/src","1" +"field_35009_f","field_35009_f","f","I","I","NetServerHandler","kt","net/minecraft/src","1" +"field_27004_h","playerInAirTime","g","I","I","NetServerHandler","kt","net/minecraft/src","1" +"field_22003_h","field_22003_h","h","Z","Z","NetServerHandler","kt","net/minecraft/src","1" +"field_35013_i","field_35013_i","i","I","I","NetServerHandler","kt","net/minecraft/src","1" +"field_35011_j","field_35011_j","j","J","J","NetServerHandler","kt","net/minecraft/src","1" +"field_35012_k","rndmObj","k","Ljava/util/Random;","Ljava/util/Random;","NetServerHandler","kt","net/minecraft/src","1" +"field_35010_l","field_35010_l","l","J","J","NetServerHandler","kt","net/minecraft/src","1" +"field_9009_g","lastPosX","m","D","D","NetServerHandler","kt","net/minecraft/src","1" +"field_9008_h","lastPosY","n","D","D","NetServerHandler","kt","net/minecraft/src","1" +"field_9007_i","lastPosZ","o","D","D","NetServerHandler","kt","net/minecraft/src","1" +"field_9006_j","hasMoved","p","Z","Z","NetServerHandler","kt","net/minecraft/src","1" +"field_10_k","field_10_k","q","LIntHashMap;","Ljw;","NetServerHandler","kt","net/minecraft/src","1" +"field_35262_B","curWorldObj","a","LWorld;","Lfi;","BiomeDecorator","go","net/minecraft/src","1" +"field_35263_C","randomGenerator","b","Ljava/util/Random;","Ljava/util/Random;","BiomeDecorator","go","net/minecraft/src","1" +"field_35258_D","chunk_X","c","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35259_E","chunk_Z","d","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35260_F","biomeGenerator","e","LBiomeGenBase;","Lkb;","BiomeDecorator","go","net/minecraft/src","1" +"field_35270_a","clayGenerator","f","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35268_b","sandGenerator","g","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35269_c","gravelGenerator","h","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35266_d","dirtGenerator","i","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35267_e","gravelGen","j","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35264_f","coalGen","k","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35265_g","ironGen","l","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35277_h","goldGen","m","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35278_i","redstoneGen","n","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35275_j","diamondGen","o","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35276_k","lapisGen","p","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35273_l","plantYellowGen","q","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35274_m","plantRedGen","r","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35271_n","mushroomBrownGen","s","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35272_o","mushroomRedGen","t","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_40320_u","bigMushroomGen","u","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35286_p","reedGen","v","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_35285_q","cactusGen","w","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_40322_x","waterlilyGen","x","LWorldGenerator;","Lor;","BiomeDecorator","go","net/minecraft/src","1" +"field_40321_y","waterlilyPerChunk","y","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35284_r","treesPerChunk","z","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35283_s","flowersPerChunk","A","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35282_t","grassPerChunk","B","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35281_u","deadBushPerChunk","C","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35280_v","mushroomsPerChunk","D","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35279_w","reedsPerChunk","E","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35289_x","cactiPerChunk","F","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35288_y","sandPerChunk","G","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35287_z","sandPerChunk2","H","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_35261_A","clayPerChunk","I","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_40318_J","bigMushroomsPerChunk","J","I","I","BiomeDecorator","go","net/minecraft/src","1" +"field_40319_K","generateFluid","K","Z","Z","BiomeDecorator","go","net/minecraft/src","1" +"field_22117_a","minecraftLogger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","ConsoleCommandHandler","sc","net/minecraft/src","1" +"field_22116_b","minecraftServer","b","LMinecraftServer;","LMinecraftServer;","ConsoleCommandHandler","sc","net/minecraft/src","1" +"field_744_a","pathPoints","a","[LPathPoint;","[Le;","Path","kv","net/minecraft/src","1" +"field_743_b","count","b","I","I","Path","kv","net/minecraft/src","1" +"field_40422_g","rconPort","g","I","I","RConThreadMain","pd","net/minecraft/src","1" +"field_40426_h","serverPort","h","I","I","RConThreadMain","pd","net/minecraft/src","1" +"field_40427_i","hostname","i","Ljava/lang/String;","Ljava/lang/String;","RConThreadMain","pd","net/minecraft/src","1" +"field_40424_j","serverSocket","j","Ljava/net/ServerSocket;","Ljava/net/ServerSocket;","RConThreadMain","pd","net/minecraft/src","1" +"field_40425_k","rconPassword","k","Ljava/lang/String;","Ljava/lang/String;","RConThreadMain","pd","net/minecraft/src","1" +"field_40423_l","clientThreads","l","Ljava/util/HashMap;","Ljava/util/HashMap;","RConThreadMain","pd","net/minecraft/src","1" +"field_4154_b","itemRand","c","Ljava/util/Random;","Ljava/util/Random;","Item","gw","net/minecraft/src","1" +"field_176_c","itemsList","d","[LItem;","[Lgw;","Item","gw","net/minecraft/src","1" +"field_4153_d","shovelSteel","e","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4152_e","pickaxeSteel","f","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4151_f","axeSteel","g","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4150_g","flintAndSteel","h","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_171_h","appleRed","i","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4149_i","bow","j","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4148_j","arrow","k","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_168_k","coal","l","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_167_l","diamond","m","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_166_m","ingotIron","n","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4147_n","ingotGold","o","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4146_o","swordSteel","p","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4145_p","swordWood","q","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4144_q","shovelWood","r","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4143_r","pickaxeWood","s","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4142_s","axeWood","t","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4141_t","swordStone","u","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4140_u","shovelStone","v","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4139_v","pickaxeStone","w","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4138_w","axeStone","x","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4137_x","swordDiamond","y","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4136_y","shovelDiamond","z","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4135_z","pickaxeDiamond","A","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4175_A","axeDiamond","B","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_209_B","stick","C","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4173_C","bowlEmpty","D","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4172_D","bowlSoup","E","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4171_E","swordGold","F","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4169_F","shovelGold","G","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4168_G","pickaxeGold","H","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4167_H","axeGold","I","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_196_I","silk","J","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_194_J","feather","K","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_193_K","gunpowder","L","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4166_L","hoeWood","M","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4165_M","hoeStone","N","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4164_N","hoeSteel","O","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4163_O","hoeDiamond","P","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4162_P","hoeGold","Q","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_187_Q","seeds","R","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_186_R","wheat","S","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_185_S","bread","T","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4161_T","helmetLeather","U","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4160_U","plateLeather","V","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4159_V","legsLeather","W","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4158_W","bootsLeather","X","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4157_X","helmetChain","Y","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4156_Y","plateChain","Z","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4155_Z","legsChain","aa","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4189_aa","bootsChain","ab","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4188_ab","helmetSteel","ac","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4187_ac","plateSteel","ad","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4186_ad","legsSteel","ae","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4185_ae","bootsSteel","af","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4184_af","helmetDiamond","ag","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4183_ag","plateDiamond","ah","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4182_ah","legsDiamond","ai","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4181_ai","bootsDiamond","aj","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4180_aj","helmetGold","ak","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4179_ak","plateGold","al","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4178_al","legsGold","am","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4177_am","bootsGold","an","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_216_an","flint","ao","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_215_ao","porkRaw","ap","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4176_ap","porkCooked","aq","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_213_aq","painting","ar","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_212_ar","appleGold","as","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4174_as","sign","at","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_208_at","doorWood","au","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_205_au","bucketEmpty","av","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4170_av","bucketWater","aw","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_201_aw","bucketLava","ax","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_199_ax","minecartEmpty","ay","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_197_ay","saddle","az","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_195_az","doorSteel","aA","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_252_aA","redstone","aB","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_251_aB","snowball","aC","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4205_aC","boat","aD","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_249_aD","leather","aE","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4204_aE","bucketMilk","aF","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4203_aF","brick","aG","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_246_aG","clay","aH","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4202_aH","reed","aI","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4201_aI","paper","aJ","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4200_aJ","book","aK","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_242_aK","slimeBall","aL","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4199_aL","minecartCrate","aM","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4198_aM","minecartPowered","aN","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_239_aN","egg","aO","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4197_aO","compass","aP","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4196_aP","fishingRod","aQ","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4195_aQ","pocketSundial","aR","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4194_aR","lightStoneDust","aS","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4193_aS","fishRaw","aT","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4192_aT","fishCooked","aU","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_21097_aU","dyePowder","aV","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_21096_aV","bone","aW","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_21095_aW","sugar","aX","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_21098_aX","cake","aY","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_22008_aY","bed","aZ","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_22007_aZ","redstoneRepeater","ba","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_25008_ba","cookie","bb","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_28021_bb","map","bc","LItemMap;","Lwd;","Item","gw","net/minecraft/src","1" +"field_31022_bc","shears","bd","LItemShears;","Lbp;","Item","gw","net/minecraft/src","1" +"field_35416_bd","melon","be","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35417_be","pumpkinSeeds","bf","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35412_bf","melonSeeds","bg","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35413_bg","beefRaw","bh","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35414_bh","beefCooked","bi","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35415_bi","chickenRaw","bj","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35409_bj","chickenCooked","bk","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35410_bk","rottenFlesh","bl","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_35411_bl","enderPearl","bm","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40239_bm","blazeRod","bn","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40235_bn","ghastTear","bo","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40236_bo","goldNugget","bp","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40237_bp","netherStalkSeeds","bq","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40238_bq","potion","br","LItemPotion;","Lft;","Item","gw","net/minecraft/src","1" +"field_40232_br","glassBottle","bs","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40231_bs","spiderEye","bt","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40234_bt","fermentedSpiderEye","bu","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40233_bu","blazePowder","bv","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40228_bv","magmaCream","bw","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40227_bw","brewingStand","bx","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40230_bx","cauldron","by","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40229_by","eyeOfEnder","bz","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40226_bz","speckledMelon","bA","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_236_aQ","record13","bB","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_4191_aV","recordCat","bC","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40244_bC","recordBlocks","bD","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40242_bD","recordChirp","bE","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40243_bE","recordFar","bF","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40247_bF","recordMall","bG","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40248_bG","recordMellohi","bH","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40245_bH","recordStal","bI","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40246_bI","recordStrad","bJ","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40240_bJ","recordWard","bK","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_40241_bK","record11","bL","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_234_aS","shiftedIndex","bM","I","I","Item","gw","net/minecraft/src","1" +"field_233_aT","maxStackSize","bN","I","I","Item","gw","net/minecraft/src","1" +"field_232_aU","maxDamage","a","I","I","Item","gw","net/minecraft/src","1" +"field_6153_aZ","iconIndex","bO","I","I","Item","gw","net/minecraft/src","1" +"field_230_aW","bFull3D","bP","Z","Z","Item","gw","net/minecraft/src","1" +"field_21094_bf","hasSubtypes","bQ","Z","Z","Item","gw","net/minecraft/src","1" +"field_20900_a","containerItem","b","LItem;","Lgw;","Item","gw","net/minecraft/src","1" +"field_39006_bR","potionInfo","bR","Ljava/lang/String;","Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"field_275_a","itemName","bS","Ljava/lang/String;","Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"field_481_e","nameToClassMap","a","Ljava/util/Map;","Ljava/util/Map;","TileEntity","oh","net/minecraft/src","1" +"field_480_f","classToNameMap","b","Ljava/util/Map;","Ljava/util/Map;","TileEntity","oh","net/minecraft/src","1" +"field_479_a","worldObj","k","LWorld;","Lfi;","TileEntity","oh","net/minecraft/src","1" +"field_478_b","xCoord","l","I","I","TileEntity","oh","net/minecraft/src","1" +"field_483_c","yCoord","m","I","I","TileEntity","oh","net/minecraft/src","1" +"field_482_d","zCoord","n","I","I","TileEntity","oh","net/minecraft/src","1" +"field_31006_h","tileEntityInvalid","o","Z","Z","TileEntity","oh","net/minecraft/src","1" +"field_35165_n","blockMetadata","p","I","I","TileEntity","oh","net/minecraft/src","1" +"field_35166_o","field_35166_o","q","LBlock;","Ltl;","TileEntity","oh","net/minecraft/src","1" +"field_659_a","numAdjacentSources","a","I","I","BlockFlowing","nx","net/minecraft/src","1" +"field_658_b","isOptimalFlowDirection","b","[Z","[Z","BlockFlowing","nx","net/minecraft/src","1" +"field_660_c","flowCost","c","[I","[I","BlockFlowing","nx","net/minecraft/src","1" +"field_40314_a","field_40314_a","a","[LStructurePieceTreasure;","[Lib;","ComponentStrongholdChestCorridor","gx","net/minecraft/src","1" +"field_40312_b","field_40312_b","b","LEnumDoor;","Lpt;","ComponentStrongholdChestCorridor","gx","net/minecraft/src","1" +"field_40313_c","field_40313_c","c","Z","Z","ComponentStrongholdChestCorridor","gx","net/minecraft/src","1" +"field_496_a","mainInventory","a","[LItemStack;","[Ljb;","InventoryPlayer","ja","net/minecraft/src","1" +"field_495_b","armorInventory","b","[LItemStack;","[Ljb;","InventoryPlayer","ja","net/minecraft/src","1" +"field_499_d","currentItem","c","I","I","InventoryPlayer","ja","net/minecraft/src","1" +"field_497_f","player","d","LEntityPlayer;","Lgz;","InventoryPlayer","ja","net/minecraft/src","1" +"field_20074_f","itemStack","f","LItemStack;","Ljb;","InventoryPlayer","ja","net/minecraft/src","1" +"field_498_e","inventoryChanged","e","Z","Z","InventoryPlayer","ja","net/minecraft/src","1" +"field_20097_a","slotIndex","a","I","I","Slot","gy","net/minecraft/src","1" +"field_20096_b","inventory","b","LIInventory;","Llp;","Slot","gy","net/minecraft/src","1" +"field_20100_c","id","c","I","I","Slot","gy","net/minecraft/src","1" +"field_20099_d","xDisplayPosition","d","I","I","Slot","gy","net/minecraft/src","1" +"field_20098_e","yDisplayPosition","e","I","I","Slot","gy","net/minecraft/src","1" +"field_35612_a","field_35612_a","a","[I","[I","Direction","jj","net/minecraft/src","1" +"field_35610_b","field_35610_b","b","[I","[I","Direction","jj","net/minecraft/src","1" +"field_35611_c","headInvisibleFace","c","[I","[I","Direction","jj","net/minecraft/src","1" +"field_35609_d","field_35609_d","d","[I","[I","Direction","jj","net/minecraft/src","1" +"field_22153_b","footInvisibleFaceRemap","e","[I","[I","Direction","jj","net/minecraft/src","1" +"field_35607_f","field_35607_f","f","[I","[I","Direction","jj","net/minecraft/src","1" +"field_35608_g","field_35608_g","g","[I","[I","Direction","jj","net/minecraft/src","1" +"field_22155_c","bedDirection","h","[[I","[[I","Direction","jj","net/minecraft/src","1" +"field_40265_a","windowId","a","I","I","Packet108EnchantItem","oq","net/minecraft/src","1" +"field_40264_b","enchantment","b","I","I","Packet108EnchantItem","oq","net/minecraft/src","1" +"field_406_a","timeSinceIgnited","a","I","I","EntityCreeper","gj","net/minecraft/src","1" +"field_405_b","lastActiveTime","b","I","I","EntityCreeper","gj","net/minecraft/src","1" +"field_20032_a","windowId","a","I","I","Packet101CloseWindow","ly","net/minecraft/src","1" +"field_59_a","entityId","a","I","I","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_58_b","type","b","B","B","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_64_c","xPosition","c","I","I","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_63_d","yPosition","d","I","I","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_62_e","zPosition","e","I","I","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_61_f","yaw","f","B","B","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_60_g","pitch","g","B","B","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_21006_h","metaData","h","LDataWatcher;","Lsu;","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_21005_i","receivedMetadata","i","Ljava/util/List;","Ljava/util/List;","Packet24MobSpawn","jl","net/minecraft/src","1" +"field_953_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","WorldManager","fn","net/minecraft/src","1" +"field_28134_b","world","b","LWorldServer;","Lfp;","WorldManager","fn","net/minecraft/src","1" +"field_40613_a","field_40613_a","a","LChunkCoordIntPair;","Lyi;","ThreadedChunkLoaderPending","xq","net/minecraft/src","1" +"field_40612_b","field_40612_b","b","LNBTTagCompound;","Lng;","ThreadedChunkLoaderPending","xq","net/minecraft/src","1" +"field_54_a","xPosition","a","I","I","Packet14BlockDig","ju","net/minecraft/src","1" +"field_53_b","yPosition","b","I","I","Packet14BlockDig","ju","net/minecraft/src","1" +"field_57_c","zPosition","c","I","I","Packet14BlockDig","ju","net/minecraft/src","1" +"field_56_d","face","d","I","I","Packet14BlockDig","ju","net/minecraft/src","1" +"field_55_e","status","e","I","I","Packet14BlockDig","ju","net/minecraft/src","1" +"field_28120_a","entityplayerObj","a","LEntityPlayer;","Lgz;","MapInfo","ri","net/minecraft/src","1" +"field_28119_b","field_28119_b","b","[I","[I","MapInfo","ri","net/minecraft/src","1" +"field_28125_c","field_28125_c","c","[I","[I","MapInfo","ri","net/minecraft/src","1" +"field_28123_e","field_28123_e","e","I","I","MapInfo","ri","net/minecraft/src","1" +"field_28122_f","field_28122_f","f","I","I","MapInfo","ri","net/minecraft/src","1" +"field_28121_g","field_28121_g","g","[B","[B","MapInfo","ri","net/minecraft/src","1" +"field_28124_d","mapDataObj","d","LMapData;","Liy;","MapInfo","ri","net/minecraft/src","1" +"field_265_aX","blocksEffectiveAgainst","bR","[LBlock;","[Ltl;","ItemTool","dv","net/minecraft/src","1" +"field_264_aY","efficiencyOnProperMaterial","a","F","F","ItemTool","dv","net/minecraft/src","1" +"field_263_aZ","damageVsEntity","bS","I","I","ItemTool","dv","net/minecraft/src","1" +"field_20913_a","toolMaterial","b","LEnumToolMaterial;","Lby;","ItemTool","dv","net/minecraft/src","1" +"field_20136_d","inventoryItemStacks","d","Ljava/util/List;","Ljava/util/List;","Container","ea","net/minecraft/src","1" +"field_20135_e","inventorySlots","e","Ljava/util/List;","Ljava/util/List;","Container","ea","net/minecraft/src","1" +"field_20134_f","windowId","f","I","I","Container","ea","net/minecraft/src","1" +"field_20132_a","field_20132_a","a","S","S","Container","ea","net/minecraft/src","1" +"field_20133_g","crafters","g","Ljava/util/List;","Ljava/util/List;","Container","ea","net/minecraft/src","1" +"field_20131_b","field_20131_b","b","Ljava/util/Set;","Ljava/util/Set;","Container","ea","net/minecraft/src","1" +"field_118_a","entityID","a","I","I","Packet5PlayerInventory","r","net/minecraft/src","1" +"field_117_b","slot","b","I","I","Packet5PlayerInventory","r","net/minecraft/src","1" +"field_20028_c","itemID","c","I","I","Packet5PlayerInventory","r","net/minecraft/src","1" +"field_21022_d","itemDamage","d","I","I","Packet5PlayerInventory","r","net/minecraft/src","1" +"field_40180_a","field_40180_a","a","Ljava/util/Random;","Ljava/util/Random;","BlockBrewingStand","fh","net/minecraft/src","1" +"field_939_a","generatorCollection","a","[LNoiseGeneratorPerlin;","[Lap;","NoiseGeneratorOctaves","sw","net/minecraft/src","1" +"field_938_b","octaves","b","I","I","NoiseGeneratorOctaves","sw","net/minecraft/src","1" +"field_272_a","blockID","a","I","I","ItemBlock","cl","net/minecraft/src","1" +"field_4086_a","blockType","a","Z","Z","BlockPumpkin","fg","net/minecraft/src","1" +"field_83_a","entityId","a","I","I","Packet30Entity","sz","net/minecraft/src","1" +"field_82_b","xPosition","b","B","B","Packet30Entity","sz","net/minecraft/src","1" +"field_88_c","yPosition","c","B","B","Packet30Entity","sz","net/minecraft/src","1" +"field_87_d","zPosition","d","B","B","Packet30Entity","sz","net/minecraft/src","1" +"field_86_e","yaw","e","B","B","Packet30Entity","sz","net/minecraft/src","1" +"field_85_f","pitch","f","B","B","Packet30Entity","sz","net/minecraft/src","1" +"field_84_g","rotating","g","Z","Z","Packet30Entity","sz","net/minecraft/src","1" +"field_40540_a","field_40540_a","a","[LStructureNetherBridgePieceWeight;","[Lrr;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"field_40539_b","field_40539_b","b","[LStructureNetherBridgePieceWeight;","[Lrr;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"field_40087_a","inventoryTitle","a","Ljava/lang/String;","Ljava/lang/String;","InventoryBasic","pq","net/minecraft/src","1" +"field_40085_b","slotsCount","b","I","I","InventoryBasic","pq","net/minecraft/src","1" +"field_40086_c","inventoryContents","c","[LItemStack;","[Ljb;","InventoryBasic","pq","net/minecraft/src","1" +"field_40084_d","field_40084_d","d","Ljava/util/List;","Ljava/util/List;","InventoryBasic","pq","net/minecraft/src","1" +"field_35427_a","field_35427_a","a","I","I","ItemFood","yf","net/minecraft/src","1" +"field_20901_a","healAmount","b","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35431_bu","saturationFactor","bR","F","F","ItemFood","yf","net/minecraft/src","1" +"field_25011_bi","isWolfsFavoriteMeat","bS","Z","Z","ItemFood","yf","net/minecraft/src","1" +"field_35428_bw","field_35428_bw","bT","Z","Z","ItemFood","yf","net/minecraft/src","1" +"field_35430_bx","field_35430_bx","bU","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35429_by","field_35429_by","bV","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35425_bz","field_35425_bz","bW","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35426_bA","field_35426_bA","bX","F","F","ItemFood","yf","net/minecraft/src","1" +"field_40047_d","xTile","d","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40048_e","yTile","e","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40045_f","zTile","f","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40046_g","inTile","g","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40051_a","inGround","a","Z","Z","EntityThrowable","bc","net/minecraft/src","1" +"field_40049_b","throwableShake","b","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40050_c","thrower","c","LEntityLiving;","Llk;","EntityThrowable","bc","net/minecraft/src","1" +"field_40052_h","field_40052_h","h","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40053_i","field_40053_i","i","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_41_a","reason","a","Ljava/lang/String;","Ljava/lang/String;","Packet255KickDisconnect","xz","net/minecraft/src","1" +"field_27990_a","field_27990_a","a","I","I","StatCrafting","st","net/minecraft/src","1" +"field_760_a","otherCoordPairs","a","[B","[B","WorldGenBigTree","im","net/minecraft/src","1" +"field_759_b","random0","b","Ljava/util/Random;","Ljava/util/Random;","WorldGenBigTree","im","net/minecraft/src","1" +"field_758_c","worldObj","c","LWorld;","Lfi;","WorldGenBigTree","im","net/minecraft/src","1" +"field_757_d","basePos","d","[I","[I","WorldGenBigTree","im","net/minecraft/src","1" +"field_756_e","heightLimit","e","I","I","WorldGenBigTree","im","net/minecraft/src","1" +"field_755_f","height","f","I","I","WorldGenBigTree","im","net/minecraft/src","1" +"field_754_g","heightAttenuation","g","D","D","WorldGenBigTree","im","net/minecraft/src","1" +"field_753_h","field_753_h","h","D","D","WorldGenBigTree","im","net/minecraft/src","1" +"field_752_i","field_752_i","i","D","D","WorldGenBigTree","im","net/minecraft/src","1" +"field_751_j","field_751_j","j","D","D","WorldGenBigTree","im","net/minecraft/src","1" +"field_750_k","field_750_k","k","D","D","WorldGenBigTree","im","net/minecraft/src","1" +"field_749_l","trunkSize","l","I","I","WorldGenBigTree","im","net/minecraft/src","1" +"field_748_m","heightLimitLimit","m","I","I","WorldGenBigTree","im","net/minecraft/src","1" +"field_747_n","leafDistanceLimit","n","I","I","WorldGenBigTree","im","net/minecraft/src","1" +"field_746_o","leafNodes","o","[[I","[[I","WorldGenBigTree","im","net/minecraft/src","1" +"field_271_a","cropID","a","I","I","ItemSeeds","ql","net/minecraft/src","1" +"field_40253_bQ","field_40253_bQ","b","I","I","ItemSeeds","ql","net/minecraft/src","1" +"field_40269_f","field_40269_f","f","LEntityPlayer;","Lgz;","SlotBrewingStandPotion","lj","net/minecraft/src","1" +"field_40270_a","field_40270_a","a","LContainerBrewingStand;","Lje;","SlotBrewingStandPotion","lj","net/minecraft/src","1" +"field_955_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","PlayerListBox","m","net/minecraft/src","1" +"field_954_b","updateCounter","b","I","I","PlayerListBox","m","net/minecraft/src","1" +"field_21133_a","tileEntityDispenser","a","LTileEntityDispenser;","Lbe;","ContainerDispenser","rh","net/minecraft/src","1" +"field_9216_a","players","a","Ljava/util/List;","Ljava/util/List;","PlayerManager","wi","net/minecraft/src","1" +"field_9215_b","playerInstances","b","LLongHashMap;","Lgc;","PlayerManager","wi","net/minecraft/src","1" +"field_833_c","playerInstancesToUpdate","c","Ljava/util/List;","Ljava/util/List;","PlayerManager","wi","net/minecraft/src","1" +"field_832_d","mcServer","d","LMinecraftServer;","LMinecraftServer;","PlayerManager","wi","net/minecraft/src","1" +"field_28110_e","playerDimension","e","I","I","PlayerManager","wi","net/minecraft/src","1" +"field_28109_f","playerViewRadius","f","I","I","PlayerManager","wi","net/minecraft/src","1" +"field_22089_e","xzDirectionsConst","g","[[I","[[I","PlayerManager","wi","net/minecraft/src","1" +"field_20903_a","courseChangeCooldown","a","I","I","EntityGhast","bv","net/minecraft/src","1" +"field_20902_b","waypointX","b","D","D","EntityGhast","bv","net/minecraft/src","1" +"field_20904_c","waypointY","c","D","D","EntityGhast","bv","net/minecraft/src","1" +"field_4102_d","waypointZ","d","D","D","EntityGhast","bv","net/minecraft/src","1" +"field_4097_ai","targetedEntity","g","LEntity;","Lrn;","EntityGhast","bv","net/minecraft/src","1" +"field_4103_aj","aggroCooldown","h","I","I","EntityGhast","bv","net/minecraft/src","1" +"field_4101_e","prevAttackCounter","e","I","I","EntityGhast","bv","net/minecraft/src","1" +"field_4100_f","attackCounter","f","I","I","EntityGhast","bv","net/minecraft/src","1" +"field_740_a","longValue","a","J","J","NBTTagLong","lx","net/minecraft/src","1" +"field_28052_a","itemID","a","S","S","Packet131MapData","aj","net/minecraft/src","1" +"field_28051_b","uniqueID","b","S","S","Packet131MapData","aj","net/minecraft/src","1" +"field_28053_c","itemData","c","[B","[B","Packet131MapData","aj","net/minecraft/src","1" +"field_40302_a","field_40302_a","a","I","I","StructureNetherBridgeEnd","ko","net/minecraft/src","1" +"field_9183_c","xTile","e","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_9182_d","yTile","f","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_9180_e","zTile","g","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_9179_f","inTile","h","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_28011_h","inData","i","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_9181_aj","inGround","j","Z","Z","EntityArrow","rk","net/minecraft/src","1" +"field_28012_a","doesArrowBelongToPlayer","a","Z","Z","EntityArrow","rk","net/minecraft/src","1" +"field_9184_a","arrowShake","b","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_439_ah","shootingEntity","c","LEntity;","Lrn;","EntityArrow","rk","net/minecraft/src","1" +"field_438_ai","ticksInGround","k","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_437_aj","ticksInAir","l","I","I","EntityArrow","rk","net/minecraft/src","1" +"field_35160_d","arrowCritical","d","Z","Z","EntityArrow","rk","net/minecraft/src","1" +"field_22143_a","emptySector","a","[B","[B","RegionFile","pj","net/minecraft/src","1" +"field_22142_b","fileName","b","Ljava/io/File;","Ljava/io/File;","RegionFile","pj","net/minecraft/src","1" +"field_22149_c","dataFile","c","Ljava/io/RandomAccessFile;","Ljava/io/RandomAccessFile;","RegionFile","pj","net/minecraft/src","1" +"field_22148_d","offsets","d","[I","[I","RegionFile","pj","net/minecraft/src","1" +"field_22147_e","chunkTimestamps","e","[I","[I","RegionFile","pj","net/minecraft/src","1" +"field_22146_f","sectorFree","f","Ljava/util/ArrayList;","Ljava/util/ArrayList;","RegionFile","pj","net/minecraft/src","1" +"field_22145_g","sizeDelta","g","I","I","RegionFile","pj","net/minecraft/src","1" +"field_22144_h","lastModified","h","J","J","RegionFile","pj","net/minecraft/src","1" +"field_993_a","textField","a","Ljavax/swing/JTextField;","Ljavax/swing/JTextField;","ServerGuiCommandListener","ad","net/minecraft/src","1" +"field_992_b","mcServerGui","b","LServerGUI;","Ltw;","ServerGuiCommandListener","ad","net/minecraft/src","1" +"field_649_a","torchActive","a","Z","Z","BlockRedstoneTorch","df","net/minecraft/src","1" +"field_648_b","torchUpdates","b","Ljava/util/List;","Ljava/util/List;","BlockRedstoneTorch","df","net/minecraft/src","1" +"field_22023_a","headBlockToFootBlockMap","a","[[I","[[I","BlockBed","ub","net/minecraft/src","1" +"field_936_d","permutations","d","[I","[I","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"field_935_a","xCoord","a","D","D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"field_934_b","yCoord","b","D","D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"field_937_c","zCoord","c","D","D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"field_25137_a","localizedName","a","LStringTranslate;","Lmr;","StatCollector","dr","net/minecraft/src","1" +"field_35021_b","worldGenSeed","b","J","J","GenLayer","el","net/minecraft/src","1" +"field_35023_a","parent","a","LGenLayer;","Lel;","GenLayer","el","net/minecraft/src","1" +"field_35022_c","chunkSeed","c","J","J","GenLayer","el","net/minecraft/src","1" +"field_35020_d","baseSeed","d","J","J","GenLayer","el","net/minecraft/src","1" +"field_22125_a","regionsByFilename","a","Ljava/util/Map;","Ljava/util/Map;","RegionFileCache","qk","net/minecraft/src","1" +"field_4206_bb","blocksEffectiveAgainst","bR","[LBlock;","[Ltl;","ItemSpade","vh","net/minecraft/src","1" +"field_35356_a","field_35356_a","a","Ljava/util/LinkedList;","Ljava/util/LinkedList;","ComponentMineshaftRoom","h","net/minecraft/src","1" +"CLOTH","CLOTH","a","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"CHAIN","CHAIN","b","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"IRON","IRON","c","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"GOLD","GOLD","d","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"DIAMOND","DIAMOND","e","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40498_f","field_40498_f","f","I","I","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40499_g","field_40499_g","g","[I","[I","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40505_h","enchantability","h","I","I","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40506_i","allArmorMaterials","i","[LEnumArmorMaterial;","[Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_35403_a","field_35403_a","a","I","I","ComponentVillageHouse4_Garden","gp","net/minecraft/src","1" +"field_35402_b","field_35402_b","b","Z","Z","ComponentVillageHouse4_Garden","gp","net/minecraft/src","1" +"field_40494_a","field_40494_a","a","LEnchantment;","Lmq;","EnchantmentData","on","net/minecraft/src","1" +"field_40493_b","field_40493_b","b","I","I","EnchantmentData","on","net/minecraft/src","1" +"field_31044_a","isSticky","a","Z","Z","BlockPistonBase","jp","net/minecraft/src","1" +"field_31043_b","ignoreUpdates","b","Z","Z","BlockPistonBase","jp","net/minecraft/src","1" +"field_9017_a","healthMP","a","I","I","Packet8UpdateHealth","ew","net/minecraft/src","1" +"field_35103_b","food","b","I","I","Packet8UpdateHealth","ew","net/minecraft/src","1" +"field_35104_c","foodSaturation","c","F","F","Packet8UpdateHealth","ew","net/minecraft/src","1" +"field_894_a","outputHandler","a","LGuiLogOutputHandler;","Ldt;","GuiLogFormatter","ic","net/minecraft/src","1" +"field_20155_a","instance","a","LCraftingManager;","Lhq;","CraftingManager","hq","net/minecraft/src","1" +"field_20154_b","recipes","b","Ljava/util/List;","Ljava/util/List;","CraftingManager","hq","net/minecraft/src","1" +"field_21164_a","smeltingBase","a","LFurnaceRecipes;","Lfb;","FurnaceRecipes","fb","net/minecraft/src","1" +"field_21163_b","smeltingList","b","Ljava/util/Map;","Ljava/util/Map;","FurnaceRecipes","fb","net/minecraft/src","1" +"field_911_a","trackedEntitySet","a","Ljava/util/Set;","Ljava/util/Set;","EntityTracker","uh","net/minecraft/src","1" +"field_910_b","trackedEntityHashTable","b","LIntHashMap;","Ljw;","EntityTracker","uh","net/minecraft/src","1" +"field_913_c","mcServer","c","LMinecraftServer;","LMinecraftServer;","EntityTracker","uh","net/minecraft/src","1" +"field_912_d","maxTrackingDistanceThreshold","d","I","I","EntityTracker","uh","net/minecraft/src","1" +"field_28113_e","field_28113_e","e","I","I","EntityTracker","uh","net/minecraft/src","1" +"field_35345_a","field_35345_a","a","LEnumDoor;","Lpt;","ComponentStrongholdStairsStraight","nk","net/minecraft/src","1" +"TILE","TILE","a","LEnumMovingObjectType;","Lji;","EnumMovingObjectType","ji","net/minecraft/src","1" +"ENTITY","ENTITY","b","LEnumMovingObjectType;","Lji;","EnumMovingObjectType","ji","net/minecraft/src","1" +"field_21124_c","allMovingObjectTypes","c","[LEnumMovingObjectType;","[Lji;","EnumMovingObjectType","ji","net/minecraft/src","1" +"field_839_a","dateFormat","a","Ljava/text/SimpleDateFormat;","Ljava/text/SimpleDateFormat;","ConsoleLogFormatter","vy","net/minecraft/src","1" +"field_741_a","byteValue","a","B","B","NBTTagByte","ps","net/minecraft/src","1" +"field_35316_g","boundingBox","g","LStructureBoundingBox;","Lvb;","StructureComponent","jx","net/minecraft/src","1" +"field_35317_h","coordBaseMode","h","I","I","StructureComponent","jx","net/minecraft/src","1" +"field_35318_i","field_35318_i","i","I","I","StructureComponent","jx","net/minecraft/src","1" +"field_20908_a","playerNetServerHandler","a","LNetServerHandler;","Lkt;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_419_b","mcServer","b","LMinecraftServer;","LMinecraftServer;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_425_ad","itemInWorldManager","c","LItemInWorldManager;","Lto;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_9155_d","managedPosX","d","D","D","EntityPlayerMP","fl","net/minecraft/src","1" +"field_9154_e","managedPosZ","e","D","D","EntityPlayerMP","fl","net/minecraft/src","1" +"field_422_ag","loadedChunks","f","Ljava/util/List;","Ljava/util/List;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_420_ah","listeningChunks","g","Ljava/util/Set;","Ljava/util/Set;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_9156_bu","lastHealth","cc","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_35221_cc","field_35221_cc","cd","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_35222_cd","field_35222_cd","ce","Z","Z","EntityPlayerMP","fl","net/minecraft/src","1" +"field_35220_ce","field_35220_ce","cf","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_15004_bw","ticksOfInvuln","cg","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_20066_bG","playerInventory","ch","[LItemStack;","[Ljb;","EntityPlayerMP","fl","net/minecraft/src","1" +"field_20065_bH","currentWindowId","ci","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_20064_am","isChangingQuantityOnly","h","Z","Z","EntityPlayerMP","fl","net/minecraft/src","1" +"field_35219_i","ping","i","I","I","EntityPlayerMP","fl","net/minecraft/src","1" +"field_41032_j","field_41032_j","j","Z","Z","EntityPlayerMP","fl","net/minecraft/src","1" +"field_1060_a","command","a","Ljava/lang/String;","Ljava/lang/String;","ServerCommand","ay","net/minecraft/src","1" +"field_1059_b","commandListener","b","LICommandListener;","Lsb;","ServerCommand","ay","net/minecraft/src","1" +"field_35091_a","inFire","a","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35089_b","onFire","b","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35090_c","lava","c","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35087_d","inWall","d","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35088_e","drown","e","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35085_f","starve","f","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35086_g","cactus","g","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35098_h","fall","h","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35099_i","outOfWorld","i","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35096_j","generic","j","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35097_k","explosion","k","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35094_l","magic","l","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1" +"field_35092_n","isBlockable","n","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_35093_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_35100_p","hungerDamage","p","F","F","DamageSource","po","net/minecraft/src","1" +"field_40278_q","field_40278_q","q","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_40277_r","field_40277_r","r","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_35095_m","damageType","m","Ljava/lang/String;","Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" +"field_78_a","xPosition","a","I","I","Packet15Place","ha","net/minecraft/src","1" +"field_77_b","yPosition","b","I","I","Packet15Place","ha","net/minecraft/src","1" +"field_81_c","zPosition","c","I","I","Packet15Place","ha","net/minecraft/src","1" +"field_80_d","direction","d","I","I","Packet15Place","ha","net/minecraft/src","1" +"field_79_e","itemStack","e","LItemStack;","Ljb;","Packet15Place","ha","net/minecraft/src","1" +"field_120_a","entityId","a","I","I","Packet18Animation","na","net/minecraft/src","1" +"field_119_b","animate","b","I","I","Packet18Animation","na","net/minecraft/src","1" +"field_21077_e","note","a","B","B","TileEntityNote","si","net/minecraft/src","1" +"field_21076_f","previousRedstoneState","b","Z","Z","TileEntityNote","si","net/minecraft/src","1" +"field_21140_b","recipeWidth","b","I","I","ShapedRecipes","ix","net/minecraft/src","1" +"field_21144_c","recipeHeight","c","I","I","ShapedRecipes","ix","net/minecraft/src","1" +"field_21143_d","recipeItems","d","[LItemStack;","[Ljb;","ShapedRecipes","ix","net/minecraft/src","1" +"field_21142_e","recipeOutput","e","LItemStack;","Ljb;","ShapedRecipes","ix","net/minecraft/src","1" +"field_21141_a","recipeOutputItemID","a","I","I","ShapedRecipes","ix","net/minecraft/src","1" +"field_35043_a","seed","a","J","J","WorldSettings","hg","net/minecraft/src","1" +"field_35041_b","gameType","b","I","I","WorldSettings","hg","net/minecraft/src","1" +"field_35042_c","mapFeatures","c","Z","Z","WorldSettings","hg","net/minecraft/src","1" +"field_40280_d","hardcoreEnabled","d","Z","Z","WorldSettings","hg","net/minecraft/src","1" +"OK","OK","a","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"NOT_POSSIBLE_HERE","NOT_POSSIBLE_HERE","b","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"NOT_POSSIBLE_NOW","NOT_POSSIBLE_NOW","c","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"TOO_FAR_AWAY","TOO_FAR_AWAY","d","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"OTHER_PROBLEM","OTHER_PROBLEM","e","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"NOT_SAFE","NOT_SAFE","f","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" +"field_25140_f","allStatuses","g","[LEnumStatus;","[Ldc;","EnumStatus","dc","net/minecraft/src","1" +"field_27018_b","lightningState","b","I","I","EntityLightningBolt","d","net/minecraft/src","1" +"field_27019_a","boltVertex","a","J","J","EntityLightningBolt","d","net/minecraft/src","1" +"field_27020_c","boltLivingTime","c","I","I","EntityLightningBolt","d","net/minecraft/src","1" +"field_35489_a","field_35489_a","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35487_b","field_35487_b","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35488_c","field_35488_c","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35486_e","field_35486_e","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_20017_a","windowId","a","I","I","Packet103SetSlot","hx","net/minecraft/src","1" +"field_20016_b","itemSlot","b","I","I","Packet103SetSlot","hx","net/minecraft/src","1" +"field_20018_c","myItemStack","c","LItemStack;","Ljb;","Packet103SetSlot","hx","net/minecraft/src","1" +"field_131_a","entityId","a","I","I","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_130_b","xPosition","b","I","I","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_135_c","yPosition","c","I","I","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_134_d","zPosition","d","I","I","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_133_e","yaw","e","B","B","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_132_f","pitch","f","B","B","Packet34EntityTeleport","qh","net/minecraft/src","1" +"field_742_a","intValue","a","I","I","NBTTagInt","ox","net/minecraft/src","1" +"field_90_a","xPosition","a","I","I","Packet53BlockChange","ss","net/minecraft/src","1" +"field_89_b","yPosition","b","I","I","Packet53BlockChange","ss","net/minecraft/src","1" +"field_93_c","zPosition","c","I","I","Packet53BlockChange","ss","net/minecraft/src","1" +"field_92_d","type","d","I","I","Packet53BlockChange","ss","net/minecraft/src","1" +"field_91_e","metadata","e","I","I","Packet53BlockChange","ss","net/minecraft/src","1" +"field_20102_a","armorType","a","I","I","SlotArmor","oz","net/minecraft/src","1" +"field_20101_b","inventory","f","LContainerPlayer;","Laa;","SlotArmor","oz","net/minecraft/src","1" +"field_998_b","field_998_b","b","[I","[I","GuiLogOutputHandler","dt","net/minecraft/src","1" +"field_1001_c","field_1001_c","c","I","I","GuiLogOutputHandler","dt","net/minecraft/src","1" +"field_999_a","field_999_a","a","Ljava/util/logging/Formatter;","Ljava/util/logging/Formatter;","GuiLogOutputHandler","dt","net/minecraft/src","1" +"field_1000_d","field_1000_d","d","Ljavax/swing/JTextArea;","Ljavax/swing/JTextArea;","GuiLogOutputHandler","dt","net/minecraft/src","1" +"field_40524_a","profilingEnabled","a","Z","Z","Profiler","pf","net/minecraft/src","1" +"field_40522_b","sectionList","b","Ljava/util/List;","Ljava/util/List;","Profiler","pf","net/minecraft/src","1" +"field_40523_c","timestampList","c","Ljava/util/List;","Ljava/util/List;","Profiler","pf","net/minecraft/src","1" +"field_40520_d","profilingSection","d","Ljava/lang/String;","Ljava/lang/String;","Profiler","pf","net/minecraft/src","1" +"field_40521_e","profilingMap","e","Ljava/util/Map;","Ljava/util/Map;","Profiler","pf","net/minecraft/src","1" +"field_35252_a","worldYBits","a","I","I","World","fi","net/minecraft/src","1" +"field_35250_b","field_35250_b","b","I","I","World","fi","net/minecraft/src","1" +"field_35251_c","worldYMax","c","I","I","World","fi","net/minecraft/src","1" +"field_35248_d","worldYMask","d","I","I","World","fi","net/minecraft/src","1" +"field_35249_e","worldOceanHeight","e","I","I","World","fi","net/minecraft/src","1" +"field_4280_a","scheduledUpdatesAreImmediate","f","Z","Z","World","fi","net/minecraft/src","1" +"field_815_a","loadedEntityList","g","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_790_z","unloadedEntityList","J","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_789_A","scheduledTickTreeSet","K","Ljava/util/TreeSet;","Ljava/util/TreeSet;","World","fi","net/minecraft/src","1" +"field_788_B","scheduledTickSet","L","Ljava/util/Set;","Ljava/util/Set;","World","fi","net/minecraft/src","1" +"field_814_b","loadedTileEntityList","h","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_34901_P","addedTileEntityList","M","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_34900_Q","field_34900_Q","N","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_805_k","playerEntities","i","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_27081_e","lightningEntities","j","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_6159_E","cloudColour","O","J","J","World","fi","net/minecraft/src","1" +"field_811_e","skylightSubtracted","k","I","I","World","fi","net/minecraft/src","1" +"field_4279_g","distHashCounter","l","I","I","World","fi","net/minecraft/src","1" +"field_4278_h","DIST_HASH_MAGIC","m","I","I","World","fi","net/minecraft/src","1" +"field_27079_B","prevRainingStrength","n","F","F","World","fi","net/minecraft/src","1" +"field_27078_C","rainingStrength","o","F","F","World","fi","net/minecraft/src","1" +"field_27077_D","prevThunderingStrength","p","F","F","World","fi","net/minecraft/src","1" +"field_27076_E","thunderingStrength","q","F","F","World","fi","net/minecraft/src","1" +"field_27075_F","lastLightningBolt","r","I","I","World","fi","net/minecraft/src","1" +"field_27080_i","lightningFlash","s","I","I","World","fi","net/minecraft/src","1" +"field_808_h","editingBlocks","t","Z","Z","World","fi","net/minecraft/src","1" +"field_784_F","lockTimestamp","P","J","J","World","fi","net/minecraft/src","1" +"field_4277_j","autosavePeriod","u","I","I","World","fi","net/minecraft/src","1" +"field_804_l","difficultySetting","v","I","I","World","fi","net/minecraft/src","1" +"field_803_m","rand","w","Ljava/util/Random;","Ljava/util/Random;","World","fi","net/minecraft/src","1" +"field_9212_p","isNewWorld","x","Z","Z","World","fi","net/minecraft/src","1" +"field_4272_q","worldProvider","y","LWorldProvider;","Lwn;","World","fi","net/minecraft/src","1" +"field_798_r","worldAccesses","z","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_783_G","chunkProvider","A","LIChunkProvider;","Lco;","World","fi","net/minecraft/src","1" +"field_9211_s","worldFile","B","LISaveHandler;","Lwg;","World","fi","net/minecraft/src","1" +"field_797_s","worldInfo","C","LWorldInfo;","Leo;","World","fi","net/minecraft/src","1" +"field_9209_x","worldChunkLoadOverride","D","Z","Z","World","fi","net/minecraft/src","1" +"field_22087_A","allPlayersSleeping","Q","Z","Z","World","fi","net/minecraft/src","1" +"field_28105_z","mapStorage","E","LMapStorage;","Lhf;","World","fi","net/minecraft/src","1" +"field_9207_I","collidingBoundingBoxes","R","Ljava/util/ArrayList;","Ljava/util/ArrayList;","World","fi","net/minecraft/src","1" +"field_31048_L","scanningTileEntities","S","Z","Z","World","fi","net/minecraft/src","1" +"field_21121_K","spawnHostileMobs","F","Z","Z","World","fi","net/minecraft/src","1" +"field_21120_L","spawnPeacefulMobs","G","Z","Z","World","fi","net/minecraft/src","1" +"field_4264_K","activeChunkSet","T","Ljava/util/Set;","Ljava/util/Set;","World","fi","net/minecraft/src","1" +"field_4263_L","ambientTickCountdown","U","I","I","World","fi","net/minecraft/src","1" +"field_35245_H","field_35245_H","H","[I","[I","World","fi","net/minecraft/src","1" +"field_778_L","field_778_L","V","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_792_x","singleplayerWorld","I","Z","Z","World","fi","net/minecraft/src","1" +"field_909_a","trackedEntity","a","LEntity;","Lrn;","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9235_d","trackingDistanceThreshold","b","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9234_e","field_9234_e","c","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9233_f","encodedPosX","d","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9232_g","encodedPosY","e","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9231_h","encodedPosZ","f","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9230_i","encodedRotationYaw","g","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9229_j","encodedRotationPitch","h","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9228_k","lastTrackedEntityMotionX","i","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9227_l","lastTrackedEntityMotionY","j","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9226_m","lastTrackedEntityMotionZ","k","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9221_t","updateCounter","l","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9224_q","lastTrackedEntityPosX","o","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9223_r","lastTrackedEntityPosY","p","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9222_s","lastTrackedEntityPosZ","q","D","D","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_12020_u","firstUpdateDone","r","Z","Z","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_9220_u","shouldSendMotionUpdates","s","Z","Z","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_28165_t","field_28165_t","t","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_900_j","playerEntitiesUpdated","m","Z","Z","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_899_k","trackedPlayers","n","Ljava/util/Set;","Ljava/util/Set;","EntityTrackerEntry","hy","net/minecraft/src","1" +"field_21071_a","fleeceColorTable","a","[[F","[[F","EntitySheep","do","net/minecraft/src","1" +"field_823_a","chunkX","a","I","I","ChunkCache","fa","net/minecraft/src","1" +"field_822_b","chunkZ","b","I","I","ChunkCache","fa","net/minecraft/src","1" +"field_825_c","chunkArray","c","[[LChunk;","[[Lle;","ChunkCache","fa","net/minecraft/src","1" +"field_824_d","worldObj","d","LWorld;","Lfi;","ChunkCache","fa","net/minecraft/src","1" +"field_21021_a","entityId","a","I","I","Packet19EntityAction","sq","net/minecraft/src","1" +"field_21020_b","state","b","I","I","Packet19EntityAction","sq","net/minecraft/src","1" +"field_35555_a","intCacheSize","a","I","I","IntCache","af","net/minecraft/src","1" +"field_35553_b","field_35553_b","b","Ljava/util/List;","Ljava/util/List;","IntCache","af","net/minecraft/src","1" +"field_35554_c","field_35554_c","c","Ljava/util/List;","Ljava/util/List;","IntCache","af","net/minecraft/src","1" +"field_35551_d","field_35551_d","d","Ljava/util/List;","Ljava/util/List;","IntCache","af","net/minecraft/src","1" +"field_35552_e","field_35552_e","e","Ljava/util/List;","Ljava/util/List;","IntCache","af","net/minecraft/src","1" +"field_152_a","chunkXPos","a","I","I","ChunkCoordIntPair","yi","net/minecraft/src","1" +"field_151_b","chunkZPos","b","I","I","ChunkCoordIntPair","yi","net/minecraft/src","1" +"field_35377_a","field_35377_a","a","I","I","ComponentVillageHouse2","di","net/minecraft/src","1" +"field_253_a","spawnID","a","I","I","ItemReed","ln","net/minecraft/src","1" +"field_48_a","xPosition","a","I","I","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_47_b","zPosition","b","I","I","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_52_c","coordinateArray","c","[S","[S","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_51_d","typeArray","d","[B","[B","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_50_e","metadataArray","e","[B","[B","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_49_f","size","f","I","I","Packet52MultiBlockChange","wj","net/minecraft/src","1" +"field_829_a","netManager","a","LNetworkManager;","Loo;","NetworkMasterThread","ws","net/minecraft/src","1" +"field_656_a","random","a","Ljava/util/Random;","Ljava/util/Random;","BlockChest","f","net/minecraft/src","1" +"field_40486_a","livingModifier","a","I","I","EnchantmentModifierLiving","xp","net/minecraft/src","1" +"field_40485_b","entityLiving","b","LEntityLiving;","Llk;","EnchantmentModifierLiving","xp","net/minecraft/src","1" +"field_651_a","modelBlock","a","LBlock;","Ltl;","BlockStairs","rs","net/minecraft/src","1" +"field_129_a","entityId","a","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_128_b","xPosition","b","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_127_c","yPosition","c","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_126_d","zPosition","d","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_125_e","rotation","e","B","B","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_124_f","pitch","f","B","B","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_123_g","roll","g","B","B","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_122_h","itemID","h","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_121_i","count","i","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_21023_j","itemDamage","m","I","I","Packet21PickupSpawn","mn","net/minecraft/src","1" +"field_40088_a","field_40088_a","a","LContainerEnchantment;","Liq;","SlotEnchantmentTable","x","net/minecraft/src","1" +"field_20108_a","craftingManager","a","LCraftingManager;","Lhq;","RecipeSorter","kn","net/minecraft/src","1" +"field_1057_d","vectorList","d","Ljava/util/List;","Ljava/util/List;","Vec3D","bx","net/minecraft/src","1" +"field_1056_e","nextVector","e","I","I","Vec3D","bx","net/minecraft/src","1" +"field_1055_a","xCoord","a","D","D","Vec3D","bx","net/minecraft/src","1" +"field_1054_b","yCoord","b","D","D","Vec3D","bx","net/minecraft/src","1" +"field_1058_c","zCoord","c","D","D","Vec3D","bx","net/minecraft/src","1" +"field_21013_a","entityId","a","I","I","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_21012_b","xPosition","b","I","I","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_21017_c","yPosition","c","I","I","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_21016_d","zPosition","d","I","I","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_21015_e","direction","e","I","I","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_21014_f","title","f","Ljava/lang/String;","Ljava/lang/String;","Packet25EntityPainting","uy","net/minecraft/src","1" +"field_74_b","id","a","I","I","Packet16BlockItemSwitch","hw","net/minecraft/src","1" +"field_731_a","key","a","Ljava/lang/String;","Ljava/lang/String;","NBTBase","ik","net/minecraft/src","1" +"field_40341_a","field_40341_a","a","LTileEntityBrewingStand;","Lxx;","ContainerBrewingStand","je","net/minecraft/src","1" +"field_40340_b","field_40340_b","b","I","I","ContainerBrewingStand","je","net/minecraft/src","1" +"field_21099_a","dyeColorNames","a","[Ljava/lang/String;","[Ljava/lang/String;","ItemDye","kg","net/minecraft/src","1" +"field_31023_bk","dyeColors","b","[I","[I","ItemDye","kg","net/minecraft/src","1" +"field_20011_a","windowId","a","I","I","Packet104WindowItems","ka","net/minecraft/src","1" +"field_20010_b","itemStack","b","[LItemStack;","[Ljb;","Packet104WindowItems","ka","net/minecraft/src","1" +"field_1003_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","PlayerNBTManager","fs","net/minecraft/src","1" +"field_22099_b","worldDir","b","Ljava/io/File;","Ljava/io/File;","PlayerNBTManager","fs","net/minecraft/src","1" +"field_1002_b","worldFile","c","Ljava/io/File;","Ljava/io/File;","PlayerNBTManager","fs","net/minecraft/src","1" +"field_28112_d","mapDataDir","d","Ljava/io/File;","Ljava/io/File;","PlayerNBTManager","fs","net/minecraft/src","1" +"field_22100_d","thisSessionLockID","e","J","J","PlayerNBTManager","fs","net/minecraft/src","1" +"field_40258_f","field_40258_f","f","Ljava/lang/String;","Ljava/lang/String;","PlayerNBTManager","fs","net/minecraft/src","1" +"field_646_a","chanceToEncourageFire","a","[I","[I","BlockFire","xy","net/minecraft/src","1" +"field_645_b","abilityToCatchFire","b","[I","[I","BlockFire","xy","net/minecraft/src","1" +"field_35687_a","worldChunkManager","a","LWorldChunkManager;","Lxe;","BiomeCache","tz","net/minecraft/src","1" +"field_35685_b","field_35685_b","b","J","J","BiomeCache","tz","net/minecraft/src","1" +"field_35686_c","field_35686_c","c","LLongHashMap;","Lgc;","BiomeCache","tz","net/minecraft/src","1" +"field_35684_d","field_35684_d","d","Ljava/util/List;","Ljava/util/List;","BiomeCache","tz","net/minecraft/src","1" +"field_35343_a","field_35343_a","a","I","I","ComponentStrongholdCorridor","nm","net/minecraft/src","1" +"field_986_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","NetworkAcceptThread","qz","net/minecraft/src","1" +"field_985_b","netWorkListener","b","LNetworkListenThread;","Lep;","NetworkAcceptThread","qz","net/minecraft/src","1" +"field_40373_w","protectionName","w","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40377_x","baseEnchantability","x","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40376_y","levelEnchantability","y","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40375_z","threesholdEnchantability","z","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40374_a","damageType","a","I","I","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40323_L","spikeGen","L","LWorldGenerator;","Lor;","BiomeEndDecorator","lv","net/minecraft/src","1" +"field_1031_a","mc","a","LMinecraftServer;","LMinecraftServer;","ThreadSleepForever","cz","net/minecraft/src","1" +"field_41044_a","field_41044_a","a","Z","Z","WorldGenerator","or","net/minecraft/src","1" +"field_40296_a","field_40296_a","a","LStructureNetherBridgePieceWeight;","Lrr;","ComponentNetherBridgeStartPiece","pk","net/minecraft/src","1" +"field_40294_b","field_40294_b","b","Ljava/util/List;","Ljava/util/List;","ComponentNetherBridgeStartPiece","pk","net/minecraft/src","1" +"field_40295_c","field_40295_c","c","Ljava/util/List;","Ljava/util/List;","ComponentNetherBridgeStartPiece","pk","net/minecraft/src","1" +"field_40293_d","field_40293_d","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentNetherBridgeStartPiece","pk","net/minecraft/src","1" +"field_35237_a","field_35237_a","a","I","I","EntitySilverfish","vl","net/minecraft/src","1" +"field_22071_b","lastTimeMillis","b","J","J","ConvertProgressUpdater","cv","net/minecraft/src","1" +"field_22072_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ConvertProgressUpdater","cv","net/minecraft/src","1" +"field_6044_a","entityId","a","I","I","Packet39AttachEntity","nc","net/minecraft/src","1" +"field_6043_b","vehicleEntityId","b","I","I","Packet39AttachEntity","nc","net/minecraft/src","1" +"field_103_a","xPosition","a","I","I","Packet50PreChunk","re","net/minecraft/src","1" +"field_102_b","yPosition","b","I","I","Packet50PreChunk","re","net/minecraft/src","1" +"field_104_c","mode","c","Z","Z","Packet50PreChunk","re","net/minecraft/src","1" +"monster","monster","a","LEnumCreatureType;","Lla;","EnumCreatureType","la","net/minecraft/src","1" +"creature","creature","b","LEnumCreatureType;","Lla;","EnumCreatureType","la","net/minecraft/src","1" +"waterCreature","waterCreature","c","LEnumCreatureType;","Lla;","EnumCreatureType","la","net/minecraft/src","1" +"field_21109_d","creatureClass","d","Ljava/lang/Class;","Ljava/lang/Class;","EnumCreatureType","la","net/minecraft/src","1" +"field_21108_e","maxNumberOfCreature","e","I","I","EnumCreatureType","la","net/minecraft/src","1" +"field_21107_f","creatureMaterial","f","LMaterial;","Llg;","EnumCreatureType","la","net/minecraft/src","1" +"field_21106_g","isPeacefulCreature","g","Z","Z","EnumCreatureType","la","net/minecraft/src","1" +"field_6155_e","allCreatureTypes","h","[LEnumCreatureType;","[Lla;","EnumCreatureType","la","net/minecraft/src","1" +"field_27007_d","thePlayer","a","LEntityPlayer;","Lgz;","SlotFurnace","ur","net/minecraft/src","1" +"field_25104_C","oneShotStats","a","Ljava/util/Map;","Ljava/util/Map;","StatList","jk","net/minecraft/src","1" +"field_25123_a","field_25123_a","b","Ljava/util/List;","Ljava/util/List;","StatList","jk","net/minecraft/src","1" +"field_25122_b","generalStats","c","Ljava/util/List;","Ljava/util/List;","StatList","jk","net/minecraft/src","1" +"field_25121_c","itemStats","d","Ljava/util/List;","Ljava/util/List;","StatList","jk","net/minecraft/src","1" +"field_25120_d","objectMineStats","e","Ljava/util/List;","Ljava/util/List;","StatList","jk","net/minecraft/src","1" +"field_25119_e","startGameStat","f","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25118_f","createWorldStat","g","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25117_g","loadWorldStat","h","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25116_h","joinMultiplayerStat","i","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25115_i","leaveGameStat","j","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25114_j","minutesPlayedStat","k","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25113_k","distanceWalkedStat","l","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25112_l","distanceSwumStat","m","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25111_m","distanceFallenStat","n","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25110_n","distanceClimbedStat","o","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25109_o","distanceFlownStat","p","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25108_p","distanceDoveStat","q","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_27095_r","distanceByMinecartStat","r","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_27094_s","distanceByBoatStat","s","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_27093_t","distanceByPigStat","t","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25106_q","jumpStat","u","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25103_r","dropStat","v","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25102_s","damageDealtStat","w","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25100_t","damageTakenStat","x","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25098_u","deathsStat","y","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25097_v","mobKillsStat","z","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25096_w","playerKillsStat","A","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25095_x","fishCaughtStat","B","LStatBase;","Luv;","StatList","jk","net/minecraft/src","1" +"field_25094_y","mineBlockStatArray","C","[LStatBase;","[Luv;","StatList","jk","net/minecraft/src","1" +"field_25093_z","objectCraftStats","D","[LStatBase;","[Luv;","StatList","jk","net/minecraft/src","1" +"field_25107_A","objectUseStats","E","[LStatBase;","[Luv;","StatList","jk","net/minecraft/src","1" +"field_25105_B","objectBreakStats","F","[LStatBase;","[Luv;","StatList","jk","net/minecraft/src","1" +"field_25101_D","blockStatsInitialized","G","Z","Z","StatList","jk","net/minecraft/src","1" +"field_25099_E","itemStatsInitialized","H","Z","Z","StatList","jk","net/minecraft/src","1" +"field_25016_a","bedChat","a","[Ljava/lang/String;","[Ljava/lang/String;","Packet70Bed","ce","net/minecraft/src","1" +"field_25015_b","bedState","b","I","I","Packet70Bed","ce","net/minecraft/src","1" +"field_35112_c","gameMode","c","I","I","Packet70Bed","ce","net/minecraft/src","1" +"field_22209_a","chunkFile","a","Ljava/io/File;","Ljava/io/File;","ChunkFile","ee","net/minecraft/src","1" +"field_22208_b","xChunk","b","I","I","ChunkFile","ee","net/minecraft/src","1" +"field_22210_c","yChunk","c","I","I","ChunkFile","ee","net/minecraft/src","1" +"field_4250_a","field_4250_a","a","I","I","WorldGenHellLava","pg","net/minecraft/src","1" +"field_886_a","SIN_TABLE","a","[F","[F","MathHelper","in","net/minecraft/src","1" +"field_404_af","attackStrength","c","I","I","EntityMob","hb","net/minecraft/src","1" +"field_21081_e","dispenserContents","a","[LItemStack;","[Ljb;","TileEntityDispenser","be","net/minecraft/src","1" +"field_21080_f","dispenserRandom","b","Ljava/util/Random;","Ljava/util/Random;","TileEntityDispenser","be","net/minecraft/src","1" +"field_20137_a","lowerChestInventory","a","LIInventory;","Llp;","ContainerChest","cf","net/minecraft/src","1" +"field_27088_b","numRows","b","I","I","ContainerChest","cf","net/minecraft/src","1" +"field_694_a","isLit","a","Z","Z","Chunk","le","net/minecraft/src","1" +"field_693_b","blocks","b","[B","[B","Chunk","le","net/minecraft/src","1" +"field_35637_c","precipitationHeightMap","c","[I","[I","Chunk","le","net/minecraft/src","1" +"field_35636_d","field_35636_d","d","[Z","[Z","Chunk","le","net/minecraft/src","1" +"field_692_c","isChunkLoaded","e","Z","Z","Chunk","le","net/minecraft/src","1" +"field_691_d","worldObj","f","LWorld;","Lfi;","Chunk","le","net/minecraft/src","1" +"field_690_e","data","g","LNibbleArray;","Lvq;","Chunk","le","net/minecraft/src","1" +"field_689_f","skylightMap","h","LNibbleArray;","Lvq;","Chunk","le","net/minecraft/src","1" +"field_688_g","blocklightMap","i","LNibbleArray;","Lvq;","Chunk","le","net/minecraft/src","1" +"field_687_h","heightMap","j","[B","[B","Chunk","le","net/minecraft/src","1" +"field_686_i","lowestBlockHeight","k","I","I","Chunk","le","net/minecraft/src","1" +"field_685_j","xPosition","l","I","I","Chunk","le","net/minecraft/src","1" +"field_684_k","zPosition","m","I","I","Chunk","le","net/minecraft/src","1" +"field_40544_v","field_40544_v","v","Z","Z","Chunk","le","net/minecraft/src","1" +"field_683_l","chunkTileEntityMap","n","Ljava/util/Map;","Ljava/util/Map;","Chunk","le","net/minecraft/src","1" +"field_682_m","entities","o","[Ljava/util/List;","[Ljava/util/List;","Chunk","le","net/minecraft/src","1" +"field_681_n","isTerrainPopulated","p","Z","Z","Chunk","le","net/minecraft/src","1" +"field_680_o","isModified","q","Z","Z","Chunk","le","net/minecraft/src","1" +"field_679_p","neverSave","r","Z","Z","Chunk","le","net/minecraft/src","1" +"field_677_r","hasEntities","s","Z","Z","Chunk","le","net/minecraft/src","1" +"field_676_s","lastSaveTime","t","J","J","Chunk","le","net/minecraft/src","1" +"field_35638_u","field_35638_u","u","Z","Z","Chunk","le","net/minecraft/src","1" +"everything","everything","a","LEnumMobType;","Lqu;","EnumMobType","qu","net/minecraft/src","1" +"mobs","mobs","b","LEnumMobType;","Lqu;","EnumMobType","qu","net/minecraft/src","1" +"players","players","c","LEnumMobType;","Lqu;","EnumMobType","qu","net/minecraft/src","1" +"field_990_d","allMobTypes","d","[LEnumMobType;","[Lqu;","EnumMobType","qu","net/minecraft/src","1" +"field_737_a","tagList","a","Ljava/util/List;","Ljava/util/List;","NBTTagList","rp","net/minecraft/src","1" +"field_736_b","tagType","b","B","B","NBTTagList","rp","net/minecraft/src","1" +"field_40484_a","damageModifier","a","I","I","EnchantmentModifierDamage","kr","net/minecraft/src","1" +"field_40483_b","damageSource","b","LDamageSource;","Lpo;","EnchantmentModifierDamage","kr","net/minecraft/src","1" +"field_4210_a","weaponDamage","a","I","I","ItemSword","pi","net/minecraft/src","1" +"field_40249_bQ","field_40249_bQ","b","LEnumToolMaterial;","Lby;","ItemSword","pi","net/minecraft/src","1" +"field_933_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","ConsoleLogManager","hm","net/minecraft/src","1" +"field_494_e","chestContents","i","[LItemStack;","[Ljb;","TileEntityChest","js","net/minecraft/src","1" +"field_35175_a","field_35175_a","a","Z","Z","TileEntityChest","js","net/minecraft/src","1" +"field_35172_b","field_35172_b","b","LTileEntityChest;","Ljs;","TileEntityChest","js","net/minecraft/src","1" +"field_35173_c","field_35173_c","c","LTileEntityChest;","Ljs;","TileEntityChest","js","net/minecraft/src","1" +"field_35170_d","field_35170_d","d","LTileEntityChest;","Ljs;","TileEntityChest","js","net/minecraft/src","1" +"field_35171_e","field_35171_e","e","LTileEntityChest;","Ljs;","TileEntityChest","js","net/minecraft/src","1" +"field_35168_f","field_35168_f","f","F","F","TileEntityChest","js","net/minecraft/src","1" +"field_35169_g","field_35169_g","g","F","F","TileEntityChest","js","net/minecraft/src","1" +"field_35176_h","field_35176_h","h","I","I","TileEntityChest","js","net/minecraft/src","1" +"field_35174_q","field_35174_q","j","I","I","TileEntityChest","js","net/minecraft/src","1" +"field_35293_a","mushroomType","a","I","I","WorldGenBigMushroom","vi","net/minecraft/src","1" +"field_27043_a","entityID","a","I","I","Packet71Weather","fd","net/minecraft/src","1" +"field_27042_b","posX","b","I","I","Packet71Weather","fd","net/minecraft/src","1" +"field_27046_c","posY","c","I","I","Packet71Weather","fd","net/minecraft/src","1" +"field_27045_d","posZ","d","I","I","Packet71Weather","fd","net/minecraft/src","1" +"field_27044_e","isLightningBolt","e","I","I","Packet71Weather","fd","net/minecraft/src","1" +"field_35547_a","components","a","Ljava/util/LinkedList;","Ljava/util/LinkedList;","StructureStart","tr","net/minecraft/src","1" +"field_35546_b","boundingBox","b","LStructureBoundingBox;","Lvb;","StructureStart","tr","net/minecraft/src","1" +"field_20139_a","furnace","a","LTileEntityFurnace;","Lrj;","ContainerFurnace","bo","net/minecraft/src","1" +"field_20138_b","lastCookTime","b","I","I","ContainerFurnace","bo","net/minecraft/src","1" +"field_20141_c","lastBurnTime","c","I","I","ContainerFurnace","bo","net/minecraft/src","1" +"field_20140_h","lastItemBurnTime","h","I","I","ContainerFurnace","bo","net/minecraft/src","1" +"field_826_a","netManager","a","LNetworkManager;","Loo;","NetworkWriterThread","wv","net/minecraft/src","1" +"field_35035_b","field_35035_b","b","LGenLayer;","Lel;","GenLayerDownfallMix","ta","net/minecraft/src","1" +"field_35036_c","field_35036_c","c","I","I","GenLayerDownfallMix","ta","net/minecraft/src","1" +"field_274_a","isFull","a","I","I","ItemBucket","bf","net/minecraft/src","1" +"field_25063_d","statId","e","I","I","StatBase","uv","net/minecraft/src","1" +"field_25062_e","statName","f","Ljava/lang/String;","Ljava/lang/String;","StatBase","uv","net/minecraft/src","1" +"field_27058_g","isIndependent","g","Z","Z","StatBase","uv","net/minecraft/src","1" +"field_27057_h","statGuid","h","Ljava/lang/String;","Ljava/lang/String;","StatBase","uv","net/minecraft/src","1" +"field_25065_a","type","a","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" +"field_25066_b","numberFormat","b","Ljava/text/NumberFormat;","Ljava/text/NumberFormat;","StatBase","uv","net/minecraft/src","1" +"field_27056_i","simpleStatType","i","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" +"field_25068_c","decimalFormat","c","Ljava/text/DecimalFormat;","Ljava/text/DecimalFormat;","StatBase","uv","net/minecraft/src","1" +"field_27055_j","timeStatType","j","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" +"field_27054_k","distanceStatType","k","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" +"field_40039_a","field_40039_a","a","LEntityDragonBase;","Lui;","DragonPart","ed","net/minecraft/src","1" +"field_40038_b","field_40038_b","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","ed","net/minecraft/src","1" +"field_974_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","NetworkListenThread","ep","net/minecraft/src","1" +"field_979_d","serverSocket","d","Ljava/net/ServerSocket;","Ljava/net/ServerSocket;","NetworkListenThread","ep","net/minecraft/src","1" +"field_978_e","networkAcceptThread","e","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkListenThread","ep","net/minecraft/src","1" +"field_973_b","isListening","b","Z","Z","NetworkListenThread","ep","net/minecraft/src","1" +"field_977_f","field_977_f","f","I","I","NetworkListenThread","ep","net/minecraft/src","1" +"field_976_g","pendingConnections","g","Ljava/util/ArrayList;","Ljava/util/ArrayList;","NetworkListenThread","ep","net/minecraft/src","1" +"field_975_h","playerList","h","Ljava/util/ArrayList;","Ljava/util/ArrayList;","NetworkListenThread","ep","net/minecraft/src","1" +"field_980_c","mcServer","c","LMinecraftServer;","LMinecraftServer;","NetworkListenThread","ep","net/minecraft/src","1" +"field_35506_i","field_35506_i","i","Ljava/util/HashMap;","Ljava/util/HashMap;","NetworkListenThread","ep","net/minecraft/src","1" +"field_35483_d","field_35483_d","d","I","I","WeightedRandomChoice","cp","net/minecraft/src","1" +"field_20114_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","wp","net/minecraft/src","1" +"field_20113_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","wp","net/minecraft/src","1" +"field_35373_a","field_35373_a","a","I","I","ComponentVillageHouse3","gi","net/minecraft/src","1" +"field_392_a","field_392_a","a","Z","Z","EntityChicken","wk","net/minecraft/src","1" +"field_391_b","field_391_b","b","F","F","EntityChicken","wk","net/minecraft/src","1" +"field_395_ad","destPos","c","F","F","EntityChicken","wk","net/minecraft/src","1" +"field_394_ae","field_394_ae","g","F","F","EntityChicken","wk","net/minecraft/src","1" +"field_393_af","field_393_af","h","F","F","EntityChicken","wk","net/minecraft/src","1" +"field_390_ai","field_390_ai","i","F","F","EntityChicken","wk","net/minecraft/src","1" +"field_396_aj","timeUntilNextEgg","j","I","I","EntityChicken","wk","net/minecraft/src","1" +"field_35660_a","disableDamage","a","Z","Z","PlayerCapabilities","vv","net/minecraft/src","1" +"field_35658_b","isFlying","b","Z","Z","PlayerCapabilities","vv","net/minecraft/src","1" +"field_35659_c","allowFlying","c","Z","Z","PlayerCapabilities","vv","net/minecraft/src","1" +"field_35657_d","depleteBuckets","d","Z","Z","PlayerCapabilities","vv","net/minecraft/src","1" +"field_4209_bb","blocksEffectiveAgainst","bR","[LBlock;","[Ltl;","ItemPickaxe","ba","net/minecraft/src","1" +"field_22216_a","posX","a","I","I","ChunkCoordinates","bu","net/minecraft/src","1" +"field_529_a","posY","b","I","I","ChunkCoordinates","bu","net/minecraft/src","1" +"field_528_b","posZ","c","I","I","ChunkCoordinates","bu","net/minecraft/src","1" +"field_22214_a","folderRegexPattern","a","Ljava/util/regex/Pattern;","Ljava/util/regex/Pattern;","ChunkFolderPattern","cm","net/minecraft/src","1" +"field_27114_a","minDisplayColumn","a","I","I","AchievementList","et","net/minecraft/src","1" +"field_27113_b","minDisplayRow","b","I","I","AchievementList","et","net/minecraft/src","1" +"field_27112_c","maxDisplayColumn","c","I","I","AchievementList","et","net/minecraft/src","1" +"field_27111_d","maxDisplayRow","d","I","I","AchievementList","et","net/minecraft/src","1" +"field_25129_a","achievementList","e","Ljava/util/List;","Ljava/util/List;","AchievementList","et","net/minecraft/src","1" +"field_25128_b","openInventory","f","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_25131_c","mineWood","g","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_25130_d","buildWorkBench","h","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27110_i","buildPickaxe","i","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27109_j","buildFurnace","j","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27108_k","acquireIron","k","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27107_l","buildHoe","l","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27106_m","makeBread","m","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27105_n","bakeCake","n","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27104_o","buildBetterPickaxe","o","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27103_p","cookFish","p","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27102_q","onARail","q","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27101_r","buildSword","r","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27100_s","killEnemy","s","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27099_t","killCow","t","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_27098_u","flyPig","u","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_35490_v","snipeSkeleton","v","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40478_w","diamonds","w","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40481_x","portal","x","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40480_y","ghast","y","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40479_z","blazeRod","z","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40475_A","potion","A","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40476_B","theEnd","B","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40477_C","theEnd2","C","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40472_D","enchantments","D","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40473_E","overkill","E","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_40474_F","bookcase","F","LAchievement;","Lni;","AchievementList","et","net/minecraft/src","1" +"field_4241_h","hellRNG","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4240_i","field_4240_i","j","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4239_j","field_4239_j","k","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4238_k","field_4238_k","l","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4237_l","field_4237_l","m","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4236_m","field_4236_m","n","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4248_a","field_4248_a","a","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4247_b","field_4247_b","b","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4235_n","worldObj","o","LWorld;","Lfi;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4234_o","field_4234_o","p","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_40183_c","field_40183_c","c","LMapGenNetherBridge;","Lkh;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4233_p","field_4233_p","q","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4232_q","gravelNoise","r","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4231_r","field_4231_r","s","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4230_s","field_4230_s","t","LMapGenBase;","Lgd;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4246_c","field_4246_c","d","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4245_d","field_4245_d","e","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4244_e","field_4244_e","f","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4243_f","field_4243_f","g","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4242_g","field_4242_g","h","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4262_e","biomeGenerator","b","LBiomeGenBase;","Lkb;","WorldChunkManagerHell","hj","net/minecraft/src","1" +"field_4261_f","field_4261_f","c","F","F","WorldChunkManagerHell","hj","net/minecraft/src","1" +"field_4260_g","field_4260_g","d","F","F","WorldChunkManagerHell","hj","net/minecraft/src","1" +"field_35420_a","field_35420_a","a","LBlock;","Ltl;","ItemMetadata","jm","net/minecraft/src","1" +"field_4207_bb","blocksEffectiveAgainst","bR","[LBlock;","[Ltl;","ItemAxe","ru","net/minecraft/src","1" +"field_28062_a","droppedChunksSet","a","Ljava/util/Set;","Ljava/util/Set;","ChunkProvider","nt","net/minecraft/src","1" +"field_28061_b","dummyChunk","b","LChunk;","Lle;","ChunkProvider","nt","net/minecraft/src","1" +"field_28067_c","chunkProvider","c","LIChunkProvider;","Lco;","ChunkProvider","nt","net/minecraft/src","1" +"field_28066_d","chunkLoader","d","LIChunkLoader;","Lbh;","ChunkProvider","nt","net/minecraft/src","1" +"field_28065_e","chunkMap","e","LLongHashMap;","Lgc;","ChunkProvider","nt","net/minecraft/src","1" +"field_28064_f","chunkList","f","Ljava/util/List;","Ljava/util/List;","ChunkProvider","nt","net/minecraft/src","1" +"field_28063_g","worldObj","g","LWorld;","Lfi;","ChunkProvider","nt","net/minecraft/src","1" +"field_35557_h","field_35557_h","h","I","I","ChunkProvider","nt","net/minecraft/src","1" +"all","all","a","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"armor","armor","b","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"armor_feet","armor_feet","c","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"armor_legs","armor_legs","d","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"armor_torso","armor_torso","e","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"armor_head","armor_head","f","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"weapon","weapon","g","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"digger","digger","h","LEnumEnchantmentType;","Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"field_40534_i","allEnchantmentTypes","i","[LEnumEnchantmentType;","[Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"field_22041_a","entityID","a","I","I","Packet17Sleep","jz","net/minecraft/src","1" +"field_22040_b","bedX","b","I","I","Packet17Sleep","jz","net/minecraft/src","1" +"field_22044_c","bedY","c","I","I","Packet17Sleep","jz","net/minecraft/src","1" +"field_22043_d","bedZ","d","I","I","Packet17Sleep","jz","net/minecraft/src","1" +"field_22042_e","field_22042_e","e","I","I","Packet17Sleep","jz","net/minecraft/src","1" +"field_446_a","fuse","a","I","I","EntityTNTPrimed","pz","net/minecraft/src","1" +"field_40390_b","timestamp","b","J","J","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40391_c","randomChallenge","c","I","I","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40388_d","requestID","d","[B","[B","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40389_e","challengeValue","e","[B","[B","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40387_f","requestIDstring","f","Ljava/lang/String;","Ljava/lang/String;","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40392_a","field_40392_a","a","LRConThreadQuery;","Lsv;","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_452_ad","tickCounter1","f","I","I","EntityPainting","px","net/minecraft/src","1" +"field_448_a","direction","a","I","I","EntityPainting","px","net/minecraft/src","1" +"field_9188_d","xPosition","b","I","I","EntityPainting","px","net/minecraft/src","1" +"field_9187_e","yPosition","c","I","I","EntityPainting","px","net/minecraft/src","1" +"field_9186_f","zPosition","d","I","I","EntityPainting","px","net/minecraft/src","1" +"field_9185_b","art","e","LEnumArt;","Lit;","EntityPainting","px","net/minecraft/src","1" +"field_137_a","collectedEntityId","a","I","I","Packet22Collect","dl","net/minecraft/src","1" +"field_136_b","collectorEntityId","b","I","I","Packet22Collect","dl","net/minecraft/src","1" +"field_28033_a","furnaceRand","a","Ljava/util/Random;","Ljava/util/Random;","BlockFurnace","rx","net/minecraft/src","1" +"field_655_a","isActive","b","Z","Z","BlockFurnace","rx","net/minecraft/src","1" +"field_28034_c","keepFurnaceInventory","c","Z","Z","BlockFurnace","rx","net/minecraft/src","1" +"field_4302_a","worldObj","a","LWorld;","Lfi;","WorldProvider","wn","net/minecraft/src","1" +"field_4301_b","worldChunkMgr","b","LWorldChunkManager;","Lxe;","WorldProvider","wn","net/minecraft/src","1" +"field_6167_c","canSleepInWorld","c","Z","Z","WorldProvider","wn","net/minecraft/src","1" +"field_6166_d","isHellWorld","d","Z","Z","WorldProvider","wn","net/minecraft/src","1" +"field_4306_c","hasNoSky","e","Z","Z","WorldProvider","wn","net/minecraft/src","1" +"field_4305_d","lightBrightnessTable","f","[F","[F","WorldProvider","wn","net/minecraft/src","1" +"field_6165_g","worldType","g","I","I","WorldProvider","wn","net/minecraft/src","1" +"field_6164_h","colorsSunriseSunset","h","[F","[F","WorldProvider","wn","net/minecraft/src","1" +"field_73_a","xPosition","a","D","D","Packet10Flying","ij","net/minecraft/src","1" +"field_72_b","yPosition","b","D","D","Packet10Flying","ij","net/minecraft/src","1" +"field_71_c","zPosition","c","D","D","Packet10Flying","ij","net/minecraft/src","1" +"field_70_d","stance","d","D","D","Packet10Flying","ij","net/minecraft/src","1" +"field_69_e","yaw","e","F","F","Packet10Flying","ij","net/minecraft/src","1" +"field_68_f","pitch","f","F","F","Packet10Flying","ij","net/minecraft/src","1" +"field_67_g","onGround","g","Z","Z","Packet10Flying","ij","net/minecraft/src","1" +"field_66_h","moving","h","Z","Z","Packet10Flying","ij","net/minecraft/src","1" +"field_65_i","rotating","i","Z","Z","Packet10Flying","ij","net/minecraft/src","1" +"field_20158_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesTools","hd","net/minecraft/src","1" +"field_20157_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesTools","hd","net/minecraft/src","1" +"field_502_a","name","a","Ljava/lang/String;","Ljava/lang/String;","InventoryLargeChest","nr","net/minecraft/src","1" +"field_501_b","upperChest","b","LIInventory;","Llp;","InventoryLargeChest","nr","net/minecraft/src","1" +"field_503_c","lowerChest","c","LIInventory;","Llp;","InventoryLargeChest","nr","net/minecraft/src","1" +"field_947_a","field_947_a","b","I","I","MapGenBase","gd","net/minecraft/src","1" +"field_946_b","rand","c","Ljava/util/Random;","Ljava/util/Random;","MapGenBase","gd","net/minecraft/src","1" +"field_35530_d","worldObj","d","LWorld;","Lfi;","MapGenBase","gd","net/minecraft/src","1" +"field_654_a","signEntityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","BlockSign","te","net/minecraft/src","1" +"field_653_b","isFreestanding","b","Z","Z","BlockSign","te","net/minecraft/src","1" +"field_9_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","NetLoginHandler","gq","net/minecraft/src","1" +"field_6_d","rand","d","Ljava/util/Random;","Ljava/util/Random;","NetLoginHandler","gq","net/minecraft/src","1" +"field_8_b","netManager","b","LNetworkManager;","Loo;","NetLoginHandler","gq","net/minecraft/src","1" +"field_7_c","finishedProcessing","c","Z","Z","NetLoginHandler","gq","net/minecraft/src","1" +"field_5_e","mcServer","e","LMinecraftServer;","LMinecraftServer;","NetLoginHandler","gq","net/minecraft/src","1" +"field_9005_f","loginTimer","f","I","I","NetLoginHandler","gq","net/minecraft/src","1" +"field_3_g","username","g","Ljava/lang/String;","Ljava/lang/String;","NetLoginHandler","gq","net/minecraft/src","1" +"field_9004_h","packet1login","h","LPacket1Login;","Lnl;","NetLoginHandler","gq","net/minecraft/src","1" +"field_1_i","serverId","i","Ljava/lang/String;","Ljava/lang/String;","NetLoginHandler","gq","net/minecraft/src","1" +"field_35069_a","mushroomType","a","I","I","BlockMushroomCap","uq","net/minecraft/src","1" +"field_35348_c","field_35348_c","c","[LStructurePieceTreasure;","[Lib;","ComponentStrongholdRoomCrossing","kk","net/minecraft/src","1" +"field_35349_a","field_35349_a","a","LEnumDoor;","Lpt;","ComponentStrongholdRoomCrossing","kk","net/minecraft/src","1" +"field_35347_b","field_35347_b","b","I","I","ComponentStrongholdRoomCrossing","kk","net/minecraft/src","1" +"field_40400_a","byteArrayOutput","a","Ljava/io/ByteArrayOutputStream;","Ljava/io/ByteArrayOutputStream;","RConOutputStream","ez","net/minecraft/src","1" +"field_40399_b","output","b","Ljava/io/DataOutputStream;","Ljava/io/DataOutputStream;","RConOutputStream","ez","net/minecraft/src","1" +"field_527_a","statsComponent","a","LGuiStatsComponent;","Lkp;","GuiStatsListener","ll","net/minecraft/src","1" +"field_27041_a","statisticId","a","I","I","Packet200Statistic","nq","net/minecraft/src","1" +"field_27040_b","amount","b","I","I","Packet200Statistic","nq","net/minecraft/src","1" +"field_4311_a","eligibleChunksForSpawning","b","Ljava/util/HashMap;","Ljava/util/HashMap;","SpawnerAnimals","cs","net/minecraft/src","1" +"field_22213_a","nightSpawnEntities","a","[Ljava/lang/Class;","[Ljava/lang/Class;","SpawnerAnimals","cs","net/minecraft/src","1" +"field_20146_a","craftMatrix","a","LInventoryCrafting;","Lmc;","ContainerWorkbench","iw","net/minecraft/src","1" +"field_20145_b","craftResult","b","LIInventory;","Llp;","ContainerWorkbench","iw","net/minecraft/src","1" +"field_20150_c","worldObj","c","LWorld;","Lfi;","ContainerWorkbench","iw","net/minecraft/src","1" +"field_20149_h","posX","h","I","I","ContainerWorkbench","iw","net/minecraft/src","1" +"field_20148_i","posY","i","I","I","ContainerWorkbench","iw","net/minecraft/src","1" +"field_20147_j","posZ","j","I","I","ContainerWorkbench","iw","net/minecraft/src","1" +"field_1053_a","threadSyncObject","a","Ljava/lang/Object;","Ljava/lang/Object;","NetworkManager","oo","net/minecraft/src","1" +"field_1052_b","numReadThreads","b","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_1051_c","numWriteThreads","c","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_1050_d","sendQueueLock","g","Ljava/lang/Object;","Ljava/lang/Object;","NetworkManager","oo","net/minecraft/src","1" +"field_1049_e","networkSocket","h","Ljava/net/Socket;","Ljava/net/Socket;","NetworkManager","oo","net/minecraft/src","1" +"field_12032_f","remoteSocketAddress","i","Ljava/net/SocketAddress;","Ljava/net/SocketAddress;","NetworkManager","oo","net/minecraft/src","1" +"field_1048_f","socketInputStream","j","Ljava/io/DataInputStream;","Ljava/io/DataInputStream;","NetworkManager","oo","net/minecraft/src","1" +"field_1047_g","socketOutputStream","k","Ljava/io/DataOutputStream;","Ljava/io/DataOutputStream;","NetworkManager","oo","net/minecraft/src","1" +"field_1046_h","isRunning","l","Z","Z","NetworkManager","oo","net/minecraft/src","1" +"field_1045_i","readPackets","m","Ljava/util/List;","Ljava/util/List;","NetworkManager","oo","net/minecraft/src","1" +"field_1044_j","dataPackets","n","Ljava/util/List;","Ljava/util/List;","NetworkManager","oo","net/minecraft/src","1" +"field_1043_k","chunkDataPackets","o","Ljava/util/List;","Ljava/util/List;","NetworkManager","oo","net/minecraft/src","1" +"field_1042_l","netHandler","p","LNetHandler;","Lsd;","NetworkManager","oo","net/minecraft/src","1" +"field_1041_m","isServerTerminating","q","Z","Z","NetworkManager","oo","net/minecraft/src","1" +"field_1040_n","writeThread","r","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkManager","oo","net/minecraft/src","1" +"field_1039_o","readThread","s","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkManager","oo","net/minecraft/src","1" +"field_1038_p","isTerminating","t","Z","Z","NetworkManager","oo","net/minecraft/src","1" +"field_1037_q","terminationReason","u","Ljava/lang/String;","Ljava/lang/String;","NetworkManager","oo","net/minecraft/src","1" +"field_20176_t","field_20176_t","v","[Ljava/lang/Object;","[Ljava/lang/Object;","NetworkManager","oo","net/minecraft/src","1" +"field_1036_r","timeSinceLastRead","w","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_1035_s","sendQueueByteLength","x","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_28141_d","field_28141_d","d","[I","[I","NetworkManager","oo","net/minecraft/src","1" +"field_28140_e","field_28140_e","e","[I","[I","NetworkManager","oo","net/minecraft/src","1" +"field_1034_t","chunkDataSendCounter","f","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_20175_w","field_20175_w","y","I","I","NetworkManager","oo","net/minecraft/src","1" +"field_995_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","PropertyManager","qt","net/minecraft/src","1" +"field_994_b","serverProperties","b","Ljava/util/Properties;","Ljava/util/Properties;","PropertyManager","qt","net/minecraft/src","1" +"field_996_c","serverPropertiesFile","c","Ljava/io/File;","Ljava/io/File;","PropertyManager","qt","net/minecraft/src","1" +"field_35385_a","field_35385_a","a","Z","Z","ComponentVillageWell","ov","net/minecraft/src","1" +"field_35384_b","field_35384_b","b","I","I","ComponentVillageWell","ov","net/minecraft/src","1" +"field_20143_a","craftMatrix","a","LInventoryCrafting;","Lmc;","ContainerPlayer","aa","net/minecraft/src","1" +"field_20142_b","craftResult","b","LIInventory;","Llp;","ContainerPlayer","aa","net/minecraft/src","1" +"field_20144_c","isMultiPlayer","c","Z","Z","ContainerPlayer","aa","net/minecraft/src","1" +"field_9195_e","xTile","e","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9193_f","yTile","f","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9197_aj","zTile","g","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9194_ak","inTile","h","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9192_al","inGround","i","Z","Z","EntityFireball","ch","net/minecraft/src","1" +"field_9191_am","shootingEntity","a","LEntityLiving;","Llk;","EntityFireball","ch","net/minecraft/src","1" +"field_9190_an","ticksAlive","j","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9189_ao","ticksInAir","k","I","I","EntityFireball","ch","net/minecraft/src","1" +"field_9199_b","accelerationX","b","D","D","EntityFireball","ch","net/minecraft/src","1" +"field_9198_c","accelerationY","c","D","D","EntityFireball","ch","net/minecraft/src","1" +"field_9196_d","accelerationZ","d","D","D","EntityFireball","ch","net/minecraft/src","1" +"field_34907_a","field_34907_a","b","LGenLayer;","Lel;","WorldChunkManager","xe","net/minecraft/src","1" +"field_34906_b","field_34906_b","c","LGenLayer;","Lel;","WorldChunkManager","xe","net/minecraft/src","1" +"field_34905_c","temperatureLayer","d","LGenLayer;","Lel;","WorldChunkManager","xe","net/minecraft/src","1" +"field_35144_d","rainfallLayer","e","LGenLayer;","Lel;","WorldChunkManager","xe","net/minecraft/src","1" +"field_35145_e","biomeCache","f","LBiomeCache;","Ltz;","WorldChunkManager","xe","net/minecraft/src","1" +"field_35143_f","biomesToSpawnIn","g","Ljava/util/List;","Ljava/util/List;","WorldChunkManager","xe","net/minecraft/src","1" +"field_40580_a","field_40580_a","a","[F","[F","WorldChunkManager","xe","net/minecraft/src","1" +"field_35375_a","field_35375_a","a","I","I","ComponentVillageHall","s","net/minecraft/src","1" +"field_40647_a","field_40647_a","a","Ljava/util/Random;","Ljava/util/Random;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_40645_b","field_40645_b","b","LEnchantmentModifierDamage;","Lkr;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_40646_c","field_40646_c","c","LEnchantmentModifierLiving;","Lxp;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_28047_a","sfxID","a","I","I","Packet61DoorChange","fu","net/minecraft/src","1" +"field_28046_b","auxData","b","I","I","Packet61DoorChange","fu","net/minecraft/src","1" +"field_28050_c","posX","c","I","I","Packet61DoorChange","fu","net/minecraft/src","1" +"field_28049_d","posY","d","I","I","Packet61DoorChange","fu","net/minecraft/src","1" +"field_28048_e","posZ","e","I","I","Packet61DoorChange","fu","net/minecraft/src","1" +"field_40355_b","enchantmentsList","b","[LEnchantment;","[Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40356_c","protection","c","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40353_d","fireProtection","d","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40354_e","featherFalling","e","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40351_f","blastProtection","f","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40352_g","projectileProtection","g","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40364_h","respiration","h","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40365_i","aquaAffinity","i","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40362_j","sharpness","j","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40363_k","smite","k","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40360_l","baneOfArthropods","l","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40361_m","knockback","m","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40358_n","fireAspect","n","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40359_o","looting","o","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40372_p","efficiency","p","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40371_q","silkTouch","q","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40370_r","unbreaking","r","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40369_s","fortune","s","LEnchantment;","Lmq;","Enchantment","mq","net/minecraft/src","1" +"field_40368_t","effectId","t","I","I","Enchantment","mq","net/minecraft/src","1" +"field_40357_a","weight","a","I","I","Enchantment","mq","net/minecraft/src","1" +"field_40367_u","type","u","LEnumEnchantmentType;","Lpn;","Enchantment","mq","net/minecraft/src","1" +"field_40366_v","name","v","Ljava/lang/String;","Ljava/lang/String;","Enchantment","mq","net/minecraft/src","1" +"field_40206_a","field_40206_a","a","Ljava/util/List;","Ljava/util/List;","MapGenNetherBridge","kh","net/minecraft/src","1" +"field_28032_a","random","a","Ljava/util/Random;","Ljava/util/Random;","BlockDispenser","wz","net/minecraft/src","1" +"field_35064_a","field_35064_a","a","I","I","BlockPane","wh","net/minecraft/src","1" +"field_40178_b","field_40178_b","b","Z","Z","BlockPane","wh","net/minecraft/src","1" +"field_41003_a","field_41003_a","a","Z","Z","BlockEndPortal","t","net/minecraft/src","1" +"field_106_a","xPosition","a","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_105_b","yPosition","b","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_112_c","zPosition","c","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_111_d","xSize","d","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_110_e","ySize","e","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_109_f","zSize","f","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_108_g","chunk","g","[B","[B","Packet51MapChunk","em","net/minecraft/src","1" +"field_107_h","chunkSize","h","I","I","Packet51MapChunk","em","net/minecraft/src","1" +"field_35120_a","mapSeed","a","J","J","Packet9Respawn","oi","net/minecraft/src","1" +"field_28045_a","respawnDimension","b","I","I","Packet9Respawn","oi","net/minecraft/src","1" +"field_35119_c","difficultySetting","c","I","I","Packet9Respawn","oi","net/minecraft/src","1" +"field_35117_d","worldHeight","d","I","I","Packet9Respawn","oi","net/minecraft/src","1" +"field_35118_e","creativeMode","e","I","I","Packet9Respawn","oi","net/minecraft/src","1" +"field_841_a","hashEntry","a","I","I","IntHashMapEntry","vx","net/minecraft/src","1" +"field_840_b","valueEntry","b","Ljava/lang/Object;","Ljava/lang/Object;","IntHashMapEntry","vx","net/minecraft/src","1" +"field_843_c","nextEntry","c","LIntHashMapEntry;","Lvx;","IntHashMapEntry","vx","net/minecraft/src","1" +"field_842_d","slotHash","d","I","I","IntHashMapEntry","vx","net/minecraft/src","1" +"field_835_a","slots","a","[LIntHashMapEntry;","[Lvx;","IntHashMap","jw","net/minecraft/src","1" +"field_834_b","count","b","I","I","IntHashMap","jw","net/minecraft/src","1" +"field_838_c","threshold","c","I","I","IntHashMap","jw","net/minecraft/src","1" +"field_837_d","growFactor","d","F","F","IntHashMap","jw","net/minecraft/src","1" +"field_836_e","versionStamp","e","I","I","IntHashMap","jw","net/minecraft/src","1" +"field_35619_f","keySet","f","Ljava/util/Set;","Ljava/util/Set;","IntHashMap","jw","net/minecraft/src","1" +"field_844_a","data","a","[B","[B","NibbleArray","vq","net/minecraft/src","1" +"field_35661_b","chunkSizeYShift","b","I","I","NibbleArray","vq","net/minecraft/src","1" +"field_35662_c","field_35662_c","c","I","I","NibbleArray","vq","net/minecraft/src","1" +"field_9176_d","field_9176_d","a","I","I","EntityBoat","gh","net/minecraft/src","1" +"field_9174_e","boatX","b","D","D","EntityBoat","gh","net/minecraft/src","1" +"field_9172_f","boatY","c","D","D","EntityBoat","gh","net/minecraft/src","1" +"field_9175_aj","boatZ","d","D","D","EntityBoat","gh","net/minecraft/src","1" +"field_9173_ak","boatYaw","e","D","D","EntityBoat","gh","net/minecraft/src","1" +"field_9171_al","boatPitch","f","D","D","EntityBoat","gh","net/minecraft/src","1" +"field_551_e","soundPowderFootstep","d","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9028_e","soundWoodFootstep","e","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9027_f","soundGravelFootstep","f","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9026_g","soundGrassFootstep","g","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9025_h","soundStoneFootstep","h","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9024_i","soundMetalFootstep","i","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9023_j","soundGlassFootstep","j","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9022_k","soundClothFootstep","k","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_9021_l","soundSandFootstep","l","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_542_n","blocksList","m","[LBlock;","[Ltl;","Block","tl","net/minecraft/src","1" +"field_541_o","tickOnLoad","n","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_540_p","opaqueCubeLookup","o","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_539_q","isBlockContainer","p","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_538_r","lightOpacity","q","[I","[I","Block","tl","net/minecraft/src","1" +"field_537_s","canBlockGrass","r","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_536_t","lightValue","s","[I","[I","Block","tl","net/minecraft/src","1" +"field_28029_t","requiresSelfNotify","t","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_40166_bL","useNeighborBrightness","u","[Z","[Z","Block","tl","net/minecraft/src","1" +"field_535_u","stone","v","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_534_v","grass","w","LBlockGrass;","Lwb;","Block","tl","net/minecraft/src","1" +"field_533_w","dirt","x","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_532_x","cobblestone","y","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_531_y","planks","z","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_6047_y","sapling","A","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4064_A","bedrock","B","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_598_B","waterMoving","C","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_596_C","waterStill","D","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_594_D","lavaMoving","E","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_592_E","lavaStill","F","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_590_F","sand","G","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4062_G","gravel","H","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4061_H","oreGold","I","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4059_I","oreIron","J","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_583_J","oreCoal","K","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_582_K","wood","L","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_581_L","leaves","M","LBlockLeaves;","Lbm;","Block","tl","net/minecraft/src","1" +"field_9043_L","sponge","N","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4056_N","glass","O","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9042_N","oreLapis","P","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9041_O","blockLapis","Q","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9040_P","dispenser","R","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9039_Q","sandStone","S","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9038_R","music","T","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9037_S","bed","U","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9036_T","railPowered","V","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9034_U","railDetector","W","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9033_V","pistonStickyBase","X","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9032_W","web","Y","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9031_X","tallGrass","Z","LBlockTallGrass;","Lqv;","Block","tl","net/minecraft/src","1" +"field_9030_Y","deadBush","aa","LBlockDeadBush;","Ljc;","Block","tl","net/minecraft/src","1" +"field_9029_Z","pistonBase","ab","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9049_aa","pistonExtension","ac","LBlockPistonExtension;","Lk;","Block","tl","net/minecraft/src","1" +"field_616_ac","cloth","ad","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9048_ac","pistonMoving","ae","LBlockPistonMoving;","Ltk;","Block","tl","net/minecraft/src","1" +"field_4072_ae","plantYellow","af","LBlockFlower;","Lvg;","Block","tl","net/minecraft/src","1" +"field_4071_af","plantRed","ag","LBlockFlower;","Lvg;","Block","tl","net/minecraft/src","1" +"field_4070_ag","mushroomBrown","ah","LBlockFlower;","Lvg;","Block","tl","net/minecraft/src","1" +"field_4069_ah","mushroomRed","ai","LBlockFlower;","Lvg;","Block","tl","net/minecraft/src","1" +"field_4068_ai","blockGold","aj","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4067_aj","blockSteel","ak","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_608_ak","stairDouble","al","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_607_al","stairSingle","am","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9047_al","brick","an","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_605_an","tnt","ao","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_604_ao","bookShelf","ap","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_603_ap","cobblestoneMossy","aq","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_602_aq","obsidian","ar","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9046_aq","torchWood","as","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_599_as","fire","at","LBlockFire;","Lxy;","Block","tl","net/minecraft/src","1" +"field_597_at","mobSpawner","au","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9045_at","stairCompactPlanks","av","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_593_av","chest","aw","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_591_aw","redstoneWire","ax","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_588_ax","oreDiamond","ay","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4060_ay","blockDiamond","az","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9044_ay","workbench","aA","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_644_aA","crops","aB","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_643_aB","tilledField","aC","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_642_aC","stoneOvenIdle","aD","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_641_aD","stoneOvenActive","aE","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4084_aE","signPost","aF","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_639_aF","doorWood","aG","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_638_aG","ladder","aH","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_637_aH","rail","aI","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9055_aH","stairCompactCobblestone","aJ","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4082_aJ","signWall","aK","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9054_aJ","lever","aL","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9053_aK","pressurePlateStone","aM","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_632_aM","doorSteel","aN","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9052_aM","pressurePlatePlanks","aO","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_630_aO","oreRedstone","aP","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_629_aP","oreRedstoneGlowing","aQ","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_628_aQ","torchRedstoneIdle","aR","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_627_aR","torchRedstoneActive","aS","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9051_aR","button","aT","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_625_aT","snow","aU","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4077_aU","ice","aV","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4076_aV","blockSnow","aW","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_622_aW","cactus","aX","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_621_aX","blockClay","aY","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_620_aY","reed","aZ","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_619_aZ","jukebox","ba","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_9050_aZ","fence","bb","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4052_bb","pumpkin","bc","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4050_bc","netherrack","bd","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4048_bd","slowSand","be","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_6065_bd","glowStone","bf","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_4044_bf","portal","bg","LBlockPortal;","Lam;","Block","tl","net/minecraft/src","1" +"field_9035_bf","pumpkinLantern","bh","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_21026_bg","cake","bi","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_22011_bh","redstoneRepeaterIdle","bj","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_22010_bi","redstoneRepeaterActive","bk","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_25013_bj","lockedChest","bl","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_28030_bl","trapdoor","bm","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35056_bm","silverfish","bn","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35052_bn","stoneBrick","bo","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35053_bo","mushroomCapBrown","bp","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35054_bp","mushroomCapRed","bq","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35055_bq","fenceIron","br","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35049_br","thinGlass","bs","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35048_bs","melon","bt","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35051_bt","pumpkinStem","bu","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35050_bu","melonStem","bv","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35045_bv","vine","bw","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35044_bw","fenceGate","bx","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35047_bx","stairsBrick","by","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_35046_by","stairsStoneBrickSmooth","bz","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40164_bz","mycelium","bA","LBlockMycelium;","Lxi;","Block","tl","net/minecraft/src","1" +"field_40165_bA","waterlily","bB","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40171_bB","netherBrick","bC","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40172_bC","netherFence","bD","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40169_bD","stairsNetherBrick","bE","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40170_bE","netherStalk","bF","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40175_bF","enchantmentTable","bG","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40176_bG","brewingStand","bH","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40173_bH","cauldron","bI","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40174_bI","endPortal","bJ","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40167_bJ","endPortalFrame","bK","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_40168_bK","whiteStone","bL","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_41002_bK","dragonEgg","bM","LBlock;","Ltl;","Block","tl","net/minecraft/src","1" +"field_575_bb","blockIndexInTexture","bN","I","I","Block","tl","net/minecraft/src","1" +"field_573_bc","blockID","bO","I","I","Block","tl","net/minecraft/src","1" +"field_571_bd","blockHardness","bP","F","F","Block","tl","net/minecraft/src","1" +"field_569_be","blockResistance","bQ","F","F","Block","tl","net/minecraft/src","1" +"field_27024_bo","blockConstructorCalled","bR","Z","Z","Block","tl","net/minecraft/src","1" +"field_27023_bp","enableStats","bS","Z","Z","Block","tl","net/minecraft/src","1" +"field_567_bf","minX","bT","D","D","Block","tl","net/minecraft/src","1" +"field_565_bg","minY","bU","D","D","Block","tl","net/minecraft/src","1" +"field_563_bh","minZ","bV","D","D","Block","tl","net/minecraft/src","1" +"field_561_bi","maxX","bW","D","D","Block","tl","net/minecraft/src","1" +"field_559_bj","maxY","bX","D","D","Block","tl","net/minecraft/src","1" +"field_557_bk","maxZ","bY","D","D","Block","tl","net/minecraft/src","1" +"field_555_bl","stepSound","bZ","LStepSound;","Ldb;","Block","tl","net/minecraft/src","1" +"field_554_bm","blockParticleGravity","ca","F","F","Block","tl","net/minecraft/src","1" +"field_553_bn","blockMaterial","cb","LMaterial;","Llg;","Block","tl","net/minecraft/src","1" +"field_552_bo","slipperiness","cc","F","F","Block","tl","net/minecraft/src","1" +"field_666_a","blockName","a","Ljava/lang/String;","Ljava/lang/String;","Block","tl","net/minecraft/src","1" +"field_949_a","hashArray","a","[LLongHashMapEntry;","[Lpv;","LongHashMap","gc","net/minecraft/src","1" +"field_948_b","numHashElements","b","I","I","LongHashMap","gc","net/minecraft/src","1" +"field_952_c","capacity","c","I","I","LongHashMap","gc","net/minecraft/src","1" +"field_951_d","percentUsable","d","F","F","LongHashMap","gc","net/minecraft/src","1" +"field_950_e","modCount","e","I","I","LongHashMap","gc","net/minecraft/src","1" +"field_21019_a","entityId","a","I","I","Packet40EntityMetadata","tp","net/minecraft/src","1" +"field_21018_b","metadata","b","Ljava/util/List;","Ljava/util/List;","Packet40EntityMetadata","tp","net/minecraft/src","1" +"field_40130_a","field_40130_a","a","F","F","EntityBlaze","mh","net/minecraft/src","1" +"field_40129_b","field_40129_b","b","I","I","EntityBlaze","mh","net/minecraft/src","1" +"field_40128_g","field_40128_g","g","I","I","EntityBlaze","mh","net/minecraft/src","1" +"field_28164_b","xCenter","b","I","I","MapData","iy","net/minecraft/src","1" +"field_28163_c","zCenter","c","I","I","MapData","iy","net/minecraft/src","1" +"field_28162_d","dimension","d","B","B","MapData","iy","net/minecraft/src","1" +"field_28161_e","scale","e","B","B","MapData","iy","net/minecraft/src","1" +"field_28160_f","colors","f","[B","[B","MapData","iy","net/minecraft/src","1" +"field_28159_g","field_28159_g","g","I","I","MapData","iy","net/minecraft/src","1" +"field_28158_h","field_28158_h","h","Ljava/util/List;","Ljava/util/List;","MapData","iy","net/minecraft/src","1" +"field_28156_j","field_28156_j","j","Ljava/util/Map;","Ljava/util/Map;","MapData","iy","net/minecraft/src","1" +"field_28157_i","playersVisibleOnMap","i","Ljava/util/List;","Ljava/util/List;","MapData","iy","net/minecraft/src","1" +"field_25082_a","instance","a","LStringTranslate;","Lmr;","StringTranslate","mr","net/minecraft/src","1" +"field_25081_b","translateTable","b","Ljava/util/Properties;","Ljava/util/Properties;","StringTranslate","mr","net/minecraft/src","1" +"field_828_a","netManager","a","LNetworkManager;","Loo;","ThreadMonitorConnection","wt","net/minecraft/src","1" +"field_22_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","ServerGUI","tw","net/minecraft/src","1" +"field_21_b","mcServer","b","LMinecraftServer;","LMinecraftServer;","ServerGUI","tw","net/minecraft/src","1" +"field_35126_a","randomId","a","I","I","Packet0KeepAlive","ls","net/minecraft/src","1" +"field_12003_a","explosionX","a","D","D","Packet60Explosion","qo","net/minecraft/src","1" +"field_12002_b","explosionY","b","D","D","Packet60Explosion","qo","net/minecraft/src","1" +"field_12006_c","explosionZ","c","D","D","Packet60Explosion","qo","net/minecraft/src","1" +"field_12005_d","explosionSize","d","F","F","Packet60Explosion","qo","net/minecraft/src","1" +"field_12004_e","destroyedBlockPositions","e","Ljava/util/Set;","Ljava/util/Set;","Packet60Explosion","qo","net/minecraft/src","1" +"field_28152_a","mapName","a","Ljava/lang/String;","Ljava/lang/String;","WorldSavedData","hs","net/minecraft/src","1" +"field_28151_b","dirty","b","Z","Z","WorldSavedData","hs","net/minecraft/src","1" +"field_40457_g","loggedIn","g","Z","Z","RConThreadClient","o","net/minecraft/src","1" +"field_40459_h","clientSocket","h","Ljava/net/Socket;","Ljava/net/Socket;","RConThreadClient","o","net/minecraft/src","1" +"field_40460_i","buffer","i","[B","[B","RConThreadClient","o","net/minecraft/src","1" +"field_40458_j","rconPassword","j","Ljava/lang/String;","Ljava/lang/String;","RConThreadClient","o","net/minecraft/src","1" +"field_35595_a","foodLevel","a","I","I","FoodStats","rd","net/minecraft/src","1" +"field_35593_b","foodSaturationLevel","b","F","F","FoodStats","rd","net/minecraft/src","1" +"field_35594_c","foodExhaustionLevel","c","F","F","FoodStats","rd","net/minecraft/src","1" +"field_35591_d","foodTimer","d","I","I","FoodStats","rd","net/minecraft/src","1" +"field_35592_e","prevFoodLevel","e","I","I","FoodStats","rd","net/minecraft/src","1" +"field_40207_a","field_40207_a","a","I","I","WorldGenSpikes","nn","net/minecraft/src","1" +"field_775_a","x","a","I","I","RedstoneUpdateInfo","xd","net/minecraft/src","1" +"field_774_b","y","b","I","I","RedstoneUpdateInfo","xd","net/minecraft/src","1" +"field_777_c","z","c","I","I","RedstoneUpdateInfo","xd","net/minecraft/src","1" +"field_776_d","updateTime","d","J","J","RedstoneUpdateInfo","xd","net/minecraft/src","1" +"field_40268_a","field_40268_a","a","LContainerEnchantment;","Liq;","SlotEnchantment","c","net/minecraft/src","1" +"field_35102_n","damageSourceEntity2","n","LEntity;","Lrn;","EntityDamageSourceIndirect","hu","net/minecraft/src","1" +"field_35569_a","selectedBlockId","a","I","I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"field_35568_b","selectedBlockMetaData","b","I","I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"field_725_a","field_725_a","b","Ljava/util/Set;","Ljava/util/Set;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_724_b","dummyChunk","c","LChunk;","Lle;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_730_c","serverChunkGenerator","d","LIChunkProvider;","Lco;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_729_d","field_729_d","e","LIChunkLoader;","Lbh;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_28068_a","chunkLoadOverride","a","Z","Z","ChunkProviderServer","kw","net/minecraft/src","1" +"field_728_e","id2ChunkMap","f","LLongHashMap;","Lgc;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_727_f","field_727_f","g","Ljava/util/List;","Ljava/util/List;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_726_g","world","h","LWorldServer;","Lfp;","ChunkProviderServer","kw","net/minecraft/src","1" +"field_849_a","stringToClassMapping","a","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" +"field_848_b","classToStringMapping","b","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" +"field_851_c","IDtoClassMapping","c","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" +"field_850_d","classToIDMapping","d","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" +"field_31046_a","field_31046_a","a","I","I","BlockPistonExtension","k","net/minecraft/src","1" +"field_40201_i","field_40201_i","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40198_j","field_40198_j","j","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40199_k","field_40199_k","k","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40196_l","field_40196_l","l","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40193_a","field_40193_a","a","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40191_b","field_40191_b","b","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40197_m","field_40197_m","m","LWorld;","Lfi;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40194_n","field_40194_n","n","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40195_o","field_40195_o","o","[LBiomeGenBase;","[Lkb;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40192_c","field_40192_c","c","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40189_d","field_40189_d","d","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40190_e","field_40190_e","e","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40187_f","field_40187_f","f","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40188_g","field_40188_g","g","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40200_h","field_40200_h","h","[[I","[[I","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_20911_y","chunkProviderServer","J","LChunkProviderServer;","Lkw;","WorldServer","fp","net/minecraft/src","1" +"field_819_z","disableSpawnProtection","K","Z","Z","WorldServer","fp","net/minecraft/src","1" +"field_816_A","levelSaving","L","Z","Z","WorldServer","fp","net/minecraft/src","1" +"field_6160_D","mcServer","M","LMinecraftServer;","LMinecraftServer;","WorldServer","fp","net/minecraft/src","1" +"field_34902_Q","field_34902_Q","N","LIntHashMap;","Ljw;","WorldServer","fp","net/minecraft/src","1" +"field_987_a","mcServerGui","a","LServerGUI;","Ltw;","ServerGuiFocusAdapter","ae","net/minecraft/src","1" +"field_35027_b","field_35027_b","b","LGenLayer;","Lel;","GenLayerTemperatureMix","dp","net/minecraft/src","1" +"field_35028_c","field_35028_c","c","I","I","GenLayerTemperatureMix","dp","net/minecraft/src","1" +"field_733_a","byteArray","a","[B","[B","NBTTagByteArray","ht","net/minecraft/src","1" +"field_35392_a","field_35392_a","a","LWorldChunkManager;","Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35390_b","field_35390_b","b","I","I","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35391_c","field_35391_c","c","LStructureVillagePieceWeight;","Lex;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35388_d","field_35388_d","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35389_e","field_35389_e","e","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35387_f","field_35387_f","f","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35335_b","field_35335_b","b","[LStructurePieceTreasure;","[Lib;","ComponentStrongholdLibrary","mg","net/minecraft/src","1" +"field_35337_a","field_35337_a","a","LEnumDoor;","Lpt;","ComponentStrongholdLibrary","mg","net/minecraft/src","1" +"field_35336_c","field_35336_c","c","Z","Z","ComponentStrongholdLibrary","mg","net/minecraft/src","1" +"field_706_j","rand","n","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_705_k","field_705_k","o","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_704_l","field_704_l","p","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_703_m","field_703_m","q","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_702_n","field_702_n","r","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_715_a","field_715_a","a","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_714_b","field_714_b","b","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_713_c","mobSpawnerNoise","c","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_700_p","worldObj","s","LWorld;","Lfi;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35563_t","mapFeaturesEnabled","t","Z","Z","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4224_q","field_4224_q","u","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35562_v","stoneNoise","v","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_695_u","caveGenerator","w","LMapGenBase;","Lgd;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35559_d","strongholdGenerator","d","LMapGenStronghold;","Lfz;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35560_e","villageGenerator","e","LMapGenVillage;","Lao;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35558_f","mineshaftGenerator","f","LMapGenMineshaft;","Lxg;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35564_x","ravineGenerator","x","LMapGenBase;","Lgd;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4223_v","biomesForGeneration","y","[LBiomeGenBase;","[Lkb;","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4229_d","field_4229_d","g","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4228_e","field_4228_e","h","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4227_f","field_4227_f","i","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4226_g","field_4226_g","j","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_4225_h","field_4225_h","k","[D","[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_35561_l","field_35561_l","l","[F","[F","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_707_i","unusedIntArray32x32","m","[[I","[[I","ChunkProviderGenerate","xo","net/minecraft/src","1" +"field_764_a","clayBlockId","a","I","I","WorldGenClay","me","net/minecraft/src","1" +"field_763_b","numberOfBlocks","b","I","I","WorldGenClay","me","net/minecraft/src","1" +"field_6038_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6037_b","field_6037_b","b","Ljava/util/HashMap;","Ljava/util/HashMap;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40030_s","hostname","s","Ljava/lang/String;","Ljava/lang/String;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40029_t","serverPort","t","I","I","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6036_c","networkServer","c","LNetworkListenThread;","Lep;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6035_d","propertyManagerObj","d","LPropertyManager;","Lqt;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6034_e","worldMngr","e","[LWorldServer;","[Lfp;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40027_f","field_40027_f","f","[J","[J","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40028_g","field_40028_g","g","[[J","[[J","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6033_f","configManager","h","LServerConfigurationManager;","Lhv;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_22005_o","commandHandler","u","LConsoleCommandHandler;","Lsc;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6025_n","serverRunning","v","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6032_g","serverStopped","i","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_9014_h","deathTime","j","I","I","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_9013_i","currentTask","k","Ljava/lang/String;","Ljava/lang/String;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_9012_j","percentDone","l","I","I","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_9010_p","playersOnline","w","Ljava/util/List;","Ljava/util/List;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6023_p","commands","x","Ljava/util/List;","Ljava/util/List;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6028_k","entityTracker","m","[LEntityTracker;","[Luh;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6027_l","onlineMode","n","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_6026_m","spawnPeacefulMobs","o","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_9011_n","pvpOn","p","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_27005_o","allowFlight","q","Z","Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_35014_p","motd","r","Ljava/lang/String;","Ljava/lang/String;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40032_y","rconQueryThread","y","LRConThreadQuery;","Lsv;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"field_40031_z","rconMainThread","z","LRConThreadMain;","Lpd;","MinecraftServer","MinecraftServer","net/minecraft/server","1" diff --git a/forge/conf/mcp.cfg b/forge/conf/mcp.cfg new file mode 100644 index 0000000000..ba606a7b08 --- /dev/null +++ b/forge/conf/mcp.cfg @@ -0,0 +1,139 @@ +[DEFAULT] +DirTemp = temp +DirSrc = src +DirLogs = logs +DirBin = bin +DirJars = jars +DirReobf = reobf +DirConf = conf +DirRuntime = runtime +DirLib = lib +DirFFOut = temp/ffout + +[CSV] +Classes = %(DirConf)s/classes.csv +Methods = %(DirConf)s/methods.csv +Fields = %(DirConf)s/fields.csv + +[SRGS] +Client = %(DirTemp)s/client_rg.srg +Server = %(DirTemp)s/server_rg.srg + +[JAR] +DirNatives = %(DirJars)s/bin/natives +Client = %(DirJars)s/bin/minecraft.jar +Server = %(DirJars)s/minecraft_server.jar +MD5Client = 3820d222b95d0b8c520d9596a756a6e6 +MD5Server = 934b6010999daa1f1b1ccdf4cb77e052 + +[RETROGUARD] +Location = %(DirRuntime)s/bin/retroguard.jar +RetroConf = %(DirTemp)s/retroguard.cfg +RetroReobConf = %(DirTemp)s/retroguard_ro.cfg +ClientConf = %(DirTemp)s/client_rg.cfg +ServerConf = %(DirTemp)s/server_rg.cfg +ClientReobConf = %(DirTemp)s/client_ro.cfg +ServerReobConf = %(DirTemp)s/server_ro.cfg +ClientOut = %(DirTemp)s/minecraft_rg.jar +ServerOut = %(DirTemp)s/minecraft_server_rg.jar +ClientLog = %(DirLogs)s/client_rg.log +ServerLog = %(DirLogs)s/server_rg.log +ClientDeobLog = %(DirLogs)s/client_deob.log +ServerDeobLog = %(DirLogs)s/server_deob.log + +[EXCEPTOR] +XClientCfg = %(DirConf)s/client.exc +XServerCfg = %(DirConf)s/server.exc +XClientOut = %(DirTemp)s/minecraft_exc.jar +XServerOut = %(DirTemp)s/minecraft_server_exc.jar +XClientLog = %(DirLogs)s/client_exc.log +XServerLog = %(DirLogs)s/server_exc.log + +[DECOMPILE] +FFClientConf = -rbr=0 -dgs=1 -asc=1 +FFServerConf = -rbr=0 -dgs=1 -asc=1 +FFClientOut = %(DirFFOut)s/client +FFServerOut = %(DirFFOut)s/server +FFClientSrc = %(DirFFOut)s/minecraft_exc.jar +FFServerSrc = %(DirFFOut)s/minecraft_server_exc.jar +FFSource = net + +[OUTPUT] +BinOut = %(DirTemp)s/bin +BinClient = %(DirTemp)s/bin/minecraft +BinServer = %(DirTemp)s/bin/minecraft_server +SrcClient = %(DirSrc)s/minecraft +SrcServer = %(DirSrc)s/minecraft_server + +[PACKAGES] +PkgClient = net/minecraft/src,net/minecraft/client +PkgServer = net/minecraft/src,net/minecraft/server + +[PATCHES] +PatchClient = %(DirConf)s/patches/minecraft.patch +PatchServer = %(DirConf)s/patches/minecraft_server.patch +PatchTemp = %(DirTemp)s/temp.patch +FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch +FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch + +[RECOMPILE] +BinClient = %(DirBin)s/minecraft +BinServer = %(DirBin)s/minecraft_server +ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar +ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar +ClientFixes = %(DirConf)s/patches + +[REOBF] +SAFFXClient = %(DirTemp)s/minecraft.saffx +SAFFXServer = %(DirTemp)s/minecraft_server.saffx +MD5Client = %(DirTemp)s/client.md5 +MD5Server = %(DirTemp)s/server.md5 +MD5PreReobfClient = %(DirTemp)s/client_reobf.md5 +MD5PreReobfServer = %(DirTemp)s/server_reobf.md5 +ObfSRGClient = %(DirTemp)s/client_ro.srg +ObfSRGServer = %(DirTemp)s/server_ro.srg +RecompJarClient = %(DirTemp)s/client_recomp.jar +RecompJarServer = %(DirTemp)s/server_recomp.jar +ObfJarClient = %(DirTemp)s/client_reobf.jar +ObfJarServer = %(DirTemp)s/server_reobf.jar +ReobfDirClient = %(DirReobf)s/minecraft +ReobfDirServer = %(DirReobf)s/minecraft_server +ReobfClientLog = %(DirLogs)s/client_reob.log +ReobfServerLog = %(DirLogs)s/server_reob.log +FixSound = minecraft/me.class +FixStart = minecraft/Start.class +NullPkg = net/minecraft/src +IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml + +[GETMODSOURCE] +OutSRCClient = modsrc/client +OutSRCServer = modsrc/server +OutSRC = modsrc + +[MCP] +LogFile = %(DirLogs)s/mcp.log +LogFileErr = %(DirLogs)s/mcperr.log + +[COMMANDS] +Patcher = %(DirRuntime)s/bin/applydiff.exe +JadRetro = %(DirRuntime)s/bin/jadretro.jar +Fernflower = %(DirRuntime)s/bin/fernflower.jar +Jadwin = %(DirRuntime)s/bin/jad.exe +Jadlinux = %(DirRuntime)s/bin/jad.exe +Jadosx = %(DirRuntime)s/bin/jad-osx +Exceptor = %(DirRuntime)s/bin/exceptor.jar +CmdRG = %s -cp {classpath} RetroGuard -searge {conffile} +CmdRGReobf = %s -cp {classpath} RetroGuard -notch {conffile} +CmdJadretro = %s -jar {jarjr} {targetdir} +CmdRecompClt = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java +CmdRecompSrv = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} +CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer +CmdStartClt = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start +CmdJadwin = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes} +CmdJadlinux = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}" +CmdJadosx = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes} +CmdPatchwin = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir} +CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir} +CmdPatchosx = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir} +CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout} +CmdExceptor = %s -jar {jarexc} {input} {output} {conf} {log} diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv new file mode 100644 index 0000000000..da50d3a2fc --- /dev/null +++ b/forge/conf/methods.csv @@ -0,0 +1,4880 @@ +"searge","name","notch","sig","notchsig","classname","classnotch","package","side" +"func_1148_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesArmor","xx","net/minecraft/src","0" +"func_35077_a","func_35077_a","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;II)Lnk;","ComponentVillage","xf","net/minecraft/src","0" +"func_35076_b","func_35076_b","b","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;II)Lnk;","ComponentVillage","xf","net/minecraft/src","0" +"func_35075_b","getAverageGroundLevel","b","(LWorld;LStructureBoundingBox;)I","(Lry;Lnl;)I","ComponentVillage","xf","net/minecraft/src","0" +"func_35074_a","canVillageGoDeeper","a","(LStructureBoundingBox;)Z","(Lnl;)Z","ComponentVillage","xf","net/minecraft/src","0" +"func_40044_a","func_40044_a","a","(LWorld;LStructureBoundingBox;IIII)V","(Lry;Lnl;IIII)V","ComponentVillage","xf","net/minecraft/src","0" +"func_40043_a","func_40043_a","a","(I)I","(I)I","ComponentVillage","xf","net/minecraft/src","0" +"func_594_b","displaySavingString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","rz","net/minecraft/src","0" +"func_595_d","displayLoadingString","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","rz","net/minecraft/src","0" +"func_593_a","setLoadingProgress","a","(I)V","(I)V","IProgressUpdate","rz","net/minecraft/src","0" +"func_40156_a","func_40156_a","a","(LDragonPart;LDamageSource;I)Z","(Lvc;Lpm;I)Z","EntityDragonBase","adh","net/minecraft/src","0" +"func_40155_e","func_40155_e","e","(LDamageSource;I)Z","(Lpm;I)Z","EntityDragonBase","adh","net/minecraft/src","0" +"func_407_b","multiplyVelocity","d","(F)LEntityFX;","(F)Lwc;","EntityFX","wc","net/minecraft/src","0" +"func_405_d","func_405_d","e","(F)LEntityFX;","(F)Lwc;","EntityFX","wc","net/minecraft/src","0" +"func_40097_b","func_40097_b","b","(FFF)V","(FFF)V","EntityFX","wc","net/minecraft/src","0" +"func_40098_n","func_40098_n","h","()F","()F","EntityFX","wc","net/minecraft/src","0" +"func_40101_o","func_40101_o","i","()F","()F","EntityFX","wc","net/minecraft/src","0" +"func_40102_p","func_40102_p","j","()F","()F","EntityFX","wc","net/minecraft/src","0" +"func_406_a","renderParticle","a","(LTessellator;FFFFFF)V","(Lcv;FFFFFF)V","EntityFX","wc","net/minecraft/src","0" +"func_404_c","getFXLayer","g","()I","()I","EntityFX","wc","net/minecraft/src","0" +"func_40099_c","setParticleTextureIndex","c","(I)V","(I)V","EntityFX","wc","net/minecraft/src","0" +"func_40100_q","func_40100_q","k","()I","()I","EntityFX","wc","net/minecraft/src","0" +"func_600_a","getBlockId","a","(III)I","(III)I","IBlockAccess","kq","net/minecraft/src","0" +"func_603_b","getBlockTileEntity","b","(III)LTileEntity;","(III)Lbq;","IBlockAccess","kq","net/minecraft/src","0" +"func_35451_b","getLightBrightnessForSkyBlocks","a","(IIII)I","(IIII)I","IBlockAccess","kq","net/minecraft/src","0" +"func_28099_a","getBrightness","b","(IIII)F","(IIII)F","IBlockAccess","kq","net/minecraft/src","0" +"func_598_c","getLightBrightness","c","(III)F","(III)F","IBlockAccess","kq","net/minecraft/src","0" +"func_602_e","getBlockMetadata","d","(III)I","(III)I","IBlockAccess","kq","net/minecraft/src","0" +"func_599_f","getBlockMaterial","e","(III)LMaterial;","(III)Lp;","IBlockAccess","kq","net/minecraft/src","0" +"func_601_g","isBlockOpaqueCube","f","(III)Z","(III)Z","IBlockAccess","kq","net/minecraft/src","0" +"func_28100_h","isBlockNormalCube","g","(III)Z","(III)Z","IBlockAccess","kq","net/minecraft/src","0" +"func_20084_d","isAirBlock","h","(III)Z","(III)Z","IBlockAccess","kq","net/minecraft/src","0" +"func_4075_a","getWorldChunkManager","a","()LWorldChunkManager;","()Lvh;","IBlockAccess","kq","net/minecraft/src","0" +"func_35452_b","getWorldHeight","b","()I","()I","IBlockAccess","kq","net/minecraft/src","0" +"func_4117_a","getEntityClassRenderObject","a","(Ljava/lang/Class;)LRender;","(Ljava/lang/Class;)Lrg;","RenderManager","wb","net/minecraft/src","0" +"func_855_a","getEntityRenderObject","a","(LEntity;)LRender;","(Lia;)Lrg;","RenderManager","wb","net/minecraft/src","0" +"func_22187_a","cacheActiveRenderInfo","a","(LWorld;LRenderEngine;LFontRenderer;LEntityLiving;LGameSettings;F)V","(Lry;Lzh;Labe;Lnq;Lki;F)V","RenderManager","wb","net/minecraft/src","0" +"func_854_a","renderEntity","a","(LEntity;F)V","(Lia;F)V","RenderManager","wb","net/minecraft/src","0" +"func_853_a","renderEntityWithPosYaw","a","(LEntity;DDDFF)V","(Lia;DDDFF)V","RenderManager","wb","net/minecraft/src","0" +"func_852_a","set","a","(LWorld;)V","(Lry;)V","RenderManager","wb","net/minecraft/src","0" +"func_851_a","getDistanceToCamera","a","(DDD)D","(DDD)D","RenderManager","wb","net/minecraft/src","0" +"func_6500_a","getFontRenderer","a","()LFontRenderer;","()Labe;","RenderManager","wb","net/minecraft/src","0" +"func_35183_c","shouldAttackPlayer","d","(LEntityPlayer;)Z","(Lvi;)Z","EntityEnderman","aii","net/minecraft/src","0" +"func_35178_q","teleportRandomly","ax","()Z","()Z","EntityEnderman","aii","net/minecraft/src","0" +"func_35182_c","teleportToEntity","j","(LEntity;)Z","(Lia;)Z","EntityEnderman","aii","net/minecraft/src","0" +"func_35179_a_","teleportTo","j","(DDD)Z","(DDD)Z","EntityEnderman","aii","net/minecraft/src","0" +"func_35177_b","setCarried","b","(I)V","(I)V","EntityEnderman","aii","net/minecraft/src","0" +"func_35176_r","getCarried","ay","()I","()I","EntityEnderman","aii","net/minecraft/src","0" +"func_35181_c","setCarryingData","c","(I)V","(I)V","EntityEnderman","aii","net/minecraft/src","0" +"func_35180_s","getCarryingData","aD","()I","()I","EntityEnderman","aii","net/minecraft/src","0" +"func_22022_g","ignoreTick","f","(LWorld;IIII)Z","(Lry;IIII)Z","BlockRedstoneRepeater","mz","net/minecraft/src","0" +"func_40282_a","func_40282_a","a","(LEntityDragon;FFF)V","(Loo;FFF)V","RenderDragon","ado","net/minecraft/src","0" +"func_40280_a","func_40280_a","a","(LEntityDragon;FFFFFF)V","(Loo;FFFFFF)V","RenderDragon","ado","net/minecraft/src","0" +"func_40281_a","func_40281_a","a","(LEntityDragon;DDDFF)V","(Loo;DDDFF)V","RenderDragon","ado","net/minecraft/src","0" +"func_40279_a","func_40279_a","a","(LEntityDragon;F)V","(Loo;F)V","RenderDragon","ado","net/minecraft/src","0" +"func_40283_a","func_40283_a","a","(LEntityDragon;IF)I","(Loo;IF)I","RenderDragon","ado","net/minecraft/src","0" +"func_35646_d","enableAbilities","b","(LEntityPlayer;)V","(Lvi;)V","PlayerControllerCreative","uq","net/minecraft/src","0" +"func_35645_e","disableAbilities","c","(LEntityPlayer;)V","(Lvi;)V","PlayerControllerCreative","uq","net/minecraft/src","0" +"func_35644_a","func_35644_a","a","(LMinecraft;LPlayerController;IIII)V","(Lnet/minecraft/client/Minecraft;Laes;IIII)V","PlayerControllerCreative","uq","net/minecraft/src","0" +"func_950_f","renderStars","f","()V","()V","RenderGlobal","afv","net/minecraft/src","0" +"func_946_a","changeWorld","a","(LWorld;)V","(Lry;)V","RenderGlobal","afv","net/minecraft/src","0" +"func_958_a","loadRenderers","a","()V","()V","RenderGlobal","afv","net/minecraft/src","0" +"func_951_a","renderEntities","a","(LVec3D;LICamera;F)V","(Lfb;Lfn;F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_953_b","getDebugInfoRenders","b","()Ljava/lang/String;","()Ljava/lang/String;","RenderGlobal","afv","net/minecraft/src","0" +"func_957_c","getDebugInfoEntities","c","()Ljava/lang/String;","()Ljava/lang/String;","RenderGlobal","afv","net/minecraft/src","0" +"func_956_b","markRenderersForNewPosition","b","(III)V","(III)V","RenderGlobal","afv","net/minecraft/src","0" +"func_943_a","sortAndRender","a","(LEntityLiving;ID)I","(Lnq;ID)I","RenderGlobal","afv","net/minecraft/src","0" +"func_962_a","checkOcclusionQueryResult","a","(II)V","(II)V","RenderGlobal","afv","net/minecraft/src","0" +"func_952_a","renderSortedRenderers","a","(IIID)I","(IIID)I","RenderGlobal","afv","net/minecraft/src","0" +"func_944_a","renderAllRenderLists","a","(ID)V","(ID)V","RenderGlobal","afv","net/minecraft/src","0" +"func_945_d","updateClouds","d","()V","()V","RenderGlobal","afv","net/minecraft/src","0" +"func_4142_a","renderSky","a","(F)V","(F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_4141_b","renderClouds","b","(F)V","(F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_27307_a","func_27307_a","a","(DDDF)Z","(DDDF)Z","RenderGlobal","afv","net/minecraft/src","0" +"func_6510_c","renderCloudsFancy","c","(F)V","(F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_948_a","updateRenderers","a","(LEntityLiving;Z)Z","(Lnq;Z)Z","RenderGlobal","afv","net/minecraft/src","0" +"func_959_a","drawBlockBreaking","a","(LEntityPlayer;LMovingObjectPosition;ILItemStack;F)V","(Lvi;Lgv;ILdk;F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_955_b","drawSelectionBox","b","(LEntityPlayer;LMovingObjectPosition;ILItemStack;F)V","(Lvi;Lgv;ILdk;F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_942_a","drawOutlinedBoundingBox","a","(LAxisAlignedBB;)V","(Lc;)V","RenderGlobal","afv","net/minecraft/src","0" +"func_949_a","markBlocksForUpdate","b","(IIIIII)V","(IIIIII)V","RenderGlobal","afv","net/minecraft/src","0" +"func_960_a","clipRenderersByFrustrum","a","(LICamera;F)V","(Lfn;F)V","RenderGlobal","afv","net/minecraft/src","0" +"func_40193_b","func_40193_b","b","(Ljava/lang/String;DDDDDD)LEntityFX;","(Ljava/lang/String;DDDDDD)Lwc;","RenderGlobal","afv","net/minecraft/src","0" +"func_28137_f","func_28137_f","e","()V","()V","RenderGlobal","afv","net/minecraft/src","0" +"func_27240_a","withElement","a","(LJ_JsonNodeBuilder;)LJ_JsonArrayNodeBuilder;","(Lrv;)Lft;","J_JsonArrayNodeBuilder","ft","net/minecraft/src","0" +"func_27241_a","build","a","()LJ_JsonRootNode;","()Lwz;","J_JsonArrayNodeBuilder","ft","net/minecraft/src","0" +"func_35039_a","func_35039_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Lkt;","ComponentStrongholdCrossing","kt","net/minecraft/src","0" +"func_35402_a","func_35402_a","a","()V","()V","ModelChest","xl","net/minecraft/src","0" +"func_40568_b","func_40568_b","b","()V","()V","ThreadedFileIOBase","ll","net/minecraft/src","0" +"func_40567_a","queueIO","a","(LIThreadedFileIO;)V","(Lpz;)V","ThreadedFileIOBase","ll","net/minecraft/src","0" +"func_40566_a","waitForFinish","a","()V","()V","ThreadedFileIOBase","ll","net/minecraft/src","0" +"values","values","values","()[LEnumCreatureAttribute;","()[Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumCreatureAttribute;","(Ljava/lang/String;)Lel;","EnumCreatureAttribute","el","net/minecraft/src","0" +"func_1192_a","addEffect","a","(LEntityFX;)V","(Lwc;)V","EffectRenderer","f","net/minecraft/src","0" +"func_1193_a","updateEffects","a","()V","()V","EffectRenderer","f","net/minecraft/src","0" +"func_1189_a","renderParticles","a","(LEntity;F)V","(Lia;F)V","EffectRenderer","f","net/minecraft/src","0" +"func_1187_b","func_1187_b","b","(LEntity;F)V","(Lia;F)V","EffectRenderer","f","net/minecraft/src","0" +"func_1188_a","clearEffects","a","(LWorld;)V","(Lry;)V","EffectRenderer","f","net/minecraft/src","0" +"func_1186_a","addBlockDestroyEffects","a","(IIIII)V","(IIIII)V","EffectRenderer","f","net/minecraft/src","0" +"func_1191_a","addBlockHitEffects","a","(IIII)V","(IIII)V","EffectRenderer","f","net/minecraft/src","0" +"func_1190_b","getStatistics","b","()Ljava/lang/String;","()Ljava/lang/String;","EffectRenderer","f","net/minecraft/src","0" +"close","close","close","()V","()V","RegionFileChunkBuffer","ahg","net/minecraft/src","0" +"func_1117_a","addSound","a","(Ljava/lang/String;Ljava/io/File;)LSoundPoolEntry;","(Ljava/lang/String;Ljava/io/File;)Llr;","SoundPool","cf","net/minecraft/src","0" +"func_1118_a","getRandomSoundFromSoundPool","a","(Ljava/lang/String;)LSoundPoolEntry;","(Ljava/lang/String;)Llr;","SoundPool","cf","net/minecraft/src","0" +"func_1116_a","getRandomSound","a","()LSoundPoolEntry;","()Llr;","SoundPool","cf","net/minecraft/src","0" +"func_40110_b","func_40110_b","b","(I)V","(I)V","EntitySpellParticleFX","sq","net/minecraft/src","0" +"func_878_a","isSolid","b","()Z","()Z","Material","p","net/minecraft/src","0" +"func_881_b","getCanBlockGrass","c","()Z","()Z","Material","p","net/minecraft/src","0" +"func_880_c","getIsSolid","d","()Z","()Z","Material","p","net/minecraft/src","0" +"func_879_d","getIsLiquid","a","()Z","()Z","Material","p","net/minecraft/src","0" +"func_28127_i","setIsTranslucent","o","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_31062_n","setNoHarvest","e","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_4130_f","setBurning","f","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_876_e","getCanBurn","g","()Z","()Z","Material","p","net/minecraft/src","0" +"func_27284_f","setIsGroundCover","h","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_27283_g","getIsGroundCover","i","()Z","()Z","Material","p","net/minecraft/src","0" +"func_28126_h","getIsOpaque","j","()Z","()Z","Material","p","net/minecraft/src","0" +"func_31061_i","getIsHarvestable","k","()Z","()Z","Material","p","net/minecraft/src","0" +"func_31064_j","getMaterialMobility","l","()I","()I","Material","p","net/minecraft/src","0" +"func_31063_k","setNoPushMobility","m","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_31060_l","setImmovableMobility","n","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" +"func_40029_a","func_40029_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lac;","ComponentNetherBridgeStraight","ac","net/minecraft/src","0" +"func_30004_j","setNotStationary","j","(LWorld;III)V","(Lry;III)V","BlockStationary","add","net/minecraft/src","0" +"func_301_k","func_301_k","k","(LWorld;III)Z","(Lry;III)Z","BlockStationary","add","net/minecraft/src","0" +"func_900_a","setScheduledTime","a","(J)LNextTickListEntry;","(J)Lahn;","NextTickListEntry","ahn","net/minecraft/src","0" +"func_899_a","comparer","a","(LNextTickListEntry;)I","(Lahn;)I","NextTickListEntry","ahn","net/minecraft/src","0" +"func_27463_a","parse","a","(Ljava/io/Reader;LJ_JsonListener;)V","(Ljava/io/Reader;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" +"func_27455_a","arrayString","a","(LJ_PositionTrackingPushbackReader;LJ_JsonListener;)V","(Lud;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" +"func_27453_b","objectString","b","(LJ_PositionTrackingPushbackReader;LJ_JsonListener;)V","(Lud;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" +"func_27449_c","aFieldToken","c","(LJ_PositionTrackingPushbackReader;LJ_JsonListener;)V","(Lud;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" +"func_27464_d","aJsonValue","d","(LJ_PositionTrackingPushbackReader;LJ_JsonListener;)V","(Lud;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" +"func_27459_a","numberToken","a","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27451_b","nonNegativeNumberToken","b","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27460_c","nonZeroDigitToken","c","(LJ_PositionTrackingPushbackReader;)C","(Lud;)C","J_SajParser","oi","net/minecraft/src","0" +"func_27458_d","digitToken","d","(LJ_PositionTrackingPushbackReader;)C","(Lud;)C","J_SajParser","oi","net/minecraft/src","0" +"func_27456_e","digitString","e","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27462_f","possibleFractionalComponent","f","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27454_g","possibleExponent","g","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27461_h","possibleSign","h","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27452_i","stringToken","i","(LJ_PositionTrackingPushbackReader;)Ljava/lang/String;","(Lud;)Ljava/lang/String;","J_SajParser","oi","net/minecraft/src","0" +"func_27457_j","escapedStringChar","j","(LJ_PositionTrackingPushbackReader;)C","(Lud;)C","J_SajParser","oi","net/minecraft/src","0" +"func_27450_k","hexadecimalNumber","k","(LJ_PositionTrackingPushbackReader;)I","(Lud;)I","J_SajParser","oi","net/minecraft/src","0" +"func_27448_l","readNextNonWhitespaceChar","l","(LJ_PositionTrackingPushbackReader;)I","(Lud;)I","J_SajParser","oi","net/minecraft/src","0" +"func_21103_b","getStackInRowAndColumn","b","(II)LItemStack;","(II)Ldk;","InventoryCrafting","lm","net/minecraft/src","0" +"func_4049_h","becomeAngryAt","j","(LEntity;)V","(Lia;)V","EntityPigZombie","jm","net/minecraft/src","0" +"func_27100_a","drawHorizontalLine","a","(IIII)V","(IIII)V","Gui","ht","net/minecraft/src","0" +"func_27099_b","drawVerticalLine","b","(IIII)V","(IIII)V","Gui","ht","net/minecraft/src","0" +"func_551_a","drawRect","a","(IIIII)V","(IIIII)V","Gui","ht","net/minecraft/src","0" +"func_549_a","drawGradientRect","a","(IIIIII)V","(IIIIII)V","Gui","ht","net/minecraft/src","0" +"func_548_a","drawCenteredString","a","(LFontRenderer;Ljava/lang/String;III)V","(Labe;Ljava/lang/String;III)V","Gui","ht","net/minecraft/src","0" +"func_547_b","drawString","b","(LFontRenderer;Ljava/lang/String;III)V","(Labe;Ljava/lang/String;III)V","Gui","ht","net/minecraft/src","0" +"func_550_b","drawTexturedModalRect","b","(IIIIII)V","(IIIIII)V","Gui","ht","net/minecraft/src","0" +"func_874_a","drawStringWithShadow","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","FontRenderer","abe","net/minecraft/src","0" +"func_873_b","drawString","b","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","FontRenderer","abe","net/minecraft/src","0" +"func_872_a","renderString","a","(Ljava/lang/String;IIIZ)V","(Ljava/lang/String;IIIZ)V","FontRenderer","abe","net/minecraft/src","0" +"func_871_a","getStringWidth","a","(Ljava/lang/String;)I","(Ljava/lang/String;)I","FontRenderer","abe","net/minecraft/src","0" +"func_27278_a","drawSplitString","a","(Ljava/lang/String;IIII)V","(Ljava/lang/String;IIII)V","FontRenderer","abe","net/minecraft/src","0" +"func_40609_a","func_40609_a","a","(Ljava/lang/String;IIIIZ)V","(Ljava/lang/String;IIIIZ)V","FontRenderer","abe","net/minecraft/src","0" +"func_27277_a","splitStringWidth","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","FontRenderer","abe","net/minecraft/src","0" +"func_165_a","doRenderItem","a","(LEntityItem;DDDFF)V","(Lih;DDDFF)V","RenderItem","iw","net/minecraft/src","0" +"func_40267_a","func_40267_a","a","(II)V","(II)V","RenderItem","iw","net/minecraft/src","0" +"func_27003_a","drawItemIntoGui","a","(LFontRenderer;LRenderEngine;IIIII)V","(Labe;Lzh;IIIII)V","RenderItem","iw","net/minecraft/src","0" +"func_161_a","renderItemIntoGUI","a","(LFontRenderer;LRenderEngine;LItemStack;II)V","(Labe;Lzh;Ldk;II)V","RenderItem","iw","net/minecraft/src","0" +"func_40266_a","func_40266_a","a","(IIIII)V","(IIIII)V","RenderItem","iw","net/minecraft/src","0" +"func_164_b","renderItemOverlayIntoGUI","b","(LFontRenderer;LRenderEngine;LItemStack;II)V","(Labe;Lzh;Ldk;II)V","RenderItem","iw","net/minecraft/src","0" +"func_162_a","renderQuad","a","(LTessellator;IIIII)V","(Lcv;IIIII)V","RenderItem","iw","net/minecraft/src","0" +"func_163_a","renderTexturedQuad","a","(IIIIII)V","(IIIIII)V","RenderItem","iw","net/minecraft/src","0" +"func_35864_a","loadItemStackFromNBT","a","(LNBTTagCompound;)LItemStack;","(Lik;)Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_1085_a","splitStack","a","(I)LItemStack;","(I)Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_1091_a","getItem","a","()LItem;","()Lacy;","ItemStack","dk","net/minecraft/src","0" +"func_1088_b","getIconIndex","b","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_1090_a","useItem","a","(LEntityPlayer;LWorld;IIII)Z","(Lvi;Lry;IIII)Z","ItemStack","dk","net/minecraft/src","0" +"func_1098_a","getStrVsBlock","a","(LBlock;)F","(Lyy;)F","ItemStack","dk","net/minecraft/src","0" +"func_1093_a","useItemRightClick","a","(LWorld;LEntityPlayer;)LItemStack;","(Lry;Lvi;)Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_35863_b","onFoodEaten","b","(LWorld;LEntityPlayer;)LItemStack;","(Lry;Lvi;)Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_1086_a","writeToNBT","b","(LNBTTagCompound;)LNBTTagCompound;","(Lik;)Lik;","ItemStack","dk","net/minecraft/src","0" +"func_1096_b","readFromNBT","c","(LNBTTagCompound;)V","(Lik;)V","ItemStack","dk","net/minecraft/src","0" +"func_1089_c","getMaxStackSize","c","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_21180_d","isStackable","d","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_21182_e","isItemStackDamageable","e","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_21183_f","getHasSubtypes","f","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_21185_g","isItemDamaged","g","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_21179_h","getItemDamageForDisplay","h","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_21181_i","getItemDamage","i","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_28156_b","setItemDamage","b","(I)V","(I)V","ItemStack","dk","net/minecraft/src","0" +"func_1094_d","getMaxDamage","j","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_25190_a","damageItem","a","(ILEntityLiving;)V","(ILnq;)V","ItemStack","dk","net/minecraft/src","0" +"func_1092_a","hitEntity","a","(LEntityLiving;LEntityPlayer;)V","(Lnq;Lvi;)V","ItemStack","dk","net/minecraft/src","0" +"func_25191_a","onDestroyBlock","a","(IIIILEntityPlayer;)V","(IIIILvi;)V","ItemStack","dk","net/minecraft/src","0" +"func_1095_a","getDamageVsEntity","a","(LEntity;)I","(Lia;)I","ItemStack","dk","net/minecraft/src","0" +"func_1099_b","canHarvestBlock","b","(LBlock;)Z","(Lyy;)Z","ItemStack","dk","net/minecraft/src","0" +"func_1097_a","onItemDestroyedByUse","a","(LEntityPlayer;)V","(Lvi;)V","ItemStack","dk","net/minecraft/src","0" +"func_1100_b","useItemOnEntity","a","(LEntityLiving;)V","(Lnq;)V","ItemStack","dk","net/minecraft/src","0" +"func_1102_e","copy","k","()LItemStack;","()Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_20107_a","areItemStacksEqual","a","(LItemStack;LItemStack;)Z","(Ldk;Ldk;)Z","ItemStack","dk","net/minecraft/src","0" +"func_20108_a","isItemStackEqual","d","(LItemStack;)Z","(Ldk;)Z","ItemStack","dk","net/minecraft/src","0" +"func_21184_a","isItemEqual","a","(LItemStack;)Z","(Ldk;)Z","ItemStack","dk","net/minecraft/src","0" +"func_30010_b","copyItemStack","b","(LItemStack;)LItemStack;","(Ldk;)Ldk;","ItemStack","dk","net/minecraft/src","0" +"func_28153_a","updateAnimation","a","(LWorld;LEntity;IZ)V","(Lry;Lia;IZ)V","ItemStack","dk","net/minecraft/src","0" +"func_28155_b","onCrafting","c","(LWorld;LEntityPlayer;)V","(Lry;Lvi;)V","ItemStack","dk","net/minecraft/src","0" +"func_28154_b","isStackEqual","c","(LItemStack;)Z","(Ldk;)Z","ItemStack","dk","net/minecraft/src","0" +"func_35866_m","getMaxItemUseDuration","l","()I","()I","ItemStack","dk","net/minecraft/src","0" +"func_35865_n","getItemUseAction","m","()LEnumAction;","()Lps;","ItemStack","dk","net/minecraft/src","0" +"func_35862_a","onPlayerStoppedUsing","a","(LWorld;LEntityPlayer;I)V","(Lry;Lvi;I)V","ItemStack","dk","net/minecraft/src","0" +"func_40710_n","hasTagCompound","n","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_40709_o","getTagCompound","o","()LNBTTagCompound;","()Lik;","ItemStack","dk","net/minecraft/src","0" +"func_40714_p","getEnchantmentTagList","p","()LNBTTagList;","()Lyi;","ItemStack","dk","net/minecraft/src","0" +"func_40706_d","setTagCompound","d","(LNBTTagCompound;)V","(Lik;)V","ItemStack","dk","net/minecraft/src","0" +"func_40712_q","getItemNameandInformation","q","()Ljava/util/List;","()Ljava/util/List;","ItemStack","dk","net/minecraft/src","0" +"func_40713_r","func_40713_r","r","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_40707_s","func_40707_s","s","()LEnumRarity;","()Lja;","ItemStack","dk","net/minecraft/src","0" +"func_40708_t","func_40708_t","t","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_40705_a","addEnchantment","a","(LEnchantment;I)V","(Laef;I)V","ItemStack","dk","net/minecraft/src","0" +"func_40711_u","func_40711_u","u","()Z","()Z","ItemStack","dk","net/minecraft/src","0" +"func_40434_a_","getEffectNames","e","(LItemStack;)Ljava/util/List;","(Ldk;)Ljava/util/List;","ItemPotion","abk","net/minecraft/src","0" +"func_40431_c_","getEffectNamesFromDamage","d","(I)Ljava/util/List;","(I)Ljava/util/List;","ItemPotion","abk","net/minecraft/src","0" +"func_40433_c","isSplashPotion","e","(I)Z","(I)Z","ItemPotion","abk","net/minecraft/src","0" +"func_40432_e","isEffectInstant","f","(I)Z","(I)Z","ItemPotion","abk","net/minecraft/src","0" +"func_175_a","preRenderScale","a","(LEntityGiantZombie;F)V","(Labc;F)V","RenderGiantZombie","ahi","net/minecraft/src","0" +"func_22179_a","deleteFiles","a","([Ljava/io/File;)V","([Ljava/io/File;)V","SaveFormatOld","w","net/minecraft/src","0" +"func_4056_N","onUpdate2","k_","()V","()V","EntityClientPlayerMP","cx","net/minecraft/src","0" +"func_9375_Q","sendInventoryChanged","j","()V","()V","EntityClientPlayerMP","cx","net/minecraft/src","0" +"func_27027_b","incrementStat","b","(LStatBase;I)V","(Lpx;I)V","EntityClientPlayerMP","cx","net/minecraft/src","0" +"func_35303_f","isFenceAt","c","(LIBlockAccess;III)Z","(Lkq;III)Z","BlockFence","nz","net/minecraft/src","0" +"func_35960_a","onTick","a","(I)V","(I)V","KeyBinding","aby","net/minecraft/src","0" +"func_35963_a","setKeyBindState","a","(IZ)V","(IZ)V","KeyBinding","aby","net/minecraft/src","0" +"func_35959_a","unPressAllKeys","a","()V","()V","KeyBinding","aby","net/minecraft/src","0" +"func_35961_b","resetKeyBindingArrayAndHash","b","()V","()V","KeyBinding","aby","net/minecraft/src","0" +"func_35962_c","isPressed","c","()Z","()Z","KeyBinding","aby","net/minecraft/src","0" +"func_35958_d","unpressKey","d","()V","()V","KeyBinding","aby","net/minecraft/src","0" +"func_35629_a","generateStructuresInChunk","a","(LWorld;Ljava/util/Random;II)Z","(Lry;Ljava/util/Random;II)Z","MapGenStructure","hl","net/minecraft/src","0" +"func_40483_a","func_40483_a","a","(III)Z","(III)Z","MapGenStructure","hl","net/minecraft/src","0" +"func_40484_a","func_40484_a","a","(LWorld;III)LChunkPosition;","(Lry;III)Lam;","MapGenStructure","hl","net/minecraft/src","0" +"func_40482_a","func_40482_a","a","()Ljava/util/List;","()Ljava/util/List;","MapGenStructure","hl","net/minecraft/src","0" +"func_35628_a","canSpawnStructureAtCoords","a","(II)Z","(II)Z","MapGenStructure","hl","net/minecraft/src","0" +"func_35630_b","getStructureStart","b","(II)LStructureStart;","(II)Loa;","MapGenStructure","hl","net/minecraft/src","0" +"func_6360_i","removeLeaves","g","(LWorld;III)V","(Lry;III)V","BlockLeaves","qo","net/minecraft/src","0" +"func_310_a","setGraphicsLevel","a","(Z)V","(Z)V","BlockLeaves","qo","net/minecraft/src","0" +"func_35602_a","canSpawnMoreVillagePiecesOfType","a","(I)Z","(I)Z","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"func_35603_a","canSpawnMoreVillagePieces","a","()Z","()Z","StructureVillagePieceWeight","aan","net/minecraft/src","0" +"func_28214_a","func_28214_a","a","(Ljava/io/File;Ljava/lang/String;Ljava/io/File;)V","(Ljava/io/File;Ljava/lang/String;Ljava/io/File;)V","StatsSyncher","jq","net/minecraft/src","0" +"func_27415_a","func_27415_a","a","(Ljava/io/File;Ljava/io/File;Ljava/io/File;)Ljava/util/Map;","(Ljava/io/File;Ljava/io/File;Ljava/io/File;)Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"func_27408_a","func_27408_a","a","(Ljava/io/File;)Ljava/util/Map;","(Ljava/io/File;)Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"func_27410_a","func_27410_a","a","(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V","(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V","StatsSyncher","jq","net/minecraft/src","0" +"func_27418_a","beginReceiveStats","a","()V","()V","StatsSyncher","jq","net/minecraft/src","0" +"func_27424_a","beginSendStats","a","(Ljava/util/Map;)V","(Ljava/util/Map;)V","StatsSyncher","jq","net/minecraft/src","0" +"func_27407_b","syncStatsFileWithMap","b","(Ljava/util/Map;)V","(Ljava/util/Map;)V","StatsSyncher","jq","net/minecraft/src","0" +"func_27420_b","func_27420_b","b","()Z","()Z","StatsSyncher","jq","net/minecraft/src","0" +"func_27425_c","func_27425_c","c","()V","()V","StatsSyncher","jq","net/minecraft/src","0" +"func_27422_a","func_27422_a","a","(LStatsSyncher;)Ljava/util/Map;","(Ljq;)Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"func_27423_b","func_27423_b","b","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_27411_c","func_27411_c","c","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_27413_d","func_27413_d","d","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_27412_a","func_27412_a","a","(LStatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V","(Ljq;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V","StatsSyncher","jq","net/minecraft/src","0" +"func_27421_a","func_27421_a","a","(LStatsSyncher;Ljava/util/Map;)Ljava/util/Map;","(Ljq;Ljava/util/Map;)Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"func_27409_a","func_27409_a","a","(LStatsSyncher;Ljava/io/File;Ljava/io/File;Ljava/io/File;)Ljava/util/Map;","(Ljq;Ljava/io/File;Ljava/io/File;Ljava/io/File;)Ljava/util/Map;","StatsSyncher","jq","net/minecraft/src","0" +"func_27416_a","setBusy","a","(LStatsSyncher;Z)Z","(Ljq;Z)Z","StatsSyncher","jq","net/minecraft/src","0" +"func_27414_e","getUnsentDataFile","e","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_27417_f","getUnsentTempFile","f","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_27419_g","getUnsentOldFile","g","(LStatsSyncher;)Ljava/io/File;","(Ljq;)Ljava/io/File;","StatsSyncher","jq","net/minecraft/src","0" +"func_465_i","getWorld","g","()LWorld;","()Lry;","EntityFallingSand","uo","net/minecraft/src","0" +"accept","accept","accept","(Ljava/io/File;Ljava/lang/String;)Z","(Ljava/io/File;Ljava/lang/String;)Z","ChunkFilePattern","rm","net/minecraft/src","0" +"func_27063_c","typeSafeApplyTo","a","(Ljava/lang/Object;)Ljava/lang/Object;","(Ljava/lang/Object;)Ljava/lang/Object;","J_LeafFunctor","yz","net/minecraft/src","0" +"func_35087_a","func_35087_a","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Lyp;Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentVillagePathGen","ahz","net/minecraft/src","0" +"func_22149_a","getChunkLoader","a","(LWorldProvider;)LIChunkLoader;","(Lk;)Ld;","ISaveHandler","nh","net/minecraft/src","0" +"func_22148_a","saveWorldInfoAndPlayer","a","(LWorldInfo;Ljava/util/List;)V","(Lsi;Ljava/util/List;)V","ISaveHandler","nh","net/minecraft/src","0" +"func_22151_c","loadWorldInfo","c","()LWorldInfo;","()Lsi;","ISaveHandler","nh","net/minecraft/src","0" +"func_22150_b","checkSessionLock","b","()V","()V","ISaveHandler","nh","net/minecraft/src","0" +"func_22152_a","saveWorldInfo","a","(LWorldInfo;)V","(Lsi;)V","ISaveHandler","nh","net/minecraft/src","0" +"func_28113_a","getMapFile","a","(Ljava/lang/String;)Ljava/io/File;","(Ljava/lang/String;)Ljava/io/File;","ISaveHandler","nh","net/minecraft/src","0" +"func_40530_d","getSaveDirectoryName","d","()Ljava/lang/String;","()Ljava/lang/String;","ISaveHandler","nh","net/minecraft/src","0" +"func_35291_d","isFenceGateOpen","b_","(I)Z","(I)Z","BlockFenceGate","fp","net/minecraft/src","0" +"func_35290_f","func_35290_f","d","(I)I","(I)I","BlockFenceGate","fp","net/minecraft/src","0" +"func_40287_a","func_40287_a","a","(LEntitySlime;IF)I","(Laed;IF)I","RenderSlime","xm","net/minecraft/src","0" +"func_178_a","scaleSlime","a","(LEntitySlime;F)V","(Laed;F)V","RenderSlime","xm","net/minecraft/src","0" +"func_154_a","renderArrow","a","(LEntityArrow;DDDFF)V","(Lro;DDDFF)V","RenderArrow","ahs","net/minecraft/src","0" +"func_40033_a","func_40033_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing3;","(Ljava/util/List;Ljava/util/Random;IIIII)Lbw;","ComponentNetherBridgeCrossing3","bw","net/minecraft/src","0" +"openInputStream","openInputStream","openInputStream","()Ljava/io/InputStream;","()Ljava/io/InputStream;","CodecMus","vo","net/minecraft/src","0" +"func_530_a","pickCheckLootItem","a","(Ljava/util/Random;)LItemStack;","(Ljava/util/Random;)Ldk;","WorldGenDungeons","acj","net/minecraft/src","0" +"func_531_b","pickMobSpawner","b","(Ljava/util/Random;)Ljava/lang/String;","(Ljava/util/Random;)Ljava/lang/String;","WorldGenDungeons","acj","net/minecraft/src","0" +"func_4132_a","renderItem","a","(LEntityLiving;LItemStack;I)V","(Lnq;Ldk;I)V","ItemRenderer","n","net/minecraft/src","0" +"func_40686_a","func_40686_a","a","(LTessellator;FFFF)V","(Lcv;FFFF)V","ItemRenderer","n","net/minecraft/src","0" +"func_4133_a","renderItemInFirstPerson","a","(F)V","(F)V","ItemRenderer","n","net/minecraft/src","0" +"func_893_b","renderOverlays","b","(F)V","(F)V","ItemRenderer","n","net/minecraft/src","0" +"func_898_a","renderInsideOfBlock","a","(FI)V","(FI)V","ItemRenderer","n","net/minecraft/src","0" +"func_892_c","renderWarpedTextureOverlay","c","(F)V","(F)V","ItemRenderer","n","net/minecraft/src","0" +"func_890_d","renderFireInFirstPerson","d","(F)V","(F)V","ItemRenderer","n","net/minecraft/src","0" +"func_895_a","updateEquippedItem","a","()V","()V","ItemRenderer","n","net/minecraft/src","0" +"func_9449_b","func_9449_b","b","()V","()V","ItemRenderer","n","net/minecraft/src","0" +"func_9450_c","func_9450_c","c","()V","()V","ItemRenderer","n","net/minecraft/src","0" +"func_166_a","shouldRenderPass","a","(LEntityLiving;IF)I","(Lnq;IF)I","RenderLiving","acq","net/minecraft/src","0" +"func_6331_b","renderEquippedItems","b","(LEntityLiving;F)V","(Lnq;F)V","RenderLiving","acq","net/minecraft/src","0" +"func_21004_a","rotateCorpse","a","(LEntityLiving;FFF)V","(Lnq;FFF)V","RenderLiving","acq","net/minecraft/src","0" +"func_40270_a","func_40270_a","a","(LEntityLiving;FFFFFF)V","(Lnq;FFFFFF)V","RenderLiving","acq","net/minecraft/src","0" +"func_171_a","doRenderLiving","a","(LEntityLiving;DDDFF)V","(Lnq;DDDFF)V","RenderLiving","acq","net/minecraft/src","0" +"func_6330_a","preRenderCallback","a","(LEntityLiving;F)V","(Lnq;F)V","RenderLiving","acq","net/minecraft/src","0" +"func_4013_a","setRenderPassModel","a","(LModelBase;)V","(Lal;)V","RenderLiving","acq","net/minecraft/src","0" +"func_22012_b","renderLivingAt","b","(LEntityLiving;DDD)V","(Lnq;DDD)V","RenderLiving","acq","net/minecraft/src","0" +"func_167_c","renderSwingProgress","d","(LEntityLiving;F)F","(Lnq;F)F","RenderLiving","acq","net/minecraft/src","0" +"func_170_d","handleRotationFloat","c","(LEntityLiving;F)F","(Lnq;F)F","RenderLiving","acq","net/minecraft/src","0" +"func_27005_b","inheritRenderPass","b","(LEntityLiving;IF)I","(Lnq;IF)I","RenderLiving","acq","net/minecraft/src","0" +"func_172_a","getDeathMaxRotation","a","(LEntityLiving;)F","(Lnq;)F","RenderLiving","acq","net/minecraft/src","0" +"func_173_a","getColorMultiplier","a","(LEntityLiving;FF)I","(Lnq;FF)I","RenderLiving","acq","net/minecraft/src","0" +"func_22014_a","passSpecialRender","a","(LEntityLiving;DDD)V","(Lnq;DDD)V","RenderLiving","acq","net/minecraft/src","0" +"func_22013_a","renderLivingLabel","a","(LEntityLiving;Ljava/lang/String;DDDI)V","(Lnq;Ljava/lang/String;DDDI)V","RenderLiving","acq","net/minecraft/src","0" +"func_40561_a","func_40561_a","a","(IJ)V","(IJ)V","PacketCount","lg","net/minecraft/src","0" +"func_20060_w","dropCurrentItem","l_","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_446_a","joinEntityItemWithWorld","a","(LEntityItem;)V","(Lih;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_457_w","swingItem","m_","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_9367_r","respawnPlayer","n_","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_20059_m","closeScreen","m","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_25058_a","addStat","a","(LStatBase;I)V","(Lpx;I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35195_X","getItemInUse","ax","()LItemStack;","()Ldk;","EntityPlayer","vi","net/minecraft/src","0" +"func_35205_Y","func_35205_Y","ay","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_35196_Z","isUsingItem","az","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" +"func_35192_aa","getItemInUseDuration","aA","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_35206_ab","stopUsingItem","aB","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_35207_ac","clearItemInUse","aC","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_35201_a","func_35201_a","b","(LItemStack;I)V","(Ldk;I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35208_ae","func_35208_ae","aD","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_35202_aE","func_35202_aE","aQ","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_451_h","collideWithPlayer","l","(LEntity;)V","(Lia;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_6417_t","getScore","aE","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_449_a","dropPlayerItem","a","(LItemStack;)V","(Ldk;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_444_a","dropPlayerItemWithRandomChoice","a","(LItemStack;Z)V","(Ldk;Z)V","EntityPlayer","vi","net/minecraft/src","0" +"func_450_a","getCurrentPlayerStrVsBlock","a","(LBlock;)F","(Lyy;)F","EntityPlayer","vi","net/minecraft/src","0" +"func_454_b","canHarvestBlock","b","(LBlock;)Z","(Lyy;)Z","EntityPlayer","vi","net/minecraft/src","0" +"func_452_a","displayGUIChest","a","(LIInventory;)V","(Lde;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_40181_c","displayGUIEnchantment","b","(III)V","(III)V","EntityPlayer","vi","net/minecraft/src","0" +"func_445_l","displayWorkbenchGUI","a","(III)V","(III)V","EntityPlayer","vi","net/minecraft/src","0" +"func_443_a_","onItemPickup","a","(LEntity;I)V","(Lia;I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_22058_C","resetHeight","aF","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_27025_G","isPVPEnabled","aG","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" +"func_25055_a","alertWolves","a","(LEntityLiving;Z)V","(Lnq;Z)V","EntityPlayer","vi","net/minecraft/src","0" +"func_453_a","displayGUIFurnace","a","(LTileEntityFurnace;)V","(Loe;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_21092_a","displayGUIDispenser","a","(LTileEntityDispenser;)V","(Lbp;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_4052_a","displayGUIEditSign","a","(LTileEntitySign;)V","(Lu;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_40180_a","displayGUIBrewingStand","a","(LTileEntityBrewingStand;)V","(Ltt;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_6415_a_","useCurrentItemOnEntity","j","(LEntity;)V","(Lia;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_6416_v","getCurrentEquippedItem","aH","()LItemStack;","()Ldk;","EntityPlayer","vi","net/minecraft/src","0" +"func_448_u","destroyCurrentEquippedItem","aI","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_463_a","attackTargetEntityWithCurrentItem","k","(LEntity;)V","(Lia;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35200_b","onCriticalHit","a","(LEntity;)V","(Lia;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_40183_c","func_40183_c","b","(LEntity;)V","(Lia;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_6420_o","func_6420_o","r","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_20058_b","onItemStackChanged","c","(LItemStack;)V","(Ldk;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_22053_b","sleepInBedAt","d","(III)LEnumStatus;","(III)Lqy;","EntityPlayer","vi","net/minecraft/src","0" +"func_22052_e","func_22052_e","b","(I)V","(I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_22056_a","wakeUpPlayer","a","(ZZZ)V","(ZZZ)V","EntityPlayer","vi","net/minecraft/src","0" +"func_22057_q","isInBed","aR","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" +"func_25060_a","verifyRespawnCoordinates","a","(LWorld;LChunkCoordinates;)LChunkCoordinates;","(Lry;Ldh;)Ldh;","EntityPlayer","vi","net/minecraft/src","0" +"func_22059_J","getBedOrientationInDegrees","aJ","()F","()F","EntityPlayer","vi","net/minecraft/src","0" +"func_22054_L","isPlayerFullyAsleep","aK","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" +"func_22060_M","getSleepTimer","aL","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_22055_b","addChatMessage","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_25059_P","getPlayerSpawnCoordinate","aM","()LChunkCoordinates;","()Ldh;","EntityPlayer","vi","net/minecraft/src","0" +"func_25061_a","setPlayerSpawnCoordinate","a","(LChunkCoordinates;)V","(Ldh;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_27026_a","triggerAchievement","a","(LStatBase;)V","(Lpx;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_25056_h","addMovementStat","j","(DDD)V","(DDD)V","EntityPlayer","vi","net/minecraft/src","0" +"func_27024_i","addMountedMovementStat","k","(DDD)V","(DDD)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35204_c","increaseXP","k","(I)V","(I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_40184_i","decreaseLevel","l","(I)V","(I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35193_as","xpBarCap","aN","()I","()I","EntityPlayer","vi","net/minecraft/src","0" +"func_35203_aG","increaseLevel","aS","()V","()V","EntityPlayer","vi","net/minecraft/src","0" +"func_35198_d","addExhaustion","g","(F)V","(F)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35191_at","getFoodStats","aO","()LFoodStats;","()Leq;","EntityPlayer","vi","net/minecraft/src","0" +"func_35197_b","canEat","b","(Z)Z","(Z)Z","EntityPlayer","vi","net/minecraft/src","0" +"func_35194_au","shouldHeal","aP","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" +"func_35199_b","setItemInUse","c","(LItemStack;I)V","(Ldk;I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_35190_e","func_35190_e","e","(III)Z","(III)Z","EntityPlayer","vi","net/minecraft/src","0" +"func_40182_b","func_40182_b","c","(I)V","(I)V","EntityPlayer","vi","net/minecraft/src","0" +"func_41014_d","copyPlayer","d","(LEntityPlayer;)V","(Lvi;)V","EntityPlayer","vi","net/minecraft/src","0" +"func_41033_a","func_41033_a","a","([Ljava/lang/String;)LItemColored;","([Ljava/lang/String;)Lhf;","ItemColored","hf","net/minecraft/src","0" +"func_35475_a","createBiomeDecorator","a","()LBiomeDecorator;","()Lql;","BiomeGenBase","sr","net/minecraft/src","0" +"func_35478_a","setTemperatureRainfall","a","(FF)LBiomeGenBase;","(FF)Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_35479_b","setMinMaxHeight","b","(FF)LBiomeGenBase;","(FF)Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_27076_e","setDisableRain","g","()LBiomeGenBase;","()Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_21107_a","getRandomWorldGenForTrees","a","(Ljava/util/Random;)LWorldGenerator;","(Ljava/util/Random;)Lig;","BiomeGenBase","sr","net/minecraft/src","0" +"func_4125_a","setBiomeName","a","(Ljava/lang/String;)LBiomeGenBase;","(Ljava/lang/String;)Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_4124_a","func_4124_a","a","(I)LBiomeGenBase;","(I)Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_4123_b","setColor","b","(I)LBiomeGenBase;","(I)Lsr;","BiomeGenBase","sr","net/minecraft/src","0" +"func_4126_a","getSkyColorByTemp","a","(F)I","(F)I","BiomeGenBase","sr","net/minecraft/src","0" +"func_25063_a","getSpawnableList","a","(LEnumCreatureType;)Ljava/util/List;","(Ljf;)Ljava/util/List;","BiomeGenBase","sr","net/minecraft/src","0" +"func_27078_c","getEnableSnow","b","()Z","()Z","BiomeGenBase","sr","net/minecraft/src","0" +"func_27077_d","canSpawnLightningBolt","c","()Z","()Z","BiomeGenBase","sr","net/minecraft/src","0" +"func_4119_a","getSpawningChance","d","()F","()F","BiomeGenBase","sr","net/minecraft/src","0" +"func_35476_e","func_35476_e","e","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" +"func_35474_f","func_35474_f","f","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" +"func_35477_a","func_35477_a","a","(LWorld;Ljava/util/Random;II)V","(Lry;Ljava/util/Random;II)V","BiomeGenBase","sr","net/minecraft/src","0" +"func_40254_a","getGrassColorAtCoords","a","(LIBlockAccess;III)I","(Lkq;III)I","BiomeGenBase","sr","net/minecraft/src","0" +"func_40255_b","getFoliageColorAtCoords","b","(LIBlockAccess;III)I","(Lkq;III)I","BiomeGenBase","sr","net/minecraft/src","0" +"func_22183_a","func_22183_a","a","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","SaveConverterMcRegion","adg","net/minecraft/src","0" +"func_22181_a","func_22181_a","a","(Ljava/io/File;Ljava/util/ArrayList;IILIProgressUpdate;)V","(Ljava/io/File;Ljava/util/ArrayList;IILrz;)V","SaveConverterMcRegion","adg","net/minecraft/src","0" +"func_22182_a","func_22182_a","a","(Ljava/util/ArrayList;IILIProgressUpdate;)V","(Ljava/util/ArrayList;IILrz;)V","SaveConverterMcRegion","adg","net/minecraft/src","0" +"func_596_a","printText","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","LoadingScreenRenderer","xw","net/minecraft/src","0" +"func_597_c","func_597_c","d","(Ljava/lang/String;)V","(Ljava/lang/String;)V","LoadingScreenRenderer","xw","net/minecraft/src","0" +"func_537_a","chunkExists","c","(II)Z","(II)Z","IChunkProvider","ej","net/minecraft/src","0" +"func_533_b","provideChunk","b","(II)LChunk;","(II)Lzx;","IChunkProvider","ej","net/minecraft/src","0" +"func_538_d","loadChunk","a","(II)LChunk;","(II)Lzx;","IChunkProvider","ej","net/minecraft/src","0" +"func_534_a","populate","a","(LIChunkProvider;II)V","(Lej;II)V","IChunkProvider","ej","net/minecraft/src","0" +"func_535_a","saveChunks","a","(ZLIProgressUpdate;)Z","(ZLrz;)Z","IChunkProvider","ej","net/minecraft/src","0" +"func_532_a","unload100OldestChunks","a","()Z","()Z","IChunkProvider","ej","net/minecraft/src","0" +"func_536_b","canSave","b","()Z","()Z","IChunkProvider","ej","net/minecraft/src","0" +"func_21109_c","makeString","c","()Ljava/lang/String;","()Ljava/lang/String;","IChunkProvider","ej","net/minecraft/src","0" +"func_40377_a","func_40377_a","a","(LEnumCreatureType;III)Ljava/util/List;","(Ljf;III)Ljava/util/List;","IChunkProvider","ej","net/minecraft/src","0" +"func_40376_a","func_40376_a","a","(LWorld;Ljava/lang/String;III)LChunkPosition;","(Lry;Ljava/lang/String;III)Lam;","IChunkProvider","ej","net/minecraft/src","0" +"func_35119_j_","getXpValue","g","()I","()I","EntityXPOrb","fk","net/minecraft/src","0" +"func_35120_i","getTextureByXP","h","()I","()I","EntityXPOrb","fk","net/minecraft/src","0" +"func_35121_b","getXPSplit","b","(I)I","(I)I","EntityXPOrb","fk","net/minecraft/src","0" +"func_40014_a","func_40014_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdPortalRoom;","(Ljava/util/List;Ljava/util/Random;IIIII)Lir;","ComponentStrongholdPortalRoom","ir","net/minecraft/src","0" +"func_35741_a","getNewBoundingBox","a","()LStructureBoundingBox;","()Lnl;","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35747_a","getComponentToAddBoundingBox","a","(IIIIIIIIII)LStructureBoundingBox;","(IIIIIIIIII)Lnl;","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35740_a","intersectsWith","a","(LStructureBoundingBox;)Z","(Lnl;)Z","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35746_a","isInsideStructureBB","a","(IIII)Z","(IIII)Z","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35738_b","resizeBoundingBoxTo","b","(LStructureBoundingBox;)V","(Lnl;)V","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35745_a","offset","a","(III)V","(III)V","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35742_b","isVecInside","b","(III)Z","(III)Z","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35744_b","getXSize","b","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35743_c","getYSize","c","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35739_d","getZSize","d","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_40597_e","func_40597_e","e","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_40596_f","func_40596_f","f","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_40598_g","func_40598_g","g","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" +"func_35293_c","func_35293_c","c","(LWorld;IIILjava/util/Random;)Z","(Lry;IIILjava/util/Random;)Z","BlockMushroom","js","net/minecraft/src","0" +"func_1137_a","createEntityPathTo","a","(LEntity;LEntity;F)LPathEntity;","(Lia;Lia;F)Ldw;","PathFinder","rw","net/minecraft/src","0" +"func_1131_a","createEntityPathTo","a","(LEntity;IIIF)LPathEntity;","(Lia;IIIF)Ldw;","PathFinder","rw","net/minecraft/src","0" +"func_1130_a","createEntityPathTo","a","(LEntity;DDDF)LPathEntity;","(Lia;DDDF)Ldw;","PathFinder","rw","net/minecraft/src","0" +"func_1129_a","addToPath","a","(LEntity;LPathPoint;LPathPoint;LPathPoint;F)LPathEntity;","(Lia;Lmo;Lmo;Lmo;F)Ldw;","PathFinder","rw","net/minecraft/src","0" +"func_1133_b","findPathOptions","b","(LEntity;LPathPoint;LPathPoint;LPathPoint;F)I","(Lia;Lmo;Lmo;Lmo;F)I","PathFinder","rw","net/minecraft/src","0" +"func_1135_a","getSafePoint","a","(LEntity;IIILPathPoint;I)LPathPoint;","(Lia;IIILmo;I)Lmo;","PathFinder","rw","net/minecraft/src","0" +"func_1136_a","openPoint","a","(III)LPathPoint;","(III)Lmo;","PathFinder","rw","net/minecraft/src","0" +"func_1132_a","getVerticalOffset","a","(LEntity;IIILPathPoint;)I","(Lia;IIILmo;)I","PathFinder","rw","net/minecraft/src","0" +"func_1134_a","createEntityPath","a","(LPathPoint;LPathPoint;)LPathEntity;","(Lmo;Lmo;)Ldw;","PathFinder","rw","net/minecraft/src","0" +"func_40160_a","func_40160_a","a","(IF)[D","(IF)[D","EntityDragon","oo","net/minecraft/src","0" +"func_41011_ay","func_41011_ay","ay","()V","()V","EntityDragon","oo","net/minecraft/src","0" +"func_41007_az","func_41007_az","az","()V","()V","EntityDragon","oo","net/minecraft/src","0" +"func_41008_a","func_41008_a","a","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityDragon","oo","net/minecraft/src","0" +"func_41009_b","func_41009_b","b","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityDragon","oo","net/minecraft/src","0" +"func_41006_aA","func_41006_aA","aA","()V","()V","EntityDragon","oo","net/minecraft/src","0" +"func_40159_b","func_40159_b","b","(D)F","(D)F","EntityDragon","oo","net/minecraft/src","0" +"func_40158_a","func_40158_a","a","(LAxisAlignedBB;)Z","(Lc;)Z","EntityDragon","oo","net/minecraft/src","0" +"func_41012_a","func_41012_a","a","(II)V","(II)V","EntityDragon","oo","net/minecraft/src","0" +"func_41010_ax","func_41010_ax","ax","()I","()I","EntityDragon","oo","net/minecraft/src","0" +"func_35830_a","func_35830_a","a","()J","()J","LongHashMapEntry","ahc","net/minecraft/src","0" +"func_35829_b","func_35829_b","b","()Ljava/lang/Object;","()Ljava/lang/Object;","LongHashMapEntry","ahc","net/minecraft/src","0" +"func_1197_a","setPosition","a","(III)V","(III)V","WorldRenderer","ge","net/minecraft/src","0" +"func_1203_g","setupGLTranslation","g","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_1198_a","updateRenderer","a","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_1202_a","distanceToEntitySquared","a","(LEntity;)F","(Lia;)F","WorldRenderer","ge","net/minecraft/src","0" +"func_1195_b","setDontDraw","b","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_1204_c","stopRendering","c","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_1200_a","getGLCallListForPass","a","(I)I","(I)I","WorldRenderer","ge","net/minecraft/src","0" +"func_1199_a","updateInFrustrum","a","(LICamera;)V","(Lfn;)V","WorldRenderer","ge","net/minecraft/src","0" +"func_1201_d","callOcclusionQueryList","d","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_1196_e","skipAllRenderPasses","e","()Z","()Z","WorldRenderer","ge","net/minecraft/src","0" +"func_1194_f","markDirty","f","()V","()V","WorldRenderer","ge","net/minecraft/src","0" +"func_340_a","loadSoundSettings","a","(LGameSettings;)V","(Lki;)V","SoundManager","ahm","net/minecraft/src","0" +"func_339_d","tryToSetLibraryAndCodecs","d","()V","()V","SoundManager","ahm","net/minecraft/src","0" +"func_335_a","onSoundOptionsChanged","a","()V","()V","SoundManager","ahm","net/minecraft/src","0" +"func_330_b","closeMinecraft","b","()V","()V","SoundManager","ahm","net/minecraft/src","0" +"func_6372_a","addSound","a","(Ljava/lang/String;Ljava/io/File;)V","(Ljava/lang/String;Ljava/io/File;)V","SoundManager","ahm","net/minecraft/src","0" +"func_6373_b","addStreaming","b","(Ljava/lang/String;Ljava/io/File;)V","(Ljava/lang/String;Ljava/io/File;)V","SoundManager","ahm","net/minecraft/src","0" +"func_6374_c","addMusic","c","(Ljava/lang/String;Ljava/io/File;)V","(Ljava/lang/String;Ljava/io/File;)V","SoundManager","ahm","net/minecraft/src","0" +"func_4033_c","playRandomMusicIfReady","c","()V","()V","SoundManager","ahm","net/minecraft/src","0" +"func_338_a","func_338_a","a","(LEntityLiving;F)V","(Lnq;F)V","SoundManager","ahm","net/minecraft/src","0" +"func_331_a","playStreaming","a","(Ljava/lang/String;FFFFF)V","(Ljava/lang/String;FFFFF)V","SoundManager","ahm","net/minecraft/src","0" +"func_336_b","playSound","b","(Ljava/lang/String;FFFFF)V","(Ljava/lang/String;FFFFF)V","SoundManager","ahm","net/minecraft/src","0" +"func_337_a","playSoundFX","a","(Ljava/lang/String;FF)V","(Ljava/lang/String;FF)V","SoundManager","ahm","net/minecraft/src","0" +"func_180_a","renderSaddledPig","a","(LEntityPig;IF)I","(Lfd;IF)I","RenderPig","yf","net/minecraft/src","0" +"func_40286_a","func_40286_a","a","(LEntityPig;DDDFF)V","(Lfd;DDDFF)V","RenderPig","yf","net/minecraft/src","0" +"func_27243_a","func_27243_a","a","()LJ_JsonStringNode;","()Loj;","J_JsonStringNodeBuilder","h","net/minecraft/src","0" +"func_861_a","func_861_a","a","(IIIDDD)V","(IIIDDD)V","RenderList","aak","net/minecraft/src","0" +"func_862_a","func_862_a","a","(III)Z","(III)Z","RenderList","aak","net/minecraft/src","0" +"func_858_a","func_858_a","a","(I)V","(I)V","RenderList","aak","net/minecraft/src","0" +"func_860_a","func_860_a","a","()V","()V","RenderList","aak","net/minecraft/src","0" +"func_859_b","func_859_b","b","()V","()V","RenderList","aak","net/minecraft/src","0" +"func_35969_a","addChild","a","(LModelRenderer;)V","(Lacf;)V","ModelRenderer","acf","net/minecraft/src","0" +"func_40602_a","setTextureOffset","a","(II)LModelRenderer;","(II)Lacf;","ModelRenderer","acf","net/minecraft/src","0" +"func_40603_a","addBox","a","(Ljava/lang/String;FFFIII)LModelRenderer;","(Ljava/lang/String;FFFIII)Lacf;","ModelRenderer","acf","net/minecraft/src","0" +"func_40604_a","addBox","a","(FFFIII)LModelRenderer;","(FFFIII)Lacf;","ModelRenderer","acf","net/minecraft/src","0" +"func_923_a","addBox","a","(FFFIIIF)V","(FFFIIIF)V","ModelRenderer","acf","net/minecraft/src","0" +"func_925_a","setRotationPoint","a","(FFF)V","(FFF)V","ModelRenderer","acf","net/minecraft/src","0" +"func_922_a","render","a","(F)V","(F)V","ModelRenderer","acf","net/minecraft/src","0" +"func_25122_b","renderWithRotation","b","(F)V","(F)V","ModelRenderer","acf","net/minecraft/src","0" +"func_926_b","postRender","c","(F)V","(F)V","ModelRenderer","acf","net/minecraft/src","0" +"func_924_c","compileDisplayList","d","(F)V","(F)V","ModelRenderer","acf","net/minecraft/src","0" +"func_35968_a","setTextureSize","b","(II)LModelRenderer;","(II)Lacf;","ModelRenderer","acf","net/minecraft/src","0" +"func_22115_j","func_22115_j","e","()V","()V","GuiSleepMP","rj","net/minecraft/src","0" +"func_21099_a","getMobID","a","()Ljava/lang/String;","()Ljava/lang/String;","TileEntityMobSpawner","ze","net/minecraft/src","0" +"func_21098_a","setMobID","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","TileEntityMobSpawner","ze","net/minecraft/src","0" +"func_484_a","anyPlayerInRange","c","()Z","()Z","TileEntityMobSpawner","ze","net/minecraft/src","0" +"func_483_c","updateDelay","d","()V","()V","TileEntityMobSpawner","ze","net/minecraft/src","0" +"func_40727_a","clearOverrideBlockTexture","a","()V","()V","RenderBlocks","acr","net/minecraft/src","0" +"func_1223_a","renderBlockUsingTexture","a","(LBlock;IIII)V","(Lyy;IIII)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31075_a","renderBlockAllFaces","a","(LBlock;III)V","(Lyy;III)V","RenderBlocks","acr","net/minecraft/src","0" +"func_35927_a","renderLightOnBlock","a","(IIII)Z","(IIII)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1234_a","renderBlockByRenderType","b","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_40729_s","renderBlockEndPortalFrame","s","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_22331_p","renderBlockBed","t","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_40730_a","renderBlockBrewingStand","a","(LBlockBrewingStand;III)Z","(Lahp;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_40728_a","renderBlockCauldron","a","(LBlockCauldron;III)Z","(Lic;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1241_b","renderBlockTorch","c","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_22332_q","renderBlockRepeater","u","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_31078_d","renderPistonBaseAllFaces","d","(LBlock;III)V","(Lyy;III)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31074_b","renderPistonBase","b","(LBlock;IIIZ)Z","(Lyy;IIIZ)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_31076_a","renderPistonRodUD","a","(DDDDDDFD)V","(DDDDDDFD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31081_b","renderPistonRodSN","b","(DDDDDDFD)V","(DDDDDDFD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31077_c","renderPistonRodEW","c","(DDDDDDFD)V","(DDDDDDFD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31079_a","renderPistonExtensionAllFaces","a","(LBlock;IIIZ)V","(Lyy;IIIZ)V","RenderBlocks","acr","net/minecraft/src","0" +"func_31080_c","renderPistonExtension","c","(LBlock;IIIZ)Z","(Lyy;IIIZ)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1229_c","renderBlockLever","e","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35921_b","renderCorrectedLightOnBlock","b","(IIII)Z","(IIII)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1235_d","renderBlockFire","f","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1242_e","renderBlockRedstoneWire","g","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1216_f","renderBlockMinecartTrack","a","(LBlockRail;III)Z","(Lafr;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1221_g","renderBlockLadder","h","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35929_i","renderBlockVine","i","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35922_a","renderBlockPane","a","(LBlockPane;III)Z","(Luh;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1226_h","renderCrossedSquares","j","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1232_i","renderBlockStem","k","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35930_l","renderBlockCrops","l","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1237_a","renderTorchAtAngle","a","(LBlock;DDDDD)V","(Lyy;DDDDD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1239_a","drawCrossedSquares","a","(LBlock;IDDD)V","(Lyy;IDDD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_35928_a","renderBlockStemSmall","a","(LBlock;IDDDD)V","(Lyy;IDDDD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_40726_m","renderBlockLilyPad","m","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35926_a","renderBlockStemBig","a","(LBlock;IIDDDD)V","(Lyy;IIDDDD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1245_b","renderBlockCropsImpl","b","(LBlock;IDDD)V","(Lyy;IDDD)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1222_j","renderBlockFluids","n","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1224_a","getFluidHeight","a","(IIILMaterial;)F","(IIILp;)F","RenderBlocks","acr","net/minecraft/src","0" +"func_1243_a","renderBlockFallingSand","a","(LBlock;LWorld;III)V","(Lyy;Lry;III)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1228_k","renderStandardBlock","o","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_22330_a","renderStandardBlockWithAmbientOcclusion","a","(LBlock;IIIFFF)Z","(Lyy;IIIFFF)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35924_c","getAoBrightness","c","(IIII)I","(IIII)I","RenderBlocks","acr","net/minecraft/src","0" +"func_4152_a","renderStandardBlockWithColorMultiplier","b","(LBlock;IIIFFF)Z","(Lyy;IIIFFF)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1233_l","renderBlockCactus","p","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1230_b","renderBlockCactusImpl","c","(LBlock;IIIFFF)Z","(Lyy;IIIFFF)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35925_a","renderBlockFence","a","(LBlockFence;III)Z","(Lnz;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_41088_a","renderBlockDragonEgg","a","(LBlockDragonEgg;III)Z","(Laci;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_35923_a","renderBlockFenceGate","a","(LBlockFenceGate;III)Z","(Lfp;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1214_n","renderBlockStairs","q","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1218_o","renderBlockDoor","r","(LBlock;III)Z","(Lyy;III)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_1244_a","renderBottomFace","a","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1217_b","renderTopFace","b","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1220_c","renderEastFace","c","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1225_d","renderWestFace","d","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1231_e","renderNorthFace","e","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1236_f","renderSouthFace","f","(LBlock;DDDI)V","(Lyy;DDDI)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1227_a","renderBlockAsItem","a","(LBlock;IF)V","(Lyy;IF)V","RenderBlocks","acr","net/minecraft/src","0" +"func_1219_a","renderItemIn3d","a","(I)Z","(I)Z","RenderBlocks","acr","net/minecraft/src","0" +"func_25039_v","getWolfShaking","ax","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25043_b_","getShadingWhileShaking","g","(F)F","(F)F","EntityWolf","aik","net/minecraft/src","0" +"func_25042_a","getShakeAngle","e","(FF)F","(FF)F","EntityWolf","aik","net/minecraft/src","0" +"func_25033_c","getInterestedAngle","h","(F)F","(F)F","EntityWolf","aik","net/minecraft/src","0" +"func_25044_b","getPathOrWalkableBlock","c","(LEntity;F)V","(Lia;F)V","EntityWolf","aik","net/minecraft/src","0" +"func_25035_a","showHeartsOrSmokeFX","b","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" +"func_25037_z","setTailRotation","ay","()F","()F","EntityWolf","aik","net/minecraft/src","0" +"func_25045_A","getWolfOwner","aD","()Ljava/lang/String;","()Ljava/lang/String;","EntityWolf","aik","net/minecraft/src","0" +"func_25036_a","setOwner","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityWolf","aik","net/minecraft/src","0" +"func_25034_B","isWolfSitting","aE","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25046_b","setIsSitting","d","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" +"func_25040_C","isWolfAngry","aF","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25041_c","setWolfAngry","e","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" +"func_25047_D","isWolfTamed","aG","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25038_d","setIsTamed","f","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" +"func_35434_a","placeDoorBlock","a","(LWorld;IIIILBlock;)V","(Lry;IIIILyy;)V","ItemDoor","zg","net/minecraft/src","0" +"func_6492_b","truncateString","b","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","TexturePackCustom","adw","net/minecraft/src","0" +"func_22299_a","getNBTTagCompound","a","()LNBTTagCompound;","()Lik;","WorldInfo","si","net/minecraft/src","0" +"func_22305_a","getNBTTagCompoundWithPlayer","a","(Ljava/util/List;)LNBTTagCompound;","(Ljava/util/List;)Lik;","WorldInfo","si","net/minecraft/src","0" +"func_22291_a","updateTagCompound","a","(LNBTTagCompound;LNBTTagCompound;)V","(Lik;Lik;)V","WorldInfo","si","net/minecraft/src","0" +"func_22288_b","getRandomSeed","b","()J","()J","WorldInfo","si","net/minecraft/src","0" +"func_22293_c","getSpawnX","c","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_22295_d","getSpawnY","d","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_22300_e","getSpawnZ","e","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_22304_f","getWorldTime","f","()J","()J","WorldInfo","si","net/minecraft/src","0" +"func_22306_g","getSizeOnDisk","g","()J","()J","WorldInfo","si","net/minecraft/src","0" +"func_22303_h","getPlayerNBTTagCompound","h","()LNBTTagCompound;","()Lik;","WorldInfo","si","net/minecraft/src","0" +"func_22290_i","getDimension","i","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_22294_a","setSpawnX","a","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_22308_b","setSpawnY","b","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_22298_c","setSpawnZ","c","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_22307_a","setWorldTime","a","(J)V","(J)V","WorldInfo","si","net/minecraft/src","0" +"func_22297_b","setSizeOnDisk","b","(J)V","(J)V","WorldInfo","si","net/minecraft/src","0" +"func_22309_a","setPlayerNBTTagCompound","a","(LNBTTagCompound;)V","(Lik;)V","WorldInfo","si","net/minecraft/src","0" +"func_22292_a","setSpawn","a","(III)V","(III)V","WorldInfo","si","net/minecraft/src","0" +"func_22302_j","getWorldName","j","()Ljava/lang/String;","()Ljava/lang/String;","WorldInfo","si","net/minecraft/src","0" +"func_22287_a","setWorldName","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","WorldInfo","si","net/minecraft/src","0" +"func_22296_k","getSaveVersion","k","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_22289_d","setSaveVersion","d","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_22301_l","getLastTimePlayed","l","()J","()J","WorldInfo","si","net/minecraft/src","0" +"func_27396_m","getIsThundering","m","()Z","()Z","WorldInfo","si","net/minecraft/src","0" +"func_27398_a","setIsThundering","a","(Z)V","(Z)V","WorldInfo","si","net/minecraft/src","0" +"func_27400_n","getThunderTime","n","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_27399_e","setThunderTime","e","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_27397_o","getIsRaining","o","()Z","()Z","WorldInfo","si","net/minecraft/src","0" +"func_27394_b","setIsRaining","b","(Z)V","(Z)V","WorldInfo","si","net/minecraft/src","0" +"func_27393_p","getRainTime","p","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_27395_f","setRainTime","f","(I)V","(I)V","WorldInfo","si","net/minecraft/src","0" +"func_35918_q","getGameType","q","()I","()I","WorldInfo","si","net/minecraft/src","0" +"func_35917_r","isMapFeaturesEnabled","r","()Z","()Z","WorldInfo","si","net/minecraft/src","0" +"func_40724_s","isHardcoreModeEnabled","s","()Z","()Z","WorldInfo","si","net/minecraft/src","0" +"func_327_a","readPacketData","a","(Ljava/io/DataInputStream;)V","(Ljava/io/DataInputStream;)V","Packet","gt","net/minecraft/src","0" +"func_322_a","writePacketData","a","(Ljava/io/DataOutputStream;)V","(Ljava/io/DataOutputStream;)V","Packet","gt","net/minecraft/src","0" +"func_323_a","processPacket","a","(LNetHandler;)V","(Lfe;)V","Packet","gt","net/minecraft/src","0" +"func_329_a","getPacketSize","a","()I","()I","Packet","gt","net/minecraft/src","0" +"func_321_a","addIdClassMapping","a","(IZZLjava/lang/Class;)V","(IZZLjava/lang/Class;)V","Packet","gt","net/minecraft/src","0" +"func_325_a","getNewPacket","a","(I)LPacket;","(I)Lgt;","Packet","gt","net/minecraft/src","0" +"func_326_b","getPacketId","b","()I","()I","Packet","gt","net/minecraft/src","0" +"func_324_b","readPacket","a","(Ljava/io/DataInputStream;Z)LPacket;","(Ljava/io/DataInputStream;Z)Lgt;","Packet","gt","net/minecraft/src","0" +"func_328_a","writePacket","a","(LPacket;Ljava/io/DataOutputStream;)V","(Lgt;Ljava/io/DataOutputStream;)V","Packet","gt","net/minecraft/src","0" +"func_27049_a","writeString","a","(Ljava/lang/String;Ljava/io/DataOutputStream;)V","(Ljava/lang/String;Ljava/io/DataOutputStream;)V","Packet","gt","net/minecraft/src","0" +"func_27048_a","readString","a","(Ljava/io/DataInputStream;I)Ljava/lang/String;","(Ljava/io/DataInputStream;I)Ljava/lang/String;","Packet","gt","net/minecraft/src","0" +"func_40187_b","func_40187_b","b","(Ljava/io/DataInputStream;)LItemStack;","(Ljava/io/DataInputStream;)Ldk;","Packet","gt","net/minecraft/src","0" +"func_40188_a","writeItemStack","a","(LItemStack;Ljava/io/DataOutputStream;)V","(Ldk;Ljava/io/DataOutputStream;)V","Packet","gt","net/minecraft/src","0" +"func_40186_c","func_40186_c","c","(Ljava/io/DataInputStream;)LNBTTagCompound;","(Ljava/io/DataInputStream;)Lik;","Packet","gt","net/minecraft/src","0" +"func_40189_a","func_40189_a","a","(LNBTTagCompound;Ljava/io/DataOutputStream;)V","(Lik;Ljava/io/DataOutputStream;)V","Packet","gt","net/minecraft/src","0" +"paint","paint","paint","(Ljava/awt/Graphics;)V","(Ljava/awt/Graphics;)V","CanvasMojangLogo","td","net/minecraft/src","0" +"func_40140_ac","setTextureByProfession","ax","()V","()V","EntityVillager","ai","net/minecraft/src","0" +"func_25021_m","canTriggerWalking","d_","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_21057_b","entityInit","b","()V","()V","Entity","ia","net/minecraft/src","0" +"func_370_e_","onUpdate","a","()V","()V","Entity","ia","net/minecraft/src","0" +"func_352_a","writeEntityToNBT","a","(LNBTTagCompound;)V","(Lik;)V","Entity","ia","net/minecraft/src","0" +"func_357_b","readEntityFromNBT","b","(LNBTTagCompound;)V","(Lik;)V","Entity","ia","net/minecraft/src","0" +"func_392_h_","getShadowSize","i_","()F","()F","Entity","ia","net/minecraft/src","0" +"func_401_c_","canBeCollidedWith","e_","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_396_a","attackEntityFrom","a","(LDamageSource;I)Z","(Lpm;I)Z","Entity","ia","net/minecraft/src","0" +"func_35115_a","getEntityBrightnessForRender","a","(F)I","(F)I","Entity","ia","net/minecraft/src","0" +"func_382_a","getEntityBrightness","b","(F)F","(F)F","Entity","ia","net/minecraft/src","0" +"func_400_c","fall","c","(F)V","(F)V","Entity","ia","net/minecraft/src","0" +"func_9282_a","handleHealthUpdate","a","(B)V","(B)V","Entity","ia","net/minecraft/src","0" +"func_20046_s","updateCloak","U","()V","()V","Entity","ia","net/minecraft/src","0" +"func_350_p","updateRidden","M","()V","()V","Entity","ia","net/minecraft/src","0" +"func_374_q","preparePlayerToSpawn","u","()V","()V","Entity","ia","net/minecraft/src","0" +"func_364_b","addToPlayerScore","b","(LEntity;I)V","(Lia;I)V","Entity","ia","net/minecraft/src","0" +"func_373_s","getEyeHeight","E","()F","()F","Entity","ia","net/minecraft/src","0" +"func_388_v","getYOffset","O","()D","()D","Entity","ia","net/minecraft/src","0" +"func_395_F","setEntityDead","v","()V","()V","Entity","ia","net/minecraft/src","0" +"func_345_I","isEntityInsideOpaqueBlock","L","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_27015_a","onKillEntity","a","(LEntityLiving;)V","(Lnq;)V","Entity","ia","net/minecraft/src","0" +"func_4039_q","setInPortal","S","()V","()V","Entity","ia","net/minecraft/src","0" +"func_397_g_","handleWaterMovement","h_","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_355_a","dealFireDamage","a","(I)V","(I)V","Entity","ia","net/minecraft/src","0" +"func_6378_b","onCollideWithPlayer","a","(LEntityPlayer;)V","(Lvi;)V","Entity","ia","net/minecraft/src","0" +"func_40048_X","getParts","ab","()[LEntity;","()[Lia;","Entity","ia","net/minecraft/src","0" +"func_6376_z","getEntityTexture","I","()Ljava/lang/String;","()Ljava/lang/String;","Entity","ia","net/minecraft/src","0" +"func_353_a","interact","c","(LEntityPlayer;)Z","(Lvi;)Z","Entity","ia","net/minecraft/src","0" +"func_21061_O","getDataWatcher","t","()LDataWatcher;","()Lcr;","Entity","ia","net/minecraft/src","0" +"func_371_a","setSize","a","(FF)V","(FF)V","Entity","ia","net/minecraft/src","0" +"func_376_c","setRotation","b","(FF)V","(FF)V","Entity","ia","net/minecraft/src","0" +"func_347_a","setPosition","d","(DDD)V","(DDD)V","Entity","ia","net/minecraft/src","0" +"func_346_d","setAngles","c","(FF)V","(FF)V","Entity","ia","net/minecraft/src","0" +"func_391_y","onEntityUpdate","w","()V","()V","Entity","ia","net/minecraft/src","0" +"func_4038_J","setOnFireFromLava","x","()V","()V","Entity","ia","net/minecraft/src","0" +"func_40046_d","setFire","e","(I)V","(I)V","Entity","ia","net/minecraft/src","0" +"func_40045_B","extinguish","y","()V","()V","Entity","ia","net/minecraft/src","0" +"func_4034_G","kill","z","()V","()V","Entity","ia","net/minecraft/src","0" +"func_403_b","isOffsetPositionInLiquid","e","(DDD)Z","(DDD)Z","Entity","ia","net/minecraft/src","0" +"func_349_c","moveEntity","b","(DDD)V","(DDD)V","Entity","ia","net/minecraft/src","0" +"func_41002_a","func_41002_a","a","(IIII)V","(IIII)V","Entity","ia","net/minecraft/src","0" +"func_9279_a","updateFallState","a","(DZ)V","(DZ)V","Entity","ia","net/minecraft/src","0" +"func_372_f_","getBoundingBox","A","()LAxisAlignedBB;","()Lc;","Entity","ia","net/minecraft/src","0" +"func_40047_D","func_40047_D","B","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_27012_af","isWet","C","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_27013_ag","isInWater","D","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_393_a","isInsideOfMaterial","a","(LMaterial;)Z","(Lp;)Z","Entity","ia","net/minecraft/src","0" +"func_359_G","handleLavaMovement","F","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_351_a","moveFlying","a","(FFF)V","(FFF)V","Entity","ia","net/minecraft/src","0" +"func_398_a","setWorld","a","(LWorld;)V","(Lry;)V","Entity","ia","net/minecraft/src","0" +"func_399_b","setPositionAndRotation","b","(DDDFF)V","(DDDFF)V","Entity","ia","net/minecraft/src","0" +"func_365_c","setLocationAndAngles","c","(DDDFF)V","(DDDFF)V","Entity","ia","net/minecraft/src","0" +"func_379_d","getDistanceToEntity","c","(LEntity;)F","(Lia;)F","Entity","ia","net/minecraft/src","0" +"func_360_d","getDistanceSq","f","(DDD)D","(DDD)D","Entity","ia","net/minecraft/src","0" +"func_361_e","getDistance","g","(DDD)D","(DDD)D","Entity","ia","net/minecraft/src","0" +"func_387_e","getDistanceSqToEntity","d","(LEntity;)D","(Lia;)D","Entity","ia","net/minecraft/src","0" +"func_380_f","applyEntityCollision","e","(LEntity;)V","(Lia;)V","Entity","ia","net/minecraft/src","0" +"func_348_f","addVelocity","h","(DDD)V","(DDD)V","Entity","ia","net/minecraft/src","0" +"func_9281_M","setBeenAttacked","G","()V","()V","Entity","ia","net/minecraft/src","0" +"func_385_d_","canBePushed","H","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_390_a","isInRangeToRenderVec3D","a","(LVec3D;)Z","(Lfb;)Z","Entity","ia","net/minecraft/src","0" +"func_384_a","isInRangeToRenderDist","a","(D)Z","(D)Z","Entity","ia","net/minecraft/src","0" +"func_358_c","addEntityID","c","(LNBTTagCompound;)Z","(Lik;)Z","Entity","ia","net/minecraft/src","0" +"func_363_d","writeToNBT","d","(LNBTTagCompound;)V","(Lik;)V","Entity","ia","net/minecraft/src","0" +"func_368_e","readFromNBT","e","(LNBTTagCompound;)V","(Lik;)V","Entity","ia","net/minecraft/src","0" +"func_389_H","getEntityString","J","()Ljava/lang/String;","()Ljava/lang/String;","Entity","ia","net/minecraft/src","0" +"func_375_a","newDoubleNBTList","a","([D)LNBTTagList;","([D)Lyi;","Entity","ia","net/minecraft/src","0" +"func_377_a","newFloatNBTList","a","([F)LNBTTagList;","([F)Lyi;","Entity","ia","net/minecraft/src","0" +"func_367_b","dropItem","b","(II)LEntityItem;","(II)Lih;","Entity","ia","net/minecraft/src","0" +"func_394_a","dropItemWithOffset","a","(IIF)LEntityItem;","(IIF)Lih;","Entity","ia","net/minecraft/src","0" +"func_21058_a","entityDropItem","a","(LItemStack;F)LEntityItem;","(Ldk;F)Lih;","Entity","ia","net/minecraft/src","0" +"func_354_B","isEntityAlive","K","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_383_b_","getCollisionBox","f","(LEntity;)LAxisAlignedBB;","(Lia;)Lc;","Entity","ia","net/minecraft/src","0" +"func_366_i_","updateRiderPosition","N","()V","()V","Entity","ia","net/minecraft/src","0" +"func_402_h","getMountedYOffset","P","()D","()D","Entity","ia","net/minecraft/src","0" +"func_6377_h","mountEntity","g","(LEntity;)V","(Lia;)V","Entity","ia","net/minecraft/src","0" +"func_378_a","setPositionAndRotation2","a","(DDDFFI)V","(DDDFFI)V","Entity","ia","net/minecraft/src","0" +"func_4035_j_","getCollisionBorderSize","Q","()F","()F","Entity","ia","net/minecraft/src","0" +"func_4037_H","getLookVec","R","()LVec3D;","()Lfb;","Entity","ia","net/minecraft/src","0" +"func_6375_a","setVelocity","a","(DDD)V","(DDD)V","Entity","ia","net/minecraft/src","0" +"func_9280_g","performHurtAnimation","T","()V","()V","Entity","ia","net/minecraft/src","0" +"func_20045_c","outfitWithItem","c","(III)V","(III)V","Entity","ia","net/minecraft/src","0" +"func_21062_U","isBurning","V","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_21063_V","isRiding","W","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_381_o","isSneaking","q","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_35117_Q","isSprinting","X","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_35113_c","setSprinting","a","(Z)V","(Z)V","Entity","ia","net/minecraft/src","0" +"func_35114_R","isEating","Y","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_35116_d","setEating","c","(Z)V","(Z)V","Entity","ia","net/minecraft/src","0" +"func_21060_d","getEntityFlag","f","(I)Z","(I)Z","Entity","ia","net/minecraft/src","0" +"func_21059_b","setFlag","a","(IZ)V","(IZ)V","Entity","ia","net/minecraft/src","0" +"func_41001_Z","getAir","Z","()I","()I","Entity","ia","net/minecraft/src","0" +"func_41003_g","setAir","g","(I)V","(I)V","Entity","ia","net/minecraft/src","0" +"func_27014_a","onStruckByLightning","a","(LEntityLightningBolt;)V","(Lsu;)V","Entity","ia","net/minecraft/src","0" +"func_28014_c","pushOutOfBlocks","c","(DDD)Z","(DDD)Z","Entity","ia","net/minecraft/src","0" +"func_35112_o","setInWeb","aa","()V","()V","Entity","ia","net/minecraft/src","0" +"func_41004_h","isEntityEqual","h","(LEntity;)Z","(Lia;)Z","Entity","ia","net/minecraft/src","0" +"func_40693_a","func_40693_a","a","(I)Z","(I)Z","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"func_40694_a","func_40694_a","a","()Z","()Z","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" +"func_813_a","loadChunk","a","(LWorld;II)LChunk;","(Lry;II)Lzx;","IChunkLoader","d","net/minecraft/src","0" +"func_812_a","saveChunk","a","(LWorld;LChunk;)V","(Lry;Lzx;)V","IChunkLoader","d","net/minecraft/src","0" +"func_815_b","saveExtraChunkData","b","(LWorld;LChunk;)V","(Lry;Lzx;)V","IChunkLoader","d","net/minecraft/src","0" +"func_814_a","func_814_a","a","()V","()V","IChunkLoader","d","net/minecraft/src","0" +"func_811_b","saveExtraData","b","()V","()V","IChunkLoader","d","net/minecraft/src","0" +"func_41041_e","func_41041_e","e","()V","()V","GuiWinGame","lt","net/minecraft/src","0" +"func_41040_b","func_41040_b","b","(IIF)V","(IIF)V","GuiWinGame","lt","net/minecraft/src","0" +"func_27310_a","aJsonNull","a","()LJ_JsonNode;","()Lan;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27313_b","aJsonTrue","b","()LJ_JsonNode;","()Lan;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27314_c","aJsonFalse","c","()LJ_JsonNode;","()Lan;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27316_a","aJsonString","a","(Ljava/lang/String;)LJ_JsonStringNode;","(Ljava/lang/String;)Loj;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27311_b","aJsonNumber","b","(Ljava/lang/String;)LJ_JsonNode;","(Ljava/lang/String;)Lan;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27309_a","aJsonArray","a","(Ljava/lang/Iterable;)LJ_JsonRootNode;","(Ljava/lang/Iterable;)Lwz;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27315_a","aJsonArray","a","([LJ_JsonNode;)LJ_JsonRootNode;","([Lan;)Lwz;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27312_a","aJsonObject","a","(Ljava/util/Map;)LJ_JsonRootNode;","(Ljava/util/Map;)Lwz;","J_JsonNodeFactories","ahf","net/minecraft/src","0" +"func_27297_a","func_27297_a","a","(LStatCrafting;LStatCrafting;)I","(Lyl;Lyl;)I","SorterStatsBlock","agt","net/minecraft/src","0" +"func_320_h","func_320_h","g","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" +"func_319_i","func_319_i","h","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" +"func_35586_a","getRandomComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" +"func_35587_b","getNextMineShaftComponent","b","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lnk;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" +"func_35585_a","getNextComponent","a","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lnk;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" +"func_35588_a","getTreasurePieces","a","()[LStructurePieceTreasure;","()[Lagq;","StructureMineshaftPieces","aez","net/minecraft/src","0" +"func_27319_a","jsonNodeDoesNotMatchPathElementsException","a","(LJ_JsonNodeDoesNotMatchChainedJsonNodeSelectorException;[Ljava/lang/Object;LJ_JsonRootNode;)LJ_JsonNodeDoesNotMatchPathElementsException;","(Lhe;[Ljava/lang/Object;Lwz;)Lxo;","J_JsonNodeDoesNotMatchPathElementsException","xo","net/minecraft/src","0" +"func_27318_b","formatMessage","b","(LJ_JsonNodeDoesNotMatchChainedJsonNodeSelectorException;[Ljava/lang/Object;LJ_JsonRootNode;)Ljava/lang/String;","(Lhe;[Ljava/lang/Object;Lwz;)Ljava/lang/String;","J_JsonNodeDoesNotMatchPathElementsException","xo","net/minecraft/src","0" +"func_27317_a","commaSeparate","a","([Ljava/lang/Object;)Ljava/lang/String;","([Ljava/lang/Object;)Ljava/lang/String;","J_JsonNodeDoesNotMatchPathElementsException","xo","net/minecraft/src","0" +"func_35789_a","getCompoundTag","a","()LNBTTagCompound;","()Lik;","ServerNBTStorage","lo","net/minecraft/src","0" +"func_35788_a","createServerNBTStorage","a","(LNBTTagCompound;)LServerNBTStorage;","(Lik;)Llo;","ServerNBTStorage","lo","net/minecraft/src","0" +"func_4148_a","saveScreenshot","a","(Ljava/io/File;II)Ljava/lang/String;","(Ljava/io/File;II)Ljava/lang/String;","ScreenShotHelper","abx","net/minecraft/src","0" +"func_35879_a","func_35879_a","a","(Ljava/io/File;Ljava/lang/String;II)Ljava/lang/String;","(Ljava/io/File;Ljava/lang/String;II)Ljava/lang/String;","ScreenShotHelper","abx","net/minecraft/src","0" +"func_20080_j","func_20080_j","e","()I","()I","GuiControls","ee","net/minecraft/src","0" +"func_27046_f","setStateIfMinecartInteractsWithRail","f","(LWorld;IIII)V","(Lry;IIII)V","BlockDetectorRail","ags","net/minecraft/src","0" +"func_20156_a","getAllowedCharacters","a","()Ljava/lang/String;","()Ljava/lang/String;","ChatAllowedCharacters","age","net/minecraft/src","0" +"func_1168_a","getBoundingBox","a","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_28196_a","clearBoundingBoxes","a","()V","()V","AxisAlignedBB","c","net/minecraft/src","0" +"func_4149_a","clearBoundingBoxPool","b","()V","()V","AxisAlignedBB","c","net/minecraft/src","0" +"func_1161_b","getBoundingBoxFromPool","b","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1165_c","setBounds","c","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1170_a","addCoord","a","(DDD)LAxisAlignedBB;","(DDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1177_b","expand","b","(DDD)LAxisAlignedBB;","(DDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1166_c","getOffsetBoundingBox","c","(DDD)LAxisAlignedBB;","(DDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1163_a","calculateXOffset","a","(LAxisAlignedBB;D)D","(Lc;D)D","AxisAlignedBB","c","net/minecraft/src","0" +"func_1172_b","calculateYOffset","b","(LAxisAlignedBB;D)D","(Lc;D)D","AxisAlignedBB","c","net/minecraft/src","0" +"func_1162_c","calculateZOffset","c","(LAxisAlignedBB;D)D","(Lc;D)D","AxisAlignedBB","c","net/minecraft/src","0" +"func_1178_a","intersectsWith","a","(LAxisAlignedBB;)Z","(Lc;)Z","AxisAlignedBB","c","net/minecraft/src","0" +"func_1174_d","offset","d","(DDD)LAxisAlignedBB;","(DDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_4150_a","isVecInside","a","(LVec3D;)Z","(Lfb;)Z","AxisAlignedBB","c","net/minecraft/src","0" +"func_1164_b","getAverageEdgeLength","c","()D","()D","AxisAlignedBB","c","net/minecraft/src","0" +"func_28195_e","contract","e","(DDD)LAxisAlignedBB;","(DDD)Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1160_c","copy","d","()LAxisAlignedBB;","()Lc;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1169_a","func_1169_a","a","(LVec3D;LVec3D;)LMovingObjectPosition;","(Lfb;Lfb;)Lgv;","AxisAlignedBB","c","net/minecraft/src","0" +"func_1167_a","isVecInYZ","b","(LVec3D;)Z","(Lfb;)Z","AxisAlignedBB","c","net/minecraft/src","0" +"func_1175_b","isVecInXZ","c","(LVec3D;)Z","(Lfb;)Z","AxisAlignedBB","c","net/minecraft/src","0" +"func_1176_c","isVecInXY","d","(LVec3D;)Z","(Lfb;)Z","AxisAlignedBB","c","net/minecraft/src","0" +"func_1171_b","setBB","b","(LAxisAlignedBB;)V","(Lc;)V","AxisAlignedBB","c","net/minecraft/src","0" +"func_809_a","flipFace","a","()V","()V","TexturedQuad","pv","net/minecraft/src","0" +"func_808_a","draw","a","(LTessellator;F)V","(Lcv;F)V","TexturedQuad","pv","net/minecraft/src","0" +"func_40040_a","func_40040_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeNetherStalkRoom;","(Ljava/util/List;Ljava/util/Random;IIIII)Lio;","ComponentNetherBridgeNetherStalkRoom","io","net/minecraft/src","0" +"func_35045_a","func_35045_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLeftTurn;","(Ljava/util/List;Ljava/util/Random;IIIII)Lhq;","ComponentStrongholdLeftTurn","hq","net/minecraft/src","0" +"func_40031_a","func_40031_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStairs;","(Ljava/util/List;Ljava/util/Random;IIIII)Lbl;","ComponentNetherBridgeStairs","bl","net/minecraft/src","0" +"func_35091_a","func_35091_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageWoodHut;","(Ljava/util/List;Ljava/util/Random;IIIII)Lwi;","ComponentVillageWoodHut","wi","net/minecraft/src","0" +"func_35376_a","func_35376_a","a","(LTileEntityChest;DDDF)V","(Ltu;DDDF)V","TileEntityChestRenderer","fv","net/minecraft/src","0" +"func_22329_a","func_22329_a","a","(III)I","(III)I","PathPoint","mo","net/minecraft/src","0" +"func_1180_a","distanceTo","a","(LPathPoint;)F","(Lmo;)F","PathPoint","mo","net/minecraft/src","0" +"func_1179_a","isAssigned","a","()Z","()Z","PathPoint","mo","net/minecraft/src","0" +"func_35374_a","func_35374_a","a","(F)V","(F)V","ContainerCreative","afp","net/minecraft/src","0" +"func_441_c","setSlimeSize","b","(I)V","(I)V","EntitySlime","aed","net/minecraft/src","0" +"func_25027_v","getSlimeSize","aF","()I","()I","EntitySlime","aed","net/minecraft/src","0" +"func_40135_ac","func_40135_ac","ax","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","aed","net/minecraft/src","0" +"func_40138_aj","func_40138_aj","aD","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","aed","net/minecraft/src","0" +"func_40136_ag","func_40136_ag","aA","()V","()V","EntitySlime","aed","net/minecraft/src","0" +"func_40131_af","func_40131_af","az","()I","()I","EntitySlime","aed","net/minecraft/src","0" +"func_40132_ae","func_40132_ae","ay","()LEntitySlime;","()Laed;","EntitySlime","aed","net/minecraft/src","0" +"func_40137_ah","func_40137_ah","aB","()Z","()Z","EntitySlime","aed","net/minecraft/src","0" +"func_40130_ai","func_40130_ai","aC","()I","()I","EntitySlime","aed","net/minecraft/src","0" +"func_40133_ao","func_40133_ao","aG","()Z","()Z","EntitySlime","aed","net/minecraft/src","0" +"func_40134_ak","func_40134_ak","aE","()Z","()Z","EntitySlime","aed","net/minecraft/src","0" +"func_40670_a","func_40670_a","a","(LTessellator;F)V","(Lcv;F)V","ModelBox","ad","net/minecraft/src","0" +"func_40671_a","func_40671_a","a","(Ljava/lang/String;)LModelBox;","(Ljava/lang/String;)Lad;","ModelBox","ad","net/minecraft/src","0" +"func_35265_a","func_35265_a","a","(LWorld;IIII)V","(Lry;IIII)V","WorldGenSwamp","qj","net/minecraft/src","0" +"func_152_a","func_152_a","a","(LEntityMinecart;DDDFF)V","(Lvm;DDDFF)V","RenderMinecart","pg","net/minecraft/src","0" +"func_40343_a","func_40343_a","a","()I","()I","ModelMagmaCube","agy","net/minecraft/src","0" +"func_28152_a","getFoilageBiomeColorizer","a","([I)V","([I)V","ColorizerFoliage","db","net/minecraft/src","0" +"func_4146_a","getFoliageColor","a","(DD)I","(DD)I","ColorizerFoliage","db","net/minecraft/src","0" +"func_21175_a","getFoliageColorPine","a","()I","()I","ColorizerFoliage","db","net/minecraft/src","0" +"func_21174_b","getFoliageColorBirch","b","()I","()I","ColorizerFoliage","db","net/minecraft/src","0" +"func_31073_c","getFoliageColorBasic","c","()I","()I","ColorizerFoliage","db","net/minecraft/src","0" +"func_587_j","drawGuiContainerForegroundLayer","c","()V","()V","GuiContainer","mg","net/minecraft/src","0" +"func_589_a","drawGuiContainerBackgroundLayer","a","(FII)V","(FII)V","GuiContainer","mg","net/minecraft/src","0" +"func_590_a","drawSlotInventory","a","(LSlot;)V","(Lvv;)V","GuiContainer","mg","net/minecraft/src","0" +"func_588_a","getSlotAtPosition","a","(II)LSlot;","(II)Lvv;","GuiContainer","mg","net/minecraft/src","0" +"func_20081_a","getIsMouseOverSlot","a","(LSlot;II)Z","(Lvv;II)Z","GuiContainer","mg","net/minecraft/src","0" +"func_35309_a","func_35309_a","a","(LSlot;IIZ)V","(Lvv;IIZ)V","GuiContainer","mg","net/minecraft/src","0" +"values","values","values","()[LEnumDoor;","()[Lmj;","EnumDoor","mj","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumDoor;","(Ljava/lang/String;)Lmj;","EnumDoor","mj","net/minecraft/src","0" +"func_22178_a","func_22178_a","a","()Ljava/lang/String;","()Ljava/lang/String;","ISaveFormat","tq","net/minecraft/src","0" +"func_22176_b","getSaveList","b","()Ljava/util/List;","()Ljava/util/List;","ISaveFormat","tq","net/minecraft/src","0" +"func_22177_c","flushCache","c","()V","()V","ISaveFormat","tq","net/minecraft/src","0" +"func_22173_b","getWorldInfo","a","(Ljava/lang/String;)LWorldInfo;","(Ljava/lang/String;)Lsi;","ISaveFormat","tq","net/minecraft/src","0" +"func_22170_a","renameWorld","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","ISaveFormat","tq","net/minecraft/src","0" +"func_22172_c","deleteWorldDirectory","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ISaveFormat","tq","net/minecraft/src","0" +"func_22174_a","getSaveLoader","a","(Ljava/lang/String;Z)LISaveHandler;","(Ljava/lang/String;Z)Lnh;","ISaveFormat","tq","net/minecraft/src","0" +"func_22175_a","isOldMapFormat","c","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","ISaveFormat","tq","net/minecraft/src","0" +"func_22171_a","convertMapFormat","a","(Ljava/lang/String;LIProgressUpdate;)Z","(Ljava/lang/String;Lrz;)Z","ISaveFormat","tq","net/minecraft/src","0" +"func_35066_a","func_35066_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentMineshaftCorridor","aba","net/minecraft/src","0" +"func_461_a","sendChatMessage","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityPlayerSP","di","net/minecraft/src","0" +"func_9372_a_","setHealth","b","(I)V","(I)V","EntityPlayerSP","di","net/minecraft/src","0" +"func_35220_u_","getFOVMultiplier","o","()F","()F","EntityPlayerSP","di","net/minecraft/src","0" +"func_6419_n","getPlayerArmorValue","p","()I","()I","EntityPlayerSP","di","net/minecraft/src","0" +"func_28027_d","isBlockTranslucent","f","(III)Z","(III)Z","EntityPlayerSP","di","net/minecraft/src","0" +"func_35219_c","setXPStats","a","(FII)V","(FII)V","EntityPlayerSP","di","net/minecraft/src","0" +"values","values","values","()[LEnumToolMaterial;","()[Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumToolMaterial;","(Ljava/lang/String;)Lnu;","EnumToolMaterial","nu","net/minecraft/src","0" +"func_21207_a","getMaxUses","a","()I","()I","EnumToolMaterial","nu","net/minecraft/src","0" +"func_21206_b","getEfficiencyOnProperMaterial","b","()F","()F","EnumToolMaterial","nu","net/minecraft/src","0" +"func_21205_c","getDamageVsEntity","c","()I","()I","EnumToolMaterial","nu","net/minecraft/src","0" +"func_21208_d","getHarvestLevel","d","()I","()I","EnumToolMaterial","nu","net/minecraft/src","0" +"func_40731_e","getEnchantability","e","()I","()I","EnumToolMaterial","nu","net/minecraft/src","0" +"func_21029_c","eatCakeSlice","c","(LWorld;IIILEntityPlayer;)V","(Lry;IIILvi;)V","BlockCake","aem","net/minecraft/src","0" +"func_318_h","setStateIfMobInteractsWithPlate","g","(LWorld;III)V","(Lry;III)V","BlockPressurePlate","wx","net/minecraft/src","0" +"func_911_a","updateRenderer","a","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_910_a","getMouseOver","a","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_35809_c","updateFovModifierHand","c","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_914_d","getFOVModifier","a","(FZ)F","(FZ)F","EntityRenderer","adt","net/minecraft/src","0" +"func_920_e","hurtCameraEffect","d","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_917_f","setupViewBobbing","e","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_4138_g","orientCamera","f","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_4139_a","setupCameraTransform","a","(FI)V","(FI)V","EntityRenderer","adt","net/minecraft/src","0" +"func_4135_b","renderHand","b","(FI)V","(FI)V","EntityRenderer","adt","net/minecraft/src","0" +"func_35810_a","disableLightmap","a","(D)V","(D)V","EntityRenderer","adt","net/minecraft/src","0" +"func_35806_b","enableLightmap","b","(D)V","(D)V","EntityRenderer","adt","net/minecraft/src","0" +"func_35807_d","updateTorchFlicker","d","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_35808_e","updateLightmap","e","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_4136_b","updateCameraAndRender","b","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_4134_c","renderWorld","a","(FJ)V","(FJ)V","EntityRenderer","adt","net/minecraft/src","0" +"func_916_c","addRainParticles","f","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_27286_d","renderRainSnow","c","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_905_b","setupOverlayRendering","b","()V","()V","EntityRenderer","adt","net/minecraft/src","0" +"func_4137_h","updateFogColor","g","(F)V","(F)V","EntityRenderer","adt","net/minecraft/src","0" +"func_4140_a","setupFog","a","(IF)V","(IF)V","EntityRenderer","adt","net/minecraft/src","0" +"func_908_a","setFogColorBuffer","a","(FFFF)Ljava/nio/FloatBuffer;","(FFFF)Ljava/nio/FloatBuffer;","EntityRenderer","adt","net/minecraft/src","0" +"func_1152_a","isBoxInFrustum","a","(DDDDDD)Z","(DDDDDD)Z","ClippingHelper","ip","net/minecraft/src","0" +"func_288_b","getFluidHeightPercent","e","(I)F","(I)F","BlockFluid","agw","net/minecraft/src","0" +"func_290_h","getFlowDecay","g","(LWorld;III)I","(Lry;III)I","BlockFluid","agw","net/minecraft/src","0" +"func_289_b","getEffectiveFlowDecay","c","(LIBlockAccess;III)I","(Lkq;III)I","BlockFluid","agw","net/minecraft/src","0" +"func_291_e","getFlowVector","g","(LIBlockAccess;III)LVec3D;","(Lkq;III)Lfb;","BlockFluid","agw","net/minecraft/src","0" +"func_293_a","func_293_a","a","(LIBlockAccess;IIILMaterial;)D","(Lkq;IIILp;)D","BlockFluid","agw","net/minecraft/src","0" +"func_287_j","checkForHarden","j","(LWorld;III)V","(Lry;III)V","BlockFluid","agw","net/minecraft/src","0" +"func_292_i","triggerLavaMixEffects","h","(LWorld;III)V","(Lry;III)V","BlockFluid","agw","net/minecraft/src","0" +"func_27331_a","getColumn","a","()I","()I","J_ThingWithPosition","if","net/minecraft/src","0" +"func_27330_b","getRow","b","()I","()I","J_ThingWithPosition","if","net/minecraft/src","0" +"func_1206_a","incrementPathIndex","a","()V","()V","PathEntity","dw","net/minecraft/src","0" +"func_1207_b","isFinished","b","()Z","()Z","PathEntity","dw","net/minecraft/src","0" +"func_1205_a","getPosition","a","(LEntity;)LVec3D;","(Lia;)Lfb;","PathEntity","dw","net/minecraft/src","0" +"func_147_a","doRender","a","(LEntity;DDDFF)V","(Lia;DDDFF)V","Render","rg","net/minecraft/src","0" +"func_151_a","loadTexture","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Render","rg","net/minecraft/src","0" +"func_140_a","loadDownloadableImageTexture","a","(Ljava/lang/String;Ljava/lang/String;)Z","(Ljava/lang/String;Ljava/lang/String;)Z","Render","rg","net/minecraft/src","0" +"func_148_a","renderEntityOnFire","a","(LEntity;DDDF)V","(Lia;DDDF)V","Render","rg","net/minecraft/src","0" +"func_144_c","renderShadow","c","(LEntity;DDDFF)V","(Lia;DDDFF)V","Render","rg","net/minecraft/src","0" +"func_149_b","getWorldFromRenderManager","b","()LWorld;","()Lry;","Render","rg","net/minecraft/src","0" +"func_145_a","renderShadowOnBlock","a","(LBlock;DDDIIIFFDDD)V","(Lyy;DDDIIIFFDDD)V","Render","rg","net/minecraft/src","0" +"func_146_a","renderOffsetAABB","a","(LAxisAlignedBB;DDD)V","(Lc;DDD)V","Render","rg","net/minecraft/src","0" +"func_142_a","renderAABB","a","(LAxisAlignedBB;)V","(Lc;)V","Render","rg","net/minecraft/src","0" +"func_4009_a","setRenderManager","a","(LRenderManager;)V","(Lwb;)V","Render","rg","net/minecraft/src","0" +"func_141_b","doRenderShadowAndFire","b","(LEntity;DDDFF)V","(Lia;DDDFF)V","Render","rg","net/minecraft/src","0" +"func_6329_a","getFontRendererFromRenderManager","a","()LFontRenderer;","()Labe;","Render","rg","net/minecraft/src","0" +"func_40288_a","func_40288_a","a","(LEntitySnowman;F)V","(Lahd;F)V","RenderSnowMan","bh","net/minecraft/src","0" +"func_31016_a","getStoredBlockID","a","()I","()I","TileEntityPiston","agb","net/minecraft/src","0" +"func_31015_b","func_31015_b","c","()Z","()Z","TileEntityPiston","agb","net/minecraft/src","0" +"func_31009_d","func_31009_d","d","()I","()I","TileEntityPiston","agb","net/minecraft/src","0" +"func_31012_k","func_31012_k","e","()Z","()Z","TileEntityPiston","agb","net/minecraft/src","0" +"func_31008_a","func_31008_a","a","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0" +"func_31017_b","func_31017_b","b","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0" +"func_31014_c","func_31014_c","c","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0" +"func_31013_d","func_31013_d","d","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0" +"func_31010_a","func_31010_a","a","(FF)V","(FF)V","TileEntityPiston","agb","net/minecraft/src","0" +"func_31011_l","clearPistonTileEntity","j","()V","()V","TileEntityPiston","agb","net/minecraft/src","0" +"func_317_e","ejectRecord","f","(LWorld;IIII)V","(Lry;IIII)V","BlockJukeBox","abl","net/minecraft/src","0" +"func_28038_b_","func_28038_b_","g","(LWorld;III)V","(Lry;III)V","BlockJukeBox","abl","net/minecraft/src","0" +"func_4042_a","calculateVelocity","a","(DDDFF)V","(DDDFF)V","EntityFishHook","ael","net/minecraft/src","0" +"func_4043_i","catchFish","g","()I","()I","EntityFishHook","ael","net/minecraft/src","0" +"func_27110_k","func_27110_k","e","()V","()V","GuiAchievements","qx","net/minecraft/src","0" +"func_27109_b","genAchievementBackground","b","(IIF)V","(IIF)V","GuiAchievements","qx","net/minecraft/src","0" +"values","values","values","()[LEnumArt;","()[Lsv;","EnumArt","sv","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumArt;","(Ljava/lang/String;)Lsv;","EnumArt","sv","net/minecraft/src","0" +"values","values","values","()[LEnumSkyBlock;","()[Lbn;","EnumSkyBlock","bn","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumSkyBlock;","(Ljava/lang/String;)Lbn;","EnumSkyBlock","bn","net/minecraft/src","0" +"func_783_a","onTick","a","()V","()V","TextureFX","dt","net/minecraft/src","0" +"func_782_a","bindImage","a","(LRenderEngine;)V","(Lzh;)V","TextureFX","dt","net/minecraft/src","0" +"func_1138_a","loadGzippedCompoundFromOutputStream","a","(Ljava/io/InputStream;)LNBTTagCompound;","(Ljava/io/InputStream;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0" +"func_1143_a","writeGzippedCompoundToOutputStream","a","(LNBTTagCompound;Ljava/io/OutputStream;)V","(Lik;Ljava/io/OutputStream;)V","CompressedStreamTools","vx","net/minecraft/src","0" +"func_40592_a","loadMapFromByteArray","a","([B)LNBTTagCompound;","([B)Lik;","CompressedStreamTools","vx","net/minecraft/src","0" +"func_40591_a","writeMapToByteArray","a","(LNBTTagCompound;)[B","(Lik;)[B","CompressedStreamTools","vx","net/minecraft/src","0" +"func_35621_a","saveMapToFileWithBackup","a","(LNBTTagCompound;Ljava/io/File;)V","(Lik;Ljava/io/File;)V","CompressedStreamTools","vx","net/minecraft/src","0" +"func_35620_b","saveMapToFile","b","(LNBTTagCompound;Ljava/io/File;)V","(Lik;Ljava/io/File;)V","CompressedStreamTools","vx","net/minecraft/src","0" +"func_35622_a","writeMapToFileUncompressed","a","(Ljava/io/File;)LNBTTagCompound;","(Ljava/io/File;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0" +"func_1141_a","writeMapUncompressed","a","(Ljava/io/DataInput;)LNBTTagCompound;","(Ljava/io/DataInput;)Lik;","CompressedStreamTools","vx","net/minecraft/src","0" +"func_1139_a","writeTo","a","(LNBTTagCompound;Ljava/io/DataOutput;)V","(Lik;Ljava/io/DataOutput;)V","CompressedStreamTools","vx","net/minecraft/src","0" +"func_35651_a","func_35651_a","a","(II)LBiomeGenBase;","(II)Lsr;","BiomeCacheBlock","cq","net/minecraft/src","0" +"func_35650_b","func_35650_b","b","(II)F","(II)F","BiomeCacheBlock","cq","net/minecraft/src","0" +"func_35652_c","func_35652_c","c","(II)F","(II)F","BiomeCacheBlock","cq","net/minecraft/src","0" +"func_40552_a","queueChunkMap","a","(LChunkCoordIntPair;LNBTTagCompound;)V","(Lacm;Lik;)V","ThreadedChunkLoader","tn","net/minecraft/src","0" +"func_40551_a","writeChunk","a","(LThreadedChunkLoaderPending;)V","(Lvp;)V","ThreadedChunkLoader","tn","net/minecraft/src","0" +"func_35188_k_","spiderScaleAmount","ax","()F","()F","EntitySpider","vq","net/minecraft/src","0" +"func_40149_l_","func_40149_l_","ay","()Z","()Z","EntitySpider","vq","net/minecraft/src","0" +"func_40148_a","func_40148_a","b","(Z)V","(Z)V","EntitySpider","vq","net/minecraft/src","0" +"func_27263_a","func_27263_a","b","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GuiSlotStats","mx","net/minecraft/src","0" +"func_27264_b","func_27264_b","c","(I)LStatCrafting;","(I)Lyl;","GuiSlotStats","mx","net/minecraft/src","0" +"func_27265_a","func_27265_a","a","(LStatCrafting;IIZ)V","(Lyl;IIZ)V","GuiSlotStats","mx","net/minecraft/src","0" +"func_27267_a","func_27267_a","a","(LStatCrafting;II)V","(Lyl;II)V","GuiSlotStats","mx","net/minecraft/src","0" +"func_27266_c","func_27266_c","d","(I)V","(I)V","GuiSlotStats","mx","net/minecraft/src","0" +"func_515_a","func_515_a","a","(DDDD)LVec3D;","(DDDD)Lfb;","EntityMinecart","vm","net/minecraft/src","0" +"func_514_g","func_514_g","i","(DDD)LVec3D;","(DDD)Lfb;","EntityMinecart","vm","net/minecraft/src","0" +"func_41026_g","isMinecartPowered","g","()Z","()Z","EntityMinecart","vm","net/minecraft/src","0" +"func_41027_b","setMinecartPowered","b","(Z)V","(Z)V","EntityMinecart","vm","net/minecraft/src","0" +"func_41024_b","func_41024_b","b","(I)V","(I)V","EntityMinecart","vm","net/minecraft/src","0" +"func_41025_i","func_41025_i","i","()I","()I","EntityMinecart","vm","net/minecraft/src","0" +"func_41028_c","func_41028_c","c","(I)V","(I)V","EntityMinecart","vm","net/minecraft/src","0" +"func_41023_l","func_41023_l","l","()I","()I","EntityMinecart","vm","net/minecraft/src","0" +"func_41029_h","func_41029_h","h","(I)V","(I)V","EntityMinecart","vm","net/minecraft/src","0" +"func_41030_m","func_41030_m","m","()I","()I","EntityMinecart","vm","net/minecraft/src","0" +"func_40145_a","spawnBabyAnimal","a","(LEntityAnimal;)LEntityAnimal;","(Lfx;)Lfx;","EntityAnimal","fx","net/minecraft/src","0" +"func_40146_g","getDelay","m","()I","()I","EntityAnimal","fx","net/minecraft/src","0" +"func_40142_a_","setDelay","b","(I)V","(I)V","EntityAnimal","fx","net/minecraft/src","0" +"func_40144_b","proceate","b","(LEntityAnimal;)V","(Lfx;)V","EntityAnimal","fx","net/minecraft/src","0" +"func_40143_a","isWheat","a","(LItemStack;)Z","(Ldk;)Z","EntityAnimal","fx","net/minecraft/src","0" +"func_40088_g","func_40088_g","e","()I","()I","EntityPotion","ab","net/minecraft/src","0" +"func_27059_b","applyTo","c","(Ljava/lang/Object;)Ljava/lang/Object;","(Ljava/lang/Object;)Ljava/lang/Object;","J_Functor","gz","net/minecraft/src","0" +"func_27058_a","matchesNode","b","(Ljava/lang/Object;)Z","(Ljava/lang/Object;)Z","J_Functor","gz","net/minecraft/src","0" +"func_27060_a","shortForm","a","()Ljava/lang/String;","()Ljava/lang/String;","J_Functor","gz","net/minecraft/src","0" +"func_20095_a","renderEars","a","(F)V","(F)V","ModelBiped","fa","net/minecraft/src","0" +"func_20096_b","renderCloak","b","(F)V","(F)V","ModelBiped","fa","net/minecraft/src","0" +"func_313_b","setDoorRotation","e","(I)V","(I)V","BlockDoor","uc","net/minecraft/src","0" +"func_311_a","onPoweredBlockChange","a","(LWorld;IIIZ)V","(Lry;IIIZ)V","BlockDoor","uc","net/minecraft/src","0" +"func_312_c","getState","f","(I)I","(I)I","BlockDoor","uc","net/minecraft/src","0" +"func_27047_e","isOpen","g","(I)Z","(I)Z","BlockDoor","uc","net/minecraft/src","0" +"func_21161_a","getDataValueId","a","()I","()I","WatchableObject","afh","net/minecraft/src","0" +"func_21160_a","setObject","a","(Ljava/lang/Object;)V","(Ljava/lang/Object;)V","WatchableObject","afh","net/minecraft/src","0" +"func_21158_b","getObject","b","()Ljava/lang/Object;","()Ljava/lang/Object;","WatchableObject","afh","net/minecraft/src","0" +"func_21159_c","getObjectType","c","()I","()I","WatchableObject","afh","net/minecraft/src","0" +"func_21162_a","setWatching","a","(Z)V","(Z)V","WatchableObject","afh","net/minecraft/src","0" +"func_21027_c_","fertilize","g","(LWorld;III)V","(Lry;III)V","BlockCrops","aha","net/minecraft/src","0" +"func_270_i","getGrowthRate","j","(LWorld;III)F","(Lry;III)F","BlockCrops","aha","net/minecraft/src","0" +"func_810_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesIngots","ady","net/minecraft/src","0" +"func_20078_a","returnEnumOptions","a","()LEnumOptions;","()Llp;","GuiSmallButton","abs","net/minecraft/src","0" +"func_40307_a","func_40307_a","a","(D)F","(D)F","ModelDragon","afo","net/minecraft/src","0" +"func_1146_a","stepSoundDir","a","()Ljava/lang/String;","()Ljava/lang/String;","StepSound","wu","net/minecraft/src","0" +"func_1147_b","getVolume","b","()F","()F","StepSound","wu","net/minecraft/src","0" +"func_1144_c","getPitch","c","()F","()F","StepSound","wu","net/minecraft/src","0" +"func_1145_d","stepSoundDir2","d","()Ljava/lang/String;","()Ljava/lang/String;","StepSound","wu","net/minecraft/src","0" +"func_903_a","getScaledWidth","a","()I","()I","ScaledResolution","ef","net/minecraft/src","0" +"func_902_b","getScaledHeight","b","()I","()I","ScaledResolution","ef","net/minecraft/src","0" +"func_25005_a","renderWolf","a","(LEntityWolf;DDDFF)V","(Laik;DDDFF)V","RenderWolf","acb","net/minecraft/src","0" +"func_25004_a","func_25004_a","a","(LEntityWolf;F)F","(Laik;F)F","RenderWolf","acb","net/minecraft/src","0" +"func_25006_b","func_25006_b","b","(LEntityWolf;F)V","(Laik;F)V","RenderWolf","acb","net/minecraft/src","0" +"func_28185_a","loadData","a","(Ljava/lang/Class;Ljava/lang/String;)LWorldSavedData;","(Ljava/lang/Class;Ljava/lang/String;)Lafz;","MapStorage","ew","net/minecraft/src","0" +"func_28184_a","setData","a","(Ljava/lang/String;LWorldSavedData;)V","(Ljava/lang/String;Lafz;)V","MapStorage","ew","net/minecraft/src","0" +"func_28188_a","saveAllData","a","()V","()V","MapStorage","ew","net/minecraft/src","0" +"func_28189_a","saveData","a","(LWorldSavedData;)V","(Lafz;)V","MapStorage","ew","net/minecraft/src","0" +"func_28187_b","loadIdCounts","b","()V","()V","MapStorage","ew","net/minecraft/src","0" +"func_28186_a","getUniqueDataId","a","(Ljava/lang/String;)I","(Ljava/lang/String;)I","MapStorage","ew","net/minecraft/src","0" +"func_27065_a","func_27065_a","a","(Ljava/util/Map;)Z","(Ljava/util/Map;)Z","J_JsonFieldNodeSelector","jr","net/minecraft/src","0" +"func_27064_b","func_27064_b","b","(Ljava/util/Map;)LJ_JsonNode;","(Ljava/util/Map;)Lan;","J_JsonFieldNodeSelector","jr","net/minecraft/src","0" +"func_35613_a","canSpawnMoreStructuresOfType","a","(I)Z","(I)Z","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"func_35614_a","canSpawnMoreStructures","a","()Z","()Z","StructureStrongholdPieceWeight","ci","net/minecraft/src","0" +"read","read","read","()I","()I","MusInputStream","cm","net/minecraft/src","0" +"read","read","read","([BII)I","([BII)I","MusInputStream","cm","net/minecraft/src","0" +"func_280_h","updateAndPropagateCurrentStrength","g","(LWorld;III)V","(Lry;III)V","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_21030_a","calculateCurrentChanges","a","(LWorld;IIIIII)V","(Lry;IIIIII)V","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_282_i","notifyWireNeighborsOfNeighborChange","h","(LWorld;III)V","(Lry;III)V","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_281_g","getMaxCurrentStrength","f","(LWorld;IIII)I","(Lry;IIII)I","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_279_b","isPowerProviderOrWire","c","(LIBlockAccess;IIII)Z","(Lkq;IIII)Z","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_41053_d","func_41053_d","d","(LIBlockAccess;IIII)Z","(Lkq;IIII)Z","BlockRedstoneWire","kw","net/minecraft/src","0" +"func_12248_a","doExplosionA","a","()V","()V","Explosion","xp","net/minecraft/src","0" +"func_12247_b","doExplosionB","a","(Z)V","(Z)V","Explosion","xp","net/minecraft/src","0" +"func_40453_a","initializeTextures","a","()V","()V","OpenGlHelper","adx","net/minecraft/src","0" +"func_40452_a","setActiveTexture","a","(I)V","(I)V","OpenGlHelper","adx","net/minecraft/src","0" +"func_40451_b","setClientActiveTexture","b","(I)V","(I)V","OpenGlHelper","adx","net/minecraft/src","0" +"func_40454_a","setLightmapTextureCoords","a","(IFF)V","(IFF)V","OpenGlHelper","adx","net/minecraft/src","0" +"func_35063_a","func_35063_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdPrison;","(Ljava/util/List;Ljava/util/Random;IIIII)Lfj;","ComponentStrongholdPrison","fj","net/minecraft/src","0" +"func_35705_a","getStructureVillageWeightedPieceList","a","(Ljava/util/Random;I)Ljava/util/ArrayList;","(Ljava/util/Random;I)Ljava/util/ArrayList;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35703_a","getAvailablePieceWeight","a","(Ljava/util/ArrayList;)I","(Ljava/util/ArrayList;)I","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35699_a","getVillageComponentFromWeightedPiece","a","(LStructureVillagePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillage;","(Laan;Ljava/util/List;Ljava/util/Random;IIIII)Lxf;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35700_c","getNextVillageComponent","c","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillage;","(Lyp;Ljava/util/List;Ljava/util/Random;IIIII)Lxf;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35702_d","getNextVillageStructureComponent","d","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35698_e","getNextComponentVillagePath","e","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35704_a","getNextStructureComponent","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_35701_b","getNextStructureComponentVillagePath","b","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lyp;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureVillagePieces","xy","net/minecraft/src","0" +"func_27040_h","isRailBlockAt","g","(LWorld;III)Z","(Lry;III)Z","BlockRail","afr","net/minecraft/src","0" +"func_27041_c","isRailBlock","e","(I)Z","(I)Z","BlockRail","afr","net/minecraft/src","0" +"func_27042_h","getIsPowered","s","()Z","()Z","BlockRail","afr","net/minecraft/src","0" +"func_4031_h","refreshTrackShape","a","(LWorld;IIIZ)V","(Lry;IIIZ)V","BlockRail","afr","net/minecraft/src","0" +"func_27044_a","isNeighborRailPowered","a","(LWorld;IIIIZI)Z","(Lry;IIIIZI)Z","BlockRail","afr","net/minecraft/src","0" +"func_27043_a","isRailPassingPower","a","(LWorld;IIIZII)Z","(Lry;IIIZII)Z","BlockRail","afr","net/minecraft/src","0" +"func_27039_a","isPoweredBlockRail","a","(LBlockRail;)Z","(Lafr;)Z","BlockRail","afr","net/minecraft/src","0" +"func_35097_a","func_35097_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageChurch;","(Ljava/util/List;Ljava/util/Random;IIIII)Luz;","ComponentVillageChurch","uz","net/minecraft/src","0" +"func_40026_a","func_40026_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeThrone;","(Ljava/util/List;Ljava/util/Random;IIIII)Lkf;","ComponentNetherBridgeThrone","kf","net/minecraft/src","0" +"func_35626_a","func_35626_a","a","(JII[BDDDFFFIID)V","(JII[BDDDFFFIID)V","MapGenRavine","rf","net/minecraft/src","0" +"func_580_a","keyTyped","a","(CI)V","(CI)V","GuiScreen","xe","net/minecraft/src","0" +"func_6448_a","initGui","a","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_570_g","updateScreen","s_","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_572_a","actionPerformed","a","(LGuiButton;)V","(Lct;)V","GuiScreen","xe","net/minecraft/src","0" +"func_571_a","drawScreen","a","(IIF)V","(IIF)V","GuiScreen","xe","net/minecraft/src","0" +"func_6449_h","onGuiClosed","d","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_6450_b","doesGuiPauseGame","b","()Z","()Z","GuiScreen","xe","net/minecraft/src","0" +"func_565_a","mouseClicked","a","(III)V","(III)V","GuiScreen","xe","net/minecraft/src","0" +"func_573_b","mouseMovedOrUp","b","(III)V","(III)V","GuiScreen","xe","net/minecraft/src","0" +"func_574_c","getClipboardString","f","()Ljava/lang/String;","()Ljava/lang/String;","GuiScreen","xe","net/minecraft/src","0" +"func_6447_a","setWorldAndResolution","a","(LMinecraft;II)V","(Lnet/minecraft/client/Minecraft;II)V","GuiScreen","xe","net/minecraft/src","0" +"func_564_d","handleInput","g","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_566_e","handleMouseInput","h","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_569_f","handleKeyboardInput","i","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_578_i","drawDefaultBackground","j","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_567_a","drawWorldBackground","a","(I)V","(I)V","GuiScreen","xe","net/minecraft/src","0" +"func_579_b","drawBackground","b","(I)V","(I)V","GuiScreen","xe","net/minecraft/src","0" +"func_568_a","deleteWorld","a","(ZI)V","(ZI)V","GuiScreen","xe","net/minecraft/src","0" +"func_27108_j","selectNextField","k","()V","()V","GuiScreen","xe","net/minecraft/src","0" +"func_21124_a","addObject","a","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","DataWatcher","cr","net/minecraft/src","0" +"func_21130_a","getWatchableObjectByte","a","(I)B","(I)B","DataWatcher","cr","net/minecraft/src","0" +"func_41062_b","getWatchableObjectShort","b","(I)S","(I)S","DataWatcher","cr","net/minecraft/src","0" +"func_25115_b","getWatchableObjectInt","c","(I)I","(I)I","DataWatcher","cr","net/minecraft/src","0" +"func_25116_c","getWatchableObjectString","d","(I)Ljava/lang/String;","(I)Ljava/lang/String;","DataWatcher","cr","net/minecraft/src","0" +"func_21129_b","updateObject","b","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","DataWatcher","cr","net/minecraft/src","0" +"func_21125_a","writeObjectsInListToStream","a","(Ljava/util/List;Ljava/io/DataOutputStream;)V","(Ljava/util/List;Ljava/io/DataOutputStream;)V","DataWatcher","cr","net/minecraft/src","0" +"func_21127_a","writeWatchableObjects","a","(Ljava/io/DataOutputStream;)V","(Ljava/io/DataOutputStream;)V","DataWatcher","cr","net/minecraft/src","0" +"func_21128_a","writeWatchableObject","a","(Ljava/io/DataOutputStream;LWatchableObject;)V","(Ljava/io/DataOutputStream;Lafh;)V","DataWatcher","cr","net/minecraft/src","0" +"func_21131_a","readWatchableObjects","a","(Ljava/io/DataInputStream;)Ljava/util/List;","(Ljava/io/DataInputStream;)Ljava/util/List;","DataWatcher","cr","net/minecraft/src","0" +"func_21126_a","updateWatchedObjectsFromList","a","(Ljava/util/List;)V","(Ljava/util/List;)V","DataWatcher","cr","net/minecraft/src","0" +"func_40357_a","isBitOn","a","(II)Z","(II)Z","PotionHelper","pk","net/minecraft/src","0" +"func_40349_b","func_40349_b","b","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" +"func_40353_c","func_40353_c","c","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" +"func_40352_a","func_40352_a","a","(I)I","(I)I","PotionHelper","pk","net/minecraft/src","0" +"func_40354_a","func_40354_a","a","(Ljava/util/Collection;)I","(Ljava/util/Collection;)I","PotionHelper","pk","net/minecraft/src","0" +"func_40358_a","func_40358_a","a","(IZ)I","(IZ)I","PotionHelper","pk","net/minecraft/src","0" +"func_40359_b","func_40359_b","b","(I)Ljava/lang/String;","(I)Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"func_40347_a","func_40347_a","a","(ZZZIIII)I","(ZZZIIII)I","PotionHelper","pk","net/minecraft/src","0" +"func_40348_c","getOnBitCount","c","(I)I","(I)I","PotionHelper","pk","net/minecraft/src","0" +"func_40355_a","func_40355_a","a","(Ljava/lang/String;III)I","(Ljava/lang/String;III)I","PotionHelper","pk","net/minecraft/src","0" +"func_40360_b","func_40360_b","b","(IZ)Ljava/util/List;","(IZ)Ljava/util/List;","PotionHelper","pk","net/minecraft/src","0" +"func_40350_a","brewBitOperations","a","(IIZZZ)I","(IIZZZ)I","PotionHelper","pk","net/minecraft/src","0" +"func_40356_a","brewPotionData","a","(ILjava/lang/String;)I","(ILjava/lang/String;)I","PotionHelper","pk","net/minecraft/src","0" +"func_40351_a","func_40351_a","a","(IIIIII)I","(IIIIII)I","PotionHelper","pk","net/minecraft/src","0" +"func_41067_a","updateRenderInfo","a","(LEntityPlayer;Z)V","(Lvi;Z)V","ActiveRenderInfo","abz","net/minecraft/src","0" +"func_41065_a","projectViewFromEntity","a","(LEntityLiving;D)LVec3D;","(Lnq;D)Lfb;","ActiveRenderInfo","abz","net/minecraft/src","0" +"func_41066_a","getBlockIdAtEntityViewpoint","a","(LWorld;LEntityLiving;F)I","(Lry;Lnq;F)I","ActiveRenderInfo","abz","net/minecraft/src","0" +"func_40090_a","func_40090_a","a","(DID)V","(DID)V","EntityEnderEye","bs","net/minecraft/src","0" +"func_40053_g","getBrewTime","a","()I","()I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"func_40050_o","canBrew","p","()Z","()Z","TileEntityBrewingStand","tt","net/minecraft/src","0" +"func_40052_p","brewPotions","q","()V","()V","TileEntityBrewingStand","tt","net/minecraft/src","0" +"func_40051_b","getPotionResult","b","(ILItemStack;)I","(ILdk;)I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"func_40049_b","setBrewTime","a","(I)V","(I)V","TileEntityBrewingStand","tt","net/minecraft/src","0" +"func_40054_n","getFilledSlots","o","()I","()I","TileEntityBrewingStand","tt","net/minecraft/src","0" +"addNotify","addNotify","addNotify","()V","()V","CanvasMinecraftApplet","ep","net/minecraft/src","0" +"removeNotify","removeNotify","removeNotify","()V","()V","CanvasMinecraftApplet","ep","net/minecraft/src","0" +"values","values","values","()[LEnumOS2;","()[Lqe;","EnumOS2","qe","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumOS2;","(Ljava/lang/String;)Lqe;","EnumOS2","qe","net/minecraft/src","0" +"func_40436_c","getMaxDamageArray","o","()[I","()[I","ItemArmor","agi","net/minecraft/src","0" +"values","values","values","()[LEnumAction;","()[Lps;","EnumAction","ps","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumAction;","(Ljava/lang/String;)Lps;","EnumAction","ps","net/minecraft/src","0" +"func_25088_a","update","a","()V","()V","GuiParticle","vg","net/minecraft/src","0" +"func_25087_a","draw","a","(F)V","(F)V","GuiParticle","vg","net/minecraft/src","0" +"func_35034_a","getStrongholdStairsComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStairs;","(Ljava/util/List;Ljava/util/Random;IIIII)Lvl;","ComponentStrongholdStairs","vl","net/minecraft/src","0" +"func_25208_a","getGuid","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","AchievementMap","kp","net/minecraft/src","0" +"func_40618_a","setIconIndex","b","(II)LPotion;","(II)Labg;","Potion","abg","net/minecraft/src","0" +"func_40619_a","getId","b","()I","()I","Potion","abg","net/minecraft/src","0" +"func_35662_a","performEffect","a","(LEntityLiving;I)V","(Lnq;I)V","Potion","abg","net/minecraft/src","0" +"func_40613_a","func_40613_a","a","(LEntityLiving;LEntityLiving;ID)V","(Lnq;Lnq;ID)V","Potion","abg","net/minecraft/src","0" +"func_40622_b","func_40622_b","a","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_35660_a","isReady","a","(II)Z","(II)Z","Potion","abg","net/minecraft/src","0" +"func_35661_a","setPotionName","a","(Ljava/lang/String;)LPotion;","(Ljava/lang/String;)Labg;","Potion","abg","net/minecraft/src","0" +"func_40623_c","getName","c","()Ljava/lang/String;","()Ljava/lang/String;","Potion","abg","net/minecraft/src","0" +"func_40617_d","hasStatusIcon","d","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_40611_e","getStatusIconIndex","e","()I","()I","Potion","abg","net/minecraft/src","0" +"func_40615_f","func_40615_f","f","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_40620_a","func_40620_a","a","(LPotionEffect;)Ljava/lang/String;","(Ls;)Ljava/lang/String;","Potion","abg","net/minecraft/src","0" +"func_40614_a","func_40614_a","a","(D)LPotion;","(D)Labg;","Potion","abg","net/minecraft/src","0" +"func_40610_g","func_40610_g","g","()D","()D","Potion","abg","net/minecraft/src","0" +"func_40616_h","func_40616_h","h","()LPotion;","()Labg;","Potion","abg","net/minecraft/src","0" +"func_40612_i","func_40612_i","i","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_40621_j","func_40621_j","j","()I","()I","Potion","abg","net/minecraft/src","0" +"func_35099_a","func_35099_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentVillageTorch","abj","net/minecraft/src","0" +"func_315_h","tryToFall","g","(LWorld;III)V","(Lry;III)V","BlockSand","cj","net/minecraft/src","0" +"func_316_a_","canFallBelow","b_","(LWorld;III)Z","(Lry;III)Z","BlockSand","cj","net/minecraft/src","0" +"func_28110_c","func_28110_c","c","()Ljava/util/Collection;","()Ljava/util/Collection;","NBTTagCompound","ik","net/minecraft/src","0" +"func_762_a","setTag","a","(Ljava/lang/String;LNBTBase;)V","(Ljava/lang/String;Lum;)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_761_a","setByte","a","(Ljava/lang/String;B)V","(Ljava/lang/String;B)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_749_a","setShort","a","(Ljava/lang/String;S)V","(Ljava/lang/String;S)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_758_a","setInteger","a","(Ljava/lang/String;I)V","(Ljava/lang/String;I)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_750_a","setLong","a","(Ljava/lang/String;J)V","(Ljava/lang/String;J)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_744_a","setFloat","a","(Ljava/lang/String;F)V","(Ljava/lang/String;F)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_765_a","setDouble","a","(Ljava/lang/String;D)V","(Ljava/lang/String;D)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_754_a","setString","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_747_a","setByteArray","a","(Ljava/lang/String;[B)V","(Ljava/lang/String;[B)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_763_a","setCompoundTag","a","(Ljava/lang/String;LNBTTagCompound;)V","(Ljava/lang/String;Lik;)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_748_a","setBoolean","a","(Ljava/lang/String;Z)V","(Ljava/lang/String;Z)V","NBTTagCompound","ik","net/minecraft/src","0" +"func_40196_b","getTag","a","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lum;","NBTTagCompound","ik","net/minecraft/src","0" +"func_751_b","hasKey","b","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","NBTTagCompound","ik","net/minecraft/src","0" +"func_746_c","getByte","c","(Ljava/lang/String;)B","(Ljava/lang/String;)B","NBTTagCompound","ik","net/minecraft/src","0" +"func_745_d","getShort","d","(Ljava/lang/String;)S","(Ljava/lang/String;)S","NBTTagCompound","ik","net/minecraft/src","0" +"func_756_e","getInteger","e","(Ljava/lang/String;)I","(Ljava/lang/String;)I","NBTTagCompound","ik","net/minecraft/src","0" +"func_764_f","getLong","f","(Ljava/lang/String;)J","(Ljava/lang/String;)J","NBTTagCompound","ik","net/minecraft/src","0" +"func_752_g","getFloat","g","(Ljava/lang/String;)F","(Ljava/lang/String;)F","NBTTagCompound","ik","net/minecraft/src","0" +"func_757_h","getDouble","h","(Ljava/lang/String;)D","(Ljava/lang/String;)D","NBTTagCompound","ik","net/minecraft/src","0" +"func_755_i","getString","i","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","NBTTagCompound","ik","net/minecraft/src","0" +"func_759_j","getByteArray","j","(Ljava/lang/String;)[B","(Ljava/lang/String;)[B","NBTTagCompound","ik","net/minecraft/src","0" +"func_743_k","getCompoundTag","k","(Ljava/lang/String;)LNBTTagCompound;","(Ljava/lang/String;)Lik;","NBTTagCompound","ik","net/minecraft/src","0" +"func_753_l","getTagList","l","(Ljava/lang/String;)LNBTTagList;","(Ljava/lang/String;)Lyi;","NBTTagCompound","ik","net/minecraft/src","0" +"func_760_m","getBoolean","m","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","NBTTagCompound","ik","net/minecraft/src","0" +"func_35071_a","func_35071_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentMineshaftCross","id","net/minecraft/src","0" +"func_20159_a","updateCraftingInventorySlot","a","(LContainer;ILItemStack;)V","(Lpj;ILdk;)V","ICrafting","abd","net/minecraft/src","0" +"func_20158_a","updateCraftingInventoryInfo","a","(LContainer;II)V","(Lpj;II)V","ICrafting","abd","net/minecraft/src","0" +"func_40218_g","func_40218_g","e","()V","()V","GuiInventory","hw","net/minecraft/src","0" +"func_22084_k","loadSaves","l","()V","()V","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22091_c","getSaveFileName","c","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22094_d","getSaveName","d","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_585_j","initButtons","e","()V","()V","GuiSelectWorld","xz","net/minecraft/src","0" +"func_584_c","selectWorld","e","(I)V","(I)V","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22090_a","getSize","a","(LGuiSelectWorld;)Ljava/util/List;","(Lxz;)Ljava/util/List;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22089_a","onElementSelected","a","(LGuiSelectWorld;I)I","(Lxz;I)I","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22086_b","getSelectedWorld","b","(LGuiSelectWorld;)I","(Lxz;)I","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22083_c","getSelectButton","c","(LGuiSelectWorld;)LGuiButton;","(Lxz;)Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22085_d","getRenameButton","d","(LGuiSelectWorld;)LGuiButton;","(Lxz;)Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22092_e","getDeleteButton","e","(LGuiSelectWorld;)LGuiButton;","(Lxz;)Lct;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22087_f","func_22087_f","f","(LGuiSelectWorld;)Ljava/lang/String;","(Lxz;)Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22093_g","getDateFormatter","g","(LGuiSelectWorld;)Ljava/text/DateFormat;","(Lxz;)Ljava/text/DateFormat;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_22088_h","func_22088_h","h","(LGuiSelectWorld;)Ljava/lang/String;","(Lxz;)Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_35315_i","func_35315_i","i","(LGuiSelectWorld;)[Ljava/lang/String;","(Lxz;)[Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"func_4129_a","generateLargeCaveNode","a","(II[BDDD)V","(II[BDDD)V","MapGenCavesHell","cz","net/minecraft/src","0" +"func_4128_a","generateCaveNode","a","(II[BDDDFFFIID)V","(II[BDDDFFFIID)V","MapGenCavesHell","cz","net/minecraft/src","0" +"func_539_c","func_539_c","d","(II)V","(II)V","ChunkProviderClient","er","net/minecraft/src","0" +"func_35796_a","combine","a","(LPotionEffect;)V","(Ls;)V","PotionEffect","s","net/minecraft/src","0" +"func_35799_a","getPotionID","a","()I","()I","PotionEffect","s","net/minecraft/src","0" +"func_35802_b","getDuration","b","()I","()I","PotionEffect","s","net/minecraft/src","0" +"func_35801_c","getAmplifier","c","()I","()I","PotionEffect","s","net/minecraft/src","0" +"func_35798_a","onUpdate","a","(LEntityLiving;)Z","(Lnq;)Z","PotionEffect","s","net/minecraft/src","0" +"func_35797_d","deincrementDuration","e","()I","()I","PotionEffect","s","net/minecraft/src","0" +"func_35800_b","performEffect","b","(LEntityLiving;)V","(Lnq;)V","PotionEffect","s","net/minecraft/src","0" +"func_40468_d","getEffectName","d","()Ljava/lang/String;","()Ljava/lang/String;","PotionEffect","s","net/minecraft/src","0" +"func_35047_a","func_35047_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgp;","ComponentStrongholdStraight","gp","net/minecraft/src","0" +"func_40017_a","func_40017_a","a","(Ljava/util/List;)I","(Ljava/util/List;)I","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40020_a","func_40020_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lgc;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)Lrh;","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40018_a","func_40018_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIIIIZ)LStructureComponent;","(Lgc;Ljava/util/List;Ljava/util/Random;IIIIIZ)Lnk;","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40022_a","func_40022_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lgc;Ljava/util/List;Ljava/util/Random;IIZ)Lnk;","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40019_b","func_40019_b","b","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lgc;Ljava/util/List;Ljava/util/Random;IIZ)Lnk;","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40016_c","func_40016_c","c","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lgc;Ljava/util/List;Ljava/util/Random;IIZ)Lnk;","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_40021_a","func_40021_a","a","(LStructureBoundingBox;)Z","(Lnl;)Z","ComponentNetherBridgePiece","rh","net/minecraft/src","0" +"func_490_a","getCookProgressScaled","a","(I)I","(I)I","TileEntityFurnace","oe","net/minecraft/src","0" +"func_489_b","getBurnTimeRemainingScaled","b","(I)I","(I)I","TileEntityFurnace","oe","net/minecraft/src","0" +"func_485_a","isBurning","a","()Z","()Z","TileEntityFurnace","oe","net/minecraft/src","0" +"func_491_j","canSmelt","p","()Z","()Z","TileEntityFurnace","oe","net/minecraft/src","0" +"func_487_i","smeltItem","o","()V","()V","TileEntityFurnace","oe","net/minecraft/src","0" +"func_488_a","getItemBurnTime","a","(LItemStack;)I","(Ldk;)I","TileEntityFurnace","oe","net/minecraft/src","0" +"func_40117_c","getMaxHealth","f_","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_425_j","onLivingUpdate","c","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_6389_d","getLivingSound","e","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","nq","net/minecraft/src","0" +"func_6394_f_","getHurtSound","f","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","nq","net/minecraft/src","0" +"func_6390_f","getDeathSound","g","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","nq","net/minecraft/src","0" +"func_422_g","getDropItemId","k","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_21066_o","dropFewItems","a","(ZI)V","(ZI)V","EntityLiving","nq","net/minecraft/src","0" +"func_435_b","moveEntityWithHeading","d","(FF)V","(FF)V","EntityLiving","nq","net/minecraft/src","0" +"func_429_A","isOnLadder","ah","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_433_a","getCanSpawnHere","i","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_4045_l","getHeldItem","s","()LItemStack;","()Ldk;","EntityLiving","nq","net/minecraft/src","0" +"func_432_b","heal","a_","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" +"func_4044_a","damageEntity","b","(LDamageSource;I)V","(Lpm;I)V","EntityLiving","nq","net/minecraft/src","0" +"func_35162_ad","func_35162_ad","aj","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_22049_v","isMovementBlocked","ai","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_418_b_","updateEntityActionState","n","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_419_b","onDeath","a","(LDamageSource;)V","(Lpm;)V","EntityLiving","nq","net/minecraft/src","0" +"func_40116_f","subtractOne","d","(I)I","(I)I","EntityLiving","nq","net/minecraft/src","0" +"func_40128_b","func_40128_b","d","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" +"func_40125_g","func_40125_g","i","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" +"func_40119_ar","func_40119_ar","o_","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_22051_K","isPlayerSleeping","ar","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_424_C","jump","ak","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_28021_c","getItemIcon","a","(LItemStack;I)I","(Ldk;I)I","EntityLiving","nq","net/minecraft/src","0" +"func_36001_a","getExperiencePoints","b","(LEntityPlayer;)I","(Lvi;)I","EntityLiving","nq","net/minecraft/src","0" +"func_35163_av","func_35163_av","ae","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_40120_m_","func_40120_m_","ad","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_27021_X","despawnEntity","al","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_25023_u","canDespawn","d","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_6393_h","getSoundVolume","w_","()F","()F","EntityLiving","nq","net/minecraft/src","0" +"func_25026_x","getVerticalFaceSpeed","am","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_6391_i","getMaxSpawnedInChunk","g_","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_421_b","getTalkInterval","p_","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_40124_t","func_40124_t","r_","()LEnumCreatureAttribute;","()Lel;","EntityLiving","nq","net/minecraft/src","0" +"func_40126_a","func_40126_a","b","(LPotionEffect;)Z","(Ls;)Z","EntityLiving","nq","net/minecraft/src","0" +"func_40127_l","func_40127_l","q_","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_420_c","canEntityBeSeen","i","(LEntity;)Z","(Lia;)Z","EntityLiving","nq","net/minecraft/src","0" +"func_22050_O","playLivingSound","ac","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_415_z","spawnExplosionParticle","af","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_40114_aH","getEntityHealth","ag","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_40121_k","setEntityHealth","h","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" +"func_40123_ac","getSoundPitch","ax","()F","()F","EntityLiving","nq","net/minecraft/src","0" +"func_40115_d","func_40115_d","c","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" +"func_434_a","knockBack","a","(LEntity;IDD)V","(Lia;IDD)V","EntityLiving","nq","net/minecraft/src","0" +"func_21067_c_","canBreatheUnderwater","h","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_426_b","faceEntity","a","(LEntity;FF)V","(Lia;FF)V","EntityLiving","nq","net/minecraft/src","0" +"func_25025_V","hasCurrentTarget","an","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_25024_W","getCurrentTarget","ao","()LEntity;","()Lia;","EntityLiving","nq","net/minecraft/src","0" +"func_417_b","updateRotation","b","(FFF)F","(FFF)F","EntityLiving","nq","net/minecraft/src","0" +"func_6392_F","onEntityDeath","ap","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_431_d","getSwingProgress","d","(F)F","(F)F","EntityLiving","nq","net/minecraft/src","0" +"func_427_e","getPosition","e","(F)LVec3D;","(F)Lfb;","EntityLiving","nq","net/minecraft/src","0" +"func_430_f","getLook","f","(F)LVec3D;","(F)Lfb;","EntityLiving","nq","net/minecraft/src","0" +"func_35159_aC","func_35159_aC","aq","()F","()F","EntityLiving","nq","net/minecraft/src","0" +"func_416_a","rayTrace","a","(DF)LMovingObjectPosition;","(DF)Lgv;","EntityLiving","nq","net/minecraft/src","0" +"func_36000_g","updatePotionEffects","as","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_40112_aN","func_40112_aN","at","()V","()V","EntityLiving","nq","net/minecraft/src","0" +"func_40118_aO","func_40118_aO","au","()Ljava/util/Collection;","()Ljava/util/Collection;","EntityLiving","nq","net/minecraft/src","0" +"func_35160_a","isPotionActive","a","(LPotion;)Z","(Labg;)Z","EntityLiving","nq","net/minecraft/src","0" +"func_35167_b","getActivePotionEffect","b","(LPotion;)LPotionEffect;","(Labg;)Ls;","EntityLiving","nq","net/minecraft/src","0" +"func_35165_a","addPotionEffect","a","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" +"func_40122_aP","func_40122_aP","av","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_36002_f","removePotionEffect","j","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" +"func_35164_b","onNewPotionEffect","c","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" +"func_35161_c","onChangedPotionEffect","d","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" +"func_35158_d","onFinishedPotionEffect","e","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" +"func_35166_t_","func_35166_t_","aw","()F","()F","EntityLiving","nq","net/minecraft/src","0" +"func_40113_j","func_40113_j","i","(DDD)V","(DDD)V","EntityLiving","nq","net/minecraft/src","0" +"func_41005_b","func_41005_b","b","(LItemStack;)V","(Ldk;)V","EntityLiving","nq","net/minecraft/src","0" +"func_20134_a","func_20134_a","a","(LInventoryBasic;)V","(Lbb;)V","IInvBasic","afq","net/minecraft/src","0" +"func_1115_a","setTexturePosition","a","(FF)LPositionTextureVertex;","(FF)Lfs;","PositionTextureVertex","fs","net/minecraft/src","0" +"func_817_a","chunkFileForXZ","a","(II)Ljava/io/File;","(II)Ljava/io/File;","ChunkLoader","gy","net/minecraft/src","0" +"func_818_a","storeChunkInCompound","a","(LChunk;LWorld;LNBTTagCompound;)V","(Lzx;Lry;Lik;)V","ChunkLoader","gy","net/minecraft/src","0" +"func_816_a","loadChunkIntoWorldFromCompound","a","(LWorld;LNBTTagCompound;)LChunk;","(Lry;Lik;)Lzx;","ChunkLoader","gy","net/minecraft/src","0" +"func_40321_a","func_40321_a","a","()I","()I","ModelBlaze","adm","net/minecraft/src","0" +"func_864_b","render","a","(LEntity;FFFFFF)V","(Lia;FFFFFF)V","ModelBase","al","net/minecraft/src","0" +"func_863_a","setRotationAngles","a","(FFFFFF)V","(FFFFFF)V","ModelBase","al","net/minecraft/src","0" +"func_25103_a","setLivingAnimations","a","(LEntityLiving;FFF)V","(Lnq;FFF)V","ModelBase","al","net/minecraft/src","0" +"func_40298_a","setTextureOffset","a","(Ljava/lang/String;II)V","(Ljava/lang/String;II)V","ModelBase","al","net/minecraft/src","0" +"func_40297_a","func_40297_a","a","(Ljava/lang/String;)LTextureOffset;","(Ljava/lang/String;)Lsx;","ModelBase","al","net/minecraft/src","0" +"func_4066_a","renderGameOverlay","a","(FZII)V","(FZII)V","GuiIngame","qd","net/minecraft/src","0" +"func_41039_c","func_41039_c","c","()V","()V","GuiIngame","qd","net/minecraft/src","0" +"func_4063_a","renderPumpkinBlur","a","(II)V","(II)V","GuiIngame","qd","net/minecraft/src","0" +"func_4064_a","renderVignette","a","(FII)V","(FII)V","GuiIngame","qd","net/minecraft/src","0" +"func_4065_b","renderPortalOverlay","b","(FII)V","(FII)V","GuiIngame","qd","net/minecraft/src","0" +"func_554_a","renderInventorySlot","a","(IIIF)V","(IIIF)V","GuiIngame","qd","net/minecraft/src","0" +"func_555_a","updateTick","a","()V","()V","GuiIngame","qd","net/minecraft/src","0" +"func_28097_b","clearChatMessages","b","()V","()V","GuiIngame","qd","net/minecraft/src","0" +"func_552_a","addChatMessage","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","GuiIngame","qd","net/minecraft/src","0" +"func_553_b","setRecordPlayingMessage","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","GuiIngame","qd","net/minecraft/src","0" +"func_22064_c","addChatMessageTranslate","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","GuiIngame","qd","net/minecraft/src","0" +"func_35080_a","func_35080_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageField;","(Ljava/util/List;Ljava/util/Random;IIIII)Lec;","ComponentVillageField","ec","net/minecraft/src","0" +"func_27327_a","format","a","(LJ_JsonRootNode;)Ljava/lang/String;","(Lwz;)Ljava/lang/String;","J_JsonFormatter","wo","net/minecraft/src","0" +"func_35089_a","func_35089_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageField2;","(Ljava/util/List;Ljava/util/Random;IIIII)Lagr;","ComponentVillageField2","agr","net/minecraft/src","0" +"func_22124_a","func_22124_a","a","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22126_b","func_22126_b","b","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22119_c","func_22119_c","c","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22122_d","func_22122_d","d","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22117_e","func_22117_e","e","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_35307_f","func_35307_f","f","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_35308_g","func_35308_g","g","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22118_f","func_22118_f","h","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22116_g","func_22116_g","i","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22121_h","func_22121_h","j","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22123_i","func_22123_i","k","(LGuiTexturePacks;)LMinecraft;","(Llb;)Lnet/minecraft/client/Minecraft;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22127_j","func_22127_j","l","(LGuiTexturePacks;)LFontRenderer;","(Llb;)Labe;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22120_k","func_22120_k","m","(LGuiTexturePacks;)LFontRenderer;","(Llb;)Labe;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_22125_l","func_22125_l","n","(LGuiTexturePacks;)LFontRenderer;","(Llb;)Labe;","GuiTexturePacks","lb","net/minecraft/src","0" +"func_21110_c","setCurrentChunkOver","d","(II)V","(II)V","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"func_21111_d","canChunkExist","e","(II)Z","(II)Z","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"func_542_c","func_542_c","f","(II)LChunk;","(II)Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"func_541_a","saveExtraChunkData","a","(LChunk;)V","(Lzx;)V","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"func_540_b","saveChunk","b","(LChunk;)V","(Lzx;)V","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" +"func_26002_a","func_26002_a","a","([B)V","([B)V","ChunkBlockMap","aig","net/minecraft/src","0" +"func_22154_d","createSessionLock","e","()V","()V","SaveHandler","e","net/minecraft/src","0" +"func_22153_a","getSaveDirectory","a","()Ljava/io/File;","()Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" +"func_177_a","renderCow","a","(LEntityCow;DDDFF)V","(Ladr;DDDFF)V","RenderCow","lj","net/minecraft/src","0" +"func_35294_i","func_35294_i","g","(LWorld;III)V","(Lry;III)V","BlockStem","pu","net/minecraft/src","0" +"func_35295_j","func_35295_j","j","(LWorld;III)F","(Lry;III)F","BlockStem","pu","net/minecraft/src","0" +"func_35296_f","func_35296_f","c","(LIBlockAccess;III)I","(Lkq;III)I","BlockStem","pu","net/minecraft/src","0" +"func_438_i","findPlayerToAttack","o","()LEntity;","()Lia;","EntityCreature","ww","net/minecraft/src","0" +"func_25028_d_","isMovementCeased","az","()Z","()Z","EntityCreature","ww","net/minecraft/src","0" +"func_437_a","attackEntity","a","(LEntity;F)V","(Lia;F)V","EntityCreature","ww","net/minecraft/src","0" +"func_28022_b","attackBlockedEntity","b","(LEntity;F)V","(Lia;F)V","EntityCreature","ww","net/minecraft/src","0" +"func_439_a","getBlockPathWeight","a","(III)F","(III)F","EntityCreature","ww","net/minecraft/src","0" +"func_31026_E","updateWanderPath","aA","()V","()V","EntityCreature","ww","net/minecraft/src","0" +"func_25031_E","hasPath","aB","()Z","()Z","EntityCreature","ww","net/minecraft/src","0" +"func_25029_a","setPathToEntity","a","(LPathEntity;)V","(Ldw;)V","EntityCreature","ww","net/minecraft/src","0" +"func_25030_F","getEntityToAttack","aC","()LEntity;","()Lia;","EntityCreature","ww","net/minecraft/src","0" +"func_25032_c","setEntityToAttack","a","(LEntity;)V","(Lia;)V","EntityCreature","ww","net/minecraft/src","0" +"func_4107_a","placeInPortal","a","(LWorld;LEntity;)V","(Lry;Lia;)V","Teleporter","aim","net/minecraft/src","0" +"func_4106_b","placeInExistingPortal","b","(LWorld;LEntity;)Z","(Lry;Lia;)Z","Teleporter","aim","net/minecraft/src","0" +"func_4108_c","createPortal","c","(LWorld;LEntity;)Z","(Lry;Lia;)Z","Teleporter","aim","net/minecraft/src","0" +"func_35849_a","prepareStructurePieces","a","()V","()V","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35853_c","canAddStructurePieces","c","()Z","()Z","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35851_a","getStrongholdComponentFromWeightedPiece","a","(Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIIII)LComponentStronghold;","(Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIIII)Los;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35847_b","func_35847_b","b","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LComponentStronghold;","(Laeh;Ljava/util/List;Ljava/util/Random;IIIII)Los;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35848_c","func_35848_c","c","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Laeh;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35850_a","func_35850_a","a","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Laeh;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_40751_a","func_40751_a","a","(Ljava/lang/Class;)Ljava/lang/Class;","(Ljava/lang/Class;)Ljava/lang/Class;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_35852_b","getStrongholdStones","b","()LStructureStrongholdStones;","()Lqa;","StructureStrongholdPieces","tc","net/minecraft/src","0" +"func_27211_a","setConnections","a","(I)V","(I)V","RailLogic","aiq","net/minecraft/src","0" +"func_785_b","refreshConnectedTracks","a","()V","()V","RailLogic","aiq","net/minecraft/src","0" +"func_784_a","isMinecartTrack","a","(III)Z","(III)Z","RailLogic","aiq","net/minecraft/src","0" +"func_795_a","getMinecartTrackLogic","a","(LChunkPosition;)LRailLogic;","(Lam;)Laiq;","RailLogic","aiq","net/minecraft/src","0" +"func_793_b","isConnectedTo","b","(LRailLogic;)Z","(Laiq;)Z","RailLogic","aiq","net/minecraft/src","0" +"func_794_b","isInTrack","b","(III)Z","(III)Z","RailLogic","aiq","net/minecraft/src","0" +"func_790_c","getAdjacentTracks","b","()I","()I","RailLogic","aiq","net/minecraft/src","0" +"func_787_c","canConnectTo","c","(LRailLogic;)Z","(Laiq;)Z","RailLogic","aiq","net/minecraft/src","0" +"func_788_d","connectToNeighbor","d","(LRailLogic;)V","(Laiq;)V","RailLogic","aiq","net/minecraft/src","0" +"func_786_c","canConnectFrom","c","(III)Z","(III)Z","RailLogic","aiq","net/minecraft/src","0" +"func_792_a","refreshTrackShape","a","(ZZ)V","(ZZ)V","RailLogic","aiq","net/minecraft/src","0" +"func_791_a","getNAdjacentTracks","a","(LRailLogic;)I","(Laiq;)I","RailLogic","aiq","net/minecraft/src","0" +"func_27089_a","setIndependent","f","()LAchievement;","()Lws;","Achievement","ws","net/minecraft/src","0" +"func_27094_b","setSpecial","g","()LAchievement;","()Lws;","Achievement","ws","net/minecraft/src","0" +"func_27091_c","registerAchievement","h","()LAchievement;","()Lws;","Achievement","ws","net/minecraft/src","0" +"func_27090_e","getDescription","i","()Ljava/lang/String;","()Ljava/lang/String;","Achievement","ws","net/minecraft/src","0" +"func_27092_a","setStatStringFormatter","a","(LIStatStringFormat;)LAchievement;","(Laal;)Lws;","Achievement","ws","net/minecraft/src","0" +"func_27093_f","getSpecial","j","()Z","()Z","Achievement","ws","net/minecraft/src","0" +"func_27322_a","func_27322_a","a","(LJ_Functor;)LJ_JsonNodeDoesNotMatchJsonNodeSelectorException;","(Lgz;)Lxc;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"func_27323_a","func_27323_a","a","(LJ_JsonNodeDoesNotMatchChainedJsonNodeSelectorException;LJ_JsonNodeSelector;)LJ_JsonNodeDoesNotMatchJsonNodeSelectorException;","(Lhe;Ldx;)Lxc;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"func_27321_b","func_27321_b","b","(LJ_JsonNodeDoesNotMatchChainedJsonNodeSelectorException;LJ_JsonNodeSelector;)LJ_JsonNodeDoesNotMatchJsonNodeSelectorException;","(Lhe;Ldx;)Lxc;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"func_27324_a","getShortFormFailPath","a","(Ljava/util/List;)Ljava/lang/String;","(Ljava/util/List;)Ljava/lang/String;","J_JsonNodeDoesNotMatchChainedJsonNodeSelectorException","he","net/minecraft/src","0" +"func_27208_a","getDocument","a","()LJ_JsonRootNode;","()Lwz;","J_JsonListenerToJdomAdapter","es","net/minecraft/src","0" +"func_27207_a","addRootNode","a","(LJ_JsonNodeBuilder;)V","(Lrv;)V","J_JsonListenerToJdomAdapter","es","net/minecraft/src","0" +"func_27206_b","addValue","b","(LJ_JsonNodeBuilder;)V","(Lrv;)V","J_JsonListenerToJdomAdapter","es","net/minecraft/src","0" +"func_885_a","func_885_a","a","(IIII)V","(IIII)V","ImageBufferDownload","vt","net/minecraft/src","0" +"func_884_b","func_884_b","b","(IIII)V","(IIII)V","ImageBufferDownload","vt","net/minecraft/src","0" +"func_886_c","func_886_c","c","(IIII)Z","(IIII)Z","ImageBufferDownload","vt","net/minecraft/src","0" +"func_35095_a","func_35095_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse1;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgs;","ComponentVillageHouse1","gs","net/minecraft/src","0" +"func_774_a","grabMouseCursor","a","()V","()V","MouseHelper","hs","net/minecraft/src","0" +"func_773_b","ungrabMouseCursor","b","()V","()V","MouseHelper","hs","net/minecraft/src","0" +"func_772_c","mouseXYChange","c","()V","()V","MouseHelper","hs","net/minecraft/src","0" +"func_25100_a","readStat","a","(LStatBase;I)V","(Lpx;I)V","StatFileWriter","tk","net/minecraft/src","0" +"func_27186_a","writeStatToMap","a","(Ljava/util/Map;LStatBase;I)V","(Ljava/util/Map;Lpx;I)V","StatFileWriter","tk","net/minecraft/src","0" +"func_27176_a","func_27176_a","a","()Ljava/util/Map;","()Ljava/util/Map;","StatFileWriter","tk","net/minecraft/src","0" +"func_27179_a","func_27179_a","a","(Ljava/util/Map;)V","(Ljava/util/Map;)V","StatFileWriter","tk","net/minecraft/src","0" +"func_27180_b","func_27180_b","b","(Ljava/util/Map;)V","(Ljava/util/Map;)V","StatFileWriter","tk","net/minecraft/src","0" +"func_27187_c","func_27187_c","c","(Ljava/util/Map;)V","(Ljava/util/Map;)V","StatFileWriter","tk","net/minecraft/src","0" +"func_27177_a","func_27177_a","a","(Ljava/lang/String;)Ljava/util/Map;","(Ljava/lang/String;)Ljava/util/Map;","StatFileWriter","tk","net/minecraft/src","0" +"func_27185_a","func_27185_a","a","(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;","(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;","StatFileWriter","tk","net/minecraft/src","0" +"func_27183_a","hasAchievementUnlocked","a","(LAchievement;)Z","(Lws;)Z","StatFileWriter","tk","net/minecraft/src","0" +"func_27181_b","canUnlockAchievement","b","(LAchievement;)Z","(Lws;)Z","StatFileWriter","tk","net/minecraft/src","0" +"func_27184_a","writeStat","a","(LStatBase;)I","(Lpx;)I","StatFileWriter","tk","net/minecraft/src","0" +"func_27175_b","func_27175_b","b","()V","()V","StatFileWriter","tk","net/minecraft/src","0" +"func_27182_c","syncStats","c","()V","()V","StatFileWriter","tk","net/minecraft/src","0" +"func_27178_d","func_27178_d","d","()V","()V","StatFileWriter","tk","net/minecraft/src","0" +"values","values","values","()[LEnumOptions;","()[Llp;","EnumOptions","lp","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumOptions;","(Ljava/lang/String;)Llp;","EnumOptions","lp","net/minecraft/src","0" +"func_20137_a","getEnumOptions","a","(I)LEnumOptions;","(I)Llp;","EnumOptions","lp","net/minecraft/src","0" +"func_20136_a","getEnumFloat","a","()Z","()Z","EnumOptions","lp","net/minecraft/src","0" +"func_20140_b","getEnumBoolean","b","()Z","()Z","EnumOptions","lp","net/minecraft/src","0" +"func_20135_c","returnEnumOrdinal","c","()I","()I","EnumOptions","lp","net/minecraft/src","0" +"func_20138_d","getEnumString","d","()Ljava/lang/String;","()Ljava/lang/String;","EnumOptions","lp","net/minecraft/src","0" +"func_711_c","invalidateBlockReceiveRegion","a","(IIIIII)V","(IIIIII)V","WorldClient","ma","net/minecraft/src","0" +"func_713_a","doPreChunk","a","(IIZ)V","(IIZ)V","WorldClient","ma","net/minecraft/src","0" +"func_712_a","addEntityToWorld","a","(ILEntity;)V","(ILia;)V","WorldClient","ma","net/minecraft/src","0" +"func_709_b","getEntityByID","a","(I)LEntity;","(I)Lia;","WorldClient","ma","net/minecraft/src","0" +"func_710_c","removeEntityFromWorld","b","(I)LEntity;","(I)Lia;","WorldClient","ma","net/minecraft/src","0" +"func_714_c","setBlockAndMetadataAndInvalidate","c","(IIIII)Z","(IIIII)Z","WorldClient","ma","net/minecraft/src","0" +"func_35881_a","decorate","a","(LWorld;Ljava/util/Random;II)V","(Lry;Ljava/util/Random;II)V","BiomeDecorator","ql","net/minecraft/src","0" +"func_35882_b","decorate","a","()V","()V","BiomeDecorator","ql","net/minecraft/src","0" +"func_35884_a","genStandardOre1","a","(ILWorldGenerator;II)V","(ILig;II)V","BiomeDecorator","ql","net/minecraft/src","0" +"func_35883_b","genStandardOre2","b","(ILWorldGenerator;II)V","(ILig;II)V","BiomeDecorator","ql","net/minecraft/src","0" +"func_35880_a","generateOres","b","()V","()V","BiomeDecorator","ql","net/minecraft/src","0" +"func_41055_g","func_41055_g","g","(LWorld;III)V","(Lry;III)V","BlockDragonEgg","aci","net/minecraft/src","0" +"func_41054_h","func_41054_h","h","(LWorld;III)V","(Lry;III)V","BlockDragonEgg","aci","net/minecraft/src","0" +"func_31036_a","getNewTileEntity","a","(IIIZZ)LTileEntity;","(IIIZZ)Lbq;","BlockPistonMoving","qz","net/minecraft/src","0" +"func_31035_a","getAxisAlignedBB","b","(LWorld;IIIIFI)LAxisAlignedBB;","(Lry;IIIIFI)Lc;","BlockPistonMoving","qz","net/minecraft/src","0" +"func_31034_c","getTileEntityAtLocation","c","(LIBlockAccess;III)LTileEntityPiston;","(Lkq;III)Lagb;","BlockPistonMoving","qz","net/minecraft/src","0" +"func_1034_a","addPoint","a","(LPathPoint;)LPathPoint;","(Lmo;)Lmo;","Path","zs","net/minecraft/src","0" +"func_1038_a","clearPath","a","()V","()V","Path","zs","net/minecraft/src","0" +"func_1036_b","dequeue","b","()LPathPoint;","()Lmo;","Path","zs","net/minecraft/src","0" +"func_1035_a","changeDistance","a","(LPathPoint;F)V","(Lmo;F)V","Path","zs","net/minecraft/src","0" +"func_1033_a","sortBack","a","(I)V","(I)V","Path","zs","net/minecraft/src","0" +"func_1037_b","sortForward","b","(I)V","(I)V","Path","zs","net/minecraft/src","0" +"func_1039_c","isPathEmpty","c","()Z","()Z","Path","zs","net/minecraft/src","0" +"func_27301_a","aJsonFieldBuilder","a","()LJ_JsonFieldBuilder;","()Laax;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"func_27304_a","withKey","a","(LJ_JsonNodeBuilder;)LJ_JsonFieldBuilder;","(Lrv;)Laax;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"func_27300_b","withValue","b","(LJ_JsonNodeBuilder;)LJ_JsonFieldBuilder;","(Lrv;)Laax;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"func_27303_b","func_27303_b","b","()LJ_JsonStringNode;","()Loj;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"func_27302_c","buildValue","c","()LJ_JsonNode;","()Lan;","J_JsonFieldBuilder","aax","net/minecraft/src","0" +"func_192_a","onItemUse","a","(LItemStack;LEntityPlayer;LWorld;IIII)Z","(Ldk;Lvi;Lry;IIII)Z","Item","acy","net/minecraft/src","0" +"func_4017_a","isFull3D","a","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_40404_a","addInformation","a","(LItemStack;Ljava/util/List;)V","(Ldk;Ljava/util/List;)V","Item","acy","net/minecraft/src","0" +"func_40398_f","func_40398_f","d","(LItemStack;)LEnumRarity;","(Ldk;)Lja;","Item","acy","net/minecraft/src","0" +"func_35413_b","onFoodEaten","a","(LItemStack;LWorld;LEntityPlayer;)LItemStack;","(Ldk;Lry;Lvi;)Ldk;","Item","acy","net/minecraft/src","0" +"func_35411_c","getMaxItemUseDuration","b","(LItemStack;)I","(Ldk;)I","Item","acy","net/minecraft/src","0" +"func_35412_b","getItemUseAction","c","(LItemStack;)LEnumAction;","(Ldk;)Lps;","Item","acy","net/minecraft/src","0" +"func_193_a","onItemRightClick","c","(LItemStack;LWorld;LEntityPlayer;)LItemStack;","(Ldk;Lry;Lvi;)Ldk;","Item","acy","net/minecraft/src","0" +"func_27009_a","getIconFromDamage","a","(I)I","(I)I","Item","acy","net/minecraft/src","0" +"func_27010_f","getColorFromDamage","c","(I)I","(I)I","Item","acy","net/minecraft/src","0" +"func_40397_d","getItemDisplayName","f","(LItemStack;)Ljava/lang/String;","(Ldk;)Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_40403_e","hasEffect","g","(LItemStack;)Z","(Ldk;)Z","Item","acy","net/minecraft/src","0" +"func_21012_a","getPlacedBlockMetadata","b","(I)I","(I)I","Item","acy","net/minecraft/src","0" +"func_21011_b","getItemNameIS","a","(LItemStack;)Ljava/lang/String;","(Ldk;)Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_25008_a","onBlockDestroyed","a","(LItemStack;IIIILEntityLiving;)Z","(Ldk;IIIILnq;)Z","Item","acy","net/minecraft/src","0" +"func_4018_a","canHarvestBlock","a","(LBlock;)Z","(Lyy;)Z","Item","acy","net/minecraft/src","0" +"func_204_a","getStrVsBlock","a","(LItemStack;LBlock;)F","(Ldk;Lyy;)F","Item","acy","net/minecraft/src","0" +"func_40399_b","getItemEnchantability","c","()I","()I","Item","acy","net/minecraft/src","0" +"func_4023_b","shouldRotateAroundWhenRendering","b","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_4022_a","setIconIndex","g","(I)LItem;","(I)Lacy;","Item","acy","net/minecraft/src","0" +"func_21009_c","setMaxStackSize","h","(I)LItem;","(I)Lacy;","Item","acy","net/minecraft/src","0" +"func_20010_a","setIconCoord","a","(II)LItem;","(II)Lacy;","Item","acy","net/minecraft/src","0" +"func_196_a","getIconIndex","h","(LItemStack;)I","(Ldk;)I","Item","acy","net/minecraft/src","0" +"func_200_b","getItemStackLimit","e","()I","()I","Item","acy","net/minecraft/src","0" +"func_21010_e","getHasSubtypes","f","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_21015_a","setHasSubtypes","a","(Z)LItem;","(Z)Lacy;","Item","acy","net/minecraft/src","0" +"func_197_c","getMaxDamage","g","()I","()I","Item","acy","net/minecraft/src","0" +"func_21013_d","setMaxDamage","i","(I)LItem;","(I)Lacy;","Item","acy","net/minecraft/src","0" +"func_25007_g","isDamageable","h","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_4021_a","hitEntity","a","(LItemStack;LEntityLiving;LEntityLiving;)Z","(Ldk;Lnq;Lnq;)Z","Item","acy","net/minecraft/src","0" +"func_4020_a","getDamageVsEntity","a","(LEntity;)I","(Lia;)I","Item","acy","net/minecraft/src","0" +"func_4019_b","useItemOnEntity","a","(LItemStack;LEntityLiving;)V","(Ldk;Lnq;)V","Item","acy","net/minecraft/src","0" +"func_4016_e","setFull3D","i","()LItem;","()Lacy;","Item","acy","net/minecraft/src","0" +"func_20011_a","setItemName","a","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lacy;","Item","acy","net/minecraft/src","0" +"func_40400_h","getLocalItemName","i","(LItemStack;)Ljava/lang/String;","(Ldk;)Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_20009_a","getItemName","d","()Ljava/lang/String;","()Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_21017_a","setContainerItem","a","(LItem;)LItem;","(Lacy;)Lacy;","Item","acy","net/minecraft/src","0" +"func_21016_h","getContainerItem","j","()LItem;","()Lacy;","Item","acy","net/minecraft/src","0" +"func_21014_i","hasContainerItem","k","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_25009_k","getStatName","l","()Ljava/lang/String;","()Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_28008_a","onUpdate","a","(LItemStack;LWorld;LEntity;IZ)V","(Ldk;Lry;Lia;IZ)V","Item","acy","net/minecraft/src","0" +"func_28009_b","onCreated","b","(LItemStack;LWorld;LEntityPlayer;)V","(Ldk;Lry;Lvi;)V","Item","acy","net/minecraft/src","0" +"func_35414_a","onPlayerStoppedUsing","a","(LItemStack;LWorld;LEntityPlayer;I)V","(Ldk;Lry;Lvi;I)V","Item","acy","net/minecraft/src","0" +"func_40407_b","func_40407_b","b","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lacy;","Item","acy","net/minecraft/src","0" +"func_40405_m","func_40405_m","m","()Ljava/lang/String;","()Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_40406_n","isValidBrewingIngredient","n","()Z","()Z","Item","acy","net/minecraft/src","0" +"func_40401_i","func_40401_i","j","(LItemStack;)Z","(Ldk;)Z","Item","acy","net/minecraft/src","0" +"func_40402_a","func_40402_a","a","(LWorld;LEntityPlayer;Z)LMovingObjectPosition;","(Lry;Lvi;Z)Lgv;","Item","acy","net/minecraft/src","0" +"func_475_b","updateEntity","b","()V","()V","TileEntity","bq","net/minecraft/src","0" +"func_482_a","readFromNBT","b","(LNBTTagCompound;)V","(Lik;)V","TileEntity","bq","net/minecraft/src","0" +"func_481_b","writeToNBT","a","(LNBTTagCompound;)V","(Lik;)V","TileEntity","bq","net/minecraft/src","0" +"func_479_f","getBlockMetadata","f","()I","()I","TileEntity","bq","net/minecraft/src","0" +"func_476_a","addMapping","a","(Ljava/lang/Class;Ljava/lang/String;)V","(Ljava/lang/Class;Ljava/lang/String;)V","TileEntity","bq","net/minecraft/src","0" +"func_477_c","createAndLoadEntity","c","(LNBTTagCompound;)LTileEntity;","(Lik;)Lbq;","TileEntity","bq","net/minecraft/src","0" +"func_480_a","getDistanceFrom","a","(DDD)D","(DDD)D","TileEntity","bq","net/minecraft/src","0" +"func_478_g","getBlockType","g","()LBlock;","()Lyy;","TileEntity","bq","net/minecraft/src","0" +"func_31006_g","isInvalid","i","()Z","()Z","TileEntity","bq","net/minecraft/src","0" +"func_31005_i","invalidate","l","()V","()V","TileEntity","bq","net/minecraft/src","0" +"func_31004_j","validate","m","()V","()V","TileEntity","bq","net/minecraft/src","0" +"func_35143_b","onTileEntityPowered","b","(II)V","(II)V","TileEntity","bq","net/minecraft/src","0" +"func_35144_b","func_35144_b","n","()V","()V","TileEntity","bq","net/minecraft/src","0" +"func_30003_j","func_30003_j","j","(LWorld;III)V","(Lry;III)V","BlockFlowing","ahx","net/minecraft/src","0" +"func_299_g","flowIntoBlock","g","(LWorld;IIII)V","(Lry;IIII)V","BlockFlowing","ahx","net/minecraft/src","0" +"func_300_a","calculateFlowCost","c","(LWorld;IIIII)I","(Lry;IIIII)I","BlockFlowing","ahx","net/minecraft/src","0" +"func_297_k","getOptimalFlowDirections","k","(LWorld;III)[Z","(Lry;III)[Z","BlockFlowing","ahx","net/minecraft/src","0" +"func_295_l","blockBlocksFlow","l","(LWorld;III)Z","(Lry;III)Z","BlockFlowing","ahx","net/minecraft/src","0" +"func_296_f","getSmallestFlowDecay","f","(LWorld;IIII)I","(Lry;IIII)I","BlockFlowing","ahx","net/minecraft/src","0" +"func_298_m","liquidCanDisplaceBlock","m","(LWorld;III)Z","(Lry;III)Z","BlockFlowing","ahx","net/minecraft/src","0" +"func_40010_a","func_40010_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdChestCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Lys;","ComponentStrongholdChestCorridor","ys","net/minecraft/src","0" +"func_494_a","getCurrentItem","a","()LItemStack;","()Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"func_505_f","getInventorySlotContainItem","g","(I)I","(I)I","InventoryPlayer","x","net/minecraft/src","0" +"func_41021_b","func_41021_b","b","(II)I","(II)I","InventoryPlayer","x","net/minecraft/src","0" +"func_21105_c","storeItemStack","d","(LItemStack;)I","(Ldk;)I","InventoryPlayer","x","net/minecraft/src","0" +"func_499_j","getFirstEmptyStack","l","()I","()I","InventoryPlayer","x","net/minecraft/src","0" +"func_496_a","setCurrentItem","a","(IIZZ)V","(IIZZ)V","InventoryPlayer","x","net/minecraft/src","0" +"func_498_a","changeCurrentItem","a","(I)V","(I)V","InventoryPlayer","x","net/minecraft/src","0" +"func_21106_d","storePartialItemStack","e","(LItemStack;)I","(Ldk;)I","InventoryPlayer","x","net/minecraft/src","0" +"func_511_b","decrementAnimations","b","()V","()V","InventoryPlayer","x","net/minecraft/src","0" +"func_510_b","consumeInventoryItem","b","(I)Z","(I)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_35157_d","hasItem","c","(I)Z","(I)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_504_a","addItemStackToInventory","a","(LItemStack;)Z","(Ldk;)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_508_a","getStrVsBlock","a","(LBlock;)F","(Lyy;)F","InventoryPlayer","x","net/minecraft/src","0" +"func_493_a","writeToNBT","a","(LNBTTagList;)LNBTTagList;","(Lyi;)Lyi;","InventoryPlayer","x","net/minecraft/src","0" +"func_513_b","readFromNBT","b","(LNBTTagList;)V","(Lyi;)V","InventoryPlayer","x","net/minecraft/src","0" +"func_502_a","getDamageVsEntity","a","(LEntity;)I","(Lia;)I","InventoryPlayer","x","net/minecraft/src","0" +"func_509_b","canHarvestBlock","b","(LBlock;)Z","(Lyy;)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_492_d","armorItemInSlot","e","(I)LItemStack;","(I)Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"func_506_f","getTotalArmorValue","f","()I","()I","InventoryPlayer","x","net/minecraft/src","0" +"func_507_e","damageArmor","f","(I)V","(I)V","InventoryPlayer","x","net/minecraft/src","0" +"func_503_g","dropAllItems","g","()V","()V","InventoryPlayer","x","net/minecraft/src","0" +"func_20076_b","setItemStack","b","(LItemStack;)V","(Ldk;)V","InventoryPlayer","x","net/minecraft/src","0" +"func_20075_i","getItemStack","i","()LItemStack;","()Ldk;","InventoryPlayer","x","net/minecraft/src","0" +"func_28018_c","getHasItemStack","c","(LItemStack;)Z","(Ldk;)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_41022_a","copyInventory","a","(LInventoryPlayer;)V","(Lx;)V","InventoryPlayer","x","net/minecraft/src","0" +"func_4105_a","isItemValid","a","(LItemStack;)Z","(Ldk;)Z","Slot","vv","net/minecraft/src","0" +"func_4103_a","onPickupFromSlot","b","(LItemStack;)V","(Ldk;)V","Slot","vv","net/minecraft/src","0" +"func_4104_e","getSlotStackLimit","a","()I","()I","Slot","vv","net/minecraft/src","0" +"func_777_b","getStack","b","()LItemStack;","()Ldk;","Slot","vv","net/minecraft/src","0" +"func_20005_c","getHasStack","c","()Z","()Z","Slot","vv","net/minecraft/src","0" +"func_776_b","putStack","c","(LItemStack;)V","(Ldk;)V","Slot","vv","net/minecraft/src","0" +"func_779_d","onSlotChanged","d","()V","()V","Slot","vv","net/minecraft/src","0" +"func_775_c","getBackgroundIconIndex","e","()I","()I","Slot","vv","net/minecraft/src","0" +"func_20004_a","decrStackSize","a","(I)LItemStack;","(I)Ldk;","Slot","vv","net/minecraft/src","0" +"func_27022_s","getPowered","ax","()Z","()Z","EntityCreeper","abh","net/minecraft/src","0" +"func_440_b","setCreeperFlashTime","g","(F)F","(F)F","EntityCreeper","abh","net/minecraft/src","0" +"func_21091_q","getCreeperState","ay","()I","()I","EntityCreeper","abh","net/minecraft/src","0" +"func_21090_e","setCreeperState","b","(I)V","(I)V","EntityCreeper","abh","net/minecraft/src","0" +"func_21053_b","getMetadata","c","()Ljava/util/List;","()Ljava/util/List;","Packet24MobSpawn","mn","net/minecraft/src","0" +"func_1213_a","checkARBOcclusion","a","()Z","()Z","OpenGlCapsChecker","mm","net/minecraft/src","0" +"func_27223_a","func_27223_a","a","(LJ_JsonStringNode;)I","(Loj;)I","J_JsonStringNode","oj","net/minecraft/src","0" +"func_848_a","processReadPackets","b","()V","()V","NetClientHandler","abp","net/minecraft/src","0" +"func_28117_a","func_28117_a","b","(LPacket;)V","(Lgt;)V","NetClientHandler","abp","net/minecraft/src","0" +"func_847_a","addToSendQueue","c","(LPacket;)V","(Lgt;)V","NetClientHandler","abp","net/minecraft/src","0" +"func_849_b","disconnect","c","()V","()V","NetClientHandler","abp","net/minecraft/src","0" +"func_12246_a","getEntityByID","a","(I)LEntity;","(I)Lia;","NetClientHandler","abp","net/minecraft/src","0" +"func_883_a","parseUserSkin","a","(Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;","(Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;","ImageBuffer","aaj","net/minecraft/src","0" +"func_20114_a","updateCraftingResults","a","()V","()V","Container","pj","net/minecraft/src","0" +"func_20112_a","updateProgressBar","a","(II)V","(II)V","Container","pj","net/minecraft/src","0" +"func_1103_a","onCraftMatrixChanged","a","(LIInventory;)V","(Lde;)V","Container","pj","net/minecraft/src","0" +"func_40233_a","func_40233_a","a","(LEntityPlayer;I)Z","(Lvi;I)Z","Container","pj","net/minecraft/src","0" +"func_1104_a","onCraftGuiClosed","b","(LEntityPlayer;)V","(Lvi;)V","Container","pj","net/minecraft/src","0" +"func_20120_b","canInteractWith","a","(LEntityPlayer;)Z","(Lvi;)Z","Container","pj","net/minecraft/src","0" +"func_27279_a","transferStackInSlot","a","(I)LItemStack;","(I)Ldk;","Container","pj","net/minecraft/src","0" +"func_35373_b","func_35373_b","b","(IIZLEntityPlayer;)V","(IIZLvi;)V","Container","pj","net/minecraft/src","0" +"func_20117_a","addSlot","a","(LSlot;)V","(Lvv;)V","Container","pj","net/minecraft/src","0" +"func_20118_a","getSlot","b","(I)LSlot;","(I)Lvv;","Container","pj","net/minecraft/src","0" +"func_27280_a","slotClick","a","(IIZLEntityPlayer;)LItemStack;","(IIZLvi;)Ldk;","Container","pj","net/minecraft/src","0" +"func_20119_a","putStackInSlot","a","(ILItemStack;)V","(ILdk;)V","Container","pj","net/minecraft/src","0" +"func_20115_a","putStacksInSlots","a","([LItemStack;)V","([Ldk;)V","Container","pj","net/minecraft/src","0" +"func_20111_a","func_20111_a","a","(LInventoryPlayer;)S","(Lx;)S","Container","pj","net/minecraft/src","0" +"func_20113_a","func_20113_a","a","(S)V","(S)V","Container","pj","net/minecraft/src","0" +"func_20110_b","func_20110_b","b","(S)V","(S)V","Container","pj","net/minecraft/src","0" +"func_28125_a","mergeItemStack","a","(LItemStack;IIZ)Z","(Ldk;IIZ)Z","Container","pj","net/minecraft/src","0" +"func_21068_q","getSaddled","t_","()Z","()Z","EntityPig","fd","net/minecraft/src","0" +"func_21069_a","setSaddled","b","(Z)V","(Z)V","EntityPig","fd","net/minecraft/src","0" +"func_35310_g","getInventory","e","()LInventoryBasic;","()Lbb;","GuiContainerCreative","aec","net/minecraft/src","0" +"func_807_a","generateNoiseOctaves","a","([DIIIIIIDDD)[D","([DIIIIIIDDD)[D","NoiseGeneratorOctaves","eb","net/minecraft/src","0" +"func_4109_a","func_4109_a","a","([DIIIIDDD)[D","([DIIIIDDD)[D","NoiseGeneratorOctaves","eb","net/minecraft/src","0" +"func_35435_b","getBlockID","a_","()I","()I","ItemBlock","uw","net/minecraft/src","0" +"func_27371_a","func_27371_a","a","(LStatCrafting;LStatCrafting;)I","(Lyl;Lyl;)I","SorterStatsItem","gf","net/minecraft/src","0" +"func_40690_b","func_40690_b","b","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Laaz;Ljava/util/List;Ljava/util/Random;IIIII)Lrh;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"func_40688_a","func_40688_a","a","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Laaz;Ljava/util/List;Ljava/util/Random;IIIII)Lrh;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"func_40689_a","func_40689_a","a","()[LStructureNetherBridgePieceWeight;","()[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"func_40687_b","func_40687_b","b","()[LStructureNetherBridgePieceWeight;","()[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" +"func_27366_a","Parse","a","(Ljava/io/Reader;)LJ_JsonRootNode;","(Ljava/io/Reader;)Lwz;","J_JdomParser","nx","net/minecraft/src","0" +"func_27367_a","parse","a","(Ljava/lang/String;)LJ_JsonRootNode;","(Ljava/lang/String;)Lwz;","J_JdomParser","nx","net/minecraft/src","0" +"func_27002_a","doRenderLightningBolt","a","(LEntityLightningBolt;DDDFF)V","(Lsu;DDDFF)V","RenderLightningBolt","adu","net/minecraft/src","0" +"func_25011_l","getHealAmount","o","()I","()I","ItemFood","agu","net/minecraft/src","0" +"func_35426_m","getSaturationModifier","p","()F","()F","ItemFood","agu","net/minecraft/src","0" +"func_25012_m","getIsWolfsFavoriteMeat","q","()Z","()Z","ItemFood","agu","net/minecraft/src","0" +"func_35425_a","setPotionEffect","a","(IIIF)LItemFood;","(IIIF)Lagu;","ItemFood","agu","net/minecraft/src","0" +"func_35424_o","setAlwaysEdible","r","()LItemFood;","()Lagu;","ItemFood","agu","net/minecraft/src","0" +"func_40078_a","onThrowableCollision","a","(LMovingObjectPosition;)V","(Lgv;)V","EntityThrowable","fm","net/minecraft/src","0" +"func_40075_e","func_40075_e","b_","()F","()F","EntityThrowable","fm","net/minecraft/src","0" +"func_40077_c","func_40077_c","c_","()F","()F","EntityThrowable","fm","net/minecraft/src","0" +"func_40074_d","func_40074_d","d","()F","()F","EntityThrowable","fm","net/minecraft/src","0" +"func_40076_a","setThrowableHeading","a","(DDDFF)V","(DDDFF)V","EntityThrowable","fm","net/minecraft/src","0" +"func_25072_b","func_25072_b","f","()I","()I","StatCrafting","yl","net/minecraft/src","0" +"func_27074_a","matchesNode_","a","(LJ_JsonNode;)Z","(Lan;)Z","J_JsonArrayNodeSelector","ahj","net/minecraft/src","0" +"func_27075_b","typeSafeApplyTo","b","(LJ_JsonNode;)Ljava/util/List;","(Lan;)Ljava/util/List;","J_JsonArrayNodeSelector","ahj","net/minecraft/src","0" +"func_521_a","generateLeafNodeList","a","()V","()V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_523_a","func_523_a","a","(IIIFBI)V","(IIIFBI)V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_528_a","func_528_a","a","(I)F","(I)F","WorldGenBigTree","yd","net/minecraft/src","0" +"func_526_b","func_526_b","b","(I)F","(I)F","WorldGenBigTree","yd","net/minecraft/src","0" +"func_520_a","generateLeafNode","a","(III)V","(III)V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_522_a","placeBlockLine","a","([I[II)V","([I[II)V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_518_b","generateLeaves","b","()V","()V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_527_c","leafNodeNeedsBase","c","(I)Z","(I)Z","WorldGenBigTree","yd","net/minecraft/src","0" +"func_529_c","generateTrunk","c","()V","()V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_525_d","generateLeafNodeBases","d","()V","()V","WorldGenBigTree","yd","net/minecraft/src","0" +"func_524_a","checkBlockLine","a","([I[I)I","([I[I)I","WorldGenBigTree","yd","net/minecraft/src","0" +"func_519_e","validTreeLocation","e","()Z","()Z","WorldGenBigTree","yd","net/minecraft/src","0" +"func_976_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesFood","air","net/minecraft/src","0" +"func_40030_a","func_40030_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeEntrance;","(Ljava/util/List;Ljava/util/Random;IIIII)Lxr;","ComponentNetherBridgeEntrance","xr","net/minecraft/src","0" +"func_27023_a","isCourseTraversable","a","(DDDD)Z","(DDDD)Z","EntityGhast","is","net/minecraft/src","0" +"func_40023_a","func_40023_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LStructureNetherBridgeEnd;","(Ljava/util/List;Ljava/util/Random;IIIII)Lld;","StructureNetherBridgeEnd","ld","net/minecraft/src","0" +"func_21008_a","func_21008_a","a","(LEntitySquid;DDDFF)V","(Lyv;DDDFF)V","RenderSquid","aic","net/minecraft/src","0" +"func_21007_a","func_21007_a","a","(LEntitySquid;FFF)V","(Lyv;FFF)V","RenderSquid","aic","net/minecraft/src","0" +"func_21005_a","func_21005_a","a","(LEntitySquid;F)V","(Lyv;F)V","RenderSquid","aic","net/minecraft/src","0" +"func_21006_b","func_21006_b","b","(LEntitySquid;F)F","(Lyv;F)F","RenderSquid","aic","net/minecraft/src","0" +"func_25125_a","update","a","(LGuiParticle;)V","(Lvg;)V","Particle","dy","net/minecraft/src","0" +"func_25127_a","preUpdate","a","()V","()V","Particle","dy","net/minecraft/src","0" +"func_25126_b","setDead","b","()V","()V","Particle","dy","net/minecraft/src","0" +"func_408_a","setArrowHeading","a","(DDDFF)V","(DDDFF)V","EntityArrow","ro","net/minecraft/src","0" +"func_22211_a","debug","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RegionFile","as","net/minecraft/src","0" +"func_22204_b","debugln","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RegionFile","as","net/minecraft/src","0" +"func_22199_a","debug","a","(Ljava/lang/String;IILjava/lang/String;)V","(Ljava/lang/String;IILjava/lang/String;)V","RegionFile","as","net/minecraft/src","0" +"func_22197_a","debug","a","(Ljava/lang/String;IIILjava/lang/String;)V","(Ljava/lang/String;IIILjava/lang/String;)V","RegionFile","as","net/minecraft/src","0" +"func_22201_b","debugln","b","(Ljava/lang/String;IILjava/lang/String;)V","(Ljava/lang/String;IILjava/lang/String;)V","RegionFile","as","net/minecraft/src","0" +"func_22210_a","getChunkDataInputStream","a","(II)Ljava/io/DataInputStream;","(II)Ljava/io/DataInputStream;","RegionFile","as","net/minecraft/src","0" +"func_22205_b","getChunkDataOutputStream","b","(II)Ljava/io/DataOutputStream;","(II)Ljava/io/DataOutputStream;","RegionFile","as","net/minecraft/src","0" +"func_22203_a","write","a","(II[BI)V","(II[BI)V","RegionFile","as","net/minecraft/src","0" +"func_22200_a","write","a","(I[BI)V","(I[BI)V","RegionFile","as","net/minecraft/src","0" +"func_22206_d","outOfBounds","d","(II)Z","(II)Z","RegionFile","as","net/minecraft/src","0" +"func_22207_e","getOffset","e","(II)I","(II)I","RegionFile","as","net/minecraft/src","0" +"func_22202_c","isChunkSaved","c","(II)Z","(II)Z","RegionFile","as","net/minecraft/src","0" +"func_22198_a","setOffset","a","(III)V","(III)V","RegionFile","as","net/minecraft/src","0" +"func_22208_b","setChunkTimestamp","b","(III)V","(III)V","RegionFile","as","net/minecraft/src","0" +"func_22196_b","close","a","()V","()V","RegionFile","as","net/minecraft/src","0" +"func_27130_k","addHeaderButtons","e","()V","()V","GuiStats","in","net/minecraft/src","0" +"func_27138_c","drawItemSprite","c","(III)V","(III)V","GuiStats","in","net/minecraft/src","0" +"func_27147_a","drawButtonBackground","a","(II)V","(II)V","GuiStats","in","net/minecraft/src","0" +"func_27136_c","drawSprite","c","(IIII)V","(IIII)V","GuiStats","in","net/minecraft/src","0" +"func_27141_a","getMinecraft","a","(LGuiStats;)LMinecraft;","(Lin;)Lnet/minecraft/client/Minecraft;","GuiStats","in","net/minecraft/src","0" +"func_27145_b","getFontRenderer1","b","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27142_c","getStatsFileWriter","c","(LGuiStats;)LStatFileWriter;","(Lin;)Ltk;","GuiStats","in","net/minecraft/src","0" +"func_27140_d","getFontRenderer2","d","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27146_e","getFontRenderer3","e","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27143_f","getMinecraft1","f","(LGuiStats;)LMinecraft;","(Lin;)Lnet/minecraft/client/Minecraft;","GuiStats","in","net/minecraft/src","0" +"func_27128_a","drawSprite","a","(LGuiStats;IIII)V","(Lin;IIII)V","GuiStats","in","net/minecraft/src","0" +"func_27149_g","getMinecraft2","g","(LGuiStats;)LMinecraft;","(Lin;)Lnet/minecraft/client/Minecraft;","GuiStats","in","net/minecraft/src","0" +"func_27133_h","getFontRenderer4","h","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27137_i","getFontRenderer5","i","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27132_j","getFontRenderer6","j","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27134_k","getFontRenderer7","k","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27139_l","getFontRenderer8","l","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27129_a","drawGradientRect","a","(LGuiStats;IIIIII)V","(Lin;IIIIII)V","GuiStats","in","net/minecraft/src","0" +"func_27144_m","getFontRenderer9","m","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27127_n","getFontRenderer10","n","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27135_b","drawGradientRect1","b","(LGuiStats;IIIIII)V","(Lin;IIIIII)V","GuiStats","in","net/minecraft/src","0" +"func_27131_o","getFontRenderer11","o","(LGuiStats;)LFontRenderer;","(Lin;)Labe;","GuiStats","in","net/minecraft/src","0" +"func_27148_a","drawItemSprite","a","(LGuiStats;III)V","(Lin;III)V","GuiStats","in","net/minecraft/src","0" +"func_6485_a","func_6485_a","c","(LMinecraft;)V","(Lnet/minecraft/client/Minecraft;)V","TexturePackBase","afs","net/minecraft/src","0" +"func_6484_b","func_6484_b","a","(LMinecraft;)V","(Lnet/minecraft/client/Minecraft;)V","TexturePackBase","afs","net/minecraft/src","0" +"func_6483_c","bindThumbnailTexture","b","(LMinecraft;)V","(Lnet/minecraft/client/Minecraft;)V","TexturePackBase","afs","net/minecraft/src","0" +"func_6482_a","func_6482_a","a","()V","()V","TexturePackBase","afs","net/minecraft/src","0" +"func_6480_b","closeTexturePackFile","b","()V","()V","TexturePackBase","afs","net/minecraft/src","0" +"func_6481_a","getResourceAsStream","a","(Ljava/lang/String;)Ljava/io/InputStream;","(Ljava/lang/String;)Ljava/io/InputStream;","TexturePackBase","afs","net/minecraft/src","0" +"func_273_a","checkForBurnout","a","(LWorld;IIIZ)Z","(Lry;IIIZ)Z","BlockRedstoneTorch","ku","net/minecraft/src","0" +"func_30002_h","func_30002_h","g","(LWorld;III)Z","(Lry;III)Z","BlockRedstoneTorch","ku","net/minecraft/src","0" +"func_22036_h","getOrientation","g","(LWorld;III)I","(Lry;III)I","BlockButton","ahv","net/minecraft/src","0" +"func_305_h","func_305_h","h","(LWorld;III)Z","(Lry;III)Z","BlockButton","ahv","net/minecraft/src","0" +"func_22027_j","setBounds","s","()V","()V","BlockBed","aab","net/minecraft/src","0" +"func_22030_c","getDirectionFromMetadata","e","(I)I","(I)I","BlockBed","aab","net/minecraft/src","0" +"func_22032_d","isBlockFootOfBed","f","(I)Z","(I)Z","BlockBed","aab","net/minecraft/src","0" +"func_22029_f","isBedOccupied","g","(I)Z","(I)Z","BlockBed","aab","net/minecraft/src","0" +"func_22031_a","setBedOccupied","a","(LWorld;IIIZ)V","(Lry;IIIZ)V","BlockBed","aab","net/minecraft/src","0" +"func_22028_g","getNearestEmptyChunkCoordinates","f","(LWorld;IIII)LChunkCoordinates;","(Lry;IIII)Ldh;","BlockBed","aab","net/minecraft/src","0" +"func_804_b","lerp","a","(DDD)D","(DDD)D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"func_4110_a","func_4110_a","a","(IDD)D","(IDD)D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"func_803_a","grad","a","(IDDD)D","(IDDD)D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"func_805_a","func_805_a","a","([DDDDIIIDDDD)V","([DDDDIIIDDDD)V","NoiseGeneratorPerlin","agk","net/minecraft/src","0" +"func_25200_a","translateToLocal","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StatCollector","hj","net/minecraft/src","0" +"func_25199_a","translateToLocalFormatted","a","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","StatCollector","hj","net/minecraft/src","0" +"func_35500_a","func_35500_a","a","(IIII)[I","(IIII)[I","GenLayer","jx","net/minecraft/src","0" +"func_35496_b","func_35496_b","b","(J)V","(J)V","GenLayer","jx","net/minecraft/src","0" +"func_35497_a","func_35497_a","a","(J)[LGenLayer;","(J)[Ljx;","GenLayer","jx","net/minecraft/src","0" +"func_35499_a","func_35499_a","a","(JJ)V","(JJ)V","GenLayer","jx","net/minecraft/src","0" +"func_35498_a","nextInt","a","(I)I","(I)I","GenLayer","jx","net/minecraft/src","0" +"func_4012_a","doRenderFireball","a","(LEntityFireball;DDDFF)V","(Laad;DDDFF)V","RenderFireball","ke","net/minecraft/src","0" +"func_22193_a","createOrLoadRegionFile","a","(Ljava/io/File;II)LRegionFile;","(Ljava/io/File;II)Las;","RegionFileCache","wl","net/minecraft/src","0" +"func_22192_a","clearRegionFileReferences","a","()V","()V","RegionFileCache","wl","net/minecraft/src","0" +"func_22194_c","getChunkInputStream","b","(Ljava/io/File;II)Ljava/io/DataInputStream;","(Ljava/io/File;II)Ljava/io/DataInputStream;","RegionFileCache","wl","net/minecraft/src","0" +"func_22190_d","getChunkOutputStream","c","(Ljava/io/File;II)Ljava/io/DataOutputStream;","(Ljava/io/File;II)Ljava/io/DataOutputStream;","RegionFileCache","wl","net/minecraft/src","0" +"values","values","values","()[LEnumArmorMaterial;","()[Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumArmorMaterial;","(Ljava/lang/String;)Ldj;","EnumArmorMaterial","dj","net/minecraft/src","0" +"func_40576_a","func_40576_a","a","(I)I","(I)I","EnumArmorMaterial","dj","net/minecraft/src","0" +"func_40574_b","getDamageReductionAmount","b","(I)I","(I)I","EnumArmorMaterial","dj","net/minecraft/src","0" +"func_40575_a","getEnchantability","a","()I","()I","EnumArmorMaterial","dj","net/minecraft/src","0" +"func_27248_a","func_27248_a","a","()LJ_JsonNodeBuilder;","()Lrv;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27251_b","func_27251_b","b","()LJ_JsonNodeBuilder;","()Lrv;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27252_c","func_27252_c","c","()LJ_JsonNodeBuilder;","()Lrv;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27250_a","func_27250_a","a","(Ljava/lang/String;)LJ_JsonNodeBuilder;","(Ljava/lang/String;)Lrv;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27254_b","func_27254_b","b","(Ljava/lang/String;)LJ_JsonStringNodeBuilder;","(Ljava/lang/String;)Lh;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27253_d","anObjectBuilder","d","()LJ_JsonObjectNodeBuilder;","()Labq;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_27249_e","anArrayBuilder","e","()LJ_JsonArrayNodeBuilder;","()Lft;","J_JsonNodeBuilders","tz","net/minecraft/src","0" +"func_35082_a","func_35082_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse4_Garden;","(Ljava/util/List;Ljava/util/Random;IIIII)Luy;","ComponentVillageHouse4_Garden","uy","net/minecraft/src","0" +"func_27260_a","func_27260_a","a","(IILTessellator;)V","(IILcv;)V","GuiSlot","jn","net/minecraft/src","0" +"func_22242_a","drawSlot","a","(IIIILTessellator;)V","(IIIILcv;)V","GuiSlot","jn","net/minecraft/src","0" +"func_22249_a","getSize","a","()I","()I","GuiSlot","jn","net/minecraft/src","0" +"func_22247_a","elementClicked","a","(IZ)V","(IZ)V","GuiSlot","jn","net/minecraft/src","0" +"func_22246_a","isSelected","a","(I)Z","(I)Z","GuiSlot","jn","net/minecraft/src","0" +"func_22245_b","getContentHeight","b","()I","()I","GuiSlot","jn","net/minecraft/src","0" +"func_22248_c","drawBackground","c","()V","()V","GuiSlot","jn","net/minecraft/src","0" +"func_27255_a","func_27255_a","a","(II)V","(II)V","GuiSlot","jn","net/minecraft/src","0" +"func_27257_b","func_27257_b","b","(II)V","(II)V","GuiSlot","jn","net/minecraft/src","0" +"func_27258_a","func_27258_a","a","(Z)V","(Z)V","GuiSlot","jn","net/minecraft/src","0" +"func_27259_a","func_27259_a","a","(ZI)V","(ZI)V","GuiSlot","jn","net/minecraft/src","0" +"func_27256_c","func_27256_c","c","(II)I","(II)I","GuiSlot","jn","net/minecraft/src","0" +"func_22240_a","registerScrollButtons","a","(Ljava/util/List;II)V","(Ljava/util/List;II)V","GuiSlot","jn","net/minecraft/src","0" +"func_22244_d","bindAmountScrolled","d","()V","()V","GuiSlot","jn","net/minecraft/src","0" +"func_22241_a","actionPerformed","a","(LGuiButton;)V","(Lct;)V","GuiSlot","jn","net/minecraft/src","0" +"func_22243_a","drawScreen","a","(IIF)V","(IIF)V","GuiSlot","jn","net/minecraft/src","0" +"func_22239_a","overlayBackground","a","(IIII)V","(IIII)V","GuiSlot","jn","net/minecraft/src","0" +"func_28157_a","renderMap","a","(LEntityPlayer;LRenderEngine;LMapData;)V","(Lvi;Lzh;Lkl;)V","MapItemRenderer","sg","net/minecraft/src","0" +"func_40032_a","func_40032_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor5;","(Ljava/util/List;Ljava/util/Random;IIIII)Lhg;","ComponentNetherBridgeCorridor5","hg","net/minecraft/src","0" +"func_27220_a","asList","a","(Ljava/lang/Iterable;)Ljava/util/List;","(Ljava/lang/Iterable;)Ljava/util/List;","J_JsonArray","kx","net/minecraft/src","0" +"func_22129_j","makeUseableName","e","()V","()V","GuiCreateWorld","xh","net/minecraft/src","0" +"func_35363_g","func_35363_g","l","()V","()V","GuiCreateWorld","xh","net/minecraft/src","0" +"func_25097_a","generateUnusedFolderName","a","(LISaveFormat;Ljava/lang/String;)Ljava/lang/String;","(Ltq;Ljava/lang/String;)Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"func_158_a","func_158_a","a","(LEntityPainting;DDDFF)V","(Ltj;DDDFF)V","RenderPainting","zv","net/minecraft/src","0" +"func_159_a","func_159_a","a","(LEntityPainting;IIII)V","(Ltj;IIII)V","RenderPainting","zv","net/minecraft/src","0" +"func_160_a","func_160_a","a","(LEntityPainting;FF)V","(Ltj;FF)V","RenderPainting","zv","net/minecraft/src","0" +"func_27192_a","format","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","IStatType","un","net/minecraft/src","0" +"func_31040_i","func_31040_i","s","()I","()I","BlockPistonBase","abr","net/minecraft/src","0" +"func_31043_h","updatePistonState","g","(LWorld;III)V","(Lry;III)V","BlockPistonBase","abr","net/minecraft/src","0" +"func_31041_f","isIndirectlyPowered","f","(LWorld;IIII)Z","(Lry;IIII)Z","BlockPistonBase","abr","net/minecraft/src","0" +"func_31044_d","getOrientation","e","(I)I","(I)I","BlockPistonBase","abr","net/minecraft/src","0" +"func_31046_e","isExtended","f","(I)Z","(I)Z","BlockPistonBase","abr","net/minecraft/src","0" +"func_31039_c","determineOrientation","c","(LWorld;IIILEntityPlayer;)I","(Lry;IIILvi;)I","BlockPistonBase","abr","net/minecraft/src","0" +"func_31042_a","canPushBlock","a","(ILWorld;IIIZ)Z","(ILry;IIIZ)Z","BlockPistonBase","abr","net/minecraft/src","0" +"func_31045_h","canExtend","g","(LWorld;IIII)Z","(Lry;IIII)Z","BlockPistonBase","abr","net/minecraft/src","0" +"func_31047_i","tryExtend","h","(LWorld;IIII)Z","(Lry;IIII)Z","BlockPistonBase","abr","net/minecraft/src","0" +"func_1120_a","getInstance","a","()LCraftingManager;","()Lsl;","CraftingManager","sl","net/minecraft/src","0" +"func_1121_a","addRecipe","a","(LItemStack;[Ljava/lang/Object;)V","(Ldk;[Ljava/lang/Object;)V","CraftingManager","sl","net/minecraft/src","0" +"func_21187_b","addShapelessRecipe","b","(LItemStack;[Ljava/lang/Object;)V","(Ldk;[Ljava/lang/Object;)V","CraftingManager","sl","net/minecraft/src","0" +"func_21188_a","findMatchingRecipe","a","(LInventoryCrafting;)LItemStack;","(Llm;)Ldk;","CraftingManager","sl","net/minecraft/src","0" +"func_25193_b","getRecipeList","b","()Ljava/util/List;","()Ljava/util/List;","CraftingManager","sl","net/minecraft/src","0" +"func_21200_a","smelting","a","()LFurnaceRecipes;","()Lmt;","FurnaceRecipes","mt","net/minecraft/src","0" +"func_21199_a","addSmelting","a","(ILItemStack;)V","(ILdk;)V","FurnaceRecipes","mt","net/minecraft/src","0" +"func_21198_a","getSmeltingResult","a","(I)LItemStack;","(I)Ldk;","FurnaceRecipes","mt","net/minecraft/src","0" +"func_25194_b","getSmeltingList","b","()Ljava/util/Map;","()Ljava/util/Map;","FurnaceRecipes","mt","net/minecraft/src","0" +"func_35053_a","func_35053_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStairsStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lso;","ComponentStrongholdStairsStraight","so","net/minecraft/src","0" +"func_40219_x_","func_40219_x_","e","()V","()V","GuiEnchantment","zw","net/minecraft/src","0" +"values","values","values","()[LEnumMovingObjectType;","()[Lbo;","EnumMovingObjectType","bo","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMovingObjectType;","(Ljava/lang/String;)Lbo;","EnumMovingObjectType","bo","net/minecraft/src","0" +"func_1210_a","reloadResources","a","()V","()V","ThreadDownloadResources","ng","net/minecraft/src","0" +"func_1209_a","loadResource","a","(Ljava/io/File;Ljava/lang/String;)V","(Ljava/io/File;Ljava/lang/String;)V","ThreadDownloadResources","ng","net/minecraft/src","0" +"func_1211_a","downloadAndInstallResource","a","(Ljava/net/URL;Ljava/lang/String;JI)V","(Ljava/net/URL;Ljava/lang/String;JI)V","ThreadDownloadResources","ng","net/minecraft/src","0" +"func_1212_a","downloadResource","a","(Ljava/net/URL;Ljava/io/File;J)V","(Ljava/net/URL;Ljava/io/File;J)V","ThreadDownloadResources","ng","net/minecraft/src","0" +"func_1208_b","closeMinecraft","b","()V","()V","ThreadDownloadResources","ng","net/minecraft/src","0" +"func_27067_a","matchesNode_","a","(Ljava/util/List;)Z","(Ljava/util/List;)Z","J_JsonElementNodeSelector","da","net/minecraft/src","0" +"func_27068_b","typeSafeApplyTo_","b","(Ljava/util/List;)LJ_JsonNode;","(Ljava/util/List;)Lan;","J_JsonElementNodeSelector","da","net/minecraft/src","0" +"func_35004_a","buildComponent","a","(LStructureComponent;Ljava/util/List;Ljava/util/Random;)V","(Lnk;Ljava/util/List;Ljava/util/Random;)V","StructureComponent","nk","net/minecraft/src","0" +"func_35023_a","addComponentParts","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;)Z","(Lry;Ljava/util/Random;Lnl;)Z","StructureComponent","nk","net/minecraft/src","0" +"func_40008_a_","func_40008_a_","c","()LChunkPosition;","()Lam;","StructureComponent","nk","net/minecraft/src","0" +"func_35021_b","getBoundingBox","a","()LStructureBoundingBox;","()Lnl;","StructureComponent","nk","net/minecraft/src","0" +"func_35012_c","func_35012_c","b","()I","()I","StructureComponent","nk","net/minecraft/src","0" +"func_35020_a","getIntersectingStructureComponent","a","(Ljava/util/List;LStructureBoundingBox;)LStructureComponent;","(Ljava/util/List;Lnl;)Lnk;","StructureComponent","nk","net/minecraft/src","0" +"func_35013_a","isLiquidInStructureBoundingBox","a","(LWorld;LStructureBoundingBox;)Z","(Lry;Lnl;)Z","StructureComponent","nk","net/minecraft/src","0" +"func_35017_a","getXWithOffset","a","(II)I","(II)I","StructureComponent","nk","net/minecraft/src","0" +"func_35008_a","getYWithOffset","b","(I)I","(I)I","StructureComponent","nk","net/minecraft/src","0" +"func_35006_b","getZWithOffset","b","(II)I","(II)I","StructureComponent","nk","net/minecraft/src","0" +"func_35009_c","func_35009_c","c","(II)I","(II)I","StructureComponent","nk","net/minecraft/src","0" +"func_35018_a","placeBlockAtCurrentPosition","a","(LWorld;IIIIILStructureBoundingBox;)V","(Lry;IIIIILnl;)V","StructureComponent","nk","net/minecraft/src","0" +"func_35007_a","getBlockIdAtCurrentPosition","a","(LWorld;IIILStructureBoundingBox;)I","(Lry;IIILnl;)I","StructureComponent","nk","net/minecraft/src","0" +"func_35011_a","fillWithBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIIIZ)V","(Lry;Lnl;IIIIIIIIZ)V","StructureComponent","nk","net/minecraft/src","0" +"func_35022_a","fillWithRandomizedBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIZLjava/util/Random;LStructurePieceBlockSelector;)V","(Lry;Lnl;IIIIIIZLjava/util/Random;Lox;)V","StructureComponent","nk","net/minecraft/src","0" +"func_35010_a","randomlyFillWithBlocks","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIIIIIIZ)V","(Lry;Lnl;Ljava/util/Random;FIIIIIIIIZ)V","StructureComponent","nk","net/minecraft/src","0" +"func_35014_a","randomlyPlaceBlock","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIII)V","(Lry;Lnl;Ljava/util/Random;FIIIII)V","StructureComponent","nk","net/minecraft/src","0" +"func_35015_a","randomlyRareFillWithBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIIZ)V","(Lry;Lnl;IIIIIIIZ)V","StructureComponent","nk","net/minecraft/src","0" +"func_35016_b","clearCurrentPositionBlocksUpwards","b","(LWorld;IIILStructureBoundingBox;)V","(Lry;IIILnl;)V","StructureComponent","nk","net/minecraft/src","0" +"func_35005_b","fillCurrentPositionBlocksDownwards","b","(LWorld;IIIIILStructureBoundingBox;)V","(Lry;IIIIILnl;)V","StructureComponent","nk","net/minecraft/src","0" +"func_35003_a","createTreasureChestAtCurrentPosition","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;III[LStructurePieceTreasure;I)V","(Lry;Lnl;Ljava/util/Random;III[Lagq;I)V","StructureComponent","nk","net/minecraft/src","0" +"func_35019_a","fillTreasureChestWithLoot","a","(Ljava/util/Random;[LStructurePieceTreasure;LTileEntityChest;I)V","(Ljava/util/Random;[Lagq;Ltu;I)V","StructureComponent","nk","net/minecraft/src","0" +"func_35002_a","placeDoorAtCurrentPosition","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;IIII)V","(Lry;Lnl;Ljava/util/Random;IIII)V","StructureComponent","nk","net/minecraft/src","0" +"func_40265_a","func_40265_a","a","(LTessellator;I)V","(Lcv;I)V","RenderSnowball","cd","net/minecraft/src","0" +"func_35736_a","func_35736_a","a","(Ljava/util/Collection;)I","(Ljava/util/Collection;)I","WeightedRandom","nc","net/minecraft/src","0" +"func_35734_a","func_35734_a","a","(Ljava/util/Random;Ljava/util/Collection;I)LWeightedRandomChoice;","(Ljava/util/Random;Ljava/util/Collection;I)Labt;","WeightedRandom","nc","net/minecraft/src","0" +"func_35733_a","func_35733_a","a","(Ljava/util/Random;Ljava/util/Collection;)LWeightedRandomChoice;","(Ljava/util/Random;Ljava/util/Collection;)Labt;","WeightedRandom","nc","net/minecraft/src","0" +"func_35737_a","func_35737_a","a","([LWeightedRandomChoice;)I","([Labt;)I","WeightedRandom","nc","net/minecraft/src","0" +"func_35732_a","func_35732_a","a","(Ljava/util/Random;[LWeightedRandomChoice;I)LWeightedRandomChoice;","(Ljava/util/Random;[Labt;I)Labt;","WeightedRandom","nc","net/minecraft/src","0" +"func_35735_a","func_35735_a","a","(Ljava/util/Random;[LWeightedRandomChoice;)LWeightedRandomChoice;","(Ljava/util/Random;[Labt;)Labt;","WeightedRandom","nc","net/minecraft/src","0" +"func_21034_c","getBlockFromDye","d_","(I)I","(I)I","BlockCloth","fr","net/minecraft/src","0" +"func_21035_d","getDyeFromBlock","d","(I)I","(I)I","BlockCloth","fr","net/minecraft/src","0" +"func_35532_a","getEntity","a","()LEntity;","()Lia;","DamageSource","pm","net/minecraft/src","0" +"func_35525_a","causeMobDamage","a","(LEntityLiving;)LDamageSource;","(Lnq;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35527_a","causePlayerDamage","a","(LEntityPlayer;)LDamageSource;","(Lvi;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35535_a","causeArrowDamage","a","(LEntityArrow;LEntity;)LDamageSource;","(Lro;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35530_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Laad;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35524_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_40542_b","func_40542_b","b","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_40547_b","projectile","b","()Z","()Z","DamageSource","pm","net/minecraft/src","0" +"func_40544_c","setProjectile","c","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35534_b","unblockable","d","()Z","()Z","DamageSource","pm","net/minecraft/src","0" +"func_35533_c","getHungerDamage","e","()F","()F","DamageSource","pm","net/minecraft/src","0" +"func_35529_d","canHarmInCreative","f","()Z","()Z","DamageSource","pm","net/minecraft/src","0" +"func_35526_e","getSourceOfDamage","g","()LEntity;","()Lia;","DamageSource","pm","net/minecraft/src","0" +"func_35528_f","setDamageBypassesArmor","h","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_35531_g","setDamageAllowedInCreativeMode","i","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_40546_j","setFireDamage","j","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0" +"func_40543_k","fireDamage","k","()Z","()Z","DamageSource","pm","net/minecraft/src","0" +"func_40545_l","getDamageType","l","()Ljava/lang/String;","()Ljava/lang/String;","DamageSource","pm","net/minecraft/src","0" +"func_1159_a","disableStandardItemLighting","a","()V","()V","RenderHelper","rt","net/minecraft/src","0" +"func_1158_b","enableStandardItemLighting","b","()V","()V","RenderHelper","rt","net/minecraft/src","0" +"func_1157_a","setColorBuffer","a","(DDDD)Ljava/nio/FloatBuffer;","(DDDD)Ljava/nio/FloatBuffer;","RenderHelper","rt","net/minecraft/src","0" +"func_1156_a","setColorBuffer","a","(FFFF)Ljava/nio/FloatBuffer;","(FFFF)Ljava/nio/FloatBuffer;","RenderHelper","rt","net/minecraft/src","0" +"func_41089_c","func_41089_c","c","()V","()V","RenderHelper","rt","net/minecraft/src","0" +"func_22164_a","getFileName","a","()Ljava/lang/String;","()Ljava/lang/String;","SaveFormatComparator","rr","net/minecraft/src","0" +"func_22162_b","getDisplayName","b","()Ljava/lang/String;","()Ljava/lang/String;","SaveFormatComparator","rr","net/minecraft/src","0" +"func_22161_d","func_22161_d","c","()Z","()Z","SaveFormatComparator","rr","net/minecraft/src","0" +"func_22163_e","getLastTimePlayed","d","()J","()J","SaveFormatComparator","rr","net/minecraft/src","0" +"func_22160_a","compareTo","a","(LSaveFormatComparator;)I","(Lrr;)I","SaveFormatComparator","rr","net/minecraft/src","0" +"func_35719_f","getGameType","e","()I","()I","SaveFormatComparator","rr","net/minecraft/src","0" +"func_40594_g","func_40594_g","f","()Z","()Z","SaveFormatComparator","rr","net/minecraft/src","0" +"func_40038_a","func_40038_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Lahw;","ComponentNetherBridgeCorridor","ahw","net/minecraft/src","0" +"func_153_a","func_153_a","a","(LEntityTNTPrimed;DDDFF)V","(Ldd;DDDFF)V","RenderTNTPrimed","nt","net/minecraft/src","0" +"func_156_a","doRenderFallingSand","a","(LEntityFallingSand;DDDFF)V","(Luo;DDDFF)V","RenderFallingSand","agh","net/minecraft/src","0" +"func_1051_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesCrafting","do","net/minecraft/src","0" +"func_21095_a","changePitch","a","()V","()V","TileEntityNote","nj","net/minecraft/src","0" +"func_21094_a","triggerNote","a","(LWorld;III)V","(Lry;III)V","TileEntityNote","nj","net/minecraft/src","0" +"func_21137_a","func_21137_a","a","(LInventoryCrafting;IIZ)Z","(Llm;IIZ)Z","ShapedRecipes","aga","net/minecraft/src","0" +"func_35518_a","getSeed","a","()J","()J","WorldSettings","yw","net/minecraft/src","0" +"func_35519_b","getGameType","b","()I","()I","WorldSettings","yw","net/minecraft/src","0" +"func_40557_c","getHardcoreEnabled","c","()Z","()Z","WorldSettings","yw","net/minecraft/src","0" +"func_35520_c","isMapFeaturesEnabled","d","()Z","()Z","WorldSettings","yw","net/minecraft/src","0" +"func_4011_a","doRenderFishHook","a","(LEntityFishHook;DDDFF)V","(Lael;DDDFF)V","RenderFish","ls","net/minecraft/src","0" +"func_35355_b","func_35355_b","b","(IIF)V","(IIF)V","GuiMainMenu","eh","net/minecraft/src","0" +"func_35354_a","rotateAndBlurSkybox","a","(F)V","(F)V","GuiMainMenu","eh","net/minecraft/src","0" +"func_35356_c","renderSkybox","c","(IIF)V","(IIF)V","GuiMainMenu","eh","net/minecraft/src","0" +"values","values","values","()[LEnumStatus;","()[Lqy;","EnumStatus","qy","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumStatus;","(Ljava/lang/String;)Lqy;","EnumStatus","qy","net/minecraft/src","0" +"func_35517_a","func_35517_a","a","(JLGenLayer;I)LGenLayer;","(JLjx;I)Ljx;","GenLayerSmoothZoom","jw","net/minecraft/src","0" +"func_275_h","isCropsNearby","g","(LWorld;III)Z","(Lry;III)Z","BlockFarmland","ni","net/minecraft/src","0" +"func_274_i","isWaterNearby","h","(LWorld;III)Z","(Lry;III)Z","BlockFarmland","ni","net/minecraft/src","0" +"func_21157_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesDyes","jc","net/minecraft/src","0" +"func_40550_A_","writeNextIO","c","()Z","()Z","IThreadedFileIO","pz","net/minecraft/src","0" +"func_40275_a","renderMagmaCube","a","(LEntityMagmaCube;DDDFF)V","(Laea;DDDFF)V","RenderMagmaCube","m","net/minecraft/src","0" +"func_40274_a","scaleMagmaCube","a","(LEntityMagmaCube;F)V","(Laea;F)V","RenderMagmaCube","m","net/minecraft/src","0" +"func_40660_a","clearProfiling","a","()V","()V","Profiler","pf","net/minecraft/src","0" +"func_40663_a","startSection","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Profiler","pf","net/minecraft/src","0" +"func_40662_b","endSection","b","()V","()V","Profiler","pf","net/minecraft/src","0" +"func_40664_b","getProfilingData","b","(Ljava/lang/String;)Ljava/util/List;","(Ljava/lang/String;)Ljava/util/List;","Profiler","pf","net/minecraft/src","0" +"func_40661_c","endStartSection","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Profiler","pf","net/minecraft/src","0" +"func_649_g","tick","c","()V","()V","World","ry","net/minecraft/src","0" +"func_4081_a","getChunkProvider","d","()LIChunkProvider;","()Lej;","World","ry","net/minecraft/src","0" +"func_4076_b","setSpawnLocation","e","()V","()V","World","ry","net/minecraft/src","0" +"func_4080_j","updateBlocksAndPlayCaveSounds","f","()V","()V","World","ry","net/minecraft/src","0" +"func_22136_c","scheduleBlockUpdate","a","(IIIII)V","(IIIII)V","World","ry","net/minecraft/src","0" +"func_700_a","tickUpdates","a","(Z)Z","(Z)Z","World","ry","net/minecraft/src","0" +"func_674_a","entityJoinedWorld","a","(LEntity;)Z","(Lia;)Z","World","ry","net/minecraft/src","0" +"func_607_d","setEntityDead","b","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0" +"func_606_b","obtainEntitySkin","c","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0" +"func_678_c","releaseEntitySkin","d","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0" +"func_635_c","setBlockMetadata","c","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_643_a","setBlockAndMetadata","b","(IIIII)Z","(IIIII)Z","World","ry","net/minecraft/src","0" +"func_634_a","setBlock","d","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_660_k","sendQuittingDisconnectingPacket","g","()V","()V","World","ry","net/minecraft/src","0" +"func_27165_m","updateWeather","h","()V","()V","World","ry","net/minecraft/src","0" +"func_25098_c","getInitialSpawnLocation","i","()V","()V","World","ry","net/minecraft/src","0" +"func_40472_j","getEntrancePortalLocation","j","()LChunkCoordinates;","()Ldh;","World","ry","net/minecraft/src","0" +"func_614_g","getFirstUncoveredBlock","a","(II)I","(II)I","World","ry","net/minecraft/src","0" +"func_6464_c","emptyMethod1","k","()V","()V","World","ry","net/minecraft/src","0" +"func_608_a","spawnPlayerWithLoadedChunks","a","(LEntityPlayer;)V","(Lvi;)V","World","ry","net/minecraft/src","0" +"func_639_a","saveWorld","a","(ZLIProgressUpdate;)V","(ZLrz;)V","World","ry","net/minecraft/src","0" +"func_669_m","saveLevel","G","()V","()V","World","ry","net/minecraft/src","0" +"func_650_a","quickSaveWorld","c","(I)Z","(I)Z","World","ry","net/minecraft/src","0" +"func_630_d","blockExists","i","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_21117_a","doChunksNearChunkExist","e","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_640_a","checkChunksExist","b","(IIIIII)Z","(IIIIII)Z","World","ry","net/minecraft/src","0" +"func_620_h","chunkExists","g","(II)Z","(II)Z","World","ry","net/minecraft/src","0" +"func_673_a","getChunkFromBlockCoords","b","(II)LChunk;","(II)Lzx;","World","ry","net/minecraft/src","0" +"func_704_b","getChunkFromChunkCoords","c","(II)LChunk;","(II)Lzx;","World","ry","net/minecraft/src","0" +"func_691_b","setBlockMetadataWithNotify","f","(IIII)V","(IIII)V","World","ry","net/minecraft/src","0" +"func_690_d","setBlockWithNotify","g","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_688_b","setBlockAndMetadataWithNotify","d","(IIIII)Z","(IIIII)Z","World","ry","net/minecraft/src","0" +"func_665_h","markBlockNeedsUpdate","j","(III)V","(III)V","World","ry","net/minecraft/src","0" +"func_617_e","notifyBlockChange","h","(IIII)V","(IIII)V","World","ry","net/minecraft/src","0" +"func_680_f","markBlocksDirtyVertical","i","(IIII)V","(IIII)V","World","ry","net/minecraft/src","0" +"func_21115_j","markBlockAsNeedsUpdate","k","(III)V","(III)V","World","ry","net/minecraft/src","0" +"func_701_b","markBlocksDirty","c","(IIIIII)V","(IIIIII)V","World","ry","net/minecraft/src","0" +"func_611_g","notifyBlocksOfNeighborChange","j","(IIII)V","(IIII)V","World","ry","net/minecraft/src","0" +"func_655_l","notifyBlockOfNeighborChange","m","(IIII)V","(IIII)V","World","ry","net/minecraft/src","0" +"func_647_i","canBlockSeeTheSky","l","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_28104_m","getFullBlockLightValue","m","(III)I","(III)I","World","ry","net/minecraft/src","0" +"func_618_j","getBlockLightValue","n","(III)I","(III)I","World","ry","net/minecraft/src","0" +"func_699_a","getBlockLightValue_do","a","(IIIZ)I","(IIIZ)I","World","ry","net/minecraft/src","0" +"func_666_c","getHeightValue","d","(II)I","(II)I","World","ry","net/minecraft/src","0" +"func_35457_a","getSkyBlockTypeBrightness","a","(LEnumSkyBlock;III)I","(Lbn;III)I","World","ry","net/minecraft/src","0" +"func_641_a","getSavedLightValue","b","(LEnumSkyBlock;III)I","(Lbn;III)I","World","ry","net/minecraft/src","0" +"func_664_b","setLightValue","a","(LEnumSkyBlock;IIII)V","(Lbn;IIII)V","World","ry","net/minecraft/src","0" +"func_624_b","isDaytime","l","()Z","()Z","World","ry","net/minecraft/src","0" +"func_645_a","rayTraceBlocks","a","(LVec3D;LVec3D;)LMovingObjectPosition;","(Lfb;Lfb;)Lgv;","World","ry","net/minecraft/src","0" +"func_642_a","rayTraceBlocks_do","a","(LVec3D;LVec3D;Z)LMovingObjectPosition;","(Lfb;Lfb;Z)Lgv;","World","ry","net/minecraft/src","0" +"func_28105_a","rayTraceBlocks_do_do","a","(LVec3D;LVec3D;ZZ)LMovingObjectPosition;","(Lfb;Lfb;ZZ)Lgv;","World","ry","net/minecraft/src","0" +"func_623_a","playSoundAtEntity","a","(LEntity;Ljava/lang/String;FF)V","(Lia;Ljava/lang/String;FF)V","World","ry","net/minecraft/src","0" +"func_684_a","playSoundEffect","a","(DDDLjava/lang/String;FF)V","(DDDLjava/lang/String;FF)V","World","ry","net/minecraft/src","0" +"func_670_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","World","ry","net/minecraft/src","0" +"func_694_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","World","ry","net/minecraft/src","0" +"func_27159_a","addWeatherEffect","e","(LEntity;)Z","(Lia;)Z","World","ry","net/minecraft/src","0" +"func_613_a","addWorldAccess","a","(LIWorldAccess;)V","(Lbd;)V","World","ry","net/minecraft/src","0" +"func_672_b","removeWorldAccess","b","(LIWorldAccess;)V","(Lbd;)V","World","ry","net/minecraft/src","0" +"func_697_a","getCollidingBoundingBoxes","a","(LEntity;LAxisAlignedBB;)Ljava/util/List;","(Lia;Lc;)Ljava/util/List;","World","ry","net/minecraft/src","0" +"func_671_a","calculateSkylightSubtracted","a","(F)I","(F)I","World","ry","net/minecraft/src","0" +"func_35464_b","func_35464_b","b","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_4079_a","getSkyColor","a","(LEntity;F)LVec3D;","(Lia;F)Lfb;","World","ry","net/minecraft/src","0" +"func_619_c","getCelestialAngle","c","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_40475_d","func_40475_d","d","(F)I","(F)I","World","ry","net/minecraft/src","0" +"func_35456_d","getCelestialAngleRadians","e","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_628_d","drawClouds","f","(F)LVec3D;","(F)Lfb;","World","ry","net/minecraft/src","0" +"func_4082_d","getFogColor","g","(F)LVec3D;","(F)Lfb;","World","ry","net/minecraft/src","0" +"func_35461_e","func_35461_e","e","(II)I","(II)I","World","ry","net/minecraft/src","0" +"func_4083_e","getTopSolidOrLiquidBlock","f","(II)I","(II)I","World","ry","net/minecraft/src","0" +"func_679_f","getStarBrightness","h","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_41083_e","func_41083_e","e","(IIIII)V","(IIIII)V","World","ry","net/minecraft/src","0" +"func_633_c","updateEntities","m","()V","()V","World","ry","net/minecraft/src","0" +"func_31054_a","addTileEntity","a","(Ljava/util/Collection;)V","(Ljava/util/Collection;)V","World","ry","net/minecraft/src","0" +"func_667_e","updateEntity","f","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0" +"func_4084_a","updateEntityWithOptionalForce","a","(LEntity;Z)V","(Lia;Z)V","World","ry","net/minecraft/src","0" +"func_604_a","checkIfAABBIsClear","a","(LAxisAlignedBB;)Z","(Lc;)Z","World","ry","net/minecraft/src","0" +"func_662_b","getIsAnyLiquid","b","(LAxisAlignedBB;)Z","(Lc;)Z","World","ry","net/minecraft/src","0" +"func_605_c","isBoundingBoxBurning","c","(LAxisAlignedBB;)Z","(Lc;)Z","World","ry","net/minecraft/src","0" +"func_682_a","handleMaterialAcceleration","a","(LAxisAlignedBB;LMaterial;LEntity;)Z","(Lc;Lp;Lia;)Z","World","ry","net/minecraft/src","0" +"func_689_a","isMaterialInBB","a","(LAxisAlignedBB;LMaterial;)Z","(Lc;Lp;)Z","World","ry","net/minecraft/src","0" +"func_707_b","isAABBInMaterial","b","(LAxisAlignedBB;LMaterial;)Z","(Lc;Lp;)Z","World","ry","net/minecraft/src","0" +"func_12243_a","createExplosion","a","(LEntity;DDDF)LExplosion;","(Lia;DDDF)Lxp;","World","ry","net/minecraft/src","0" +"func_12244_a","newExplosion","a","(LEntity;DDDFZ)LExplosion;","(Lia;DDDFZ)Lxp;","World","ry","net/minecraft/src","0" +"func_675_a","func_675_a","a","(LVec3D;LAxisAlignedBB;)F","(Lfb;Lc;)F","World","ry","net/minecraft/src","0" +"func_612_i","onBlockHit","a","(LEntityPlayer;IIII)V","(Lvi;IIII)V","World","ry","net/minecraft/src","0" +"func_4085_a","func_4085_a","a","(Ljava/lang/Class;)LEntity;","(Ljava/lang/Class;)Lia;","World","ry","net/minecraft/src","0" +"func_687_d","getDebugLoadedEntities","n","()Ljava/lang/String;","()Ljava/lang/String;","World","ry","net/minecraft/src","0" +"func_21119_g","func_21119_g","o","()Ljava/lang/String;","()Ljava/lang/String;","World","ry","net/minecraft/src","0" +"func_654_a","setBlockTileEntity","a","(IIILTileEntity;)V","(IIILbq;)V","World","ry","net/minecraft/src","0" +"func_692_l","removeBlockTileEntity","o","(III)V","(III)V","World","ry","net/minecraft/src","0" +"func_35455_a","func_35455_a","a","(LTileEntity;)V","(Lbq;)V","World","ry","net/minecraft/src","0" +"func_41082_b","func_41082_b","b","(IIIZ)Z","(IIIZ)Z","World","ry","net/minecraft/src","0" +"func_651_a","saveWorldIndirectly","a","(LIProgressUpdate;)V","(Lrz;)V","World","ry","net/minecraft/src","0" +"func_644_f","calculateInitialSkylight","p","()V","()V","World","ry","net/minecraft/src","0" +"func_21114_a","setAllowedMobSpawns","a","(ZZ)V","(ZZ)V","World","ry","net/minecraft/src","0" +"func_27163_E","calculateInitialWeather","H","()V","()V","World","ry","net/minecraft/src","0" +"func_27164_F","stopPrecipitation","I","()V","()V","World","ry","net/minecraft/src","0" +"func_40471_p","func_40471_p","p","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_40481_q","func_40481_q","q","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_40476_b","func_40476_b","c","(IIIZ)Z","(IIIZ)Z","World","ry","net/minecraft/src","0" +"func_40478_r","func_40478_r","r","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_35463_p","updateAllLightTypes","s","(III)V","(III)V","World","ry","net/minecraft/src","0" +"func_35460_a","computeSkyLightValue","a","(IIIIII)I","(IIIIII)I","World","ry","net/minecraft/src","0" +"func_35458_d","computeBlockLightValue","d","(IIIIII)I","(IIIIII)I","World","ry","net/minecraft/src","0" +"func_35459_c","updateLightByType","c","(LEnumSkyBlock;III)V","(Lbn;III)V","World","ry","net/minecraft/src","0" +"func_41081_a","func_41081_a","a","(LChunk;Z)Ljava/util/List;","(Lzx;Z)Ljava/util/List;","World","ry","net/minecraft/src","0" +"func_677_m","randomDisplayUpdates","t","(III)V","(III)V","World","ry","net/minecraft/src","0" +"func_659_b","getEntitiesWithinAABBExcludingEntity","b","(LEntity;LAxisAlignedBB;)Ljava/util/List;","(Lia;Lc;)Ljava/util/List;","World","ry","net/minecraft/src","0" +"func_657_a","getEntitiesWithinAABB","a","(Ljava/lang/Class;LAxisAlignedBB;)Ljava/util/List;","(Ljava/lang/Class;Lc;)Ljava/util/List;","World","ry","net/minecraft/src","0" +"func_658_i","getLoadedEntityList","q","()Ljava/util/List;","()Ljava/util/List;","World","ry","net/minecraft/src","0" +"func_698_b","updateTileEntityChunkAndDoNothing","b","(IIILTileEntity;)V","(IIILbq;)V","World","ry","net/minecraft/src","0" +"func_621_b","countEntities","b","(Ljava/lang/Class;)I","(Ljava/lang/Class;)I","World","ry","net/minecraft/src","0" +"func_636_a","addLoadedEntities","a","(Ljava/util/List;)V","(Ljava/util/List;)V","World","ry","net/minecraft/src","0" +"func_632_b","unloadEntities","b","(Ljava/util/List;)V","(Ljava/util/List;)V","World","ry","net/minecraft/src","0" +"func_656_j","dropOldChunks","r","()V","()V","World","ry","net/minecraft/src","0" +"func_695_a","canBlockBePlacedAt","a","(IIIIZI)Z","(IIIIZI)Z","World","ry","net/minecraft/src","0" +"func_702_a","getPathToEntity","a","(LEntity;LEntity;F)LPathEntity;","(Lia;Lia;F)Ldw;","World","ry","net/minecraft/src","0" +"func_637_a","getEntityPathToXYZ","a","(LEntity;IIIF)LPathEntity;","(Lia;IIIF)Ldw;","World","ry","net/minecraft/src","0" +"func_668_j","isBlockProvidingPowerTo","k","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_646_n","isBlockGettingPowered","u","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_706_k","isBlockIndirectlyProvidingPowerTo","l","(IIII)Z","(IIII)Z","World","ry","net/minecraft/src","0" +"func_625_o","isBlockIndirectlyGettingPowered","v","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_609_a","getClosestPlayerToEntity","a","(LEntity;D)LEntityPlayer;","(Lia;D)Lvi;","World","ry","net/minecraft/src","0" +"func_683_a","getClosestPlayer","a","(DDDD)LEntityPlayer;","(DDDD)Lvi;","World","ry","net/minecraft/src","0" +"func_40480_b","getClosestVulnerablePlayerToEntity","b","(LEntity;D)LEntityPlayer;","(Lia;D)Lvi;","World","ry","net/minecraft/src","0" +"func_40473_b","getClosestVulnerablePlayer","b","(DDDD)LEntityPlayer;","(DDDD)Lvi;","World","ry","net/minecraft/src","0" +"func_25099_a","getPlayerEntityByName","a","(Ljava/lang/String;)LEntityPlayer;","(Ljava/lang/String;)Lvi;","World","ry","net/minecraft/src","0" +"func_693_a","setChunkData","a","(IIIIII[B)V","(IIIIII[B)V","World","ry","net/minecraft/src","0" +"func_663_l","checkSessionLock","s","()V","()V","World","ry","net/minecraft/src","0" +"func_648_a","setWorldTime","a","(J)V","(J)V","World","ry","net/minecraft/src","0" +"func_22138_q","getWorldSeed","t","()J","()J","World","ry","net/minecraft/src","0" +"func_22139_r","getWorldTime","u","()J","()J","World","ry","net/minecraft/src","0" +"func_22137_s","getSpawnPoint","v","()LChunkCoordinates;","()Ldh;","World","ry","net/minecraft/src","0" +"func_22143_a","setSpawnPoint","a","(LChunkCoordinates;)V","(Ldh;)V","World","ry","net/minecraft/src","0" +"func_705_f","joinEntityInSurroundings","g","(LEntity;)V","(Lia;)V","World","ry","net/minecraft/src","0" +"func_6466_a","canMineBlock","a","(LEntityPlayer;III)Z","(Lvi;III)Z","World","ry","net/minecraft/src","0" +"func_9425_a","setEntityState","a","(LEntity;B)V","(Lia;B)V","World","ry","net/minecraft/src","0" +"func_9424_o","updateEntityList","w","()V","()V","World","ry","net/minecraft/src","0" +"func_21118_q","getIChunkProvider","x","()LIChunkProvider;","()Lej;","World","ry","net/minecraft/src","0" +"func_21116_c","playNoteAt","f","(IIIII)V","(IIIII)V","World","ry","net/minecraft/src","0" +"func_40479_y","getSaveHandler","y","()LISaveHandler;","()Lnh;","World","ry","net/minecraft/src","0" +"func_22144_v","getWorldInfo","z","()LWorldInfo;","()Lsi;","World","ry","net/minecraft/src","0" +"func_22140_w","updateAllPlayersSleepingFlag","A","()V","()V","World","ry","net/minecraft/src","0" +"func_22141_x","wakeUpAllPlayers","B","()V","()V","World","ry","net/minecraft/src","0" +"func_22142_y","isAllPlayersFullyAsleep","C","()Z","()Z","World","ry","net/minecraft/src","0" +"func_27166_f","getWeightedThunderStrength","i","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_27162_g","getRainStrength","j","(F)F","(F)F","World","ry","net/minecraft/src","0" +"func_27158_h","setRainStrength","k","(F)V","(F)V","World","ry","net/minecraft/src","0" +"func_27160_B","getIsThundering","D","()Z","()Z","World","ry","net/minecraft/src","0" +"func_27161_C","isRaining","E","()Z","()Z","World","ry","net/minecraft/src","0" +"func_27167_r","canLightningStrikeAt","w","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_28102_a","setItemData","a","(Ljava/lang/String;LWorldSavedData;)V","(Ljava/lang/String;Lafz;)V","World","ry","net/minecraft/src","0" +"func_28103_a","loadItemData","a","(Ljava/lang/Class;Ljava/lang/String;)LWorldSavedData;","(Ljava/lang/Class;Ljava/lang/String;)Lafz;","World","ry","net/minecraft/src","0" +"func_28101_b","getUniqueDataId","b","(Ljava/lang/String;)I","(Ljava/lang/String;)I","World","ry","net/minecraft/src","0" +"func_28106_e","playAuxSFX","g","(IIIII)V","(IIIII)V","World","ry","net/minecraft/src","0" +"func_28107_a","playAuxSFXAtEntity","a","(LEntityPlayer;IIIII)V","(Lvi;IIIII)V","World","ry","net/minecraft/src","0" +"func_35462_u","setRandomSeed","x","(III)Ljava/util/Random;","(III)Ljava/util/Random;","World","ry","net/minecraft/src","0" +"func_6465_g","updatingLighting","F","()Z","()Z","World","ry","net/minecraft/src","0" +"func_616_a","scheduleLightingUpdate","a","(LEnumSkyBlock;IIIIII)V","(Lbn;IIIIII)V","World","ry","net/minecraft/src","0" +"func_40474_a","func_40474_a","a","(LEnumCreatureType;III)LSpawnListEntry;","(Ljf;III)Lyx;","World","ry","net/minecraft/src","0" +"func_40477_b","func_40477_b","b","(Ljava/lang/String;III)LChunkPosition;","(Ljava/lang/String;III)Lam;","World","ry","net/minecraft/src","0" +"func_887_a","renderSign","a","()V","()V","SignModel","rb","net/minecraft/src","0" +"func_934_a","markBlockAndNeighborsNeedsUpdate","a","(III)V","(III)V","IWorldAccess","bd","net/minecraft/src","0" +"func_937_b","markBlockRangeNeedsUpdate","a","(IIIIII)V","(IIIIII)V","IWorldAccess","bd","net/minecraft/src","0" +"func_933_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","IWorldAccess","bd","net/minecraft/src","0" +"func_940_a","playSound","a","(Ljava/lang/String;DDDFF)V","(Ljava/lang/String;DDDFF)V","IWorldAccess","bd","net/minecraft/src","0" +"func_939_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","IWorldAccess","bd","net/minecraft/src","0" +"func_941_a","obtainEntitySkin","a","(LEntity;)V","(Lia;)V","IWorldAccess","bd","net/minecraft/src","0" +"func_938_b","releaseEntitySkin","b","(LEntity;)V","(Lia;)V","IWorldAccess","bd","net/minecraft/src","0" +"func_935_a","doNothingWithTileEntity","a","(IIILTileEntity;)V","(IIILbq;)V","IWorldAccess","bd","net/minecraft/src","0" +"func_28136_a","playAuxSFX","a","(LEntityPlayer;IIIII)V","(Lvi;IIIII)V","IWorldAccess","bd","net/minecraft/src","0" +"func_157_a","renderBoat","a","(LEntityBoat;DDDFF)V","(Lno;DDDFF)V","RenderBoat","ru","net/minecraft/src","0" +"func_31070_a","func_31070_a","a","(LTileEntityPiston;DDDF)V","(Lagb;DDDF)V","TileEntityRendererPiston","xd","net/minecraft/src","0" +"func_35516_a","func_35516_a","a","(II)I","(II)I","GenLayerZoom","act","net/minecraft/src","0" +"func_35514_b","func_35514_b","b","(IIII)I","(IIII)I","GenLayerZoom","act","net/minecraft/src","0" +"func_35515_a","func_35515_a","a","(JLGenLayer;I)LGenLayer;","(JLjx;I)Ljx;","GenLayerZoom","act","net/minecraft/src","0" +"func_21074_p_","getFleeceColor","l","()I","()I","EntitySheep","hm","net/minecraft/src","0" +"func_21071_b_","setFleeceColor","c","(I)V","(I)V","EntitySheep","hm","net/minecraft/src","0" +"func_21072_p","getSheared","v_","()Z","()Z","EntitySheep","hm","net/minecraft/src","0" +"func_21073_a","setSheared","b","(Z)V","(Z)V","EntitySheep","hm","net/minecraft/src","0" +"func_21070_a","getRandomFleeceColor","a","(Ljava/util/Random;)I","(Ljava/util/Random;)I","EntitySheep","hm","net/minecraft/src","0" +"func_4086_d","getLightValue","i","(III)I","(III)I","ChunkCache","xk","net/minecraft/src","0" +"func_716_a","getLightValueExt","a","(IIIZ)I","(IIIZ)I","ChunkCache","xk","net/minecraft/src","0" +"func_35454_a","getSkyBlockTypeBrightness","a","(LEnumSkyBlock;III)I","(Lbn;III)I","ChunkCache","xk","net/minecraft/src","0" +"func_35453_b","getSpecialBlockBrightness","b","(LEnumSkyBlock;III)I","(Lbn;III)I","ChunkCache","xk","net/minecraft/src","0" +"func_1124_a","generateDisplayLists","a","(I)I","(I)I","GLAllocation","bt","net/minecraft/src","0" +"func_1128_a","generateTextureNames","a","(Ljava/nio/IntBuffer;)V","(Ljava/nio/IntBuffer;)V","GLAllocation","bt","net/minecraft/src","0" +"func_28194_b","deleteDisplayLists","b","(I)V","(I)V","GLAllocation","bt","net/minecraft/src","0" +"func_1126_a","deleteTexturesAndDisplayLists","a","()V","()V","GLAllocation","bt","net/minecraft/src","0" +"func_1127_b","createDirectByteBuffer","c","(I)Ljava/nio/ByteBuffer;","(I)Ljava/nio/ByteBuffer;","GLAllocation","bt","net/minecraft/src","0" +"func_1125_c","createDirectIntBuffer","d","(I)Ljava/nio/IntBuffer;","(I)Ljava/nio/IntBuffer;","GLAllocation","bt","net/minecraft/src","0" +"func_1123_d","createDirectFloatBuffer","e","(I)Ljava/nio/FloatBuffer;","(I)Ljava/nio/FloatBuffer;","GLAllocation","bt","net/minecraft/src","0" +"func_35267_a","getIntCache","a","(I)[I","(I)[I","IntCache","bm","net/minecraft/src","0" +"func_35268_a","func_35268_a","a","()V","()V","IntCache","bm","net/minecraft/src","0" +"func_22011_a","chunkXZ2Int","a","(II)J","(II)J","ChunkCoordIntPair","acm","net/minecraft/src","0" +"func_40735_a","func_40735_a","a","()I","()I","ChunkCoordIntPair","acm","net/minecraft/src","0" +"func_40736_b","func_40736_b","b","()I","()I","ChunkCoordIntPair","acm","net/minecraft/src","0" +"func_40737_a","func_40737_a","a","(I)LChunkPosition;","(I)Lam;","ChunkCoordIntPair","acm","net/minecraft/src","0" +"func_35447_a","getSilverfishDeathRotation","a","(LEntitySilverfish;)F","(Lgl;)F","RenderSilverfish","xt","net/minecraft/src","0" +"func_35448_a","renderSilverfish","a","(LEntitySilverfish;DDDFF)V","(Lgl;DDDFF)V","RenderSilverfish","xt","net/minecraft/src","0" +"func_35449_a","shouldSilverfishRenderPass","a","(LEntitySilverfish;IF)I","(Lgl;IF)I","RenderSilverfish","xt","net/minecraft/src","0" +"func_35085_a","func_35085_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse2;","(Ljava/util/List;Ljava/util/Random;IIIII)Lko;","ComponentVillageHouse2","ko","net/minecraft/src","0" +"func_283_a_","getBlockEntity","j_","()LTileEntity;","()Lbq;","BlockContainer","ba","net/minecraft/src","0" +"func_35306_h","unifyAdjacentChests","a_","(LWorld;III)V","(Lry;III)V","BlockChest","au","net/minecraft/src","0" +"func_286_h","isThereANeighborChest","g","(LWorld;III)Z","(Lry;III)Z","BlockChest","au","net/minecraft/src","0" +"func_27349_a","func_27349_a","a","([Ljava/lang/Object;)LJ_JsonNodeSelector;","([Ljava/lang/Object;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27346_b","func_27346_b","b","([Ljava/lang/Object;)LJ_JsonNodeSelector;","([Ljava/lang/Object;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27353_c","func_27353_c","c","([Ljava/lang/Object;)LJ_JsonNodeSelector;","([Ljava/lang/Object;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27348_a","func_27348_a","a","(Ljava/lang/String;)LJ_JsonNodeSelector;","(Ljava/lang/String;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27350_a","func_27350_a","a","(LJ_JsonStringNode;)LJ_JsonNodeSelector;","(Loj;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27351_b","func_27351_b","b","(Ljava/lang/String;)LJ_JsonNodeSelector;","(Ljava/lang/String;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27347_a","func_27347_a","a","(I)LJ_JsonNodeSelector;","(I)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27354_b","func_27354_b","b","(I)LJ_JsonNodeSelector;","(I)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27352_a","chainOn","a","([Ljava/lang/Object;LJ_JsonNodeSelector;)LJ_JsonNodeSelector;","([Ljava/lang/Object;Ldx;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_27345_a","chainedJsonNodeSelector","a","(LJ_JsonNodeSelector;LJ_JsonNodeSelector;)LJ_JsonNodeSelector;","(Ldx;Ldx;)Ldx;","J_JsonNodeSelectors","ek","net/minecraft/src","0" +"func_35033_a","placeDoor","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;LEnumDoor;III)V","(Lry;Ljava/util/Random;Lnl;Lmj;III)V","ComponentStronghold","os","net/minecraft/src","0" +"func_35031_a","getRandomDoor","a","(Ljava/util/Random;)LEnumDoor;","(Ljava/util/Random;)Lmj;","ComponentStronghold","os","net/minecraft/src","0" +"func_35028_a","func_35028_a","a","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Laeh;Ljava/util/List;Ljava/util/Random;II)Lnk;","ComponentStronghold","os","net/minecraft/src","0" +"func_35032_b","func_35032_b","b","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Laeh;Ljava/util/List;Ljava/util/Random;II)Lnk;","ComponentStronghold","os","net/minecraft/src","0" +"func_35029_c","func_35029_c","c","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Laeh;Ljava/util/List;Ljava/util/Random;II)Lnk;","ComponentStronghold","os","net/minecraft/src","0" +"func_35030_a","canStrongholdGoDeeper","a","(LStructureBoundingBox;)Z","(Lnl;)Z","ComponentStronghold","os","net/minecraft/src","0" +"func_1155_a","getInstance","a","()LClippingHelper;","()Lip;","ClippingHelperImpl","qs","net/minecraft/src","0" +"func_1154_a","normalize","a","([[FI)V","([[FI)V","ClippingHelperImpl","qs","net/minecraft/src","0" +"func_1153_b","init","b","()V","()V","ClippingHelperImpl","qs","net/minecraft/src","0" +"func_35609_a","func_35609_a","a","(LBlock;IF)V","(Lyy;IF)V","ChestItemRenderHelper","acl","net/minecraft/src","0" +"func_1040_a","compareRecipes","a","(LIRecipe;LIRecipe;)I","(Lue;Lue;)I","RecipeSorter","ga","net/minecraft/src","0" +"func_27290_a","func_27290_a","a","(LJ_JsonNodeBuilder;)V","(Lrv;)V","J_NodeContainer","ye","net/minecraft/src","0" +"func_27289_a","func_27289_a","a","(LJ_JsonFieldBuilder;)V","(Laax;)V","J_NodeContainer","ye","net/minecraft/src","0" +"func_1260_a","createVectorHelper","a","(DDD)LVec3D;","(DDD)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_28215_a","clearVectorList","a","()V","()V","Vec3D","fb","net/minecraft/src","0" +"func_1259_a","initialize","b","()V","()V","Vec3D","fb","net/minecraft/src","0" +"func_1248_b","createVector","b","(DDD)LVec3D;","(DDD)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1254_e","setComponents","e","(DDD)LVec3D;","(DDD)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1262_a","subtract","a","(LVec3D;)LVec3D;","(Lfb;)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1252_b","normalize","c","()LVec3D;","()Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_35612_b","dotProduct","b","(LVec3D;)D","(Lfb;)D","Vec3D","fb","net/minecraft/src","0" +"func_1246_b","crossProduct","c","(LVec3D;)LVec3D;","(Lfb;)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1257_c","addVector","c","(DDD)LVec3D;","(DDD)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1251_c","distanceTo","d","(LVec3D;)D","(Lfb;)D","Vec3D","fb","net/minecraft/src","0" +"func_1261_d","squareDistanceTo","e","(LVec3D;)D","(Lfb;)D","Vec3D","fb","net/minecraft/src","0" +"func_1255_d","squareDistanceTo","d","(DDD)D","(DDD)D","Vec3D","fb","net/minecraft/src","0" +"func_1253_c","lengthVector","d","()D","()D","Vec3D","fb","net/minecraft/src","0" +"func_1247_a","getIntermediateWithXValue","a","(LVec3D;D)LVec3D;","(Lfb;D)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1250_b","getIntermediateWithYValue","b","(LVec3D;D)LVec3D;","(Lfb;D)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1256_c","getIntermediateWithZValue","c","(LVec3D;D)LVec3D;","(Lfb;D)Lfb;","Vec3D","fb","net/minecraft/src","0" +"func_1258_a","rotateAroundX","a","(F)V","(F)V","Vec3D","fb","net/minecraft/src","0" +"func_1249_b","rotateAroundY","b","(F)V","(F)V","Vec3D","fb","net/minecraft/src","0" +"func_41035_a","func_41035_a","a","(LEntityEnderCrystal;DDDFF)V","(Lsf;DDDFF)V","RenderEnderCrystal","ti","net/minecraft/src","0" +"func_1063_a","sortByDistanceToEntity","a","(LWorldRenderer;LWorldRenderer;)I","(Lge;Lge;)I","EntitySorter","oy","net/minecraft/src","0" +"func_735_a","writeTagContents","a","(Ljava/io/DataOutput;)V","(Ljava/io/DataOutput;)V","NBTBase","um","net/minecraft/src","0" +"func_736_a","readTagContents","a","(Ljava/io/DataInput;)V","(Ljava/io/DataInput;)V","NBTBase","um","net/minecraft/src","0" +"func_733_a","getType","a","()B","()B","NBTBase","um","net/minecraft/src","0" +"func_40195_b","cloneTag","b","()LNBTBase;","()Lum;","NBTBase","um","net/minecraft/src","0" +"func_732_a","setKey","n","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lum;","NBTBase","um","net/minecraft/src","0" +"func_737_b","getKey","d","()Ljava/lang/String;","()Ljava/lang/String;","NBTBase","um","net/minecraft/src","0" +"func_734_b","readTag","b","(Ljava/io/DataInput;)LNBTBase;","(Ljava/io/DataInput;)Lum;","NBTBase","um","net/minecraft/src","0" +"func_738_a","writeTag","a","(LNBTBase;Ljava/io/DataOutput;)V","(Lum;Ljava/io/DataOutput;)V","NBTBase","um","net/minecraft/src","0" +"func_739_a","createTagOfType","a","(BLjava/lang/String;)LNBTBase;","(BLjava/lang/String;)Lum;","NBTBase","um","net/minecraft/src","0" +"func_731_b","getTagName","a","(B)Ljava/lang/String;","(B)Ljava/lang/String;","NBTBase","um","net/minecraft/src","0" +"func_40293_a","func_40293_a","a","(LEntityVillager;IF)I","(Lai;IF)I","RenderVillager","ch","net/minecraft/src","0" +"func_40294_a","renderVillager","a","(LEntityVillager;DDDFF)V","(Lai;DDDFF)V","RenderVillager","ch","net/minecraft/src","0" +"func_40290_a","func_40290_a","a","(LEntityVillager;DDD)V","(Lai;DDD)V","RenderVillager","ch","net/minecraft/src","0" +"func_40291_a","func_40291_a","a","(LEntityVillager;F)V","(Lai;F)V","RenderVillager","ch","net/minecraft/src","0" +"func_40292_b","func_40292_b","b","(LEntityVillager;F)V","(Lai;F)V","RenderVillager","ch","net/minecraft/src","0" +"func_904_a","updateTimer","a","()V","()V","Timer","aij","net/minecraft/src","0" +"func_264_a","setBurnRate","a","(III)V","(III)V","BlockFire","wj","net/minecraft/src","0" +"func_266_a","tryToCatchBlockOnFire","a","(LWorld;IIIILjava/util/Random;I)V","(Lry;IIIILjava/util/Random;I)V","BlockFire","wj","net/minecraft/src","0" +"func_263_h","func_263_h","g","(LWorld;III)Z","(Lry;III)Z","BlockFire","wj","net/minecraft/src","0" +"func_262_i","getChanceOfNeighborsEncouragingFire","h","(LWorld;III)I","(Lry;III)I","BlockFire","wj","net/minecraft/src","0" +"func_261_b","canBlockCatchFire","c","(LIBlockAccess;III)Z","(Lkq;III)Z","BlockFire","wj","net/minecraft/src","0" +"func_265_g","getChanceToEncourageFire","f","(LWorld;IIII)I","(Lry;IIII)I","BlockFire","wj","net/minecraft/src","0" +"func_35726_e","getBiomeCacheBlock","a","(II)LBiomeCacheBlock;","(II)Lcq;","BiomeCache","agl","net/minecraft/src","0" +"func_35725_a","func_35725_a","b","(II)LBiomeGenBase;","(II)Lsr;","BiomeCache","agl","net/minecraft/src","0" +"func_35722_b","func_35722_b","c","(II)F","(II)F","BiomeCache","agl","net/minecraft/src","0" +"func_35727_c","func_35727_c","d","(II)F","(II)F","BiomeCache","agl","net/minecraft/src","0" +"func_35724_a","cleanupCache","a","()V","()V","BiomeCache","agl","net/minecraft/src","0" +"func_35723_d","getCachedBiomes","e","(II)[LBiomeGenBase;","(II)[Lsr;","BiomeCache","agl","net/minecraft/src","0" +"func_35721_a","getWorldChunkManager","a","(LBiomeCache;)LWorldChunkManager;","(Lagl;)Lvh;","BiomeCache","agl","net/minecraft/src","0" +"func_35051_a","func_35051_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentStrongholdCorridor","vn","net/minecraft/src","0" +"func_31032_h","func_31032_h","g","(LWorld;III)Z","(Lry;III)Z","BlockTorch","bg","net/minecraft/src","0" +"func_271_h","dropTorchIfCantStay","h","(LWorld;III)Z","(Lry;III)Z","BlockTorch","bg","net/minecraft/src","0" +"func_22386_a","func_22386_a","a","(FF)F","(FF)F","MouseFilter","ne","net/minecraft/src","0" +"func_516_a","generate","a","(LWorld;Ljava/util/Random;III)Z","(Lry;Ljava/util/Random;III)Z","WorldGenerator","ig","net/minecraft/src","0" +"func_517_a","func_517_a","a","(DDD)V","(DDD)V","WorldGenerator","ig","net/minecraft/src","0" +"func_41060_a","func_41060_a","a","(LWorld;IIIII)V","(Lry;IIIII)V","WorldGenerator","ig","net/minecraft/src","0" +"func_4115_a","handleLogin","a","(LPacket1Login;)V","(Laj;)V","NetHandler","fe","net/minecraft/src","0" +"func_832_a","handlePickupSpawn","a","(LPacket21PickupSpawn;)V","(Lts;)V","NetHandler","fe","net/minecraft/src","0" +"func_835_a","handleVehicleSpawn","a","(LPacket23VehicleSpawn;)V","(Lgh;)V","NetHandler","fe","net/minecraft/src","0" +"func_35778_a","handleXPOrb","a","(LPacket26EntityExpOrb;)V","(Lfi;)V","NetHandler","fe","net/minecraft/src","0" +"func_27246_a","handleWeather","a","(LPacket71Weather;)V","(Labf;)V","NetHandler","fe","net/minecraft/src","0" +"func_21146_a","handleEntityPainting","a","(LPacket25EntityPainting;)V","(Lyr;)V","NetHandler","fe","net/minecraft/src","0" +"func_6498_a","handleEntityVelocity","a","(LPacket28EntityVelocity;)V","(Lqm;)V","NetHandler","fe","net/minecraft/src","0" +"func_21148_a","handleEntityMetadata","a","(LPacket40EntityMetadata;)V","(Lse;)V","NetHandler","fe","net/minecraft/src","0" +"func_820_a","handleNamedEntitySpawn","a","(LPacket20NamedEntitySpawn;)V","(Lph;)V","NetHandler","fe","net/minecraft/src","0" +"func_829_a","handleEntityTeleport","a","(LPacket34EntityTeleport;)V","(Lbe;)V","NetHandler","fe","net/minecraft/src","0" +"func_827_a","handleEntity","a","(LPacket30Entity;)V","(Lrd;)V","NetHandler","fe","net/minecraft/src","0" +"func_839_a","handleDestroyEntity","a","(LPacket29DestroyEntity;)V","(Lfw;)V","NetHandler","fe","net/minecraft/src","0" +"func_837_a","handleFlying","a","(LPacket10Flying;)V","(Lhk;)V","NetHandler","fe","net/minecraft/src","0" +"func_826_a","handlePreChunk","a","(LPacket50PreChunk;)V","(Lt;)V","NetHandler","fe","net/minecraft/src","0" +"func_824_a","handleMultiBlockChange","a","(LPacket52MultiBlockChange;)V","(Lnp;)V","NetHandler","fe","net/minecraft/src","0" +"func_833_a","handleMapChunk","a","(LPacket51MapChunk;)V","(Lkh;)V","NetHandler","fe","net/minecraft/src","0" +"func_822_a","handleBlockChange","a","(LPacket53BlockChange;)V","(Lack;)V","NetHandler","fe","net/minecraft/src","0" +"func_844_a","handleKickDisconnect","a","(LPacket255KickDisconnect;)V","(Lsw;)V","NetHandler","fe","net/minecraft/src","0" +"func_823_a","handleErrorMessage","a","(Ljava/lang/String;[Ljava/lang/Object;)V","(Ljava/lang/String;[Ljava/lang/Object;)V","NetHandler","fe","net/minecraft/src","0" +"func_834_a","handleCollect","a","(LPacket22Collect;)V","(Lrc;)V","NetHandler","fe","net/minecraft/src","0" +"func_4113_a","handleChat","a","(LPacket3Chat;)V","(Labb;)V","NetHandler","fe","net/minecraft/src","0" +"func_825_a","handleArmAnimation","a","(LPacket18Animation;)V","(Labu;)V","NetHandler","fe","net/minecraft/src","0" +"func_22186_a","handleSleep","a","(LPacket17Sleep;)V","(Laft;)V","NetHandler","fe","net/minecraft/src","0" +"func_838_a","handleHandshake","a","(LPacket2Handshake;)V","(Lhh;)V","NetHandler","fe","net/minecraft/src","0" +"func_828_a","handleMobSpawn","a","(LPacket24MobSpawn;)V","(Lmn;)V","NetHandler","fe","net/minecraft/src","0" +"func_846_a","handleUpdateTime","a","(LPacket4UpdateTime;)V","(Lcb;)V","NetHandler","fe","net/minecraft/src","0" +"func_845_a","handleSpawnPosition","a","(LPacket6SpawnPosition;)V","(Laee;)V","NetHandler","fe","net/minecraft/src","0" +"func_6497_a","handleAttachEntity","a","(LPacket39AttachEntity;)V","(Lagx;)V","NetHandler","fe","net/minecraft/src","0" +"func_9447_a","handleEntityStatus","a","(LPacket38EntityStatus;)V","(Lbf;)V","NetHandler","fe","net/minecraft/src","0" +"func_9446_a","handleHealth","a","(LPacket8UpdateHealth;)V","(Lqg;)V","NetHandler","fe","net/minecraft/src","0" +"func_35777_a","handleExperience","a","(LPacket43Experience;)V","(Lnw;)V","NetHandler","fe","net/minecraft/src","0" +"func_9448_a","handleRespawn","a","(LPacket9Respawn;)V","(Laep;)V","NetHandler","fe","net/minecraft/src","0" +"func_12245_a","handleExplosion","a","(LPacket60Explosion;)V","(Lkm;)V","NetHandler","fe","net/minecraft/src","0" +"func_20087_a","handleOpenWindow","a","(LPacket100OpenWindow;)V","(Lwm;)V","NetHandler","fe","net/minecraft/src","0" +"func_20088_a","handleSetSlot","a","(LPacket103SetSlot;)V","(Liu;)V","NetHandler","fe","net/minecraft/src","0" +"func_20089_a","handleContainerTransaction","a","(LPacket106Transaction;)V","(Lly;)V","NetHandler","fe","net/minecraft/src","0" +"func_20094_a","handleWindowItems","a","(LPacket104WindowItems;)V","(Lyh;)V","NetHandler","fe","net/minecraft/src","0" +"func_20093_a","handleUpdateSign","a","(LPacket130UpdateSign;)V","(Lhy;)V","NetHandler","fe","net/minecraft/src","0" +"func_20090_a","handleCraftingProgress","a","(LPacket105UpdateProgressbar;)V","(Lgb;)V","NetHandler","fe","net/minecraft/src","0" +"func_843_a","handlePlayerInventory","a","(LPacket5PlayerInventory;)V","(Llw;)V","NetHandler","fe","net/minecraft/src","0" +"func_20092_a","handleCloseWindow","a","(LPacket101CloseWindow;)V","(Lhi;)V","NetHandler","fe","net/minecraft/src","0" +"func_21145_a","handleNotePlay","a","(LPacket54PlayNoteBlock;)V","(Lagm;)V","NetHandler","fe","net/minecraft/src","0" +"func_25118_a","handleBedUpdate","a","(LPacket70Bed;)V","(Lho;)V","NetHandler","fe","net/minecraft/src","0" +"func_28116_a","processItemData","a","(LPacket131MapData;)V","(Laej;)V","NetHandler","fe","net/minecraft/src","0" +"func_28115_a","handleAuxSFX","a","(LPacket61DoorChange;)V","(Lsh;)V","NetHandler","fe","net/minecraft/src","0" +"func_27245_a","handleStatistic","a","(LPacket200Statistic;)V","(Lzl;)V","NetHandler","fe","net/minecraft/src","0" +"func_35780_a","handleEntityEffect","a","(LPacket41EntityEffect;)V","(Lij;)V","NetHandler","fe","net/minecraft/src","0" +"func_35783_a","handleRemoveEntityEffect","a","(LPacket42RemoveEntityEffect;)V","(Laf;)V","NetHandler","fe","net/minecraft/src","0" +"func_27247_c","isServerHandler","a","()Z","()Z","NetHandler","fe","net/minecraft/src","0" +"func_35779_a","handlePlayerInfo","a","(LPacket201PlayerInfo;)V","(Loz;)V","NetHandler","fe","net/minecraft/src","0" +"func_35784_a","handleKeepAlive","a","(LPacket0KeepAlive;)V","(Lwf;)V","NetHandler","fe","net/minecraft/src","0" +"func_4114_b","registerPacket","a","(LPacket;)V","(Lgt;)V","NetHandler","fe","net/minecraft/src","0" +"func_821_a","handleBlockDig","a","(LPacket14BlockDig;)V","(Lsm;)V","NetHandler","fe","net/minecraft/src","0" +"func_819_a","handlePlace","a","(LPacket15Place;)V","(Lem;)V","NetHandler","fe","net/minecraft/src","0" +"func_841_a","handleBlockItemSwitch","a","(LPacket16BlockItemSwitch;)V","(Laio;)V","NetHandler","fe","net/minecraft/src","0" +"func_21147_a","handleEntityAction","a","(LPacket19EntityAction;)V","(Lag;)V","NetHandler","fe","net/minecraft/src","0" +"func_6499_a","handleUseEntity","a","(LPacket7UseEntity;)V","(Lzm;)V","NetHandler","fe","net/minecraft/src","0" +"func_20091_a","handleWindowClick","a","(LPacket102WindowClick;)V","(Laa;)V","NetHandler","fe","net/minecraft/src","0" +"func_22185_a","handlePosition","a","(LPacket27Position;)V","(Lzi;)V","NetHandler","fe","net/minecraft/src","0" +"func_35782_a","handleServerPing","a","(LPacket254ServerPing;)V","(Llx;)V","NetHandler","fe","net/minecraft/src","0" +"func_35781_a","handleCreativeSetSlot","a","(LPacket107CreativeSetSlot;)V","(Ldg;)V","NetHandler","fe","net/minecraft/src","0" +"func_40599_a","handleEnchantItem","a","(LPacket108EnchantItem;)V","(Lacv;)V","NetHandler","fe","net/minecraft/src","0" +"func_40277_a","renderBlaze","a","(LEntityBlaze;DDDFF)V","(Lqf;DDDFF)V","RenderBlaze","aq","net/minecraft/src","0" +"func_40042_a","func_40042_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor3;","(Ljava/util/List;Ljava/util/Random;IIIII)Ltr;","ComponentNetherBridgeCorridor3","tr","net/minecraft/src","0" +"values","values","values","()[LEnumCreatureType;","()[Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumCreatureType;","(Ljava/lang/String;)Ljf;","EnumCreatureType","jf","net/minecraft/src","0" +"func_21170_a","getCreatureClass","a","()Ljava/lang/Class;","()Ljava/lang/Class;","EnumCreatureType","jf","net/minecraft/src","0" +"func_21169_b","getMaxNumberOfCreature","b","()I","()I","EnumCreatureType","jf","net/minecraft/src","0" +"func_21171_c","getCreatureMaterial","c","()LMaterial;","()Lp;","EnumCreatureType","jf","net/minecraft/src","0" +"func_21168_d","getPeacefulCreature","d","()Z","()Z","EnumCreatureType","jf","net/minecraft/src","0" +"func_931_a","renderTileEntityMobSpawner","a","(LTileEntityMobSpawner;DDDF)V","(Lze;DDDF)V","TileEntityMobSpawnerRenderer","on","net/minecraft/src","0" +"func_27360_a","func_27360_a","a","()V","()V","StatList","ny","net/minecraft/src","0" +"func_25154_a","initBreakableStats","b","()V","()V","StatList","ny","net/minecraft/src","0" +"func_25151_b","initStats","c","()V","()V","StatList","ny","net/minecraft/src","0" +"func_25157_c","initCraftableStats","d","()V","()V","StatList","ny","net/minecraft/src","0" +"func_25153_a","initMinableStats","a","(Ljava/lang/String;I)[LStatBase;","(Ljava/lang/String;I)[Lpx;","StatList","ny","net/minecraft/src","0" +"func_25155_a","initUsableStats","a","([LStatBase;Ljava/lang/String;III)[LStatBase;","([Lpx;Ljava/lang/String;III)[Lpx;","StatList","ny","net/minecraft/src","0" +"func_25149_b","func_25149_b","b","([LStatBase;Ljava/lang/String;III)[LStatBase;","([Lpx;Ljava/lang/String;III)[Lpx;","StatList","ny","net/minecraft/src","0" +"func_25150_a","replaceAllSimilarBlocks","a","([LStatBase;)V","([Lpx;)V","StatList","ny","net/minecraft/src","0" +"func_25156_a","replaceSimilarBlocks","a","([LStatBase;II)V","([Lpx;II)V","StatList","ny","net/minecraft/src","0" +"func_27361_a","getOneShotStat","a","(I)LStatBase;","(I)Lpx;","StatList","ny","net/minecraft/src","0" +"func_342_a","isBoundingBoxInFrustum","a","(LAxisAlignedBB;)Z","(Lc;)Z","ICamera","fn","net/minecraft/src","0" +"func_343_a","setPosition","a","(DDD)V","(DDD)V","ICamera","fn","net/minecraft/src","0" +"func_27102_a","queueTakenAchievement","a","(LAchievement;)V","(Lws;)V","GuiAchievement","lk","net/minecraft/src","0" +"func_27101_b","queueAchievementInformation","b","(LAchievement;)V","(Lws;)V","GuiAchievement","lk","net/minecraft/src","0" +"func_25079_b","updateAchievementWindowScale","b","()V","()V","GuiAchievement","lk","net/minecraft/src","0" +"func_25080_a","updateAchievementWindow","a","()V","()V","GuiAchievement","lk","net/minecraft/src","0" +"func_22322_a","compareChunks","a","(LChunkFile;)I","(Lck;)I","ChunkFile","ck","net/minecraft/src","0" +"func_22324_a","getChunkFile","a","()Ljava/io/File;","()Ljava/io/File;","ChunkFile","ck","net/minecraft/src","0" +"func_22323_b","getXChunk","b","()I","()I","ChunkFile","ck","net/minecraft/src","0" +"func_22321_c","getYChunk","c","()I","()I","ChunkFile","ck","net/minecraft/src","0" +"func_35438_a","func_35438_a","a","(LEntityXPOrb;DDDFF)V","(Lfk;DDDFF)V","RenderXPOrb","pw","net/minecraft/src","0" +"func_1106_a","sin","a","(F)F","(F)F","MathHelper","me","net/minecraft/src","0" +"func_1114_b","cos","b","(F)F","(F)F","MathHelper","me","net/minecraft/src","0" +"func_1113_c","sqrt_float","c","(F)F","(F)F","MathHelper","me","net/minecraft/src","0" +"func_1109_a","sqrt_double","a","(D)F","(D)F","MathHelper","me","net/minecraft/src","0" +"func_1110_d","floor_float","d","(F)I","(F)I","MathHelper","me","net/minecraft/src","0" +"func_40346_b","func_40346_b","b","(D)I","(D)I","MathHelper","me","net/minecraft/src","0" +"func_1108_b","floor_double","c","(D)I","(D)I","MathHelper","me","net/minecraft/src","0" +"func_35599_c","floor_double_long","d","(D)J","(D)J","MathHelper","me","net/minecraft/src","0" +"func_1112_e","abs","e","(F)F","(F)F","MathHelper","me","net/minecraft/src","0" +"func_35597_a","abs_int","a","(I)I","(I)I","MathHelper","me","net/minecraft/src","0" +"func_41084_a","clamp_int","a","(III)I","(III)I","MathHelper","me","net/minecraft/src","0" +"func_1107_a","abs_max","a","(DD)D","(DD)D","MathHelper","me","net/minecraft/src","0" +"func_1111_a","bucketInt","a","(II)I","(II)I","MathHelper","me","net/minecraft/src","0" +"func_22282_a","stringNullOrLengthZero","a","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","MathHelper","me","net/minecraft/src","0" +"func_35598_a","getRandomIntegerInRange","a","(Ljava/util/Random;II)I","(Ljava/util/Random;II)I","MathHelper","me","net/minecraft/src","0" +"func_35175_b","attackEntityAsMob","b","(LEntity;)Z","(Lia;)Z","EntityMob","zo","net/minecraft/src","0" +"func_40147_Y","func_40147_Y","u_","()Z","()Z","EntityMob","zo","net/minecraft/src","0" +"func_21100_b","getRandomStackFromInventory","a","()LItemStack;","()Ldk;","TileEntityDispenser","bp","net/minecraft/src","0" +"func_303_h","checkBlockCoordValid","f","(LWorld;III)V","(Lry;III)V","BlockReed","md","net/minecraft/src","0" +"func_6531_a","setTexturePack","a","(LTexturePackBase;)Z","(Lafs;)Z","TexturePackList","adk","net/minecraft/src","0" +"func_6532_a","updateAvaliableTexturePacks","a","()V","()V","TexturePackList","adk","net/minecraft/src","0" +"func_6530_b","availableTexturePacks","b","()Ljava/util/List;","()Ljava/util/List;","TexturePackList","adk","net/minecraft/src","0" +"func_40025_a","func_40025_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing2;","(Ljava/util/List;Ljava/util/Random;IIIII)Lyj;","ComponentNetherBridgeCrossing2","yj","net/minecraft/src","0" +"func_1017_a","isAtLocation","a","(II)Z","(II)Z","Chunk","zx","net/minecraft/src","0" +"func_999_b","getHeightValue","b","(II)I","(II)I","Chunk","zx","net/minecraft/src","0" +"func_1014_a","func_1014_a","a","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_1018_b","generateHeightMap","b","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_1024_c","generateSkylightMap","c","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_4143_d","func_4143_d","d","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_1008_a","getBlockID","a","(III)I","(III)I","Chunk","zx","net/minecraft/src","0" +"func_1010_a","setBlockIDWithMetadata","a","(IIIII)Z","(IIIII)Z","Chunk","zx","net/minecraft/src","0" +"func_1022_a","setBlockID","a","(IIII)Z","(IIII)Z","Chunk","zx","net/minecraft/src","0" +"func_1021_b","getBlockMetadata","b","(III)I","(III)I","Chunk","zx","net/minecraft/src","0" +"func_1009_b","setBlockMetadata","b","(IIII)Z","(IIII)Z","Chunk","zx","net/minecraft/src","0" +"func_1025_a","getSavedLightValue","a","(LEnumSkyBlock;III)I","(Lbn;III)I","Chunk","zx","net/minecraft/src","0" +"func_1011_a","setLightValue","a","(LEnumSkyBlock;IIII)V","(Lbn;IIII)V","Chunk","zx","net/minecraft/src","0" +"func_1019_c","getBlockLightValue","c","(IIII)I","(IIII)I","Chunk","zx","net/minecraft/src","0" +"func_1000_a","addEntity","a","(LEntity;)V","(Lia;)V","Chunk","zx","net/minecraft/src","0" +"func_1015_b","removeEntity","b","(LEntity;)V","(Lia;)V","Chunk","zx","net/minecraft/src","0" +"func_1016_a","removeEntityAtIndex","a","(LEntity;I)V","(Lia;I)V","Chunk","zx","net/minecraft/src","0" +"func_1007_c","canBlockSeeTheSky","c","(III)Z","(III)Z","Chunk","zx","net/minecraft/src","0" +"func_1002_d","getChunkBlockTileEntity","d","(III)LTileEntity;","(III)Lbq;","Chunk","zx","net/minecraft/src","0" +"func_1001_a","addTileEntity","a","(LTileEntity;)V","(Lbq;)V","Chunk","zx","net/minecraft/src","0" +"func_1005_a","setChunkBlockTileEntity","a","(IIILTileEntity;)V","(IIILbq;)V","Chunk","zx","net/minecraft/src","0" +"func_1023_e","removeChunkBlockTileEntity","e","(III)V","(III)V","Chunk","zx","net/minecraft/src","0" +"func_995_d","onChunkLoad","e","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_998_e","onChunkUnload","f","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_1006_f","setChunkModified","g","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_994_a","getEntitiesWithinAABBForEntity","a","(LEntity;LAxisAlignedBB;Ljava/util/List;)V","(Lia;Lc;Ljava/util/List;)V","Chunk","zx","net/minecraft/src","0" +"func_1013_a","getEntitiesOfTypeWithinAAAB","a","(Ljava/lang/Class;LAxisAlignedBB;Ljava/util/List;)V","(Ljava/lang/Class;Lc;Ljava/util/List;)V","Chunk","zx","net/minecraft/src","0" +"func_1012_a","needsSaving","a","(Z)Z","(Z)Z","Chunk","zx","net/minecraft/src","0" +"func_1004_a","setChunkData","a","([BIIIIIII)I","([BIIIIIII)I","Chunk","zx","net/minecraft/src","0" +"func_997_a","getRandomWithSeed","a","(J)Ljava/util/Random;","(J)Ljava/util/Random;","Chunk","zx","net/minecraft/src","0" +"func_21167_h","isEmpty","h","()Z","()Z","Chunk","zx","net/minecraft/src","0" +"func_996_c","propagateSkylightOcclusion","d","(II)V","(II)V","Chunk","zx","net/minecraft/src","0" +"func_35839_k","func_35839_k","l","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_1020_f","checkSkylightNeighborHeight","f","(III)V","(III)V","Chunk","zx","net/minecraft/src","0" +"func_35842_d","updateSkylightNeighborHeight","d","(IIII)V","(IIII)V","Chunk","zx","net/minecraft/src","0" +"func_1003_g","relightBlock","g","(III)V","(III)V","Chunk","zx","net/minecraft/src","0" +"func_25124_i","func_25124_i","i","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_35843_a","populateChunk","a","(LIChunkProvider;LIChunkProvider;II)V","(Lej;Lej;II)V","Chunk","zx","net/minecraft/src","0" +"func_35840_c","func_35840_c","c","(II)I","(II)I","Chunk","zx","net/minecraft/src","0" +"func_35841_j","func_35841_j","j","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_40740_k","func_40740_k","k","()LChunkCoordIntPair;","()Lacm;","Chunk","zx","net/minecraft/src","0" +"func_27234_b","buildNode","b","()LJ_JsonNode;","()Lan;","J_JsonNodeBuilder","rv","net/minecraft/src","0" +"values","values","values","()[LEnumMobType;","()[Lxb;","EnumMobType","xb","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMobType;","(Ljava/lang/String;)Lxb;","EnumMobType","xb","net/minecraft/src","0" +"func_742_a","setTag","a","(LNBTBase;)V","(Lum;)V","NBTTagList","yi","net/minecraft/src","0" +"func_741_a","tagAt","a","(I)LNBTBase;","(I)Lum;","NBTTagList","yi","net/minecraft/src","0" +"func_740_c","tagCount","c","()I","()I","NBTTagList","yi","net/minecraft/src","0" +"func_35147_g","func_35147_g","a","()V","()V","TileEntityChest","tu","net/minecraft/src","0" +"func_21028_c","growTree","c","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","BlockSapling","aet","net/minecraft/src","0" +"func_35511_a","choose","a","(II)I","(II)I","GenLayerZoomFuzzy","gn","net/minecraft/src","0" +"func_35510_b","choose","b","(IIII)I","(IIII)I","GenLayerZoomFuzzy","gn","net/minecraft/src","0" +"func_469_c","getSizeInventory","c","()I","()I","IInventory","de","net/minecraft/src","0" +"func_468_c","getStackInSlot","d","(I)LItemStack;","(I)Ldk;","IInventory","de","net/minecraft/src","0" +"func_471_d","getInvName","d","()Ljava/lang/String;","()Ljava/lang/String;","IInventory","de","net/minecraft/src","0" +"func_473_a","decrStackSize","a","(II)LItemStack;","(II)Ldk;","IInventory","de","net/minecraft/src","0" +"func_472_a","setInventorySlotContents","a","(ILItemStack;)V","(ILdk;)V","IInventory","de","net/minecraft/src","0" +"func_470_e","getInventoryStackLimit","e","()I","()I","IInventory","de","net/minecraft/src","0" +"func_474_j_","onInventoryChanged","h","()V","()V","IInventory","de","net/minecraft/src","0" +"func_20070_a_","isUseableByPlayer","b_","(LEntityPlayer;)Z","(Lvi;)Z","IInventory","de","net/minecraft/src","0" +"func_35142_x_","openChest","j","()V","()V","IInventory","de","net/minecraft/src","0" +"func_35141_y_","closeChest","k","()V","()V","IInventory","de","net/minecraft/src","0" +"func_35715_c","isSizeableStructure","d","()Z","()Z","StructureStart","oa","net/minecraft/src","0" +"func_35712_a","getBoundingBox","a","()LStructureBoundingBox;","()Lnl;","StructureStart","oa","net/minecraft/src","0" +"func_40560_b","func_40560_b","b","()Ljava/util/LinkedList;","()Ljava/util/LinkedList;","StructureStart","oa","net/minecraft/src","0" +"func_35711_a","generateStructure","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;)V","(Lry;Ljava/util/Random;Lnl;)V","StructureStart","oa","net/minecraft/src","0" +"func_35714_b","updateBoundingBox","c","()V","()V","StructureStart","oa","net/minecraft/src","0" +"func_35713_a","markAvailableHeight","a","(LWorld;Ljava/util/Random;I)V","(Lry;Ljava/util/Random;I)V","StructureStart","oa","net/minecraft/src","0" +"func_40559_a","func_40559_a","a","(LWorld;Ljava/util/Random;II)V","(Lry;Ljava/util/Random;II)V","StructureStart","oa","net/minecraft/src","0" +"func_35442_a","renderEnderman","a","(LEntityEnderman;DDDFF)V","(Laii;DDDFF)V","RenderEnderman","aae","net/minecraft/src","0" +"func_35443_a","renderCarrying","a","(LEntityEnderman;F)V","(Laii;F)V","RenderEnderman","aae","net/minecraft/src","0" +"func_35441_a","renderEyes","a","(LEntityEnderman;IF)I","(Laii;IF)I","RenderEnderman","aae","net/minecraft/src","0" +"values","values","values","()[LEnumJsonNodeType;","()[Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumJsonNodeType;","(Ljava/lang/String;)Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" +"func_25068_c","registerStat","a","()LStatBase;","()Lpx;","StatBase","px","net/minecraft/src","0" +"func_25067_a","isAchievement","c","()Z","()Z","StatBase","px","net/minecraft/src","0" +"func_27082_h","initIndependentStat","b","()LStatBase;","()Lpx;","StatBase","px","net/minecraft/src","0" +"func_27084_a","func_27084_a","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","StatBase","px","net/minecraft/src","0" +"func_27083_i","getNumberFormat","d","()Ljava/text/NumberFormat;","()Ljava/text/NumberFormat;","StatBase","px","net/minecraft/src","0" +"func_27081_j","getDecimalFormat","e","()Ljava/text/DecimalFormat;","()Ljava/text/DecimalFormat;","StatBase","px","net/minecraft/src","0" +"func_27329_a","format","a","(LJ_JsonRootNode;Ljava/io/Writer;)V","(Lwz;Ljava/io/Writer;)V","J_CompactJsonFormatter","rx","net/minecraft/src","0" +"func_27328_a","formatJsonNode","a","(LJ_JsonNode;Ljava/io/Writer;)V","(Lan;Ljava/io/Writer;)V","J_CompactJsonFormatter","rx","net/minecraft/src","0" +"func_766_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesWeapons","kj","net/minecraft/src","0" +"func_27218_a","getType","b","()LEnumJsonNodeType;","()Lpp;","J_JsonNode","an","net/minecraft/src","0" +"func_27216_b","getText","c","()Ljava/lang/String;","()Ljava/lang/String;","J_JsonNode","an","net/minecraft/src","0" +"func_27214_c","getFields","a","()Ljava/util/Map;","()Ljava/util/Map;","J_JsonNode","an","net/minecraft/src","0" +"func_27215_d","getElements","d","()Ljava/util/List;","()Ljava/util/List;","J_JsonNode","an","net/minecraft/src","0" +"func_27213_a","getStringValue","a","([Ljava/lang/Object;)Ljava/lang/String;","([Ljava/lang/Object;)Ljava/lang/String;","J_JsonNode","an","net/minecraft/src","0" +"func_27217_b","getArrayNode","b","([Ljava/lang/Object;)Ljava/util/List;","([Ljava/lang/Object;)Ljava/util/List;","J_JsonNode","an","net/minecraft/src","0" +"func_27219_a","wrapExceptionsFor","a","(LJ_JsonNodeSelector;LJ_JsonNode;[Ljava/lang/Object;)Ljava/lang/Object;","(Ldx;Lan;[Ljava/lang/Object;)Ljava/lang/Object;","J_JsonNode","an","net/minecraft/src","0" +"func_191_a","setSpiderDeathMaxRotation","a","(LEntitySpider;)F","(Lvq;)F","RenderSpider","abw","net/minecraft/src","0" +"func_190_a","setSpiderEyeBrightness","a","(LEntitySpider;IF)I","(Lvq;IF)I","RenderSpider","abw","net/minecraft/src","0" +"func_35446_a","scaleSpider","a","(LEntitySpider;F)V","(Lvq;F)V","RenderSpider","abw","net/minecraft/src","0" +"func_40701_a","compareProfilerResult","a","(LProfilerResult;)I","(Lafx;)I","ProfilerResult","afx","net/minecraft/src","0" +"func_40700_a","getDisplayColor","a","()I","()I","ProfilerResult","afx","net/minecraft/src","0" +"func_35101_a","func_35101_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse3;","(Ljava/util/List;Ljava/util/Random;IIIII)Ltf;","ComponentVillageHouse3","tf","net/minecraft/src","0" +"func_6473_b","func_6473_b","d","(LEntityPlayer;)V","(Lvi;)V","PlayerController","aes","net/minecraft/src","0" +"func_722_a","sendPlaceBlock","a","(LEntityPlayer;LWorld;LItemStack;IIII)Z","(Lvi;Lry;Ldk;IIII)Z","PlayerController","aes","net/minecraft/src","0" +"func_719_a","clickBlock","b","(IIII)V","(IIII)V","PlayerController","aes","net/minecraft/src","0" +"func_6470_c","sendBlockRemoving","c","(IIII)V","(IIII)V","PlayerController","aes","net/minecraft/src","0" +"func_6468_a","resetBlockRemoving","b","()V","()V","PlayerController","aes","net/minecraft/src","0" +"func_6469_d","shouldDrawHUD","a","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_717_a","onWorldChange","a","(LWorld;)V","(Lry;)V","PlayerController","aes","net/minecraft/src","0" +"func_727_b","getBlockReachDistance","c","()F","()F","PlayerController","aes","net/minecraft/src","0" +"func_35641_g","func_35641_g","f","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_35640_h","isInCreativeMode","g","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_35636_i","extendedReach","h","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_6476_a","flipPlayer","a","(LEntityPlayer;)V","(Lvi;)V","PlayerController","aes","net/minecraft/src","0" +"func_729_b","sendBlockRemoved","a","(IIII)Z","(IIII)Z","PlayerController","aes","net/minecraft/src","0" +"func_6467_a","setPartialTime","a","(F)V","(F)V","PlayerController","aes","net/minecraft/src","0" +"func_4087_b","createPlayer","b","(LWorld;)LEntityPlayer;","(Lry;)Lvi;","PlayerController","aes","net/minecraft/src","0" +"func_6474_c","updateController","d","()V","()V","PlayerController","aes","net/minecraft/src","0" +"func_35642_f","func_35642_f","e","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_6471_a","sendUseItem","a","(LEntityPlayer;LWorld;LItemStack;)Z","(Lvi;Lry;Ldk;)Z","PlayerController","aes","net/minecraft/src","0" +"func_6475_a","interactWithEntity","b","(LEntityPlayer;LEntity;)V","(Lvi;Lia;)V","PlayerController","aes","net/minecraft/src","0" +"func_6472_b","attackEntity","a","(LEntityPlayer;LEntity;)V","(Lvi;Lia;)V","PlayerController","aes","net/minecraft/src","0" +"func_27174_a","windowClick","a","(IIIZLEntityPlayer;)LItemStack;","(IIIZLvi;)Ldk;","PlayerController","aes","net/minecraft/src","0" +"func_20086_a","func_20086_a","a","(ILEntityPlayer;)V","(ILvi;)V","PlayerController","aes","net/minecraft/src","0" +"func_40593_a","func_40593_a","a","(II)V","(II)V","PlayerController","aes","net/minecraft/src","0" +"func_35643_e","func_35643_e","i","()Z","()Z","PlayerController","aes","net/minecraft/src","0" +"func_35638_c","onStoppedUsingItem","a_","(LEntityPlayer;)V","(Lvi;)V","PlayerController","aes","net/minecraft/src","0" +"func_35637_a","func_35637_a","a","(LItemStack;I)V","(Ldk;I)V","PlayerController","aes","net/minecraft/src","0" +"func_35639_a","func_35639_a","a","(LItemStack;)V","(Ldk;)V","PlayerController","aes","net/minecraft/src","0" +"func_181_a","renderChicken","a","(LEntityChicken;DDDFF)V","(Lqh;DDDFF)V","RenderChicken","dp","net/minecraft/src","0" +"func_182_a","getWingRotation","a","(LEntityChicken;F)F","(Lqh;F)F","RenderChicken","dp","net/minecraft/src","0" +"func_40601_a","writeCapabilitiesToNBT","a","(LNBTTagCompound;)V","(Lik;)V","PlayerCapabilities","wq","net/minecraft/src","0" +"func_40600_b","readCapabilitiesFromNBT","b","(LNBTTagCompound;)V","(Lik;)V","PlayerCapabilities","wq","net/minecraft/src","0" +"func_40244_a","calculateModifier","a","(LEnchantment;I)V","(Laef;I)V","IEnchantmentModifier","fz","net/minecraft/src","0" +"func_35395_a","func_35395_a","a","()I","()I","ModelSilverfish","aaq","net/minecraft/src","0" +"func_28149_a","getTextureContents","a","(Ljava/lang/String;)[I","(Ljava/lang/String;)[I","RenderEngine","zh","net/minecraft/src","0" +"func_28148_b","getImageContentsAndAllocate","b","(Ljava/awt/image/BufferedImage;)[I","(Ljava/awt/image/BufferedImage;)[I","RenderEngine","zh","net/minecraft/src","0" +"func_28147_a","getImageContents","a","(Ljava/awt/image/BufferedImage;[I)[I","(Ljava/awt/image/BufferedImage;[I)[I","RenderEngine","zh","net/minecraft/src","0" +"func_1070_a","getTexture","b","(Ljava/lang/String;)I","(Ljava/lang/String;)I","RenderEngine","zh","net/minecraft/src","0" +"func_1069_b","unwrapImageByColumns","c","(Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;","(Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;","RenderEngine","zh","net/minecraft/src","0" +"func_1074_a","allocateAndSetupTexture","a","(Ljava/awt/image/BufferedImage;)I","(Ljava/awt/image/BufferedImage;)I","RenderEngine","zh","net/minecraft/src","0" +"func_1068_a","setupTexture","a","(Ljava/awt/image/BufferedImage;I)V","(Ljava/awt/image/BufferedImage;I)V","RenderEngine","zh","net/minecraft/src","0" +"func_28150_a","createTextureFromBytes","a","([IIII)V","([IIII)V","RenderEngine","zh","net/minecraft/src","0" +"func_1078_a","deleteTexture","a","(I)V","(I)V","RenderEngine","zh","net/minecraft/src","0" +"func_1071_a","getTextureForDownloadableImage","a","(Ljava/lang/String;Ljava/lang/String;)I","(Ljava/lang/String;Ljava/lang/String;)I","RenderEngine","zh","net/minecraft/src","0" +"func_1075_a","obtainImageData","a","(Ljava/lang/String;LImageBuffer;)LThreadDownloadImageData;","(Ljava/lang/String;Laaj;)Laap;","RenderEngine","zh","net/minecraft/src","0" +"func_1073_b","releaseImageData","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RenderEngine","zh","net/minecraft/src","0" +"func_1066_a","registerTextureFX","a","(LTextureFX;)V","(Ldt;)V","RenderEngine","zh","net/minecraft/src","0" +"func_1067_a","updateDynamicTextures","a","()V","()V","RenderEngine","zh","net/minecraft/src","0" +"func_1077_b","alphaBlend","a","(II)I","(II)I","RenderEngine","zh","net/minecraft/src","0" +"func_1065_b","refreshTextures","b","()V","()V","RenderEngine","zh","net/minecraft/src","0" +"func_6526_a","readTextureImage","a","(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;","(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;","RenderEngine","zh","net/minecraft/src","0" +"func_1076_b","bindTexture","b","(I)V","(I)V","RenderEngine","zh","net/minecraft/src","0" +"func_27343_a","formatString","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","IStatStringFormat","aal","net/minecraft/src","0" +"func_982_a","draw","a","()I","()I","Tessellator","cv","net/minecraft/src","0" +"func_985_d","reset","d","()V","()V","Tessellator","cv","net/minecraft/src","0" +"func_977_b","startDrawingQuads","b","()V","()V","Tessellator","cv","net/minecraft/src","0" +"func_992_a","startDrawing","a","(I)V","(I)V","Tessellator","cv","net/minecraft/src","0" +"func_981_a","setTextureUV","a","(DD)V","(DD)V","Tessellator","cv","net/minecraft/src","0" +"func_35835_b","setBrightness","b","(I)V","(I)V","Tessellator","cv","net/minecraft/src","0" +"func_987_a","setColorOpaque_F","a","(FFF)V","(FFF)V","Tessellator","cv","net/minecraft/src","0" +"func_986_a","setColorRGBA_F","a","(FFFF)V","(FFFF)V","Tessellator","cv","net/minecraft/src","0" +"func_979_a","setColorOpaque","a","(III)V","(III)V","Tessellator","cv","net/minecraft/src","0" +"func_978_a","setColorRGBA","a","(IIII)V","(IIII)V","Tessellator","cv","net/minecraft/src","0" +"func_983_a","addVertexWithUV","a","(DDDDD)V","(DDDDD)V","Tessellator","cv","net/minecraft/src","0" +"func_991_a","addVertex","a","(DDD)V","(DDD)V","Tessellator","cv","net/minecraft/src","0" +"func_990_b","setColorOpaque_I","c","(I)V","(I)V","Tessellator","cv","net/minecraft/src","0" +"func_6513_a","setColorRGBA_I","a","(II)V","(II)V","Tessellator","cv","net/minecraft/src","0" +"func_989_c","disableColor","c","()V","()V","Tessellator","cv","net/minecraft/src","0" +"func_980_b","setNormal","b","(FFF)V","(FFF)V","Tessellator","cv","net/minecraft/src","0" +"func_984_b","setTranslationD","b","(DDD)V","(DDD)V","Tessellator","cv","net/minecraft/src","0" +"func_988_c","setTranslationF","c","(FFF)V","(FFF)V","Tessellator","cv","net/minecraft/src","0" +"compare","compare","compare","(Ljava/lang/Object;Ljava/lang/Object;)I","(Ljava/lang/Object;Ljava/lang/Object;)I","RenderSorter","jy","net/minecraft/src","0" +"func_993_a","doCompare","a","(LWorldRenderer;LWorldRenderer;)I","(Lge;Lge;)I","RenderSorter","jy","net/minecraft/src","0" +"compareTo","compareTo","compareTo","(Ljava/lang/Object;)I","(Ljava/lang/Object;)I","ChunkCoordinates","dh","net/minecraft/src","0" +"func_22393_a","compareChunkCoordinate","a","(LChunkCoordinates;)I","(Ldh;)I","ChunkCoordinates","dh","net/minecraft/src","0" +"func_27439_a","getSqDistanceTo","a","(III)D","(III)D","ChunkCoordinates","dh","net/minecraft/src","0" +"func_35302_d","canBePlacedOn","e","(I)Z","(I)Z","BlockVine","ahl","net/minecraft/src","0" +"func_35301_h","canVineStay","g","(LWorld;III)Z","(Lry;III)Z","BlockVine","ahl","net/minecraft/src","0" +"accept","accept","accept","(Ljava/io/File;)Z","(Ljava/io/File;)Z","ChunkFolderPattern","agj","net/minecraft/src","0" +"func_27374_a","func_27374_a","a","()V","()V","AchievementList","ut","net/minecraft/src","0" +"func_25117_b","getRecipeOutput","a","()LItemStack;","()Ldk;","IRecipe","ue","net/minecraft/src","0" +"func_21135_a","matches","a","(LInventoryCrafting;)Z","(Llm;)Z","IRecipe","ue","net/minecraft/src","0" +"func_21136_b","getCraftingResult","b","(LInventoryCrafting;)LItemStack;","(Llm;)Ldk;","IRecipe","ue","net/minecraft/src","0" +"func_1184_a","getRecipeSize","b","()I","()I","IRecipe","ue","net/minecraft/src","0" +"func_27369_a","func_27369_a","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","MD5String","vz","net/minecraft/src","0" +"windowClosing","windowClosing","windowClosing","(Ljava/awt/event/WindowEvent;)V","(Ljava/awt/event/WindowEvent;)V","GameWindowListener","sj","net/minecraft/src","0" +"func_28181_a","setGrassBiomeColorizer","a","([I)V","([I)V","ColorizerGrass","ha","net/minecraft/src","0" +"func_4147_a","getGrassColor","a","(DD)I","(DD)I","ColorizerGrass","ha","net/minecraft/src","0" +"func_4059_a","generateNetherTerrain","a","(II[B)V","(II[B)V","ChunkProviderHell","jv","net/minecraft/src","0" +"func_4058_b","func_4058_b","b","(II[B)V","(II[B)V","ChunkProviderHell","jv","net/minecraft/src","0" +"func_4057_a","func_4057_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderHell","jv","net/minecraft/src","0" +"func_40446_a","func_40446_a","a","(LTileEntityEndPortal;DDDF)V","(Lyg;DDDF)V","RenderEndPortal","abi","net/minecraft/src","0" +"func_40447_a","func_40447_a","a","(FFFF)Ljava/nio/FloatBuffer;","(FFFF)Ljava/nio/FloatBuffer;","RenderEndPortal","abi","net/minecraft/src","0" +"func_27237_a","func_27237_a","a","(LJ_JsonFieldBuilder;)LJ_JsonObjectNodeBuilder;","(Laax;)Labq;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" +"func_27235_a","func_27235_a","a","()LJ_JsonRootNode;","()Lwz;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" +"func_27236_a","func_27236_a","a","(LJ_JsonObjectNodeBuilder;)Ljava/util/List;","(Labq;)Ljava/util/List;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" +"func_932_a","renderTileEntitySignAt","a","(LTileEntitySign;DDDF)V","(Lu;DDDF)V","TileEntitySignRenderer","aeu","net/minecraft/src","0" +"func_35391_d","dropChunk","d","(II)V","(II)V","ChunkProvider","jz","net/minecraft/src","0" +"func_28061_d","loadChunkFromFile","e","(II)LChunk;","(II)Lzx;","ChunkProvider","jz","net/minecraft/src","0" +"func_28063_a","unloadAndSaveChunkData","a","(LChunk;)V","(Lzx;)V","ChunkProvider","jz","net/minecraft/src","0" +"func_28062_b","unloadAndSaveChunk","b","(LChunk;)V","(Lzx;)V","ChunkProvider","jz","net/minecraft/src","0" +"values","values","values","()[LEnumEnchantmentType;","()[Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumEnchantmentType;","(Ljava/lang/String;)Lq;","EnumEnchantmentType","q","net/minecraft/src","0" +"func_40650_a","canEnchantItem","a","(LItem;)Z","(Lacy;)Z","EnumEnchantmentType","q","net/minecraft/src","0" +"func_4032_a_","tryToCreatePortal","g","(LWorld;III)Z","(Lry;III)Z","BlockPortal","sc","net/minecraft/src","0" +"func_22068_a","setText","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","GuiTextField","dv","net/minecraft/src","0" +"func_22071_a","getText","a","()Ljava/lang/String;","()Ljava/lang/String;","GuiTextField","dv","net/minecraft/src","0" +"func_22070_b","updateCursorCounter","b","()V","()V","GuiTextField","dv","net/minecraft/src","0" +"func_22072_a","textboxKeyTyped","a","(CI)V","(CI)V","GuiTextField","dv","net/minecraft/src","0" +"func_22069_a","mouseClicked","a","(III)V","(III)V","GuiTextField","dv","net/minecraft/src","0" +"func_27106_a","setFocused","a","(Z)V","(Z)V","GuiTextField","dv","net/minecraft/src","0" +"func_22067_c","drawTextBox","c","()V","()V","GuiTextField","dv","net/minecraft/src","0" +"func_22066_a","setMaxStringLength","a","(I)V","(I)V","GuiTextField","dv","net/minecraft/src","0" +"func_35648_a","setCreative","a","(Z)V","(Z)V","PlayerControllerMP","zn","net/minecraft/src","0" +"func_730_e","syncCurrentPlayItem","j","()V","()V","PlayerControllerMP","zn","net/minecraft/src","0" +"func_28043_c","setBlockBoundsForBlockRender","d","(I)V","(I)V","BlockTrapDoor","mf","net/minecraft/src","0" +"func_28042_a","onPoweredBlockChange","a","(LWorld;IIIZ)V","(Lry;IIIZ)V","BlockTrapDoor","mf","net/minecraft/src","0" +"func_28041_d","isTrapdoorOpen","e","(I)Z","(I)Z","BlockTrapDoor","mf","net/minecraft/src","0" +"func_41052_f","func_41052_f","f","(I)Z","(I)Z","BlockTrapDoor","mf","net/minecraft/src","0" +"func_27356_a","matches","a","(Ljava/lang/Object;)Z","(Ljava/lang/Object;)Z","J_JsonNodeSelector","dx","net/minecraft/src","0" +"func_27357_b","getValue","b","(Ljava/lang/Object;)Ljava/lang/Object;","(Ljava/lang/Object;)Ljava/lang/Object;","J_JsonNodeSelector","dx","net/minecraft/src","0" +"func_27355_a","with","a","(LJ_JsonNodeSelector;)LJ_JsonNodeSelector;","(Ldx;)Ldx;","J_JsonNodeSelector","dx","net/minecraft/src","0" +"func_27358_a","shortForm","a","()Ljava/lang/String;","()Ljava/lang/String;","J_JsonNodeSelector","dx","net/minecraft/src","0" +"func_28013_a","getMPMapData","a","(SLWorld;)LMapData;","(SLry;)Lkl;","ItemMap","bv","net/minecraft/src","0" +"func_28012_a","getMapData","a","(LItemStack;LWorld;)LMapData;","(Ldk;Lry;)Lkl;","ItemMap","bv","net/minecraft/src","0" +"func_28011_a","updateMapData","a","(LWorld;LEntity;LMapData;)V","(Lry;Lia;Lkl;)V","ItemMap","bv","net/minecraft/src","0" +"func_409_i","explode","g","()V","()V","EntityTNTPrimed","dd","net/minecraft/src","0" +"func_412_b","func_412_b","b","(I)V","(I)V","EntityPainting","tj","net/minecraft/src","0" +"func_411_c","func_411_c","c","(I)F","(I)F","EntityPainting","tj","net/minecraft/src","0" +"func_410_i","canStay","g","()Z","()Z","EntityPainting","tj","net/minecraft/src","0" +"func_4144_a","getSpecialRendererForClass","a","(Ljava/lang/Class;)LTileEntitySpecialRenderer;","(Ljava/lang/Class;)Ldu;","TileEntityRenderer","ah","net/minecraft/src","0" +"func_1028_a","hasSpecialRenderer","a","(LTileEntity;)Z","(Lbq;)Z","TileEntityRenderer","ah","net/minecraft/src","0" +"func_1031_b","getSpecialRendererForEntity","b","(LTileEntity;)LTileEntitySpecialRenderer;","(Lbq;)Ldu;","TileEntityRenderer","ah","net/minecraft/src","0" +"func_22267_a","cacheActiveRenderInfo","a","(LWorld;LRenderEngine;LFontRenderer;LEntityLiving;F)V","(Lry;Lzh;Labe;Lnq;F)V","TileEntityRenderer","ah","net/minecraft/src","0" +"func_40742_a","func_40742_a","a","()V","()V","TileEntityRenderer","ah","net/minecraft/src","0" +"func_1030_a","renderTileEntity","a","(LTileEntity;F)V","(Lbq;F)V","TileEntityRenderer","ah","net/minecraft/src","0" +"func_1032_a","renderTileEntityAt","a","(LTileEntity;DDDF)V","(Lbq;DDDF)V","TileEntityRenderer","ah","net/minecraft/src","0" +"func_31072_a","func_31072_a","a","(LWorld;)V","(Lry;)V","TileEntityRenderer","ah","net/minecraft/src","0" +"func_6516_a","getFontRenderer","b","()LFontRenderer;","()Labe;","TileEntityRenderer","ah","net/minecraft/src","0" +"func_284_h","setDefaultDirection","g","(LWorld;III)V","(Lry;III)V","BlockFurnace","eu","net/minecraft/src","0" +"func_285_a","updateFurnaceBlockState","a","(ZLWorld;III)V","(ZLry;III)V","BlockFurnace","eu","net/minecraft/src","0" +"func_4098_a","registerWorldChunkManager","b","()V","()V","WorldProvider","k","net/minecraft/src","0" +"func_4094_c","getChunkProvider","c","()LIChunkProvider;","()Lej;","WorldProvider","k","net/minecraft/src","0" +"func_4100_a","calculateCelestialAngle","a","(JF)F","(JF)F","WorldProvider","k","net/minecraft/src","0" +"func_4097_b","calcSunriseSunsetColors","a","(FF)[F","(FF)[F","WorldProvider","k","net/minecraft/src","0" +"func_4096_a","getFogColor","b","(FF)LVec3D;","(FF)Lfb;","WorldProvider","k","net/minecraft/src","0" +"func_28112_c","func_28112_c","f","()Z","()Z","WorldProvider","k","net/minecraft/src","0" +"func_6477_d","canRespawnHere","d","()Z","()Z","WorldProvider","k","net/minecraft/src","0" +"func_28111_d","getCloudHeight","e","()F","()F","WorldProvider","k","net/minecraft/src","0" +"func_4102_a","canCoordinateBeSpawn","a","(II)Z","(II)Z","WorldProvider","k","net/minecraft/src","0" +"func_40469_f","getEntrancePortalLocation","g","()LChunkCoordinates;","()Ldh;","WorldProvider","k","net/minecraft/src","0" +"func_4093_b","generateLightBrightnessTable","a","()V","()V","WorldProvider","k","net/minecraft/src","0" +"func_4095_a","registerWorld","a","(LWorld;)V","(Lry;)V","WorldProvider","k","net/minecraft/src","0" +"func_40470_b","func_40470_b","b","(JF)I","(JF)I","WorldProvider","k","net/minecraft/src","0" +"func_4101_a","getProviderForDimension","a","(I)LWorldProvider;","(I)Lk;","WorldProvider","k","net/minecraft/src","0" +"func_314_h","func_314_h","g","(LWorld;III)Z","(Lry;III)Z","BlockSnow","aif","net/minecraft/src","0" +"func_40212_d","func_40212_d","e","(I)Z","(I)Z","BlockEndPortalFrame","rl","net/minecraft/src","0" +"func_267_h","checkIfAttachedToBlock","g","(LWorld;III)Z","(Lry;III)Z","BlockLever","aaa","net/minecraft/src","0" +"func_40028_a","func_40028_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Lui;","ComponentNetherBridgeCrossing","ui","net/minecraft/src","0" +"func_27334_a","unread","a","(C)V","(C)V","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"func_27335_a","uncount","a","([C)V","([C)V","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"func_27333_c","read","c","()I","()I","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"func_27336_b","read","b","([C)I","([C)I","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"func_27332_a","updateCharacterAndLineCounts","a","(I)V","(I)V","J_PositionTrackingPushbackReader","ud","net/minecraft/src","0" +"func_1122_a","addRecipes","a","(LCraftingManager;)V","(Lsl;)V","RecipesTools","zq","net/minecraft/src","0" +"func_867_a","generate","a","(LIChunkProvider;LWorld;II[B)V","(Lej;Lry;II[B)V","MapGenBase","bz","net/minecraft/src","0" +"func_868_a","recursiveGenerate","a","(LWorld;IIII[B)V","(Lry;IIII[B)V","MapGenBase","bz","net/minecraft/src","0" +"func_35059_a","func_35059_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdRoomCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Ljt;","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" +"func_797_a","updatePlayerMoveState","a","(LEntityPlayer;)V","(Lvi;)V","MovementInput","agn","net/minecraft/src","0" +"func_4153_a","getRandomSpawningPointInChunk","a","(LWorld;II)LChunkPosition;","(Lry;II)Lam;","SpawnerAnimals","we","net/minecraft/src","0" +"func_4154_a","performSpawning","a","(LWorld;ZZ)I","(Lry;ZZ)I","SpawnerAnimals","we","net/minecraft/src","0" +"func_21203_a","canCreatureTypeSpawnAtLocation","a","(LEnumCreatureType;LWorld;III)Z","(Ljf;Lry;III)Z","SpawnerAnimals","we","net/minecraft/src","0" +"func_21204_a","creatureSpecificInit","a","(LEntityLiving;LWorld;FFF)V","(Lnq;Lry;FFF)V","SpawnerAnimals","we","net/minecraft/src","0" +"func_35957_a","func_35957_a","a","(LWorld;LBiomeGenBase;IIIILjava/util/Random;)V","(Lry;Lsr;IIIILjava/util/Random;)V","SpawnerAnimals","we","net/minecraft/src","0" +"func_35305_d","getPosingIdByMetadata","e","(I)Z","(I)Z","BlockSilverfish","vf","net/minecraft/src","0" +"func_35304_f","func_35304_f","f","(I)I","(I)I","BlockSilverfish","vf","net/minecraft/src","0" +"func_4041_a","func_4041_a","a","(III)LEntityDiggingFX;","(III)Lmp;","EntityDiggingFX","mp","net/minecraft/src","0" +"func_972_a","addToSendQueue","a","(LPacket;)V","(Lgt;)V","NetworkManager","hc","net/minecraft/src","0" +"func_964_b","sendPacket","d","()Z","()Z","NetworkManager","hc","net/minecraft/src","0" +"func_28139_a","wakeThreads","a","()V","()V","NetworkManager","hc","net/minecraft/src","0" +"func_973_c","readPacket","e","()Z","()Z","NetworkManager","hc","net/minecraft/src","0" +"func_970_a","onNetworkError","a","(Ljava/lang/Exception;)V","(Ljava/lang/Exception;)V","NetworkManager","hc","net/minecraft/src","0" +"func_974_a","networkShutdown","a","(Ljava/lang/String;[Ljava/lang/Object;)V","(Ljava/lang/String;[Ljava/lang/Object;)V","NetworkManager","hc","net/minecraft/src","0" +"func_967_a","processReadPackets","b","()V","()V","NetworkManager","hc","net/minecraft/src","0" +"func_28142_c","func_28142_c","c","()V","()V","NetworkManager","hc","net/minecraft/src","0" +"func_971_a","isRunning","a","(LNetworkManager;)Z","(Lhc;)Z","NetworkManager","hc","net/minecraft/src","0" +"func_968_b","isServerTerminating","b","(LNetworkManager;)Z","(Lhc;)Z","NetworkManager","hc","net/minecraft/src","0" +"func_966_c","readNetworkPacket","c","(LNetworkManager;)Z","(Lhc;)Z","NetworkManager","hc","net/minecraft/src","0" +"func_965_d","sendNetworkPacket","d","(LNetworkManager;)Z","(Lhc;)Z","NetworkManager","hc","net/minecraft/src","0" +"func_28140_f","getOutputStream","e","(LNetworkManager;)Ljava/io/DataOutputStream;","(Lhc;)Ljava/io/DataOutputStream;","NetworkManager","hc","net/minecraft/src","0" +"func_28138_e","getIsTerminating","f","(LNetworkManager;)Z","(Lhc;)Z","NetworkManager","hc","net/minecraft/src","0" +"func_30005_a","func_30005_a","a","(LNetworkManager;Ljava/lang/Exception;)V","(Lhc;Ljava/lang/Exception;)V","NetworkManager","hc","net/minecraft/src","0" +"func_969_e","getReadThread","g","(LNetworkManager;)Ljava/lang/Thread;","(Lhc;)Ljava/lang/Thread;","NetworkManager","hc","net/minecraft/src","0" +"func_963_f","getWriteThread","h","(LNetworkManager;)Ljava/lang/Thread;","(Lhc;)Ljava/lang/Thread;","NetworkManager","hc","net/minecraft/src","0" +"func_35324_p","loadServerList","p","()V","()V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35323_q","saveServerList","q","()V","()V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35337_c","initGuiControls","e","()V","()V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_4067_a","parseIntWithDefault","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35322_a","joinServer","c","(I)V","(I)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35330_a","joinServer","a","(LServerNBTStorage;)V","(Llo;)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35328_b","pollServer","b","(LServerNBTStorage;)V","(Llo;)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35325_a","func_35325_a","a","(Ljava/lang/String;II)V","(Ljava/lang/String;II)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35320_a","getServerList","a","(LGuiMultiplayer;)Ljava/util/List;","(Lxi;)Ljava/util/List;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35326_a","setSelectedServer","a","(LGuiMultiplayer;I)I","(Lxi;I)I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35333_b","getSelectedServer","b","(LGuiMultiplayer;)I","(Lxi;)I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35329_c","getButtonSelect","c","(LGuiMultiplayer;)LGuiButton;","(Lxi;)Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35334_d","getButtonEdit","d","(LGuiMultiplayer;)LGuiButton;","(Lxi;)Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35339_e","getButtonDelete","e","(LGuiMultiplayer;)LGuiButton;","(Lxi;)Lct;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35332_b","joinServer","b","(LGuiMultiplayer;I)V","(Lxi;I)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35321_g","getLock","l","()Ljava/lang/Object;","()Ljava/lang/Object;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35338_m","getThreadsPending","m","()I","()I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35331_n","incrementThreadsPending","n","()I","()I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35336_a","pollServer","a","(LGuiMultiplayer;LServerNBTStorage;)V","(Lxi;Llo;)V","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35335_o","decrementThreadsPending","o","()I","()I","GuiMultiplayer","xi","net/minecraft/src","0" +"func_35327_a","func_35327_a","a","(LGuiMultiplayer;Ljava/lang/String;)Ljava/lang/String;","(Lxi;Ljava/lang/String;)Ljava/lang/String;","GuiMultiplayer","xi","net/minecraft/src","0" +"func_40071_a","func_40071_a","a","(LMovingObjectPosition;)V","(Lgv;)V","EntityFireball","aad","net/minecraft/src","0" +"func_4074_a","getBiomeGenAtChunkCoord","a","(LChunkCoordIntPair;)LBiomeGenBase;","(Lacm;)Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_4073_a","getBiomeGenAt","a","(II)LBiomeGenBase;","(II)Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_4069_a","func_4069_a","a","(IIII)[LBiomeGenBase;","(IIII)[Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_4071_a","getTemperatures","a","([FIIII)[F","([FIIII)[F","WorldChunkManager","vh","net/minecraft/src","0" +"func_40539_b","func_40539_b","b","(IIII)[F","(IIII)[F","WorldChunkManager","vh","net/minecraft/src","0" +"func_35560_b","getRainfall","b","([FIIII)[F","([FIIII)[F","WorldChunkManager","vh","net/minecraft/src","0" +"func_35558_c","func_35558_c","b","(II)F","(II)F","WorldChunkManager","vh","net/minecraft/src","0" +"func_4070_a","loadBlockGeneratorData","a","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lsr;IIII)[Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_35555_a","func_35555_a","a","([LBiomeGenBase;IIIIZ)[LBiomeGenBase;","([Lsr;IIIIZ)[Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_35556_a","func_35556_a","a","(IIILjava/util/List;Ljava/util/Random;)LChunkPosition;","(IIILjava/util/List;Ljava/util/Random;)Lam;","WorldChunkManager","vh","net/minecraft/src","0" +"func_35562_a","areBiomesViable","a","(IIILjava/util/List;)Z","(IIILjava/util/List;)Z","WorldChunkManager","vh","net/minecraft/src","0" +"func_35559_a","getBiomesToSpawnIn","a","()Ljava/util/List;","()Ljava/util/List;","WorldChunkManager","vh","net/minecraft/src","0" +"func_35554_b","func_35554_b","a","(III)F","(III)F","WorldChunkManager","vh","net/minecraft/src","0" +"func_40540_a","func_40540_a","a","(FI)F","(FI)F","WorldChunkManager","vh","net/minecraft/src","0" +"func_35557_b","func_35557_b","b","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lsr;IIII)[Lsr;","WorldChunkManager","vh","net/minecraft/src","0" +"func_35561_b","func_35561_b","b","()V","()V","WorldChunkManager","vh","net/minecraft/src","0" +"func_35078_a","func_35078_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHall;","(Ljava/util/List;Ljava/util/Random;IIIII)Lacz;","ComponentVillageHall","acz","net/minecraft/src","0" +"func_40634_b","getEnchantmentLevel","b","(ILItemStack;)I","(ILdk;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40636_a","getMaxEnchantmentLevel","a","(I[LItemStack;)I","(I[Ldk;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40641_a","applyEnchantmentModifier","a","(LIEnchantmentModifier;LItemStack;)V","(Lfz;Ldk;)V","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40639_a","applyEnchantmentModifierArray","a","(LIEnchantmentModifier;[LItemStack;)V","(Lfz;[Ldk;)V","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40643_a","getEnchantmentModifierDamage","a","(LInventoryPlayer;LDamageSource;)I","(Lx;Lpm;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40630_a","getEnchantmentModifierLiving","a","(LInventoryPlayer;LEntityLiving;)I","(Lx;Lnq;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40645_b","getKnockbackModifier","b","(LInventoryPlayer;LEntityLiving;)I","(Lx;Lnq;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40631_c","getFireAspectModifier","c","(LInventoryPlayer;LEntityLiving;)I","(Lx;Lnq;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40632_a","getRespiration","a","(LInventoryPlayer;)I","(Lx;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40642_b","getEfficiencyModifier","b","(LInventoryPlayer;)I","(Lx;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40640_c","getUnbreakingModifier","c","(LInventoryPlayer;)I","(Lx;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40646_d","getSilkTouchModifier","d","(LInventoryPlayer;)Z","(Lx;)Z","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40638_e","getFortuneModifier","e","(LInventoryPlayer;)I","(Lx;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40637_f","getLootingModifier","f","(LInventoryPlayer;)I","(Lx;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40633_g","getAquaAffinityModifier","g","(LInventoryPlayer;)Z","(Lx;)Z","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40629_a","calcItemStackEnchantability","a","(Ljava/util/Random;IILItemStack;)I","(Ljava/util/Random;IILdk;)I","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40644_a","buildEnchantmentList","a","(Ljava/util/Random;LItemStack;I)Ljava/util/List;","(Ljava/util/Random;Ldk;I)Ljava/util/List;","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40635_a","mapEnchantmentData","a","(ILItemStack;)Ljava/util/Map;","(ILdk;)Ljava/util/Map;","EnchantmentHelper","ml","net/minecraft/src","0" +"func_40492_a","getMinEnchantability","a","(I)I","(I)I","Enchantment","aef","net/minecraft/src","0" +"func_40489_b","getMaxEnchantability","b","(I)I","(I)I","Enchantment","aef","net/minecraft/src","0" +"func_40491_a","getMaxLevel","a","()I","()I","Enchantment","aef","net/minecraft/src","0" +"func_40496_a","canApplyTogether","a","(LEnchantment;)Z","(Laef;)Z","Enchantment","aef","net/minecraft/src","0" +"func_40497_a","calcModifierDamage","a","(ILDamageSource;)I","(ILpm;)I","Enchantment","aef","net/minecraft/src","0" +"func_40488_d","getName","b","()Ljava/lang/String;","()Ljava/lang/String;","Enchantment","aef","net/minecraft/src","0" +"func_40490_a","calcModifierLiving","a","(ILEntityLiving;)I","(ILnq;)I","Enchantment","aef","net/minecraft/src","0" +"func_40495_b","getWeight","c","()I","()I","Enchantment","aef","net/minecraft/src","0" +"func_40493_c","getMinLevel","d","()I","()I","Enchantment","aef","net/minecraft/src","0" +"func_40494_a","setName","a","(Ljava/lang/String;)LEnchantment;","(Ljava/lang/String;)Laef;","Enchantment","aef","net/minecraft/src","0" +"func_40487_c","getTranslatedName","c","(I)Ljava/lang/String;","(I)Ljava/lang/String;","Enchantment","aef","net/minecraft/src","0" +"func_40485_b","func_40485_b","b","()Ljava/util/List;","()Ljava/util/List;","MapGenNetherBridge","ed","net/minecraft/src","0" +"func_930_a","renderTileEntityAt","a","(LTileEntity;DDDF)V","(Lbq;DDDF)V","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"func_31069_a","func_31069_a","a","(LWorld;)V","(Lry;)V","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"func_6507_a","bindTextureByName","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"func_928_a","setTileEntityRenderer","a","(LTileEntityRenderer;)V","(Lah;)V","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"func_6508_a","getFontRenderer","a","()LFontRenderer;","()Labe;","TileEntitySpecialRenderer","du","net/minecraft/src","0" +"func_21032_h","setDispenserDefaultDirection","g","(LWorld;III)V","(Lry;III)V","BlockDispenser","cu","net/minecraft/src","0" +"func_21033_c","dispenseItem","c","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","BlockDispenser","cu","net/minecraft/src","0" +"values","values","values","()[LEnumRarity;","()[Lja;","EnumRarity","ja","net/minecraft/src","0" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumRarity;","(Ljava/lang/String;)Lja;","EnumRarity","ja","net/minecraft/src","0" +"func_35299_s","func_35299_s","j","()I","()I","BlockPane","uh","net/minecraft/src","0" +"func_35298_d","func_35298_d","e","(I)Z","(I)Z","BlockPane","uh","net/minecraft/src","0" +"func_184_a","updateCreeperScale","a","(LEntityCreeper;F)V","(Labh;F)V","RenderCreeper","hb","net/minecraft/src","0" +"func_183_a","updateCreeperColorMultiplier","a","(LEntityCreeper;FF)I","(Labh;FF)I","RenderCreeper","hb","net/minecraft/src","0" +"func_27006_a","func_27006_a","a","(LEntityCreeper;IF)I","(Labh;IF)I","RenderCreeper","hb","net/minecraft/src","0" +"func_27007_b","func_27007_b","b","(LEntityCreeper;IF)I","(Labh;IF)I","RenderCreeper","hb","net/minecraft/src","0" +"func_176_a","setWoolColorAndRender","a","(LEntitySheep;IF)I","(Lhm;IF)I","RenderSheep","ahr","net/minecraft/src","0" +"func_40271_a","func_40271_a","a","(LEntitySheep;DDDFF)V","(Lhm;DDDFF)V","RenderSheep","ahr","net/minecraft/src","0" +"equals","equals","equals","(Ljava/lang/Object;)Z","(Ljava/lang/Object;)Z","IntHashMapEntry","aei","net/minecraft/src","0" +"hashCode","hashCode","hashCode","()I","()I","IntHashMapEntry","aei","net/minecraft/src","0" +"toString","toString","toString","()Ljava/lang/String;","()Ljava/lang/String;","IntHashMapEntry","aei","net/minecraft/src","0" +"func_768_a","getHash","a","()I","()I","IntHashMapEntry","aei","net/minecraft/src","0" +"func_767_b","getValue","b","()Ljava/lang/Object;","()Ljava/lang/Object;","IntHashMapEntry","aei","net/minecraft/src","0" +"func_1055_e","computeHash","g","(I)I","(I)I","IntHashMap","ob","net/minecraft/src","0" +"func_1062_a","getSlotIndex","a","(II)I","(II)I","IntHashMap","ob","net/minecraft/src","0" +"func_1057_a","lookup","a","(I)Ljava/lang/Object;","(I)Ljava/lang/Object;","IntHashMap","ob","net/minecraft/src","0" +"func_35858_b","containsKey","b","(I)Z","(I)Z","IntHashMap","ob","net/minecraft/src","0" +"func_35859_c","lookupEntry","c","(I)LIntHashMapEntry;","(I)Laei;","IntHashMap","ob","net/minecraft/src","0" +"func_1061_a","addKey","a","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","IntHashMap","ob","net/minecraft/src","0" +"func_1060_f","grow","h","(I)V","(I)V","IntHashMap","ob","net/minecraft/src","0" +"func_1059_a","copyTo","a","([LIntHashMapEntry;)V","([Laei;)V","IntHashMap","ob","net/minecraft/src","0" +"func_1052_b","removeObject","d","(I)Ljava/lang/Object;","(I)Ljava/lang/Object;","IntHashMap","ob","net/minecraft/src","0" +"func_1054_c","removeEntry","e","(I)LIntHashMapEntry;","(I)Laei;","IntHashMap","ob","net/minecraft/src","0" +"func_1058_a","clearMap","a","()V","()V","IntHashMap","ob","net/minecraft/src","0" +"func_1053_a","insert","a","(IILjava/lang/Object;I)V","(IILjava/lang/Object;I)V","IntHashMap","ob","net/minecraft/src","0" +"func_35860_b","getKeySet","b","()Ljava/util/Set;","()Ljava/util/Set;","IntHashMap","ob","net/minecraft/src","0" +"func_1056_d","getHash","f","(I)I","(I)I","IntHashMap","ob","net/minecraft/src","0" +"func_771_a","getNibble","a","(III)I","(III)I","NibbleArray","up","net/minecraft/src","0" +"func_770_a","setNibble","a","(IIII)V","(IIII)V","NibbleArray","up","net/minecraft/src","0" +"func_769_a","isValid","a","()Z","()Z","NibbleArray","up","net/minecraft/src","0" +"func_41015_b","setDamageTaken","b","(I)V","(I)V","EntityBoat","no","net/minecraft/src","0" +"func_41020_g","getDamageTaken","g","()I","()I","EntityBoat","no","net/minecraft/src","0" +"func_41019_c","setTimeSinceHit","c","(I)V","(I)V","EntityBoat","no","net/minecraft/src","0" +"func_41018_h","getTimeSinceHit","h","()I","()I","EntityBoat","no","net/minecraft/src","0" +"func_41017_d","setForwardDirection","d","(I)V","(I)V","EntityBoat","no","net/minecraft/src","0" +"func_41016_i","getForwardDirection","i","()I","()I","EntityBoat","no","net/minecraft/src","0" +"func_242_c","renderAsNormalBlock","b","()Z","()Z","Block","yy","net/minecraft/src","0" +"func_243_a","canPlaceBlockAt","c","(LWorld;III)Z","(Lry;III)Z","Block","yy","net/minecraft/src","0" +"func_223_g","canBlockStay","e","(LWorld;III)Z","(Lry;III)Z","Block","yy","net/minecraft/src","0" +"func_208_a","updateTick","a","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","Block","yy","net/minecraft/src","0" +"func_232_a","getBlockTextureFromSideAndMetadata","a","(II)I","(II)I","Block","yy","net/minecraft/src","0" +"func_260_c","shouldSideBeRendered","a_","(LIBlockAccess;IIII)Z","(Lkq;IIII)Z","Block","yy","net/minecraft/src","0" +"func_210_f","getRenderType","c","()I","()I","Block","yy","net/minecraft/src","0" +"func_218_a","getBlockTextureFromSide","b","(I)I","(I)I","Block","yy","net/minecraft/src","0" +"func_228_c","isIndirectlyPoweringTo","c","(LWorld;IIII)Z","(Lry;IIII)Z","Block","yy","net/minecraft/src","0" +"func_231_b","isPoweringTo","b","(LIBlockAccess;IIII)Z","(Lkq;IIII)Z","Block","yy","net/minecraft/src","0" +"func_226_a","onNeighborBlockChange","a","(LWorld;IIII)V","(Lry;IIII)V","Block","yy","net/minecraft/src","0" +"func_250_a","blockActivated","a","(LWorld;IIILEntityPlayer;)Z","(Lry;IIILvi;)Z","Block","yy","net/minecraft/src","0" +"func_209_d","canProvidePower","g","()Z","()Z","Block","yy","net/minecraft/src","0" +"func_4026_a","onBlockPlacedBy","a","(LWorld;IIILEntityLiving;)V","(Lry;IIILnq;)V","Block","yy","net/minecraft/src","0" +"func_235_e","onBlockAdded","a","(LWorld;III)V","(Lry;III)V","Block","yy","net/minecraft/src","0" +"func_252_b","onBlockDestroyedByPlayer","e","(LWorld;IIII)V","(Lry;IIII)V","Block","yy","net/minecraft/src","0" +"func_217_b","isOpaqueCube","a","()Z","()Z","Block","yy","net/minecraft/src","0" +"func_240_a","idDropped","a","(ILjava/util/Random;I)I","(ILjava/util/Random;I)I","Block","yy","net/minecraft/src","0" +"func_247_b","randomDisplayTick","b","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","Block","yy","net/minecraft/src","0" +"func_35274_i","getBlockColor","f","()I","()I","Block","yy","net/minecraft/src","0" +"func_31030_b","getRenderColor","c","(I)I","(I)I","Block","yy","net/minecraft/src","0" +"func_207_d","colorMultiplier","a","(LIBlockAccess;III)I","(Lkq;III)I","Block","yy","net/minecraft/src","0" +"func_40198_a","func_40198_a","a","(ILjava/util/Random;)I","(ILjava/util/Random;)I","Block","yy","net/minecraft/src","0" +"func_220_a_","harvestBlock","a","(LWorld;LEntityPlayer;IIII)V","(Lry;Lvi;IIII)V","Block","yy","net/minecraft/src","0" +"func_229_a","quantityDropped","a","(Ljava/util/Random;)I","(Ljava/util/Random;)I","Block","yy","net/minecraft/src","0" +"func_4027_c","onBlockDestroyedByExplosion","i","(LWorld;III)V","(Lry;III)V","Block","yy","net/minecraft/src","0" +"func_233_b","onBlockClicked","b","(LWorld;IIILEntityPlayer;)V","(Lry;IIILvi;)V","Block","yy","net/minecraft/src","0" +"func_41049_c_","func_41049_c_","c_","(I)LItemStack;","(I)Ldk;","Block","yy","net/minecraft/src","0" +"func_221_d","getCollisionBoundingBoxFromPool","b","(LWorld;III)LAxisAlignedBB;","(Lry;III)Lc;","Block","yy","net/minecraft/src","0" +"func_238_a","setBlockBoundsBasedOnState","b","(LIBlockAccess;III)V","(Lkq;III)V","Block","yy","net/minecraft/src","0" +"func_214_b","onBlockRemoval","d","(LWorld;III)V","(Lry;III)V","Block","yy","net/minecraft/src","0" +"func_21025_b","damageDropped","a","(I)I","(I)I","Block","yy","net/minecraft/src","0" +"func_254_a","onEntityWalking","b","(LWorld;IIILEntity;)V","(Lry;IIILia;)V","Block","yy","net/minecraft/src","0" +"func_21024_a","powerBlock","a","(LWorld;IIIII)V","(Lry;IIIII)V","Block","yy","net/minecraft/src","0" +"func_211_a","getBlockTexture","a","(LIBlockAccess;IIII)I","(Lkq;IIII)I","Block","yy","net/minecraft/src","0" +"func_246_f","getSelectedBoundingBoxFromPool","c_","(LWorld;III)LAxisAlignedBB;","(Lry;III)Lc;","Block","yy","net/minecraft/src","0" +"func_236_b","onEntityCollidedWithBlock","a","(LWorld;IIILEntity;)V","(Lry;IIILia;)V","Block","yy","net/minecraft/src","0" +"func_234_g","getRenderBlockPass","h","()I","()I","Block","yy","net/minecraft/src","0" +"func_31029_h","getMobilityFlag","i","()I","()I","Block","yy","net/minecraft/src","0" +"func_4025_d","tickRate","d","()I","()I","Block","yy","net/minecraft/src","0" +"func_237_e","setBlockBoundsForItemRender","e","()V","()V","Block","yy","net/minecraft/src","0" +"func_224_a","canCollideCheck","a","(IZ)Z","(IZ)Z","Block","yy","net/minecraft/src","0" +"func_28029_d","getIsBlockSolid","e","(LIBlockAccess;IIII)Z","(Lkq;IIII)Z","Block","yy","net/minecraft/src","0" +"func_257_a","velocityToAddToEntity","a","(LWorld;IIILEntity;LVec3D;)V","(Lry;IIILia;Lfb;)V","Block","yy","net/minecraft/src","0" +"func_35275_c","getMixedBrightnessForBlock","e","(LIBlockAccess;III)I","(Lkq;III)I","Block","yy","net/minecraft/src","0" +"func_241_c","getBlockBrightness","d","(LIBlockAccess;III)F","(Lkq;III)F","Block","yy","net/minecraft/src","0" +"func_216_a","dropBlockAsItemWithChance","a","(LWorld;IIIIFI)V","(Lry;IIIIFI)V","Block","yy","net/minecraft/src","0" +"func_255_a","collisionRayTrace","a","(LWorld;IIILVec3D;LVec3D;)LMovingObjectPosition;","(Lry;IIILfb;Lfb;)Lgv;","Block","yy","net/minecraft/src","0" +"func_28030_e","canPlaceBlockOnSide","d","(LWorld;IIII)Z","(Lry;IIII)Z","Block","yy","net/minecraft/src","0" +"func_230_a","getCollidingBoundingBoxes","a","(LWorld;IIILAxisAlignedBB;Ljava/util/ArrayList;)V","(Lry;IIILc;Ljava/util/ArrayList;)V","Block","yy","net/minecraft/src","0" +"func_258_d","onBlockPlaced","b","(LWorld;IIII)V","(Lry;IIII)V","Block","yy","net/minecraft/src","0" +"func_227_a","getExplosionResistance","a","(LEntity;)F","(Lia;)F","Block","yy","net/minecraft/src","0" +"func_245_h","isCollidable","k","()Z","()Z","Block","yy","net/minecraft/src","0" +"func_28028_i","initializeBlock","x_","()V","()V","Block","yy","net/minecraft/src","0" +"func_28031_n","setRequiresSelfNotify","l","()LBlock;","()Lyy;","Block","yy","net/minecraft/src","0" +"func_4024_a","setStepSound","a","(LStepSound;)LBlock;","(Lwu;)Lyy;","Block","yy","net/minecraft/src","0" +"func_256_d","setLightOpacity","h","(I)LBlock;","(I)Lyy;","Block","yy","net/minecraft/src","0" +"func_215_a","setLightValue","a","(F)LBlock;","(F)Lyy;","Block","yy","net/minecraft/src","0" +"func_219_b","setResistance","b","(F)LBlock;","(F)Lyy;","Block","yy","net/minecraft/src","0" +"func_222_c","setHardness","c","(F)LBlock;","(F)Lyy;","Block","yy","net/minecraft/src","0" +"func_31028_l","setBlockUnbreakable","m","()LBlock;","()Lyy;","Block","yy","net/minecraft/src","0" +"func_31031_m","getHardness","n","()F","()F","Block","yy","net/minecraft/src","0" +"func_253_b","setTickOnLoad","b","(Z)LBlock;","(Z)Lyy;","Block","yy","net/minecraft/src","0" +"func_213_a","setBlockBounds","a","(FFFFFF)V","(FFFFFF)V","Block","yy","net/minecraft/src","0" +"func_225_a","blockStrength","a","(LEntityPlayer;)F","(Lvi;)F","Block","yy","net/minecraft/src","0" +"func_259_b_","dropBlockAsItem","b","(LWorld;IIIII)V","(Lry;IIIII)V","Block","yy","net/minecraft/src","0" +"func_31027_a","dropBlockAsItem_do","a","(LWorld;IIILItemStack;)V","(Lry;IIILdk;)V","Block","yy","net/minecraft/src","0" +"func_244_a","isVecInsideYZBounds","a","(LVec3D;)Z","(Lfb;)Z","Block","yy","net/minecraft/src","0" +"func_249_b","isVecInsideXZBounds","b","(LVec3D;)Z","(Lfb;)Z","Block","yy","net/minecraft/src","0" +"func_251_c","isVecInsideXYBounds","c","(LVec3D;)Z","(Lfb;)Z","Block","yy","net/minecraft/src","0" +"func_20012_a","setBlockName","a","(Ljava/lang/String;)LBlock;","(Ljava/lang/String;)Lyy;","Block","yy","net/minecraft/src","0" +"func_25016_i","translateBlockName","o","()Ljava/lang/String;","()Ljava/lang/String;","Block","yy","net/minecraft/src","0" +"func_20013_i","getBlockName","p","()Ljava/lang/String;","()Ljava/lang/String;","Block","yy","net/minecraft/src","0" +"func_27033_k","getEnableStats","q","()Z","()Z","Block","yy","net/minecraft/src","0" +"func_27032_l","disableStats","r","()LBlock;","()Lyy;","Block","yy","net/minecraft/src","0" +"func_35276_e","getAmbientOcclusionLightValue","f","(LIBlockAccess;III)F","(Lkq;III)F","Block","yy","net/minecraft/src","0" +"func_558_a","getHoverState","a","(Z)I","(Z)I","GuiButton","ct","net/minecraft/src","0" +"func_560_b","mouseDragged","b","(LMinecraft;II)V","(Lnet/minecraft/client/Minecraft;II)V","GuiButton","ct","net/minecraft/src","0" +"func_562_c","mousePressed","c","(LMinecraft;II)Z","(Lnet/minecraft/client/Minecraft;II)Z","GuiButton","ct","net/minecraft/src","0" +"func_559_a","mouseReleased","a","(II)V","(II)V","GuiButton","ct","net/minecraft/src","0" +"func_561_a","drawButton","a","(LMinecraft;II)V","(Lnet/minecraft/client/Minecraft;II)V","GuiButton","ct","net/minecraft/src","0" +"func_35568_g","getHashedKey","g","(J)I","(J)I","LongHashMap","wv","net/minecraft/src","0" +"func_35571_a","hash","a","(I)I","(I)I","LongHashMap","wv","net/minecraft/src","0" +"func_35573_a","getHashIndex","a","(II)I","(II)I","LongHashMap","wv","net/minecraft/src","0" +"func_35576_a","getNumHashElements","a","()I","()I","LongHashMap","wv","net/minecraft/src","0" +"func_35578_a","getValueByKey","a","(J)Ljava/lang/Object;","(J)Ljava/lang/Object;","LongHashMap","wv","net/minecraft/src","0" +"func_35575_b","func_35575_b","b","(J)Z","(J)Z","LongHashMap","wv","net/minecraft/src","0" +"func_35569_c","func_35569_c","c","(J)LLongHashMapEntry;","(J)Lahc;","LongHashMap","wv","net/minecraft/src","0" +"func_35577_a","add","a","(JLjava/lang/Object;)V","(JLjava/lang/Object;)V","LongHashMap","wv","net/minecraft/src","0" +"func_35567_b","resizeTable","b","(I)V","(I)V","LongHashMap","wv","net/minecraft/src","0" +"func_35579_a","copyHashTableTo","a","([LLongHashMapEntry;)V","([Lahc;)V","LongHashMap","wv","net/minecraft/src","0" +"func_35574_d","remove","d","(J)Ljava/lang/Object;","(J)Ljava/lang/Object;","LongHashMap","wv","net/minecraft/src","0" +"func_35572_e","removeKey","e","(J)LLongHashMapEntry;","(J)Lahc;","LongHashMap","wv","net/minecraft/src","0" +"func_35570_a","createKey","a","(IJLjava/lang/Object;I)V","(IJLjava/lang/Object;I)V","LongHashMap","wv","net/minecraft/src","0" +"func_35566_f","getHashCode","f","(J)I","(J)I","LongHashMap","wv","net/minecraft/src","0" +"func_21047_b","getMetadata","c","()Ljava/util/List;","()Ljava/util/List;","Packet40EntityMetadata","se","net/minecraft/src","0" +"func_40249_a","func_40249_a","a","()Ljava/lang/String;","()Ljava/lang/String;","EnchantmentNameParts","ea","net/minecraft/src","0" +"func_40250_a","func_40250_a","a","(J)V","(J)V","EnchantmentNameParts","ea","net/minecraft/src","0" +"func_40039_a","func_40039_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor4;","(Ljava/util/List;Ljava/util/Random;IIIII)Lacs;","ComponentNetherBridgeCorridor4","acs","net/minecraft/src","0" +"func_40041_a","func_40041_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor2;","(Ljava/util/List;Ljava/util/Random;IIIII)Llu;","ComponentNetherBridgeCorridor2","lu","net/minecraft/src","0" +"func_40151_ac","func_40151_ac","ax","()Z","()Z","EntityBlaze","qf","net/minecraft/src","0" +"func_40150_a","func_40150_a","b","(Z)V","(Z)V","EntityBlaze","qf","net/minecraft/src","0" +"func_28169_a","func_28169_a","a","(LEntityPlayer;LItemStack;)V","(Lvi;Ldk;)V","MapData","kl","net/minecraft/src","0" +"func_28170_a","func_28170_a","a","(III)V","(III)V","MapData","kl","net/minecraft/src","0" +"func_28171_a","func_28171_a","a","([B)V","([B)V","MapData","kl","net/minecraft/src","0" +"func_27072_a","func_27072_a","a","(LJ_JsonNode;)Z","(Lan;)Z","J_JsonStringNodeSelector","ji","net/minecraft/src","0" +"func_27073_b","func_27073_b","b","(LJ_JsonNode;)Ljava/lang/String;","(Lan;)Ljava/lang/String;","J_JsonStringNodeSelector","ji","net/minecraft/src","0" +"func_269_b","canThisPlantGrowOnThisBlockID","d","(I)Z","(I)Z","BlockFlower","wg","net/minecraft/src","0" +"func_268_h","checkFlowerChange","h","(LWorld;III)V","(Lry;III)V","BlockFlower","wg","net/minecraft/src","0" +"func_20162_a","getInstance","a","()LStringTranslate;","()Lqp;","StringTranslate","qp","net/minecraft/src","0" +"func_20163_a","translateKey","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StringTranslate","qp","net/minecraft/src","0" +"func_20160_a","translateKeyFormat","a","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","StringTranslate","qp","net/minecraft/src","0" +"func_20161_b","translateNamedKey","b","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StringTranslate","qp","net/minecraft/src","0" +"func_20102_a","getKeyBindingDescription","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"func_1047_d","getOptionDisplayString","b","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"func_41085_c","func_41085_c","c","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"func_1042_a","setKeyBinding","a","(II)V","(II)V","GameSettings","ki","net/minecraft/src","0" +"func_1048_a","setOptionFloatValue","a","(LEnumOptions;F)V","(Llp;F)V","GameSettings","ki","net/minecraft/src","0" +"func_1045_b","setOptionValue","a","(LEnumOptions;I)V","(Llp;I)V","GameSettings","ki","net/minecraft/src","0" +"func_20104_a","getOptionFloatValue","a","(LEnumOptions;)F","(Llp;)F","GameSettings","ki","net/minecraft/src","0" +"func_20103_b","getOptionOrdinalValue","b","(LEnumOptions;)Z","(Llp;)Z","GameSettings","ki","net/minecraft/src","0" +"func_1043_a","getKeyBinding","c","(LEnumOptions;)Ljava/lang/String;","(Llp;)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"func_6519_a","loadOptions","a","()V","()V","GameSettings","ki","net/minecraft/src","0" +"func_1050_a","parseFloat","a","(Ljava/lang/String;)F","(Ljava/lang/String;)F","GameSettings","ki","net/minecraft/src","0" +"func_1041_b","saveOptions","b","()V","()V","GameSettings","ki","net/minecraft/src","0" +"func_40444_c","shouldRenderClouds","c","()Z","()Z","GameSettings","ki","net/minecraft/src","0" +"func_344_a","isBoxInFrustum","a","(DDDDDD)Z","(DDDDDD)Z","Frustrum","ev","net/minecraft/src","0" +"func_4014_a","func_4014_a","a","(LEntityGhast;F)V","(Lis;F)V","RenderGhast","im","net/minecraft/src","0" +"func_28163_a","readFromNBT","a","(LNBTTagCompound;)V","(Lik;)V","WorldSavedData","afz","net/minecraft/src","0" +"func_28162_b","writeToNBT","b","(LNBTTagCompound;)V","(Lik;)V","WorldSavedData","afz","net/minecraft/src","0" +"func_28164_a","markDirty","a","()V","()V","WorldSavedData","afz","net/minecraft/src","0" +"func_28165_a","setDirty","a","(Z)V","(Z)V","WorldSavedData","afz","net/minecraft/src","0" +"func_28166_b","isDirty","b","()Z","()Z","WorldSavedData","afz","net/minecraft/src","0" +"func_35771_a","addStats","a","(IF)V","(IF)V","FoodStats","eq","net/minecraft/src","0" +"func_35761_a","addStatsFrom","a","(LItemFood;)V","(Lagu;)V","FoodStats","eq","net/minecraft/src","0" +"func_35768_a","onUpdate","a","(LEntityPlayer;)V","(Lvi;)V","FoodStats","eq","net/minecraft/src","0" +"func_35766_a","readStatsFromNBT","a","(LNBTTagCompound;)V","(Lik;)V","FoodStats","eq","net/minecraft/src","0" +"func_35763_b","writeStatsToNBT","b","(LNBTTagCompound;)V","(Lik;)V","FoodStats","eq","net/minecraft/src","0" +"func_35765_a","getFoodLevel","a","()I","()I","FoodStats","eq","net/minecraft/src","0" +"func_35769_b","getPrevFoodLevel","b","()I","()I","FoodStats","eq","net/minecraft/src","0" +"func_35770_c","needFood","c","()Z","()Z","FoodStats","eq","net/minecraft/src","0" +"func_35762_a","addExhaustion","a","(F)V","(F)V","FoodStats","eq","net/minecraft/src","0" +"func_35760_d","getFoodSaturationLevel","d","()F","()F","FoodStats","eq","net/minecraft/src","0" +"func_35764_a","setFoodLevel","a","(I)V","(I)V","FoodStats","eq","net/minecraft/src","0" +"func_35767_b","setFoodSaturationLevel","b","(F)V","(F)V","FoodStats","eq","net/minecraft/src","0" +"func_27195_b","startDocument","b","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27204_c","endDocument","c","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27200_d","startArray","d","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27197_e","endArray","e","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27194_f","startObject","f","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27203_g","endObject","g","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27205_a","startField","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","J_JsonListener","yc","net/minecraft/src","0" +"func_27199_h","endField","h","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27201_b","numberValue","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","J_JsonListener","yc","net/minecraft/src","0" +"func_27196_i","trueValue","i","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27198_c","stringValue","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","J_JsonListener","yc","net/minecraft/src","0" +"func_27193_j","falseValue","j","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_27202_k","nullValue","k","()V","()V","J_JsonListener","yc","net/minecraft/src","0" +"func_35706_a","selectBlocks","a","(Ljava/util/Random;IIIZ)V","(Ljava/util/Random;IIIZ)V","StructurePieceBlockSelector","ox","net/minecraft/src","0" +"func_35707_a","getSelectedBlockId","a","()I","()I","StructurePieceBlockSelector","ox","net/minecraft/src","0" +"func_35708_b","getSelectedBlockMetaData","b","()I","()I","StructurePieceBlockSelector","ox","net/minecraft/src","0" +"func_40449_a","func_40449_a","a","(LTileEntityEnchantmentTable;DDDF)V","(Lrq;DDDF)V","RenderEnchantmentTable","wn","net/minecraft/src","0" +"func_870_a","generateLargeCaveNode","a","(JII[BDDD)V","(JII[BDDD)V","MapGenCaves","ln","net/minecraft/src","0" +"func_869_a","generateCaveNode","a","(JII[BDDDFFFIID)V","(JII[BDDDFFFIID)V","MapGenCaves","ln","net/minecraft/src","0" +"func_1080_a","addMapping","a","(Ljava/lang/Class;Ljava/lang/String;I)V","(Ljava/lang/Class;Ljava/lang/String;I)V","EntityList","afw","net/minecraft/src","0" +"func_1079_a","createEntityInWorld","a","(Ljava/lang/String;LWorld;)LEntity;","(Ljava/lang/String;Lry;)Lia;","EntityList","afw","net/minecraft/src","0" +"func_1081_a","createEntityFromNBT","a","(LNBTTagCompound;LWorld;)LEntity;","(Lik;Lry;)Lia;","EntityList","afw","net/minecraft/src","0" +"func_1084_a","createEntity","a","(ILWorld;)LEntity;","(ILry;)Lia;","EntityList","afw","net/minecraft/src","0" +"func_1082_a","getEntityID","a","(LEntity;)I","(Lia;)I","EntityList","afw","net/minecraft/src","0" +"func_1083_b","getEntityString","b","(LEntity;)Ljava/lang/String;","(Lia;)Ljava/lang/String;","EntityList","afw","net/minecraft/src","0" +"func_31052_a_","func_31052_a_","e","(I)V","(I)V","BlockPistonExtension","acu","net/minecraft/src","0" +"func_31051_a","func_31051_a","s","()V","()V","BlockPistonExtension","acu","net/minecraft/src","0" +"func_31050_c","func_31050_c","f","(I)I","(I)I","BlockPistonExtension","acu","net/minecraft/src","0" +"func_40380_a","func_40380_a","a","(II[B[LBiomeGenBase;)V","(II[B[Lsr;)V","ChunkProviderEnd","a","net/minecraft/src","0" +"func_40381_b","func_40381_b","b","(II[B[LBiomeGenBase;)V","(II[B[Lsr;)V","ChunkProviderEnd","a","net/minecraft/src","0" +"func_40379_a","func_40379_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderEnd","a","net/minecraft/src","0" +"func_40273_a","func_40273_a","a","(LEntityMooshroom;DDDFF)V","(Ltb;DDDFF)V","RenderMooshroom","la","net/minecraft/src","0" +"func_40272_a","func_40272_a","a","(LEntityMooshroom;F)V","(Ltb;F)V","RenderMooshroom","la","net/minecraft/src","0" +"func_35027_a","func_35027_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentMineshaftStairs","ra","net/minecraft/src","0" +"func_27070_a","func_27070_a","a","(LJ_JsonNode;)Z","(Lan;)Z","J_JsonObjectNodeSelector","agz","net/minecraft/src","0" +"func_27071_b","func_27071_b","b","(LJ_JsonNode;)Ljava/util/Map;","(Lan;)Ljava/util/Map;","J_JsonObjectNodeSelector","agz","net/minecraft/src","0" +"func_28182_a","getWaterBiomeColorizer","a","([I)V","([I)V","ColorizerWater","ya","net/minecraft/src","0" +"func_35105_a","getWorldChunkMngr","d","()LWorldChunkManager;","()Lvh;","ComponentVillageStartPiece","yp","net/minecraft/src","0" +"func_35055_a","func_35055_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLibrary;","(Ljava/util/List;Ljava/util/Random;IIIII)Lzc;","ComponentStrongholdLibrary","zc","net/minecraft/src","0" +"func_4060_a","generateTerrain","a","(II[B)V","(II[B)V","ChunkProviderGenerate","xj","net/minecraft/src","0" +"func_4062_a","replaceBlocksForBiome","a","(II[B[LBiomeGenBase;)V","(II[B[Lsr;)V","ChunkProviderGenerate","xj","net/minecraft/src","0" +"func_4061_a","initializeNoiseField","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderGenerate","xj","net/minecraft/src","0" +"func_187_a","setArmorModel","a","(LEntityPlayer;IF)I","(Lvi;IF)I","RenderPlayer","zr","net/minecraft/src","0" +"func_188_a","renderPlayer","a","(LEntityPlayer;DDDFF)V","(Lvi;DDDFF)V","RenderPlayer","zr","net/minecraft/src","0" +"func_22015_a","renderName","a","(LEntityPlayer;DDD)V","(Lvi;DDD)V","RenderPlayer","zr","net/minecraft/src","0" +"func_4015_a","renderSpecials","a","(LEntityPlayer;F)V","(Lvi;F)V","RenderPlayer","zr","net/minecraft/src","0" +"func_186_b","renderPlayerScale","b","(LEntityPlayer;F)V","(Lvi;F)V","RenderPlayer","zr","net/minecraft/src","0" +"func_185_b","drawFirstPersonHand","b","()V","()V","RenderPlayer","zr","net/minecraft/src","0" +"func_22016_b","renderPlayerSleep","b","(LEntityPlayer;DDD)V","(Lvi;DDD)V","RenderPlayer","zr","net/minecraft/src","0" +"func_22017_a","rotatePlayer","a","(LEntityPlayer;FFF)V","(Lvi;FFF)V","RenderPlayer","zr","net/minecraft/src","0" +"func_582_a","setNetClientHandler","a","(LGuiConnecting;LNetClientHandler;)LNetClientHandler;","(Lri;Labp;)Labp;","GuiConnecting","ri","net/minecraft/src","0" +"func_581_a","isCancelled","a","(LGuiConnecting;)Z","(Lri;)Z","GuiConnecting","ri","net/minecraft/src","0" +"func_583_b","getNetClientHandler","b","(LGuiConnecting;)LNetClientHandler;","(Lri;)Labp;","GuiConnecting","ri","net/minecraft/src","0" +"init","init","init","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"func_6233_a","startMainThread","a","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"start","start","start","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"stop","stop","stop","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"destroy","destroy","destroy","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"func_6232_b","shutdown","b","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"func_6231_c","clearApplet","c","()V","()V","MinecraftApplet","MinecraftApplet","net/minecraft/client","0" +"run","run","run","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_4007_a","displayUnexpectedThrowable","a","(LUnexpectedThrowable;)V","(Loq;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_28003_b","onMinecraftCrash","b","(LUnexpectedThrowable;)V","(Loq;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6258_a","setServer","a","(Ljava/lang/String;I)V","(Ljava/lang/String;I)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6271_a","startGame","a","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6257_q","loadScreen","v","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6274_a","scaledTessellator","a","(IIIIII)V","(IIIIII)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6240_b","getMinecraftDir","b","()Ljava/io/File;","()Ljava/io/File;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6264_a","getAppDir","a","(Ljava/lang/String;)Ljava/io/File;","(Ljava/lang/String;)Ljava/io/File;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6267_r","getOs","w","()LEnumOS2;","()Lqe;","Minecraft","Minecraft","net/minecraft/client","0" +"func_22004_c","getSaveLoader","c","()LISaveFormat;","()Ltq;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6272_a","displayGuiScreen","a","(LGuiScreen;)V","(Lxe;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6250_c","checkGLError","d","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6266_c","shutdownMinecraftApplet","d","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_40001_x","runGameLoop","x","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_28002_e","freeMemory","e","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6248_s","screenshotListener","y","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_40003_b","updateDebugProfilerName","b","(I)V","(I)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6238_a","displayDebugInfo","a","(J)V","(J)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6244_d","shutdown","f","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6259_e","setIngameFocus","g","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6273_f","setIngameNotInFocus","h","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6252_g","displayInGameMenu","i","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6254_a","sendClickBlockToController","a","(IZ)V","(IZ)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6243_a","clickMouse","c","(I)V","(I)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6270_h","toggleFullscreen","j","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6249_a","resize","a","(II)V","(II)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_28001_B","startThreadCheckHasPaid","z","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6246_i","runTick","k","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6242_u","forceReload","A","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6260_j","isMultiplayerWorld","l","()Z","()Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_6247_b","startWorld","a","(Ljava/lang/String;Ljava/lang/String;LWorldSettings;)V","(Ljava/lang/String;Ljava/lang/String;Lyw;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6237_k","usePortal","a","(I)V","(I)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_40002_b","exitToMainMenu","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6261_a","changeWorld1","a","(LWorld;)V","(Lry;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6263_a","changeWorld2","a","(LWorld;Ljava/lang/String;)V","(Lry;Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6256_a","changeWorld","a","(LWorld;Ljava/lang/String;LEntityPlayer;)V","(Lry;Ljava/lang/String;Lvi;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_22002_b","convertMapFormat","b","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6255_d","preloadWorld","e","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6268_a","installResource","a","(Ljava/lang/String;Ljava/io/File;)V","(Ljava/lang/String;Ljava/io/File;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6241_m","debugInfoRenders","m","()Ljava/lang/String;","()Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6262_n","func_6262_n","n","()Ljava/lang/String;","()Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"func_21002_o","func_21002_o","o","()Ljava/lang/String;","()Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6245_o","debugInfoEntities","p","()Ljava/lang/String;","()Ljava/lang/String;","Minecraft","Minecraft","net/minecraft/client","0" +"func_6239_p","respawn","a","(ZIZ)V","(ZIZ)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6269_a","startMainThread1","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_6253_a","startMainThread","a","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_20001_q","getSendQueue","q","()LNetClientHandler;","()Labp;","Minecraft","Minecraft","net/minecraft/client","0" +"main","main","main","([Ljava/lang/String;)V","([Ljava/lang/String;)V","Minecraft","Minecraft","net/minecraft/client","0" +"func_22006_t","isGuiEnabled","r","()Z","()Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_22001_u","isFancyGraphicsEnabled","s","()Z","()Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_22005_v","isAmbientOcclusionEnabled","t","()Z","()Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_22007_w","isDebugInfoEnabled","u","()Z","()Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_22003_b","lineIsCommand","c","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","Minecraft","Minecraft","net/minecraft/client","0" +"func_6265_t","clickMiddleMouseButton","B","()V","()V","Minecraft","Minecraft","net/minecraft/client","0" +"func_20172_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesArmor","z","net/minecraft/src","1" +"func_35368_a","func_35368_a","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentVillage","sr","net/minecraft/src","1" +"func_35369_b","func_35369_b","b","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentVillage","sr","net/minecraft/src","1" +"func_35367_b","getFoundationLevel","b","(LWorld;LStructureBoundingBox;)I","(Lfi;Lvb;)I","ComponentVillage","sr","net/minecraft/src","1" +"func_35366_a","func_35366_a","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentVillage","sr","net/minecraft/src","1" +"func_40309_a","func_40309_a","a","(LWorld;LStructureBoundingBox;IIII)V","(Lfi;Lvb;IIII)V","ComponentVillage","sr","net/minecraft/src","1" +"func_40310_a","func_40310_a","a","(I)I","(I)I","ComponentVillage","sr","net/minecraft/src","1" +"func_438_a","displaySavingString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","xk","net/minecraft/src","1" +"func_439_b","displayLoadingString","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","xk","net/minecraft/src","1" +"func_437_a","setLoadingProgress","a","(I)V","(I)V","IProgressUpdate","xk","net/minecraft/src","1" +"func_40136_a","func_40136_a","a","(LDragonPart;LDamageSource;I)Z","(Led;Lpo;I)Z","EntityDragonBase","ui","net/minecraft/src","1" +"func_40137_e","func_40137_e","e","(LDamageSource;I)Z","(Lpo;I)Z","EntityDragonBase","ui","net/minecraft/src","1" +"func_444_a","getBlockId","a","(III)I","(III)I","IBlockAccess","wy","net/minecraft/src","1" +"func_451_k","getBlockTileEntity","b","(III)LTileEntity;","(III)Loh;","IBlockAccess","wy","net/minecraft/src","1" +"func_446_b","getBlockMetadata","c","(III)I","(III)I","IBlockAccess","wy","net/minecraft/src","1" +"func_443_c","getBlockMaterial","d","(III)LMaterial;","(III)Llg;","IBlockAccess","wy","net/minecraft/src","1" +"func_445_d","isBlockNormalCube","e","(III)Z","(III)Z","IBlockAccess","wy","net/minecraft/src","1" +"func_35232_c","func_35232_c","c","(LEntityPlayer;)Z","(Lgz;)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35227_w","func_35227_w","u_","()Z","()Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35230_e","func_35230_e","f","(LEntity;)Z","(Lrn;)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35228_a","func_35228_a","b","(DDD)Z","(DDD)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35226_b","func_35226_b","b","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" +"func_35225_x","getCarried","A","()I","()I","EntityEnderman","mb","net/minecraft/src","1" +"func_35229_d","func_35229_d","c","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" +"func_35231_y","getCarryingData","B","()I","()I","EntityEnderman","mb","net/minecraft/src","1" +"func_726_a","writePlayerData","a","(LEntityPlayer;)V","(Lgz;)V","IPlayerFileData","ii","net/minecraft/src","1" +"func_725_b","readPlayerData","b","(LEntityPlayer;)V","(Lgz;)V","IPlayerFileData","ii","net/minecraft/src","1" +"func_22012_g","ignoreTick","f","(LWorld;IIII)Z","(Lfi;IIII)Z","BlockRedstoneRepeater","wa","net/minecraft/src","1" +"func_35350_a","func_35350_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Lup;","ComponentStrongholdCrossing","up","net/minecraft/src","1" +"func_40509_b","func_40509_b","b","()V","()V","ThreadedFileIOBase","ct","net/minecraft/src","1" +"func_40507_a","func_40507_a","a","(LIThreadedFileIO;)V","(Lgm;)V","ThreadedFileIOBase","ct","net/minecraft/src","1" +"func_40508_a","func_40508_a","a","()V","()V","ThreadedFileIOBase","ct","net/minecraft/src","1" +"values","values","values","()[LEnumCreatureAttribute;","()[Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumCreatureAttribute;","(Ljava/lang/String;)Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" +"func_216_a","isSolid","a","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_219_b","getCanBlockGrass","b","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_218_c","getIsSolid","c","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_217_d","getIsLiquid","d","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_28129_i","setIsTranslucent","o","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_31058_n","setNoHarvest","e","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_4052_f","setBurning","f","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_4051_e","getBurning","g","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_27089_f","setIsGroundCover","h","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_27090_g","getIsGroundCover","i","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_28128_h","getIsOpaque","j","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_31055_i","getIsHarvestable","k","()Z","()Z","Material","lg","net/minecraft/src","1" +"func_31056_j","getMaterialMobility","l","()I","()I","Material","lg","net/minecraft/src","1" +"func_31059_k","setNoPushMobility","m","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_31057_l","setImmovableMobility","n","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" +"func_40289_a","func_40289_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Ldu;","ComponentNetherBridgeStraight","du","net/minecraft/src","1" +"func_30005_i","func_30005_i","i","(LWorld;III)V","(Lfi;III)V","BlockStationary","nh","net/minecraft/src","1" +"func_4033_j","isFlammable","j","(LWorld;III)Z","(Lfi;III)Z","BlockStationary","nh","net/minecraft/src","1" +"func_733_a","setScheduledTime","a","(J)LNextTickListEntry;","(J)Lqa;","NextTickListEntry","qa","net/minecraft/src","1" +"func_734_a","comparer","a","(LNextTickListEntry;)I","(Lqa;)I","NextTickListEntry","qa","net/minecraft/src","1" +"func_21084_a","getStackInRowAndColumn","b","(II)LItemStack;","(II)Ljb;","InventoryCrafting","mc","net/minecraft/src","1" +"func_4047_h","becomeAngryAt","f","(LEntity;)V","(Lrn;)V","EntityPigZombie","xj","net/minecraft/src","1" +"func_35618_a","loadItemStackFromNBT","a","(LNBTTagCompound;)LItemStack;","(Lng;)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_20118_a","splitStack","a","(I)LItemStack;","(I)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_569_a","getItem","a","()LItem;","()Lgw;","ItemStack","jb","net/minecraft/src","1" +"func_572_a","useItem","a","(LEntityPlayer;LWorld;IIII)Z","(Lgz;Lfi;IIII)Z","ItemStack","jb","net/minecraft/src","1" +"func_574_a","getStrVsBlock","a","(LBlock;)F","(Ltl;)F","ItemStack","jb","net/minecraft/src","1" +"func_6168_a","useItemRightClick","a","(LWorld;LEntityPlayer;)LItemStack;","(Lfi;Lgz;)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_35617_b","func_35617_b","b","(LWorld;LEntityPlayer;)LItemStack;","(Lfi;Lgz;)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_570_a","writeToNBT","b","(LNBTTagCompound;)LNBTTagCompound;","(Lng;)Lng;","ItemStack","jb","net/minecraft/src","1" +"func_575_b","readFromNBT","c","(LNBTTagCompound;)V","(Lng;)V","ItemStack","jb","net/minecraft/src","1" +"func_576_b","getMaxStackSize","b","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_21132_c","isStackable","c","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_21126_d","isItemStackDamageable","d","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_21128_e","getHasSubtypes","e","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_21130_f","isItemDamaged","f","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_21131_g","getItemDamageForDisplay","g","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_21125_h","getItemDamage","h","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_28145_b","setItemDamage","b","(I)V","(I)V","ItemStack","jb","net/minecraft/src","1" +"func_571_c","getMaxDamage","i","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_25125_a","damageItem","a","(ILEntityLiving;)V","(ILlk;)V","ItemStack","jb","net/minecraft/src","1" +"func_9217_a","hitEntity","a","(LEntityLiving;LEntityPlayer;)V","(Llk;Lgz;)V","ItemStack","jb","net/minecraft/src","1" +"func_25124_a","onDestroyBlock","a","(IIIILEntityPlayer;)V","(IIIILgz;)V","ItemStack","jb","net/minecraft/src","1" +"func_9218_a","getDamageVsEntity","a","(LEntity;)I","(Lrn;)I","ItemStack","jb","net/minecraft/src","1" +"func_573_b","canHarvestBlock","b","(LBlock;)Z","(Ltl;)Z","ItemStack","jb","net/minecraft/src","1" +"func_577_a","onItemDestroyedByUse","a","(LEntityPlayer;)V","(Lgz;)V","ItemStack","jb","net/minecraft/src","1" +"func_21129_b","useItemOnEntity","a","(LEntityLiving;)V","(Llk;)V","ItemStack","jb","net/minecraft/src","1" +"func_578_d","copy","j","()LItemStack;","()Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_20119_a","areItemStacksEqual","a","(LItemStack;LItemStack;)Z","(Ljb;Ljb;)Z","ItemStack","jb","net/minecraft/src","1" +"func_20116_b","isItemStackEqual","d","(LItemStack;)Z","(Ljb;)Z","ItemStack","jb","net/minecraft/src","1" +"func_21127_a","isItemEqual","a","(LItemStack;)Z","(Ljb;)Z","ItemStack","jb","net/minecraft/src","1" +"func_35616_k","func_35616_k","k","()Ljava/lang/String;","()Ljava/lang/String;","ItemStack","jb","net/minecraft/src","1" +"func_20117_a","copyItemStack","b","(LItemStack;)LItemStack;","(Ljb;)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_28143_a","updateAnimation","a","(LWorld;LEntity;IZ)V","(Lfi;Lrn;IZ)V","ItemStack","jb","net/minecraft/src","1" +"func_28142_b","onCrafting","c","(LWorld;LEntityPlayer;)V","(Lfi;Lgz;)V","ItemStack","jb","net/minecraft/src","1" +"func_28144_c","isStackEqual","c","(LItemStack;)Z","(Ljb;)Z","ItemStack","jb","net/minecraft/src","1" +"func_35614_l","func_35614_l","l","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_35615_m","func_35615_m","m","()LEnumAction;","()Ljf;","ItemStack","jb","net/minecraft/src","1" +"func_35613_a","func_35613_a","a","(LWorld;LEntityPlayer;I)V","(Lfi;Lgz;I)V","ItemStack","jb","net/minecraft/src","1" +"func_40608_n","func_40608_n","n","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_40607_o","func_40607_o","o","()LNBTTagCompound;","()Lng;","ItemStack","jb","net/minecraft/src","1" +"func_40609_p","func_40609_p","p","()LNBTTagList;","()Lrp;","ItemStack","jb","net/minecraft/src","1" +"func_40604_d","setNBTData","d","(LNBTTagCompound;)V","(Lng;)V","ItemStack","jb","net/minecraft/src","1" +"func_40606_q","func_40606_q","q","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_40605_a","func_40605_a","a","(LEnchantment;I)V","(Lmq;I)V","ItemStack","jb","net/minecraft/src","1" +"func_40610_r","func_40610_r","r","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_40256_b","getPotionEffectsForItemStack","b","(LItemStack;)Ljava/util/List;","(Ljb;)Ljava/util/List;","ItemPotion","ft","net/minecraft/src","1" +"func_40255_b","getPotionEffectsForDamage","b","(I)Ljava/util/List;","(I)Ljava/util/List;","ItemPotion","ft","net/minecraft/src","1" +"func_40254_c","func_40254_c","c","(I)Z","(I)Z","ItemPotion","ft","net/minecraft/src","1" +"func_22103_b","getWorldInfo","b","(Ljava/lang/String;)LWorldInfo;","(Ljava/lang/String;)Leo;","SaveFormatOld","sl","net/minecraft/src","1" +"func_22104_a","func_22104_a","a","([Ljava/io/File;)V","([Ljava/io/File;)V","SaveFormatOld","sl","net/minecraft/src","1" +"func_22105_a","getSaveLoader","a","(Ljava/lang/String;Z)LISaveHandler;","(Ljava/lang/String;Z)Lwg;","SaveFormatOld","sl","net/minecraft/src","1" +"func_40177_b","canConnectFenceTo","b","(LIBlockAccess;III)Z","(Lwy;III)Z","BlockFence","jv","net/minecraft/src","1" +"func_35532_a","func_35532_a","a","(LWorld;Ljava/util/Random;II)Z","(Lfi;Ljava/util/Random;II)Z","MapGenStructure","qp","net/minecraft/src","1" +"func_40204_a","func_40204_a","a","(III)Z","(III)Z","MapGenStructure","qp","net/minecraft/src","1" +"func_40202_a","func_40202_a","a","(LWorld;III)LChunkPosition;","(Lfi;III)Lvo;","MapGenStructure","qp","net/minecraft/src","1" +"func_40203_a","func_40203_a","a","()Ljava/util/List;","()Ljava/util/List;","MapGenStructure","qp","net/minecraft/src","1" +"func_35531_a","func_35531_a","a","(II)Z","(II)Z","MapGenStructure","qp","net/minecraft/src","1" +"func_35533_b","func_35533_b","b","(II)LStructureStart;","(II)Ltr;","MapGenStructure","qp","net/minecraft/src","1" +"func_6091_h","removeLeaves","g","(LWorld;III)V","(Lfi;III)V","BlockLeaves","bm","net/minecraft/src","1" +"func_35491_a","canSpawnMoreVillagePiecesOfType","a","(I)Z","(I)Z","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"func_35492_a","canSpawnMoreVillagePieces","a","()Z","()Z","StructureVillagePieceWeight","ex","net/minecraft/src","1" +"accept","accept","accept","(Ljava/io/File;Ljava/lang/String;)Z","(Ljava/io/File;Ljava/lang/String;)Z","ChunkFilePattern","qs","net/minecraft/src","1" +"func_35378_a","func_35378_a","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Lj;Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentVillagePathGen","so","net/minecraft/src","1" +"windowClosing","windowClosing","windowClosing","(Ljava/awt/event/WindowEvent;)V","(Ljava/awt/event/WindowEvent;)V","ServerWindowAdapter","ab","net/minecraft/src","1" +"func_22092_a","getChunkLoader","a","(LWorldProvider;)LIChunkLoader;","(Lwn;)Lbh;","ISaveHandler","wg","net/minecraft/src","1" +"func_22095_a","saveWorldInfoAndPlayer","a","(LWorldInfo;Ljava/util/List;)V","(Leo;Ljava/util/List;)V","ISaveHandler","wg","net/minecraft/src","1" +"func_22093_e","func_22093_e","e","()V","()V","ISaveHandler","wg","net/minecraft/src","1" +"func_22096_c","loadWorldInfo","c","()LWorldInfo;","()Leo;","ISaveHandler","wg","net/minecraft/src","1" +"func_22091_b","checkSessionLock","b","()V","()V","ISaveHandler","wg","net/minecraft/src","1" +"func_22094_a","saveWorldInfo","a","(LWorldInfo;)V","(Leo;)V","ISaveHandler","wg","net/minecraft/src","1" +"func_22090_d","getPlayerNBTManager","d","()LIPlayerFileData;","()Lii;","ISaveHandler","wg","net/minecraft/src","1" +"func_28111_b","getMapFileFromName","b","(Ljava/lang/String;)Ljava/io/File;","(Ljava/lang/String;)Ljava/io/File;","ISaveHandler","wg","net/minecraft/src","1" +"func_35070_c","func_35070_c","d","(I)Z","(I)Z","BlockFenceGate","tt","net/minecraft/src","1" +"func_35071_d","func_35071_d","e","(I)I","(I)I","BlockFenceGate","tt","net/minecraft/src","1" +"func_40292_a","func_40292_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing3;","(Ljava/util/List;Ljava/util/Random;IIIII)Lpm;","ComponentNetherBridgeCrossing3","pm","net/minecraft/src","1" +"func_434_a","pickCheckLootItem","a","(Ljava/util/Random;)LItemStack;","(Ljava/util/Random;)Ljb;","WorldGenDungeons","ev","net/minecraft/src","1" +"func_433_b","pickMobSpawner","b","(Ljava/util/Random;)Ljava/lang/String;","(Ljava/util/Random;)Ljava/lang/String;","WorldGenDungeons","ev","net/minecraft/src","1" +"func_40615_a","func_40615_a","a","(IJ)V","(IJ)V","PacketCount","vn","net/minecraft/src","1" +"func_35209_o_","func_35209_o_","H","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_35196_E","func_35196_E","I","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_35205_F","func_35205_F","J","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_35208_b","func_35208_b","b","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35199_C","func_35199_C","G","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_20043_I","usePersonalCraftingInventory","B","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_35204_o","func_35204_o","A","()I","()I","EntityPlayer","gz","net/minecraft/src","1" +"func_171_h","collideWithPlayer","k","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_161_a","dropCurrentItem","N","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_20044_b","dropPlayerItem","b","(LItemStack;)V","(Ljb;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_169_a","dropPlayerItemWithRandomChoice","a","(LItemStack;Z)V","(Ljb;Z)V","EntityPlayer","gz","net/minecraft/src","1" +"func_162_a","joinEntityItemWithWorld","a","(LEntityItem;)V","(Lhp;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_165_a","getCurrentPlayerStrVsBlock","a","(LBlock;)F","(Ltl;)F","EntityPlayer","gz","net/minecraft/src","1" +"func_167_b","canHarvestBlock","b","(LBlock;)Z","(Ltl;)Z","EntityPlayer","gz","net/minecraft/src","1" +"func_166_a","displayGUIChest","a","(LIInventory;)V","(Llp;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40106_c","func_40106_c","c","(III)V","(III)V","EntityPlayer","gz","net/minecraft/src","1" +"func_174_A","displayWorkbenchGUI","b","(III)V","(III)V","EntityPlayer","gz","net/minecraft/src","1" +"func_163_c","onItemPickup","a","(LEntity;I)V","(Lrn;I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_22064_l_","resetHeight","w","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_27016_t","isPVPEnabled","y","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_25047_a","alertWolves","a","(LEntityLiving;Z)V","(Llk;Z)V","EntityPlayer","gz","net/minecraft/src","1" +"func_170_a","displayGUIFurnace","a","(LTileEntityFurnace;)V","(Lrj;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_21072_a","displayGUIDispenser","a","(LTileEntityDispenser;)V","(Lbe;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_4048_a","displayGUIEditSign","a","(LTileEntitySign;)V","(Lxu;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40110_a","func_40110_a","a","(LTileEntityBrewingStand;)V","(Lxx;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_9145_g","useCurrentItemOnEntity","e","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_172_B","getCurrentEquippedItem","P","()LItemStack;","()Ljb;","EntityPlayer","gz","net/minecraft/src","1" +"func_164_C","destroyCurrentEquippedItem","Q","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_168_z","swingItem","r_","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_9146_h","attackTargetEntityWithCurrentItem","f","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35202_e","func_35202_e","c","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40109_c","func_40109_c","d","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_20045_a","onItemStackChanged","a","(LItemStack;)V","(Ljb;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_22060_a","sleepInBedAt","a","(III)LEnumStatus;","(III)Ldc;","EntityPlayer","gz","net/minecraft/src","1" +"func_22059_e","func_22059_e","c","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_22062_a","wakeUpPlayer","a","(ZZZ)V","(ZZZ)V","EntityPlayer","gz","net/minecraft/src","1" +"func_22063_l","isInBed","C","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_25051_a","verifyBedCoordinates","a","(LWorld;LChunkCoordinates;)LChunkCoordinates;","(Lfi;Lbu;)Lbu;","EntityPlayer","gz","net/minecraft/src","1" +"func_22065_F","isPlayerFullyAsleep","V","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_22061_a","addChatMessage","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_25049_H","getSpawnChunk","W","()LChunkCoordinates;","()Lbu;","EntityPlayer","gz","net/minecraft/src","1" +"func_25050_a","setSpawnChunk","a","(LChunkCoordinates;)V","(Lbu;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_27017_a","triggerAchievement","a","(LStatBase;)V","(Luv;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_25046_a","addStat","a","(LStatBase;I)V","(Luv;I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_25045_g","addMovementStat","b","(DDD)V","(DDD)V","EntityPlayer","gz","net/minecraft/src","1" +"func_27015_h","addMountedMovementStat","h","(DDD)V","(DDD)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35195_d","addExperience","h","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40108_b","removeExperience","b","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35203_U","func_35203_U","Z","()I","()I","EntityPlayer","gz","net/minecraft/src","1" +"func_36001_y","func_36001_y","D","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_35198_b","addExhaustion","c","(F)V","(F)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35207_V","func_35207_V","aa","()LFoodStats;","()Lrd;","EntityPlayer","gz","net/minecraft/src","1" +"func_35197_c","func_35197_c","b","(Z)Z","(Z)Z","EntityPlayer","gz","net/minecraft/src","1" +"func_35206_W","mustHeal","ab","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_35201_a","func_35201_a","a","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35200_c","func_35200_c","d","(III)Z","(III)Z","EntityPlayer","gz","net/minecraft/src","1" +"func_40107_e","func_40107_e","e","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_41031_d","func_41031_d","c","(LEntityPlayer;)V","(Lgz;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_41040_a","func_41040_a","a","([Ljava/lang/String;)LItemColored;","([Ljava/lang/String;)Lwm;","ItemColored","wm","net/minecraft/src","1" +"func_35514_a","createBiomeDecorator","a","()LBiomeDecorator;","()Lgo;","BiomeGenBase","kb","net/minecraft/src","1" +"func_35512_a","setTemperatureRainfall","a","(FF)LBiomeGenBase;","(FF)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_35511_b","setMinMaxHeight","b","(FF)LBiomeGenBase;","(FF)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_27047_e","setDisableRain","g","()LBiomeGenBase;","()Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_21114_a","getRandomWorldGenForTrees","a","(Ljava/util/Random;)LWorldGenerator;","(Ljava/util/Random;)Lor;","BiomeGenBase","kb","net/minecraft/src","1" +"func_4082_a","setBiomeName","a","(Ljava/lang/String;)LBiomeGenBase;","(Ljava/lang/String;)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_4080_a","func_4080_a","a","(I)LBiomeGenBase;","(I)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_4079_b","setColor","b","(I)LBiomeGenBase;","(I)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" +"func_25055_a","getSpawnableList","a","(LEnumCreatureType;)Ljava/util/List;","(Lla;)Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1" +"func_27049_c","getEnableSnow","b","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1" +"func_27048_d","canSpawnLightningBolt","c","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1" +"func_4078_a","getBiome","d","()F","()F","BiomeGenBase","kb","net/minecraft/src","1" +"func_35510_e","func_35510_e","e","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" +"func_35509_f","func_35509_f","f","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" +"func_35513_a","func_35513_a","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","BiomeGenBase","kb","net/minecraft/src","1" +"func_22108_a","func_22108_a","a","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","SaveConverterMcRegion","ho","net/minecraft/src","1" +"func_22107_a","func_22107_a","a","(Ljava/io/File;Ljava/util/ArrayList;IILIProgressUpdate;)V","(Ljava/io/File;Ljava/util/ArrayList;IILxk;)V","SaveConverterMcRegion","ho","net/minecraft/src","1" +"func_22109_a","func_22109_a","a","(Ljava/util/ArrayList;IILIProgressUpdate;)V","(Ljava/util/ArrayList;IILxk;)V","SaveConverterMcRegion","ho","net/minecraft/src","1" +"func_365_a","chunkExists","a","(II)Z","(II)Z","IChunkProvider","co","net/minecraft/src","1" +"func_363_b","provideChunk","b","(II)LChunk;","(II)Lle;","IChunkProvider","co","net/minecraft/src","1" +"func_376_d","loadChunk","c","(II)LChunk;","(II)Lle;","IChunkProvider","co","net/minecraft/src","1" +"func_4055_a","populate","a","(LIChunkProvider;II)V","(Lco;II)V","IChunkProvider","co","net/minecraft/src","1" +"func_360_a","saveChunks","a","(ZLIProgressUpdate;)Z","(ZLxk;)Z","IChunkProvider","co","net/minecraft/src","1" +"func_361_a","unload100OldestChunks","a","()Z","()Z","IChunkProvider","co","net/minecraft/src","1" +"func_364_b","canSave","b","()Z","()Z","IChunkProvider","co","net/minecraft/src","1" +"func_40181_a","func_40181_a","a","(LEnumCreatureType;III)Ljava/util/List;","(Lla;III)Ljava/util/List;","IChunkProvider","co","net/minecraft/src","1" +"func_40182_a","func_40182_a","a","(LWorld;Ljava/lang/String;III)LChunkPosition;","(Lfi;Ljava/lang/String;III)Lvo;","IChunkProvider","co","net/minecraft/src","1" +"func_35153_j_","getXpValue","g","()I","()I","EntityXPOrb","cn","net/minecraft/src","1" +"func_35152_b","getMore","b","(I)I","(I)I","EntityXPOrb","cn","net/minecraft/src","1" +"func_40315_a","func_40315_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdPortalRoom;","(Ljava/util/List;Ljava/util/Random;IIIII)Llf;","ComponentStrongholdPortalRoom","lf","net/minecraft/src","1" +"func_35672_a","func_35672_a","a","()LStructureBoundingBox;","()Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35663_a","func_35663_a","a","(IIIIIIIIII)LStructureBoundingBox;","(IIIIIIIIII)Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35664_a","canFitInside","a","(LStructureBoundingBox;)Z","(Lvb;)Z","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35671_a","isInBbArea","a","(IIII)Z","(IIII)Z","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35666_b","expandTo","b","(LStructureBoundingBox;)V","(Lvb;)V","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35670_a","offset","a","(III)V","(III)V","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35667_b","isInBbVolume","b","(III)Z","(III)Z","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35669_b","bbWidth","b","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35668_c","bbHeight","c","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35665_d","bbDepth","d","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_40623_e","func_40623_e","e","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_40622_f","func_40622_f","f","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_40624_g","func_40624_g","g","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35065_b","fertilizeMushrom","b","(LWorld;IIILjava/util/Random;)Z","(Lfi;IIILjava/util/Random;)Z","BlockMushroom","sf","net/minecraft/src","1" +"func_657_a","createEntityPathTo","a","(LEntity;LEntity;F)LPathEntity;","(Lrn;Lrn;F)Ldk;","PathFinder","ge","net/minecraft/src","1" +"func_651_a","createEntityPathTo","a","(LEntity;IIIF)LPathEntity;","(Lrn;IIIF)Ldk;","PathFinder","ge","net/minecraft/src","1" +"func_652_a","createEntityPathTo","a","(LEntity;DDDF)LPathEntity;","(Lrn;DDDF)Ldk;","PathFinder","ge","net/minecraft/src","1" +"func_656_a","addToPath","a","(LEntity;LPathPoint;LPathPoint;LPathPoint;F)LPathEntity;","(Lrn;Le;Le;Le;F)Ldk;","PathFinder","ge","net/minecraft/src","1" +"func_654_b","findPathOptions","b","(LEntity;LPathPoint;LPathPoint;LPathPoint;F)I","(Lrn;Le;Le;Le;F)I","PathFinder","ge","net/minecraft/src","1" +"func_650_a","getSafePoint","a","(LEntity;IIILPathPoint;I)LPathPoint;","(Lrn;IIILe;I)Le;","PathFinder","ge","net/minecraft/src","1" +"func_655_a","openPoint","a","(III)LPathPoint;","(III)Le;","PathFinder","ge","net/minecraft/src","1" +"func_649_a","getVerticalOffset","a","(LEntity;IIILPathPoint;)I","(Lrn;IIILe;)I","PathFinder","ge","net/minecraft/src","1" +"func_653_a","createEntityPath","a","(LPathPoint;LPathPoint;)LPathEntity;","(Le;Le;)Ldk;","PathFinder","ge","net/minecraft/src","1" +"func_40139_a","func_40139_a","a","(IF)[D","(IF)[D","EntityDragon","sy","net/minecraft/src","1" +"func_41036_u","func_41036_u","w","()V","()V","EntityDragon","sy","net/minecraft/src","1" +"func_41033_v","func_41033_v","y","()V","()V","EntityDragon","sy","net/minecraft/src","1" +"func_41034_a","func_41034_a","a","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityDragon","sy","net/minecraft/src","1" +"func_41035_b","func_41035_b","b","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityDragon","sy","net/minecraft/src","1" +"func_41037_w","func_41037_w","A","()V","()V","EntityDragon","sy","net/minecraft/src","1" +"func_40141_a","func_40141_a","a","(D)F","(D)F","EntityDragon","sy","net/minecraft/src","1" +"func_40140_a","func_40140_a","a","(LAxisAlignedBB;)Z","(Leu;)Z","EntityDragon","sy","net/minecraft/src","1" +"func_41038_a","func_41038_a","a","(II)V","(II)V","EntityDragon","sy","net/minecraft/src","1" +"func_690_a","update","a","()V","()V","IUpdatePlayerListBox","fe","net/minecraft/src","1" +"func_736_a","func_736_a","a","()J","()J","LongHashMapEntry","pv","net/minecraft/src","1" +"func_735_b","func_735_b","b","()Ljava/lang/Object;","()Ljava/lang/Object;","LongHashMapEntry","pv","net/minecraft/src","1" +"func_40402_a","startThread","a","()V","()V","RConThreadBase","uu","net/minecraft/src","1" +"func_40413_b","isRunning","b","()Z","()Z","RConThreadBase","uu","net/minecraft/src","1" +"func_40406_a","logInfo","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RConThreadBase","uu","net/minecraft/src","1" +"func_40408_b","log","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RConThreadBase","uu","net/minecraft/src","1" +"func_40405_c","logWarning","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RConThreadBase","uu","net/minecraft/src","1" +"func_40409_d","logSevere","d","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RConThreadBase","uu","net/minecraft/src","1" +"func_40407_c","getNumberOfPlayers","c","()I","()I","RConThreadBase","uu","net/minecraft/src","1" +"func_40401_a","registerSocket","a","(Ljava/net/DatagramSocket;)V","(Ljava/net/DatagramSocket;)V","RConThreadBase","uu","net/minecraft/src","1" +"func_40403_a","closeSocket","a","(Ljava/net/DatagramSocket;Z)Z","(Ljava/net/DatagramSocket;Z)Z","RConThreadBase","uu","net/minecraft/src","1" +"func_40411_a","closeServerSocket","a","(Ljava/net/ServerSocket;)Z","(Ljava/net/ServerSocket;)Z","RConThreadBase","uu","net/minecraft/src","1" +"func_40404_a","closeServerSocket_do","a","(Ljava/net/ServerSocket;Z)Z","(Ljava/net/ServerSocket;Z)Z","RConThreadBase","uu","net/minecraft/src","1" +"func_40410_d","closeAllSockets","d","()V","()V","RConThreadBase","uu","net/minecraft/src","1" +"func_40412_a","clos","a","(Z)V","(Z)V","RConThreadBase","uu","net/minecraft/src","1" +"func_21078_a","setMobID","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","TileEntityMobSpawner","de","net/minecraft/src","1" +"func_195_a","anyPlayerInRange","c","()Z","()Z","TileEntityMobSpawner","de","net/minecraft/src","1" +"func_196_d","updateDelay","e","()V","()V","TileEntityMobSpawner","de","net/minecraft/src","1" +"func_779_a","addPlayer","a","(LEntityPlayerMP;)V","(Lfl;)V","PlayerInstance","al","net/minecraft/src","1" +"func_778_b","removePlayer","b","(LEntityPlayerMP;)V","(Lfl;)V","PlayerInstance","al","net/minecraft/src","1" +"func_775_a","markBlockNeedsUpdate","a","(III)V","(III)V","PlayerInstance","al","net/minecraft/src","1" +"func_776_a","sendPacketToPlayersInInstance","a","(LPacket;)V","(Lkf;)V","PlayerInstance","al","net/minecraft/src","1" +"func_777_a","onUpdate","a","()V","()V","PlayerInstance","al","net/minecraft/src","1" +"func_20178_a","updateTileEntity","a","(LTileEntity;)V","(Loh;)V","PlayerInstance","al","net/minecraft/src","1" +"func_25035_b","setPathEntity","c","(LEntity;F)V","(Lrn;F)V","EntityWolf","gs","net/minecraft/src","1" +"func_25033_a","isNowTamed","a","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" +"func_25034_v","getOwner","y","()Ljava/lang/String;","()Ljava/lang/String;","EntityWolf","gs","net/minecraft/src","1" +"func_25029_a","setOwner","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityWolf","gs","net/minecraft/src","1" +"func_25036_w","getIsSitting","t_","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" +"func_25031_b","setIsSitting","b","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" +"func_25028_x","isWolfAngry","A","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" +"func_25037_c","setIsAngry","c","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" +"func_25030_y","isTamed","B","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" +"func_25032_d","setIsTamed","d","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" +"func_35418_a","func_35418_a","a","(LWorld;IIIILBlock;)V","(Lfi;IIIILtl;)V","ItemDoor","ia","net/minecraft/src","1" +"func_22185_a","getNBTTagCompound","a","()LNBTTagCompound;","()Lng;","WorldInfo","eo","net/minecraft/src","1" +"func_22183_a","storeLevelDataToNBT","a","(Ljava/util/List;)LNBTTagCompound;","(Ljava/util/List;)Lng;","WorldInfo","eo","net/minecraft/src","1" +"func_22176_a","saveNBTTag","a","(LNBTTagCompound;LNBTTagCompound;)V","(Lng;Lng;)V","WorldInfo","eo","net/minecraft/src","1" +"func_22187_b","getRandomSeed","b","()J","()J","WorldInfo","eo","net/minecraft/src","1" +"func_22184_c","getSpawnX","c","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_22179_d","getSpawnY","d","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_22189_e","getSpawnZ","e","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_22186_f","getWorldTime","f","()J","()J","WorldInfo","eo","net/minecraft/src","1" +"func_22182_g","getSizeOnDisk","g","()J","()J","WorldInfo","eo","net/minecraft/src","1" +"func_22178_h","getDimension","h","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_22180_a","setWorldTime","a","(J)V","(J)V","WorldInfo","eo","net/minecraft/src","1" +"func_22177_b","setSizeOnDisk","b","(J)V","(J)V","WorldInfo","eo","net/minecraft/src","1" +"func_22181_a","setSpawnPosition","a","(III)V","(III)V","WorldInfo","eo","net/minecraft/src","1" +"func_22190_a","setWorldName","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","WorldInfo","eo","net/minecraft/src","1" +"func_22188_i","getSaveVersion","i","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_22191_a","setSaveVersion","a","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" +"func_27122_j","getIsThundering","j","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" +"func_27119_a","setIsThundering","a","(Z)V","(Z)V","WorldInfo","eo","net/minecraft/src","1" +"func_27117_k","getThunderTime","k","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_27121_b","setThunderTime","b","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" +"func_27115_l","getIsRaining","l","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" +"func_27116_b","setIsRaining","b","(Z)V","(Z)V","WorldInfo","eo","net/minecraft/src","1" +"func_27120_m","getRainTime","m","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_27118_c","setRainTime","c","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" +"func_35501_n","getGameType","n","()I","()I","WorldInfo","eo","net/minecraft/src","1" +"func_35499_o","getMapFeaturesEnabled","o","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" +"func_35500_d","setGameType","d","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" +"func_40470_p","isHardcoreModeEnabled","p","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" +"func_70_a","readPacketData","a","(Ljava/io/DataInputStream;)V","(Ljava/io/DataInputStream;)V","Packet","kf","net/minecraft/src","1" +"func_68_a","writePacketData","a","(Ljava/io/DataOutputStream;)V","(Ljava/io/DataOutputStream;)V","Packet","kf","net/minecraft/src","1" +"func_72_a","processPacket","a","(LNetHandler;)V","(Lsd;)V","Packet","kf","net/minecraft/src","1" +"func_71_a","getPacketSize","a","()I","()I","Packet","kf","net/minecraft/src","1" +"func_64_a","addIdClassMapping","a","(IZZLjava/lang/Class;)V","(IZZLjava/lang/Class;)V","Packet","kf","net/minecraft/src","1" +"func_67_a","getNewPacket","a","(I)LPacket;","(I)Lkf;","Packet","kf","net/minecraft/src","1" +"func_69_b","getPacketId","b","()I","()I","Packet","kf","net/minecraft/src","1" +"func_65_b","readPacket","a","(Ljava/io/DataInputStream;Z)LPacket;","(Ljava/io/DataInputStream;Z)Lkf;","Packet","kf","net/minecraft/src","1" +"func_66_a","writePacket","a","(LPacket;Ljava/io/DataOutputStream;)V","(Lkf;Ljava/io/DataOutputStream;)V","Packet","kf","net/minecraft/src","1" +"func_27038_a","writeString","a","(Ljava/lang/String;Ljava/io/DataOutputStream;)V","(Ljava/lang/String;Ljava/io/DataOutputStream;)V","Packet","kf","net/minecraft/src","1" +"func_27037_a","readString","a","(Ljava/io/DataInputStream;I)Ljava/lang/String;","(Ljava/io/DataInputStream;I)Ljava/lang/String;","Packet","kf","net/minecraft/src","1" +"func_40262_b","func_40262_b","b","(Ljava/io/DataInputStream;)LItemStack;","(Ljava/io/DataInputStream;)Ljb;","Packet","kf","net/minecraft/src","1" +"func_40261_a","writeItemStack","a","(LItemStack;Ljava/io/DataOutputStream;)V","(Ljb;Ljava/io/DataOutputStream;)V","Packet","kf","net/minecraft/src","1" +"func_40259_c","func_40259_c","c","(Ljava/io/DataInputStream;)LNBTTagCompound;","(Ljava/io/DataInputStream;)Lng;","Packet","kf","net/minecraft/src","1" +"func_40260_a","func_40260_a","a","(LNBTTagCompound;Ljava/io/DataOutputStream;)V","(Lng;Ljava/io/DataOutputStream;)V","Packet","kf","net/minecraft/src","1" +"func_40111_y","setTextureByProfession","y","()V","()V","EntityVillager","fm","net/minecraft/src","1" +"func_25017_l","canTriggerWalking","g_","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_21044_a","entityInit","b","()V","()V","Entity","rn","net/minecraft/src","1" +"func_106_b_","onUpdate","w_","()V","()V","Entity","rn","net/minecraft/src","1" +"func_97_a","writeEntityToNBT","b","(LNBTTagCompound;)V","(Lng;)V","Entity","rn","net/minecraft/src","1" +"func_99_b","readEntityFromNBT","a","(LNBTTagCompound;)V","(Lng;)V","Entity","rn","net/minecraft/src","1" +"func_129_c_","canBeCollidedWith","e_","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_121_a","attackEntityFrom","a","(LDamageSource;I)Z","(Lpo;I)Z","Entity","rn","net/minecraft/src","1" +"func_108_b","getEntityBrightness","a","(F)F","(F)F","Entity","rn","net/minecraft/src","1" +"func_114_a","fall","b","(F)V","(F)V","Entity","rn","net/minecraft/src","1" +"func_115_v","updateRidden","M","()V","()V","Entity","rn","net/minecraft/src","1" +"func_96_b","addToPlayerScore","b","(LEntity;I)V","(Lrn;I)V","Entity","rn","net/minecraft/src","1" +"func_104_p","getEyeHeight","x","()F","()F","Entity","rn","net/minecraft/src","1" +"func_117_x","getYOffset","R","()D","()D","Entity","rn","net/minecraft/src","1" +"func_118_j","setEntityDead","S","()V","()V","Entity","rn","net/minecraft/src","1" +"func_91_u","isEntityInsideOpaqueBlock","T","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_27010_a","onKillEntity","a","(LEntityLiving;)V","(Llk;)V","Entity","rn","net/minecraft/src","1" +"func_4042_C","setInPortal","Y","()V","()V","Entity","rn","net/minecraft/src","1" +"func_35150_Y","func_35150_Y","ad","()Ljava/lang/String;","()Ljava/lang/String;","Entity","rn","net/minecraft/src","1" +"func_119_o","handleWaterMovement","i_","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_125_b","dealFireDamage","a","(I)V","(I)V","Entity","rn","net/minecraft/src","1" +"func_6093_b","onCollideWithPlayer","a_","(LEntityPlayer;)V","(Lgz;)V","Entity","rn","net/minecraft/src","1" +"func_40037_aF","func_40037_aF","aG","()[LEntity;","()[Lrn;","Entity","rn","net/minecraft/src","1" +"func_6092_a","interact","b","(LEntityPlayer;)Z","(Lgz;)Z","Entity","rn","net/minecraft/src","1" +"func_21039_p","getDataWatcher","au","()LDataWatcher;","()Lsu;","Entity","rn","net/minecraft/src","1" +"func_113_a","setSize","b","(FF)V","(FF)V","Entity","rn","net/minecraft/src","1" +"func_6096_b","setRotation","c","(FF)V","(FF)V","Entity","rn","net/minecraft/src","1" +"func_86_a","setPosition","c","(DDD)V","(DDD)V","Entity","rn","net/minecraft/src","1" +"func_84_k","onEntityUpdate","af","()V","()V","Entity","rn","net/minecraft/src","1" +"func_4040_n","setOnFireFromLava","av","()V","()V","Entity","rn","net/minecraft/src","1" +"func_40034_j","func_40034_j","j","(I)V","(I)V","Entity","rn","net/minecraft/src","1" +"func_40036_aw","func_40036_aw","aw","()V","()V","Entity","rn","net/minecraft/src","1" +"func_4043_o","kill","ao","()V","()V","Entity","rn","net/minecraft/src","1" +"func_133_b","isOffsetPositionInLiquid","d","(DDD)Z","(DDD)Z","Entity","rn","net/minecraft/src","1" +"func_88_c","moveEntity","a","(DDD)V","(DDD)V","Entity","rn","net/minecraft/src","1" +"func_41011_a","func_41011_a","a","(IIII)V","(IIII)V","Entity","rn","net/minecraft/src","1" +"func_122_m","updateFallState","a","(DZ)V","(DZ)V","Entity","rn","net/minecraft/src","1" +"func_93_n","getBoundingBox","h_","()LAxisAlignedBB;","()Leu;","Entity","rn","net/minecraft/src","1" +"func_40033_ax","func_40033_ax","ax","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_27008_Y","isWet","ay","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_27011_Z","isInWater","az","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_110_a","isInsideOfMaterial","a","(LMaterial;)Z","(Llg;)Z","Entity","rn","net/minecraft/src","1" +"func_112_q","handleLavaMovement","aA","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_90_a","moveFlying","a","(FFF)V","(FFF)V","Entity","rn","net/minecraft/src","1" +"func_28007_a","setWorld","a","(LWorld;)V","(Lfi;)V","Entity","rn","net/minecraft/src","1" +"func_6095_b","setPositionAndRotation","b","(DDDFF)V","(DDDFF)V","Entity","rn","net/minecraft/src","1" +"func_107_c","setLocationAndAngles","c","(DDDFF)V","(DDDFF)V","Entity","rn","net/minecraft/src","1" +"func_94_a","getDistanceToEntity","h","(LEntity;)F","(Lrn;)F","Entity","rn","net/minecraft/src","1" +"func_101_d","getDistanceSq","e","(DDD)D","(DDD)D","Entity","rn","net/minecraft/src","1" +"func_103_e","getDistance","f","(DDD)D","(DDD)D","Entity","rn","net/minecraft/src","1" +"func_102_b","getDistanceSqToEntity","i","(LEntity;)D","(Lrn;)D","Entity","rn","net/minecraft/src","1" +"func_92_c","applyEntityCollision","j","(LEntity;)V","(Lrn;)V","Entity","rn","net/minecraft/src","1" +"func_87_f","addVelocity","b_","(DDD)V","(DDD)V","Entity","rn","net/minecraft/src","1" +"func_9060_u","setBeenAttacked","aB","()V","()V","Entity","rn","net/minecraft/src","1" +"func_124_r","canBePushed","f_","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_95_c","addEntityID","c","(LNBTTagCompound;)Z","(Lng;)Z","Entity","rn","net/minecraft/src","1" +"func_98_d","writeToNBT","d","(LNBTTagCompound;)V","(Lng;)V","Entity","rn","net/minecraft/src","1" +"func_100_e","readFromNBT","e","(LNBTTagCompound;)V","(Lng;)V","Entity","rn","net/minecraft/src","1" +"func_109_s","getEntityString","aC","()Ljava/lang/String;","()Ljava/lang/String;","Entity","rn","net/minecraft/src","1" +"func_132_a","newDoubleNBTList","a","([D)LNBTTagList;","([D)Lrp;","Entity","rn","net/minecraft/src","1" +"func_85_a","newFloatNBTList","a","([F)LNBTTagList;","([F)Lrp;","Entity","rn","net/minecraft/src","1" +"func_128_a","dropItem","b","(II)LEntityItem;","(II)Lhp;","Entity","rn","net/minecraft/src","1" +"func_123_a","dropItemWithOffset","a","(IIF)LEntityItem;","(IIF)Lhp;","Entity","rn","net/minecraft/src","1" +"func_21040_a","entityDropItem","a","(LItemStack;F)LEntityItem;","(Ljb;F)Lhp;","Entity","rn","net/minecraft/src","1" +"func_120_t","isEntityAlive","aj","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_89_d","getCollisionBox","a_","(LEntity;)LAxisAlignedBB;","(Lrn;)Leu;","Entity","rn","net/minecraft/src","1" +"func_127_w","updateRiderPosition","i","()V","()V","Entity","rn","net/minecraft/src","1" +"func_130_h","getMountedYOffset","q","()D","()D","Entity","rn","net/minecraft/src","1" +"func_6094_e","mountEntity","b","(LEntity;)V","(Lrn;)V","Entity","rn","net/minecraft/src","1" +"func_41010_j_","func_41010_j_","j_","()F","()F","Entity","rn","net/minecraft/src","1" +"func_4039_B","getLookVec","ap","()LVec3D;","()Lbx;","Entity","rn","net/minecraft/src","1" +"func_20042_E","getInventory","v","()[LItemStack;","()[Ljb;","Entity","rn","net/minecraft/src","1" +"func_40035_z","func_40035_z","z","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_9059_p","isSneaking","aD","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_21043_b","setSneaking","e","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" +"func_35149_at","getSprinting","aE","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_35146_g","setSprinting","f","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" +"func_35148_h","func_35148_h","g","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" +"func_21042_c","getFlag","k","(I)Z","(I)Z","Entity","rn","net/minecraft/src","1" +"func_21041_a","setFlag","a","(IZ)V","(IZ)V","Entity","rn","net/minecraft/src","1" +"func_41009_al","getAir","aF","()I","()I","Entity","rn","net/minecraft/src","1" +"func_41008_j","setAir","l","(I)V","(I)V","Entity","rn","net/minecraft/src","1" +"func_27009_a","onStruckByLightning","a","(LEntityLightningBolt;)V","(Ld;)V","Entity","rn","net/minecraft/src","1" +"func_28005_g","pushOutOfBlocks","g","(DDD)Z","(DDD)Z","Entity","rn","net/minecraft/src","1" +"func_35147_q","setInWeb","s","()V","()V","Entity","rn","net/minecraft/src","1" +"func_41012_c_","func_41012_c_","a","(LEntity;)Z","(Lrn;)Z","Entity","rn","net/minecraft/src","1" +"func_40649_a","func_40649_a","a","(I)Z","(I)Z","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"func_40650_a","func_40650_a","a","()Z","()Z","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" +"func_659_a","loadChunk","a","(LWorld;II)LChunk;","(Lfi;II)Lle;","IChunkLoader","bh","net/minecraft/src","1" +"func_662_a","saveChunk","a","(LWorld;LChunk;)V","(Lfi;Lle;)V","IChunkLoader","bh","net/minecraft/src","1" +"func_4104_b","saveExtraChunkData","b","(LWorld;LChunk;)V","(Lfi;Lle;)V","IChunkLoader","bh","net/minecraft/src","1" +"func_661_a","func_661_a","a","()V","()V","IChunkLoader","bh","net/minecraft/src","1" +"func_660_b","saveExtraData","b","()V","()V","IChunkLoader","bh","net/minecraft/src","1" +"func_321_g","glow","g","(LWorld;III)V","(Lfi;III)V","BlockRedstoneOre","bw","net/minecraft/src","1" +"func_320_h","sparkle","h","(LWorld;III)V","(Lfi;III)V","BlockRedstoneOre","bw","net/minecraft/src","1" +"func_35434_a","getRandomComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureMineshaftPieces","iv","net/minecraft/src","1" +"func_35435_b","getNextMineShaftComponent","b","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Ljx;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureMineshaftPieces","iv","net/minecraft/src","1" +"func_35433_a","getNextComponent","a","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Ljx;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureMineshaftPieces","iv","net/minecraft/src","1" +"func_35432_a","getTreasurePieces","a","()[LStructurePieceTreasure;","()[Lib;","StructureMineshaftPieces","iv","net/minecraft/src","1" +"func_27035_f","setStateIfMinecartInteractsWithRail","f","(LWorld;IIII)V","(Lfi;IIII)V","BlockDetectorRail","os","net/minecraft/src","1" +"func_20161_a","getAllowedCharacters","a","()Ljava/lang/String;","()Ljava/lang/String;","ChatAllowedCharacters","fx","net/minecraft/src","1" +"func_698_a","getBoundingBox","a","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_703_a","clearBoundingBoxPool","a","()V","()V","AxisAlignedBB","eu","net/minecraft/src","1" +"func_693_b","getBoundingBoxFromPool","b","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_695_c","setBounds","c","(DDDDDD)LAxisAlignedBB;","(DDDDDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_700_a","addCoord","a","(DDD)LAxisAlignedBB;","(DDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_708_b","expand","b","(DDD)LAxisAlignedBB;","(DDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_696_c","getOffsetBoundingBox","c","(DDD)LAxisAlignedBB;","(DDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_710_a","calculateXOffset","a","(LAxisAlignedBB;D)D","(Leu;D)D","AxisAlignedBB","eu","net/minecraft/src","1" +"func_701_b","calculateYOffset","b","(LAxisAlignedBB;D)D","(Leu;D)D","AxisAlignedBB","eu","net/minecraft/src","1" +"func_709_c","calculateZOffset","c","(LAxisAlignedBB;D)D","(Leu;D)D","AxisAlignedBB","eu","net/minecraft/src","1" +"func_704_a","intersectsWith","a","(LAxisAlignedBB;)Z","(Leu;)Z","AxisAlignedBB","eu","net/minecraft/src","1" +"func_702_d","offset","d","(DDD)LAxisAlignedBB;","(DDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_28183_a","isVecInside","a","(LVec3D;)Z","(Lbx;)Z","AxisAlignedBB","eu","net/minecraft/src","1" +"func_694_e","contract","e","(DDD)LAxisAlignedBB;","(DDD)Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_711_b","copy","b","()LAxisAlignedBB;","()Leu;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_706_a","func_706_a","a","(LVec3D;LVec3D;)LMovingObjectPosition;","(Lbx;Lbx;)Luc;","AxisAlignedBB","eu","net/minecraft/src","1" +"func_697_a","isVecInYZ","b","(LVec3D;)Z","(Lbx;)Z","AxisAlignedBB","eu","net/minecraft/src","1" +"func_705_b","isVecInXZ","c","(LVec3D;)Z","(Lbx;)Z","AxisAlignedBB","eu","net/minecraft/src","1" +"func_707_c","isVecInXY","d","(LVec3D;)Z","(Lbx;)Z","AxisAlignedBB","eu","net/minecraft/src","1" +"func_699_b","setBB","b","(LAxisAlignedBB;)V","(Leu;)V","AxisAlignedBB","eu","net/minecraft/src","1" +"func_40291_a","func_40291_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeNetherStalkRoom;","(Ljava/util/List;Ljava/util/Random;IIIII)Lfc;","ComponentNetherBridgeNetherStalkRoom","fc","net/minecraft/src","1" +"func_25052_a","getIsEditAble","c","()Z","()Z","TileEntitySign","xu","net/minecraft/src","1" +"func_35330_a","func_35330_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLeftTurn;","(Ljava/util/List;Ljava/util/Random;IIIII)Lsh;","ComponentStrongholdLeftTurn","sh","net/minecraft/src","1" +"func_40299_a","func_40299_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStairs;","(Ljava/util/List;Ljava/util/Random;IIIII)Lmw;","ComponentNetherBridgeStairs","mw","net/minecraft/src","1" +"func_35393_a","func_35393_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageWoodHut;","(Ljava/util/List;Ljava/util/Random;IIIII)Lyd;","ComponentVillageWoodHut","yd","net/minecraft/src","1" +"func_22203_a","func_22203_a","a","(III)I","(III)I","PathPoint","e","net/minecraft/src","1" +"func_731_a","distanceTo","a","(LPathPoint;)F","(Le;)F","PathPoint","e","net/minecraft/src","1" +"func_730_a","isAssigned","a","()Z","()Z","PathPoint","e","net/minecraft/src","1" +"func_160_c","setSlimeSize","b","(I)V","(I)V","EntitySlime","tn","net/minecraft/src","1" +"func_25027_m","getSlimeSize","H","()I","()I","EntitySlime","tn","net/minecraft/src","1" +"func_40120_w","func_40120_w","w","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","tn","net/minecraft/src","1" +"func_40118_E","func_40118_E","E","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","tn","net/minecraft/src","1" +"func_40116_B","func_40116_B","B","()V","()V","EntitySlime","tn","net/minecraft/src","1" +"func_40115_A","func_40115_A","A","()I","()I","EntitySlime","tn","net/minecraft/src","1" +"func_40114_y","func_40114_y","y","()LEntitySlime;","()Ltn;","EntitySlime","tn","net/minecraft/src","1" +"func_40119_C","func_40119_C","C","()Z","()Z","EntitySlime","tn","net/minecraft/src","1" +"func_40113_D","func_40113_D","D","()I","()I","EntitySlime","tn","net/minecraft/src","1" +"func_40117_I","func_40117_I","I","()Z","()Z","EntitySlime","tn","net/minecraft/src","1" +"func_40121_G","func_40121_G","G","()Z","()Z","EntitySlime","tn","net/minecraft/src","1" +"func_35292_a","func_35292_a","a","(LWorld;IIII)V","(Lfi;IIII)V","WorldGenSwamp","bk","net/minecraft/src","1" +"func_22031_c","getStrafeMovement","c","()F","()F","Packet27Position","pl","net/minecraft/src","1" +"func_22029_d","getPitchRotation","d","()F","()F","Packet27Position","pl","net/minecraft/src","1" +"func_22028_e","getForwardMovement","e","()F","()F","Packet27Position","pl","net/minecraft/src","1" +"func_22033_f","getYawRotation","f","()F","()F","Packet27Position","pl","net/minecraft/src","1" +"func_22032_g","isSneaking","g","()Z","()Z","Packet27Position","pl","net/minecraft/src","1" +"func_22030_h","isInJump","h","()Z","()Z","Packet27Position","pl","net/minecraft/src","1" +"values","values","values","()[LEnumDoor;","()[Lpt;","EnumDoor","pt","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumDoor;","(Ljava/lang/String;)Lpt;","EnumDoor","pt","net/minecraft/src","1" +"func_22102_a","isOldSaveType","a","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","ISaveFormat","mz","net/minecraft/src","1" +"func_22101_a","convertMapFormat","a","(Ljava/lang/String;LIProgressUpdate;)Z","(Ljava/lang/String;Lxk;)Z","ISaveFormat","mz","net/minecraft/src","1" +"func_35357_a","func_35357_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentMineshaftCorridor","rz","net/minecraft/src","1" +"values","values","values","()[LEnumToolMaterial;","()[Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumToolMaterial;","(Ljava/lang/String;)Lby;","EnumToolMaterial","by","net/minecraft/src","1" +"func_21180_a","getMaxUses","a","()I","()I","EnumToolMaterial","by","net/minecraft/src","1" +"func_21179_b","getEfficiencyOnProperMaterial","b","()F","()F","EnumToolMaterial","by","net/minecraft/src","1" +"func_21178_c","getDamageVsEntity","c","()I","()I","EnumToolMaterial","by","net/minecraft/src","1" +"func_21181_d","getHarvestLevel","d","()I","()I","EnumToolMaterial","by","net/minecraft/src","1" +"func_40487_e","getEnchantability","e","()I","()I","EnumToolMaterial","by","net/minecraft/src","1" +"func_21030_c","eatCakeSlice","c","(LWorld;IIILEntityPlayer;)V","(Lfi;IIILgz;)V","BlockCake","th","net/minecraft/src","1" +"func_318_g","setStateIfMobInteractsWithPlate","g","(LWorld;III)V","(Lfi;III)V","BlockPressurePlate","bz","net/minecraft/src","1" +"func_299_b","getFluidHeightPercent","d","(I)F","(I)F","BlockFluid","qr","net/minecraft/src","1" +"func_301_g","getFlowDecay","g","(LWorld;III)I","(Lfi;III)I","BlockFluid","qr","net/minecraft/src","1" +"func_303_b","getEffectiveFlowDecay","b","(LIBlockAccess;III)I","(Lwy;III)I","BlockFluid","qr","net/minecraft/src","1" +"func_298_c","getFlowVector","c","(LIBlockAccess;III)LVec3D;","(Lwy;III)Lbx;","BlockFluid","qr","net/minecraft/src","1" +"func_302_i","checkForHarden","i","(LWorld;III)V","(Lfi;III)V","BlockFluid","qr","net/minecraft/src","1" +"func_300_h","triggerLavaMixEffects","h","(LWorld;III)V","(Lfi;III)V","BlockFluid","qr","net/minecraft/src","1" +"func_728_a","incrementPathIndex","a","()V","()V","PathEntity","dk","net/minecraft/src","1" +"func_729_b","isFinished","b","()Z","()Z","PathEntity","dk","net/minecraft/src","1" +"func_727_a","getPosition","a","(LEntity;)LVec3D;","(Lrn;)Lbx;","PathEntity","dk","net/minecraft/src","1" +"func_31012_a","getStoredBlockID","c","()I","()I","TileEntityPiston","tf","net/minecraft/src","1" +"func_31010_c","func_31010_c","e","()Z","()Z","TileEntityPiston","tf","net/minecraft/src","1" +"func_31008_d","func_31008_d","f","()I","()I","TileEntityPiston","tf","net/minecraft/src","1" +"func_31007_a","func_31007_a","a","(F)F","(F)F","TileEntityPiston","tf","net/minecraft/src","1" +"func_31009_a","func_31009_a","a","(FF)V","(FF)V","TileEntityPiston","tf","net/minecraft/src","1" +"func_31011_k","clearPistonTileEntity","g","()V","()V","TileEntityPiston","tf","net/minecraft/src","1" +"func_286_f","ejectRecord","f","(LWorld;IIII)V","(Lfi;IIII)V","BlockJukeBox","fw","net/minecraft/src","1" +"func_28035_b_","insertDisc","c_","(LWorld;III)V","(Lfi;III)V","BlockJukeBox","fw","net/minecraft/src","1" +"func_6142_a","calculateVelocity","a","(DDDFF)V","(DDDFF)V","EntityFishHook","lq","net/minecraft/src","1" +"func_6143_c","catchFish","j","()I","()I","EntityFishHook","lq","net/minecraft/src","1" +"values","values","values","()[LEnumArt;","()[Lit;","EnumArt","it","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumArt;","(Ljava/lang/String;)Lit;","EnumArt","it","net/minecraft/src","1" +"values","values","values","()[LEnumSkyBlock;","()[Lei;","EnumSkyBlock","ei","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumSkyBlock;","(Ljava/lang/String;)Lei;","EnumSkyBlock","ei","net/minecraft/src","1" +"func_436_a","updateStats","a","()V","()V","GuiStatsComponent","kp","net/minecraft/src","1" +"func_40571_a","func_40571_a","a","([J)D","([J)D","GuiStatsComponent","kp","net/minecraft/src","1" +"paint","paint","paint","(Ljava/awt/Graphics;)V","(Ljava/awt/Graphics;)V","GuiStatsComponent","kp","net/minecraft/src","1" +"func_435_a","update","a","(LGuiStatsComponent;)V","(Lkp;)V","GuiStatsComponent","kp","net/minecraft/src","1" +"func_770_a","loadGzippedCompoundFromOutputStream","a","(Ljava/io/InputStream;)LNBTTagCompound;","(Ljava/io/InputStream;)Lng;","CompressedStreamTools","ax","net/minecraft/src","1" +"func_769_a","writeGzippedCompoundToOutputStream","a","(LNBTTagCompound;Ljava/io/OutputStream;)V","(Lng;Ljava/io/OutputStream;)V","CompressedStreamTools","ax","net/minecraft/src","1" +"func_40515_a","func_40515_a","a","([B)LNBTTagCompound;","([B)Lng;","CompressedStreamTools","ax","net/minecraft/src","1" +"func_40516_a","func_40516_a","a","(LNBTTagCompound;)[B","(Lng;)[B","CompressedStreamTools","ax","net/minecraft/src","1" +"func_774_a","read","a","(Ljava/io/DataInput;)LNBTTagCompound;","(Ljava/io/DataInput;)Lng;","CompressedStreamTools","ax","net/minecraft/src","1" +"func_771_a","writeTo","a","(LNBTTagCompound;Ljava/io/DataOutput;)V","(Lng;Ljava/io/DataOutput;)V","CompressedStreamTools","ax","net/minecraft/src","1" +"func_35700_a","func_35700_a","a","(II)LBiomeGenBase;","(II)Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1" +"func_40626_b","func_40626_b","b","(II)F","(II)F","BiomeCacheBlock","tb","net/minecraft/src","1" +"func_40326_a","func_40326_a","a","(LChunkCoordIntPair;LNBTTagCompound;)V","(Lyi;Lng;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" +"func_40325_a","func_40325_a","a","(LThreadedChunkLoaderPending;)V","(Lxq;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" +"func_40124_p_","func_40124_p_","o_","()Z","()Z","EntitySpider","cq","net/minecraft/src","1" +"func_40125_a","func_40125_a","a","(Z)V","(Z)V","EntitySpider","cq","net/minecraft/src","1" +"func_182_g","func_182_g","h","(DDD)LVec3D;","(DDD)Lbx;","EntityMinecart","xv","net/minecraft/src","1" +"func_41015_m","func_41015_m","j","()Z","()Z","EntityMinecart","xv","net/minecraft/src","1" +"func_41017_a","func_41017_a","a","(Z)V","(Z)V","EntityMinecart","xv","net/minecraft/src","1" +"func_41018_e_","func_41018_e_","b","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" +"func_41020_o","func_41020_o","k","()I","()I","EntityMinecart","xv","net/minecraft/src","1" +"func_41014_b","func_41014_b","c","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" +"func_41019_p","func_41019_p","l","()I","()I","EntityMinecart","xv","net/minecraft/src","1" +"func_41016_d","func_41016_d","d","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" +"func_41021_q","func_41021_q","m","()I","()I","EntityMinecart","xv","net/minecraft/src","1" +"func_40133_a","func_40133_a","a","(LEntityAnimal;)LEntityAnimal;","(Lbi;)Lbi;","EntityAnimal","bi","net/minecraft/src","1" +"func_40135_j","getDelay","j","()I","()I","EntityAnimal","bi","net/minecraft/src","1" +"func_40132_b_","setDelay","b_","(I)V","(I)V","EntityAnimal","bi","net/minecraft/src","1" +"func_40131_b","proceate","b","(LEntityAnimal;)V","(Lbi;)V","EntityAnimal","bi","net/minecraft/src","1" +"func_40134_a","isWheat","a","(LItemStack;)Z","(Ljb;)Z","EntityAnimal","bi","net/minecraft/src","1" +"func_40054_n_","getPotionDamage","f","()I","()I","EntityPotion","bs","net/minecraft/src","1" +"func_273_b","setDoorRotation","d","(I)V","(I)V","BlockDoor","ku","net/minecraft/src","1" +"func_272_a","onPoweredBlockChange","a","(LWorld;IIIZ)V","(Lfi;IIIZ)V","BlockDoor","ku","net/minecraft/src","1" +"func_271_d","getState","e","(I)I","(I)I","BlockDoor","ku","net/minecraft/src","1" +"func_27036_e","isOpen","f","(I)Z","(I)Z","BlockDoor","ku","net/minecraft/src","1" +"func_21172_a","getDataValueId","a","()I","()I","WatchableObject","lt","net/minecraft/src","1" +"func_21171_a","setObject","a","(Ljava/lang/Object;)V","(Ljava/lang/Object;)V","WatchableObject","lt","net/minecraft/src","1" +"func_21168_b","getObject","b","()Ljava/lang/Object;","()Ljava/lang/Object;","WatchableObject","lt","net/minecraft/src","1" +"func_21169_c","getObjectType","c","()I","()I","WatchableObject","lt","net/minecraft/src","1" +"func_21170_d","getWatching","d","()Z","()Z","WatchableObject","lt","net/minecraft/src","1" +"func_21173_a","setWatching","a","(Z)V","(Z)V","WatchableObject","lt","net/minecraft/src","1" +"func_21028_c","fertilize","g","(LWorld;III)V","(Lfi;III)V","BlockCrops","mt","net/minecraft/src","1" +"func_278_h","getGrowthRate","i","(LWorld;III)F","(Lfi;III)F","BlockCrops","mt","net/minecraft/src","1" +"func_20159_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesIngots","sk","net/minecraft/src","1" +"func_738_a","getVolume","a","()F","()F","StepSound","db","net/minecraft/src","1" +"func_739_b","getPitch","b","()F","()F","StepSound","db","net/minecraft/src","1" +"func_737_c","stepSoundDir","c","()Ljava/lang/String;","()Ljava/lang/String;","StepSound","db","net/minecraft/src","1" +"func_40583_a","getBytesAsString","a","([BII)Ljava/lang/String;","([BII)Ljava/lang/String;","RConUtils","io","net/minecraft/src","1" +"func_40582_a","getRemainingBytesAsLEInt","a","([BI)I","([BI)I","RConUtils","io","net/minecraft/src","1" +"func_40586_b","getBytesAsLEInt","b","([BII)I","([BII)I","RConUtils","io","net/minecraft/src","1" +"func_40585_c","getBytesAsBEint","c","([BII)I","([BII)I","RConUtils","io","net/minecraft/src","1" +"func_40584_a","getByteAsHexString","a","(B)Ljava/lang/String;","(B)Ljava/lang/String;","RConUtils","io","net/minecraft/src","1" +"func_28178_a","loadData","a","(Ljava/lang/Class;Ljava/lang/String;)LWorldSavedData;","(Ljava/lang/Class;Ljava/lang/String;)Lhs;","MapStorage","hf","net/minecraft/src","1" +"func_28177_a","setData","a","(Ljava/lang/String;LWorldSavedData;)V","(Ljava/lang/String;Lhs;)V","MapStorage","hf","net/minecraft/src","1" +"func_28176_a","saveAllData","a","()V","()V","MapStorage","hf","net/minecraft/src","1" +"func_28175_a","saveData","a","(LWorldSavedData;)V","(Lhs;)V","MapStorage","hf","net/minecraft/src","1" +"func_28174_b","loadIdCounts","b","()V","()V","MapStorage","hf","net/minecraft/src","1" +"func_28173_a","getUniqueDataId","a","(Ljava/lang/String;)I","(Ljava/lang/String;)I","MapStorage","hf","net/minecraft/src","1" +"func_40002_a","resetLog","a","()V","()V","RConConsoleSource","vj","net/minecraft/src","1" +"func_40003_b","getLogContents","b","()Ljava/lang/String;","()Ljava/lang/String;","RConConsoleSource","vj","net/minecraft/src","1" +"func_35575_a","canSpawnMoreStructuresOfType","a","(I)Z","(I)Z","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"func_35576_a","canSpawnMoreStructures","a","()Z","()Z","StructureStrongholdPieceWeight","rl","net/minecraft/src","1" +"func_292_g","updateAndPropagateCurrentStrength","g","(LWorld;III)V","(Lfi;III)V","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_21031_a","calculateCurrentChanges","a","(LWorld;IIIIII)V","(Lfi;IIIIII)V","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_291_h","notifyWireNeighborsOfNeighborChange","h","(LWorld;III)V","(Lfi;III)V","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_290_f","getMaxCurrentStrength","f","(LWorld;IIII)I","(Lfi;IIII)I","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_41007_c","func_41007_c","c","(LIBlockAccess;IIII)Z","(Lwy;IIII)Z","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_293_b","isPowerProviderOrWire","d","(LIBlockAccess;IIII)Z","(Lwy;IIII)Z","BlockRedstoneWire","rm","net/minecraft/src","1" +"func_12023_a","doExplosionA","a","()V","()V","Explosion","py","net/minecraft/src","1" +"func_732_a","doExplosionB","a","(Z)V","(Z)V","Explosion","py","net/minecraft/src","1" +"func_35332_a","func_35332_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdPrison;","(Ljava/util/List;Ljava/util/Random;IIIII)Log;","ComponentStrongholdPrison","og","net/minecraft/src","1" +"func_35646_a","getStructureVillageWeightedPieceList","a","(Ljava/util/Random;I)Ljava/util/ArrayList;","(Ljava/util/Random;I)Ljava/util/ArrayList;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35645_a","getAvailablePieceWeight","a","(Ljava/util/ArrayList;)I","(Ljava/util/ArrayList;)I","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35639_a","getVillageComponentFromWeightedPiece","a","(LStructureVillagePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillage;","(Lex;Ljava/util/List;Ljava/util/Random;IIIII)Lsr;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35643_c","getNextVillageComponent","c","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillage;","(Lj;Ljava/util/List;Ljava/util/Random;IIIII)Lsr;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35641_d","getNextVillageStructureComponent","d","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35644_e","getNextComponentVillagePath","e","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35640_a","getNextStructureComponent","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_35642_b","getNextStructureComponentVillagePath","b","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureVillagePieces","xr","net/minecraft/src","1" +"func_27029_g","isRailBlockAt","g","(LWorld;III)Z","(Lfi;III)Z","BlockRail","ok","net/minecraft/src","1" +"func_27030_c","isRailBlock","d","(I)Z","(I)Z","BlockRail","ok","net/minecraft/src","1" +"func_27028_d","getIsPowered","h","()Z","()Z","BlockRail","ok","net/minecraft/src","1" +"func_4038_g","refreshTrackShape","a","(LWorld;IIIZ)V","(Lfi;IIIZ)V","BlockRail","ok","net/minecraft/src","1" +"func_27032_a","isNeighborRailPowered","a","(LWorld;IIIIZI)Z","(Lfi;IIIIZI)Z","BlockRail","ok","net/minecraft/src","1" +"func_27031_a","isRailPassingPower","a","(LWorld;IIIZII)Z","(Lfi;IIIZII)Z","BlockRail","ok","net/minecraft/src","1" +"func_27033_a","isPoweredBlockRail","a","(LBlockRail;)Z","(Lok;)Z","BlockRail","ok","net/minecraft/src","1" +"func_35380_a","func_35380_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageChurch;","(Ljava/util/List;Ljava/util/Random;IIIII)Lob;","ComponentVillageChurch","ob","net/minecraft/src","1" +"func_40304_a","func_40304_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeThrone;","(Ljava/util/List;Ljava/util/Random;IIIII)Lvd;","ComponentNetherBridgeThrone","vd","net/minecraft/src","1" +"func_35539_a","func_35539_a","a","(JII[BDDDFFFIID)V","(JII[BDDDFFFIID)V","MapGenRavine","wo","net/minecraft/src","1" +"func_21153_a","addObject","a","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","DataWatcher","su","net/minecraft/src","1" +"func_21156_a","getWatchableObjectByte","a","(I)B","(I)B","DataWatcher","su","net/minecraft/src","1" +"func_41048_b","getWatchableObjectShort","b","(I)S","(I)S","DataWatcher","su","net/minecraft/src","1" +"func_25075_b","getWatchableObjectInt","c","(I)I","(I)I","DataWatcher","su","net/minecraft/src","1" +"func_25076_c","getWatchableObjectString","d","(I)Ljava/lang/String;","(I)Ljava/lang/String;","DataWatcher","su","net/minecraft/src","1" +"func_21155_b","updateObject","b","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","DataWatcher","su","net/minecraft/src","1" +"func_21150_a","hasObjectChanged","a","()Z","()Z","DataWatcher","su","net/minecraft/src","1" +"func_21151_a","writeObjectsInListToStream","a","(Ljava/util/List;Ljava/io/DataOutputStream;)V","(Ljava/util/List;Ljava/io/DataOutputStream;)V","DataWatcher","su","net/minecraft/src","1" +"func_21148_b","getChangedObjects","b","()Ljava/util/ArrayList;","()Ljava/util/ArrayList;","DataWatcher","su","net/minecraft/src","1" +"func_21152_a","writeWatchableObjects","a","(Ljava/io/DataOutputStream;)V","(Ljava/io/DataOutputStream;)V","DataWatcher","su","net/minecraft/src","1" +"func_21154_a","writeWatchableObject","a","(Ljava/io/DataOutputStream;LWatchableObject;)V","(Ljava/io/DataOutputStream;Llt;)V","DataWatcher","su","net/minecraft/src","1" +"func_21149_a","readWatchableObjects","a","(Ljava/io/DataInputStream;)Ljava/util/List;","(Ljava/io/DataInputStream;)Ljava/util/List;","DataWatcher","su","net/minecraft/src","1" +"func_40547_a","checkFlag","a","(II)Z","(II)Z","PotionHelper","km","net/minecraft/src","1" +"func_40549_b","isFlagSet","b","(II)I","(II)I","PotionHelper","km","net/minecraft/src","1" +"func_40552_c","isFlagUnset","c","(II)I","(II)I","PotionHelper","km","net/minecraft/src","1" +"func_40553_a","func_40553_a","a","(Ljava/util/Collection;)I","(Ljava/util/Collection;)I","PotionHelper","km","net/minecraft/src","1" +"func_40546_a","func_40546_a","a","(ZZZIIII)I","(ZZZIIII)I","PotionHelper","km","net/minecraft/src","1" +"func_40551_a","countSetFlags","a","(I)I","(I)I","PotionHelper","km","net/minecraft/src","1" +"func_40554_a","func_40554_a","a","(Ljava/lang/String;III)I","(Ljava/lang/String;III)I","PotionHelper","km","net/minecraft/src","1" +"func_40550_a","getPotionEffects","a","(IZ)Ljava/util/List;","(IZ)Ljava/util/List;","PotionHelper","km","net/minecraft/src","1" +"func_40548_a","handleBitFromIngredient","a","(IIZZZ)I","(IIZZZ)I","PotionHelper","km","net/minecraft/src","1" +"func_40555_a","applyIngredient","a","(ILjava/lang/String;)I","(ILjava/lang/String;)I","PotionHelper","km","net/minecraft/src","1" +"func_40056_a","func_40056_a","a","(DID)V","(DID)V","EntityEnderEye","ck","net/minecraft/src","1" +"func_40077_h","func_40077_h","h","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40075_o","func_40075_o","o","()Z","()Z","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40076_p","func_40076_p","p","()V","()V","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40078_b","applyPotionIngredient","b","(ILItemStack;)I","(ILjb;)I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40079_n","func_40079_n","n","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40428_a","sendResponsePacket","a","([BLjava/net/DatagramPacket;)V","([BLjava/net/DatagramPacket;)V","RConThreadQuery","sv","net/minecraft/src","1" +"func_40430_a","parseIncomingPacket","a","(Ljava/net/DatagramPacket;)Z","(Ljava/net/DatagramPacket;)Z","RConThreadQuery","sv","net/minecraft/src","1" +"func_40434_b","createQueryResponse","b","(Ljava/net/DatagramPacket;)[B","(Ljava/net/DatagramPacket;)[B","RConThreadQuery","sv","net/minecraft/src","1" +"func_40435_a","getRequestID","a","(Ljava/net/SocketAddress;)[B","(Ljava/net/SocketAddress;)[B","RConThreadQuery","sv","net/minecraft/src","1" +"func_40436_c","verifyClientAuth","c","(Ljava/net/DatagramPacket;)Ljava/lang/Boolean;","(Ljava/net/DatagramPacket;)Ljava/lang/Boolean;","RConThreadQuery","sv","net/minecraft/src","1" +"func_40431_d","sendAuthChallenge","d","(Ljava/net/DatagramPacket;)V","(Ljava/net/DatagramPacket;)V","RConThreadQuery","sv","net/minecraft/src","1" +"func_40432_e","cleanQueryClientsMap","e","()V","()V","RConThreadQuery","sv","net/minecraft/src","1" +"func_40433_a","stopWithException","a","(Ljava/lang/Exception;)V","(Ljava/lang/Exception;)V","RConThreadQuery","sv","net/minecraft/src","1" +"func_40429_f","initQuerySystem","f","()Z","()Z","RConThreadQuery","sv","net/minecraft/src","1" +"func_40250_n","func_40250_n","n","()[I","()[I","ItemArmor","vf","net/minecraft/src","1" +"values","values","values","()[LEnumAction;","()[Ljf;","EnumAction","jf","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumAction;","(Ljava/lang/String;)Ljf;","EnumAction","jf","net/minecraft/src","1" +"func_35696_a","toggleGameType","a","(I)V","(I)V","ItemInWorldManager","to","net/minecraft/src","1" +"func_35697_a","getGameType","a","()I","()I","ItemInWorldManager","to","net/minecraft/src","1" +"func_35698_b","isCreative","b","()Z","()Z","ItemInWorldManager","to","net/minecraft/src","1" +"func_35695_b","func_35695_b","b","(I)V","(I)V","ItemInWorldManager","to","net/minecraft/src","1" +"func_328_a","updateBlockRemoving","c","()V","()V","ItemInWorldManager","to","net/minecraft/src","1" +"func_324_a","blockClicked","a","(IIII)V","(IIII)V","ItemInWorldManager","to","net/minecraft/src","1" +"func_22045_b","blockRemoving","a","(III)V","(III)V","ItemInWorldManager","to","net/minecraft/src","1" +"func_323_b","removeBlock","b","(III)Z","(III)Z","ItemInWorldManager","to","net/minecraft/src","1" +"func_325_c","blockHarvessted","c","(III)Z","(III)Z","ItemInWorldManager","to","net/minecraft/src","1" +"func_6154_a","itemUsed","a","(LEntityPlayer;LWorld;LItemStack;)Z","(Lgz;Lfi;Ljb;)Z","ItemInWorldManager","to","net/minecraft/src","1" +"func_327_a","activeBlockOrUseItem","a","(LEntityPlayer;LWorld;LItemStack;IIII)Z","(Lgz;Lfi;Ljb;IIII)Z","ItemInWorldManager","to","net/minecraft/src","1" +"func_35694_a","setWorld","a","(LWorldServer;)V","(Lfp;)V","ItemInWorldManager","to","net/minecraft/src","1" +"func_35325_a","getStrongholdStairsComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStairs;","(Ljava/util/List;Ljava/util/Random;IIIII)Lig;","ComponentStrongholdStairs","ig","net/minecraft/src","1" +"func_25132_a","getGuid","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","AchievementMap","b","net/minecraft/src","1" +"func_40589_a","setIconIndex","a","(II)LPotion;","(II)Lir;","Potion","ir","net/minecraft/src","1" +"func_40594_a","getPotionId","a","()I","()I","Potion","ir","net/minecraft/src","1" +"func_35438_a","func_35438_a","a","(LEntityLiving;I)V","(Llk;I)V","Potion","ir","net/minecraft/src","1" +"func_40588_a","affectEntity","a","(LEntityLiving;LEntityLiving;ID)V","(Llk;Llk;ID)V","Potion","ir","net/minecraft/src","1" +"func_40595_b","isInstant","b","()Z","()Z","Potion","ir","net/minecraft/src","1" +"func_35437_a","isReady","b","(II)Z","(II)Z","Potion","ir","net/minecraft/src","1" +"func_35439_a","setPotionName","a","(Ljava/lang/String;)LPotion;","(Ljava/lang/String;)Lir;","Potion","ir","net/minecraft/src","1" +"func_40596_c","getPotionName","c","()Ljava/lang/String;","()Ljava/lang/String;","Potion","ir","net/minecraft/src","1" +"func_40591_a","func_40591_a","a","(D)LPotion;","(D)Lir;","Potion","ir","net/minecraft/src","1" +"func_40592_d","func_40592_d","d","()D","()D","Potion","ir","net/minecraft/src","1" +"func_40590_e","func_40590_e","e","()LPotion;","()Lir;","Potion","ir","net/minecraft/src","1" +"func_40593_f","func_40593_f","f","()Z","()Z","Potion","ir","net/minecraft/src","1" +"func_40597_g","func_40597_g","g","()I","()I","Potion","ir","net/minecraft/src","1" +"func_35382_a","func_35382_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentVillageTorch","oe","net/minecraft/src","1" +"func_284_h","tryToFall","h","(LWorld;III)V","(Lfi;III)V","BlockSand","gv","net/minecraft/src","1" +"func_285_g","canFallBelow","g","(LWorld;III)Z","(Lfi;III)Z","BlockSand","gv","net/minecraft/src","1" +"func_28107_c","func_28107_c","d","()Ljava/util/Collection;","()Ljava/util/Collection;","NBTTagCompound","ng","net/minecraft/src","1" +"func_399_a","setTag","a","(Ljava/lang/String;LNBTBase;)V","(Ljava/lang/String;Lik;)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_409_a","setByte","a","(Ljava/lang/String;B)V","(Ljava/lang/String;B)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_394_a","setShort","a","(Ljava/lang/String;S)V","(Ljava/lang/String;S)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_405_a","setInteger","a","(Ljava/lang/String;I)V","(Ljava/lang/String;I)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_396_a","setLong","a","(Ljava/lang/String;J)V","(Ljava/lang/String;J)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_390_a","setFloat","a","(Ljava/lang/String;F)V","(Ljava/lang/String;F)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_411_a","setDouble","a","(Ljava/lang/String;D)V","(Ljava/lang/String;D)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_403_a","setString","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_391_a","setByteArray","a","(Ljava/lang/String;[B)V","(Ljava/lang/String;[B)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_392_a","setCompoundTag","a","(Ljava/lang/String;LNBTTagCompound;)V","(Ljava/lang/String;Lng;)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_393_a","setBoolean","a","(Ljava/lang/String;Z)V","(Ljava/lang/String;Z)V","NBTTagCompound","ng","net/minecraft/src","1" +"func_40469_b","func_40469_b","b","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lik;","NBTTagCompound","ng","net/minecraft/src","1" +"func_410_a","hasKey","c","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","NBTTagCompound","ng","net/minecraft/src","1" +"func_408_b","getByte","d","(Ljava/lang/String;)B","(Ljava/lang/String;)B","NBTTagCompound","ng","net/minecraft/src","1" +"func_406_c","getShort","e","(Ljava/lang/String;)S","(Ljava/lang/String;)S","NBTTagCompound","ng","net/minecraft/src","1" +"func_395_d","getInteger","f","(Ljava/lang/String;)I","(Ljava/lang/String;)I","NBTTagCompound","ng","net/minecraft/src","1" +"func_404_e","getLong","g","(Ljava/lang/String;)J","(Ljava/lang/String;)J","NBTTagCompound","ng","net/minecraft/src","1" +"func_389_f","getFloat","h","(Ljava/lang/String;)F","(Ljava/lang/String;)F","NBTTagCompound","ng","net/minecraft/src","1" +"func_398_g","getDouble","i","(Ljava/lang/String;)D","(Ljava/lang/String;)D","NBTTagCompound","ng","net/minecraft/src","1" +"func_401_h","getString","j","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","NBTTagCompound","ng","net/minecraft/src","1" +"func_400_i","getByteArray","k","(Ljava/lang/String;)[B","(Ljava/lang/String;)[B","NBTTagCompound","ng","net/minecraft/src","1" +"func_397_j","getCompoundTag","l","(Ljava/lang/String;)LNBTTagCompound;","(Ljava/lang/String;)Lng;","NBTTagCompound","ng","net/minecraft/src","1" +"func_407_k","getTagList","m","(Ljava/lang/String;)LNBTTagList;","(Ljava/lang/String;)Lrp;","NBTTagCompound","ng","net/minecraft/src","1" +"func_402_l","getBoolean","n","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","NBTTagCompound","ng","net/minecraft/src","1" +"func_35362_a","func_35362_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentMineshaftCross","my","net/minecraft/src","1" +"func_20054_a","updateCraftingInventory","a","(LContainer;Ljava/util/List;)V","(Lea;Ljava/util/List;)V","ICrafting","ej","net/minecraft/src","1" +"func_20055_a","updateCraftingInventorySlot","a","(LContainer;ILItemStack;)V","(Lea;ILjb;)V","ICrafting","ej","net/minecraft/src","1" +"func_20056_a","updateCraftingInventoryInfo","a","(LContainer;II)V","(Lea;II)V","ICrafting","ej","net/minecraft/src","1" +"func_4106_a","generateLargeCaveNode","a","(II[BDDD)V","(II[BDDD)V","MapGenCavesHell","ou","net/minecraft/src","1" +"func_4105_a","generateCaveNode","a","(II[BDDDFFFIID)V","(II[BDDDFFFIID)V","MapGenCavesHell","ou","net/minecraft/src","1" +"func_35650_a","combine","a","(LPotionEffect;)V","(Lww;)V","PotionEffect","ww","net/minecraft/src","1" +"func_35649_a","getPotionID","a","()I","()I","PotionEffect","ww","net/minecraft/src","1" +"func_35653_b","getDuration","b","()I","()I","PotionEffect","ww","net/minecraft/src","1" +"func_35652_c","getAmplifier","c","()I","()I","PotionEffect","ww","net/minecraft/src","1" +"func_35648_a","onUpdate","a","(LEntityLiving;)Z","(Llk;)Z","PotionEffect","ww","net/minecraft/src","1" +"func_35647_d","deincrementDuration","e","()I","()I","PotionEffect","ww","net/minecraft/src","1" +"func_35651_b","performEffect","b","(LEntityLiving;)V","(Llk;)V","PotionEffect","ww","net/minecraft/src","1" +"func_40614_d","func_40614_d","d","()Ljava/lang/String;","()Ljava/lang/String;","PotionEffect","ww","net/minecraft/src","1" +"func_35338_a","func_35338_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lnu;","ComponentStrongholdStraight","nu","net/minecraft/src","1" +"func_40282_a","func_40282_a","a","(Ljava/util/List;)I","(Ljava/util/List;)I","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40284_a","func_40284_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lpk;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40283_a","func_40283_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIIIIZ)LStructureComponent;","(Lpk;Ljava/util/List;Ljava/util/Random;IIIIIZ)Ljx;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40287_a","func_40287_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lpk;Ljava/util/List;Ljava/util/Random;IIZ)Ljx;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40285_b","func_40285_b","b","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lpk;Ljava/util/List;Ljava/util/Random;IIZ)Ljx;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40288_c","func_40288_c","c","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/Random;IIZ)LStructureComponent;","(Lpk;Ljava/util/List;Ljava/util/Random;IIZ)Ljx;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_40286_a","func_40286_a","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentNetherBridgePiece","jh","net/minecraft/src","1" +"func_191_e","isBurning","h","()Z","()Z","TileEntityFurnace","rj","net/minecraft/src","1" +"func_193_g","canSmelt","o","()Z","()Z","TileEntityFurnace","rj","net/minecraft/src","1" +"func_189_f","smeltItem","n","()V","()V","TileEntityFurnace","rj","net/minecraft/src","1" +"func_194_a","getItemBurnTime","a","(LItemStack;)I","(Ljb;)I","TileEntityFurnace","rj","net/minecraft/src","1" +"func_40095_c","getMaxHealth","c","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_153_y","onLivingUpdate","d","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_6097_d","getLivingSound","c_","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","lk","net/minecraft/src","1" +"func_6100_e","getHurtSound","m","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","lk","net/minecraft/src","1" +"func_6098_f","getDeathSound","n","()Ljava/lang/String;","()Ljava/lang/String;","EntityLiving","lk","net/minecraft/src","1" +"func_149_g","getDropItemId","e","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_21047_g_","dropFewItems","a","(ZI)V","(ZI)V","EntityLiving","lk","net/minecraft/src","1" +"func_148_c","moveEntityWithHeading","a","(FF)V","(FF)V","EntityLiving","lk","net/minecraft/src","1" +"func_144_E","isOnLadder","r","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_155_a","getCanSpawnHere","g","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_35180_G","func_35180_G","K","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_22058_w","isMovementBlocked","L","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_152_d_","updateEntityActionState","m_","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_142_f","onDeath","a","(LDamageSource;)V","(Lpo;)V","EntityLiving","lk","net/minecraft/src","1" +"func_40094_f","func_40094_f","f","(I)I","(I)I","EntityLiving","lk","net/minecraft/src","1" +"func_40099_b","func_40099_b","b","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" +"func_40101_g","func_40101_g","g","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" +"func_40092_O","func_40092_O","O","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_6099_c","damageEntity","c","(LDamageSource;I)V","(Lpo;I)V","EntityLiving","lk","net/minecraft/src","1" +"func_22057_E","isPlayerSleeping","U","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_154_F","jump","X","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_36000_a","getExperiencePoints","a","(LEntityPlayer;)I","(Lgz;)I","EntityLiving","lk","net/minecraft/src","1" +"func_35188_X","func_35188_X","ac","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_40102_ag","func_40102_ag","ag","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_27013_Q","despawnEntity","ak","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_25020_s","canDespawn","d_","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_6102_h","getSoundVolume","o","()F","()F","EntityLiving","lk","net/minecraft/src","1" +"func_25018_n_","getVerticalFaceSpeed","q_","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_4045_i","getMaxSpawnedInChunk","p","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_146_b","getTalkInterval","h","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_40093_t","func_40093_t","t","()LEnumCreatureAttribute;","()Lbq;","EntityLiving","lk","net/minecraft/src","1" +"func_40096_a","func_40096_a","a","(LPotionEffect;)Z","(Lww;)Z","EntityLiving","lk","net/minecraft/src","1" +"func_40104_l","func_40104_l","l","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_145_g","canEntityBeSeen","g","(LEntity;)Z","(Lrn;)Z","EntityLiving","lk","net/minecraft/src","1" +"func_22056_G","playLivingSound","ae","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_156_D","spawnExplosionParticle","ah","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_137_a","heal","d","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" +"func_40097_ai","getEntityHealth","ai","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_40103_i","setEntityHealth","i","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" +"func_40090_w","func_40090_w","w","()F","()F","EntityLiving","lk","net/minecraft/src","1" +"func_40091_d","func_40091_d","d","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" +"func_143_a","knockBack","a","(LEntity;IDD)V","(Lrn;IDD)V","EntityLiving","lk","net/minecraft/src","1" +"func_21046_d_","canBreatheUnderwater","f","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_147_b","faceEntity","a","(LEntity;FF)V","(Lrn;FF)V","EntityLiving","lk","net/minecraft/src","1" +"func_25021_O","hasCurrentTarget","al","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_25019_P","getCurrentTarget","am","()LEntity;","()Lrn;","EntityLiving","lk","net/minecraft/src","1" +"func_140_b","updateRotation","b","(FFF)F","(FFF)F","EntityLiving","lk","net/minecraft/src","1" +"func_6101_K","onEntityDeath","an","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_141_d","getLook","d","(F)LVec3D;","(F)Lbx;","EntityLiving","lk","net/minecraft/src","1" +"func_35186_aj","func_35186_aj","aq","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_40089_ar","func_40089_ar","ar","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_35183_ak","func_35183_ak","as","()Ljava/util/Collection;","()Ljava/util/Collection;","EntityLiving","lk","net/minecraft/src","1" +"func_35184_a","func_35184_a","a","(LPotion;)Z","(Lir;)Z","EntityLiving","lk","net/minecraft/src","1" +"func_35187_b","getActivePotionEffect","b","(LPotion;)LPotionEffect;","(Lir;)Lww;","EntityLiving","lk","net/minecraft/src","1" +"func_35182_d","addPotionEffect","e","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_40100_at","isEntityUndead","at","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" +"func_35181_a","func_35181_a","b","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35179_b","func_35179_b","c","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35185_c","func_35185_c","d","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35178_D","func_35178_D","F","()F","()F","EntityLiving","lk","net/minecraft/src","1" +"func_40098_a_","func_40098_a_","a_","(DDD)V","(DDD)V","EntityLiving","lk","net/minecraft/src","1" +"func_41030_c","func_41030_c","c","(LItemStack;)V","(Ljb;)V","EntityLiving","lk","net/minecraft/src","1" +"func_618_a","setPlayerManager","a","([LWorldServer;)V","([Lfp;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28172_a","joinNewPlayerManager","a","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_640_a","getMaxTrackingDistance","a","()I","()I","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28167_a","getPlayerManager","a","(I)LPlayerManager;","(I)Lwi;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28166_b","readPlayerDataFromFile","b","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_627_a","playerLoggedIn","c","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_613_b","serverUpdateMountedMovingPlayer","d","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_616_c","playerLoggedOut","e","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_619_a","login","a","(LNetLoginHandler;Ljava/lang/String;)LEntityPlayerMP;","(Lgq;Ljava/lang/String;)Lfl;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_9242_d","recreatePlayerEntity","a","(LEntityPlayerMP;IZ)LEntityPlayerMP;","(Lfl;IZ)Lfl;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28168_f","sendPlayerToOtherDimension","a","(LEntityPlayerMP;I)V","(Lfl;I)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_637_b","onTick","b","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_622_a","markBlockNeedsUpdate","a","(IIII)V","(IIII)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_631_a","sendPacketToAllPlayers","a","(LPacket;)V","(Lkf;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28169_a","sendPacketToAllPlayersInDimension","a","(LPacket;I)V","(Lkf;I)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_633_c","getPlayerList","c","()Ljava/lang/String;","()Ljava/lang/String;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_40575_d","getPlayerNamesAsList","d","()[Ljava/lang/String;","()[Ljava/lang/String;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22159_a","banPlayer","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22161_b","pardonPlayer","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_623_e","readBannedPlayers","l","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_626_f","writeBannedPlayers","m","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_40576_e","getBannedPlayersList","e","()Ljava/util/Set;","()Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_40574_f","getBannedIPsList","f","()Ljava/util/Set;","()Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22162_c","banIP","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22163_d","pardonIP","d","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_9245_g","loadBannedList","n","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_9248_h","saveBannedList","o","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_35479_e","addOp","e","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_35478_f","removeOp","f","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_9249_i","loadOps","p","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_9239_j","saveOps","q","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22168_m","loadWhiteList","r","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22160_n","saveWhiteList","s","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22166_g","isAllowedToLogin","g","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_639_g","isOp","h","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_620_h","getPlayerEntity","i","(Ljava/lang/String;)LEntityPlayerMP;","(Ljava/lang/String;)Lfl;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_628_a","sendChatMessageToPlayer","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_12022_a","sendPacketToPlayersAroundPoint","a","(DDDDILPacket;)V","(DDDDILkf;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28171_a","func_28171_a","a","(LEntityPlayer;DDDDILPacket;)V","(Lgz;DDDDILkf;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_630_i","sendChatMessageToAllOps","j","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_621_a","sendPacketToPlayer","a","(Ljava/lang/String;LPacket;)Z","(Ljava/lang/String;Lkf;)Z","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_617_d","savePlayerStates","g","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_636_a","sentTileEntityToPlayer","a","(IIILTileEntity;)V","(IIILoh;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22169_k","addToWhiteList","k","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22170_l","removeFromWhiteList","l","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22167_e","getWhiteListedIPs","h","()Ljava/util/Set;","()Ljava/util/Set;","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_22171_f","reloadWhiteList","i","()V","()V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_28170_a","func_28170_a","a","(LEntityPlayerMP;LWorldServer;)V","(Lfl;Lfp;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_30008_g","func_30008_g","f","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_35481_g","playersOnline","j","()I","()I","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_35480_h","getMaxPlayers","k","()I","()I","ServerConfigurationManager","hv","net/minecraft/src","1" +"func_40581_a","func_40581_a","a","(LInventoryBasic;)V","(Lpq;)V","IInvBasic","hz","net/minecraft/src","1" +"func_665_a","chunkFileForXZ","a","(II)Ljava/io/File;","(II)Ljava/io/File;","ChunkLoader","sj","net/minecraft/src","1" +"func_663_a","storeChunkInCompound","a","(LChunk;LWorld;LNBTTagCompound;)V","(Lle;Lfi;Lng;)V","ChunkLoader","sj","net/minecraft/src","1" +"func_664_a","loadChunkIntoWorldFromCompound","a","(LWorld;LNBTTagCompound;)LChunk;","(Lfi;Lng;)Lle;","ChunkLoader","sj","net/minecraft/src","1" +"func_35370_a","func_35370_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageField;","(Ljava/util/List;Ljava/util/Random;IIIII)Lp;","ComponentVillageField","p","net/minecraft/src","1" +"func_35399_a","func_35399_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageField2;","(Ljava/util/List;Ljava/util/Random;IIIII)Lvc;","ComponentVillageField2","vc","net/minecraft/src","1" +"func_26001_a","func_26001_a","a","([B)V","([B)V","ChunkBlockMap","uj","net/minecraft/src","1" +"func_35066_f_","func_35066_f_","g","(LWorld;III)V","(Lfi;III)V","BlockStem","np","net/minecraft/src","1" +"func_35067_h","func_35067_h","i","(LWorld;III)F","(Lfi;III)F","BlockStem","np","net/minecraft/src","1" +"func_158_i","findPlayerToAttack","k","()LEntity;","()Lrn;","EntityCreature","il","net/minecraft/src","1" +"func_25026_u","isMovementCeased","w","()Z","()Z","EntityCreature","il","net/minecraft/src","1" +"func_157_a","attackEntity","a","(LEntity;F)V","(Lrn;F)V","EntityCreature","il","net/minecraft/src","1" +"func_28013_b","attackBlockedEntity","b","(LEntity;F)V","(Lrn;F)V","EntityCreature","il","net/minecraft/src","1" +"func_159_a","getBlockPathWeight","a","(III)F","(III)F","EntityCreature","il","net/minecraft/src","1" +"func_31021_B","updateWanderPath","C","()V","()V","EntityCreature","il","net/minecraft/src","1" +"func_25023_z","hasPath","D","()Z","()Z","EntityCreature","il","net/minecraft/src","1" +"func_25022_a","setPathToEntity","a","(LPathEntity;)V","(Ldk;)V","EntityCreature","il","net/minecraft/src","1" +"func_25024_A","getEntityToAttack","E","()LEntity;","()Lrn;","EntityCreature","il","net/minecraft/src","1" +"func_25025_c","setTarget","e","(LEntity;)V","(Lrn;)V","EntityCreature","il","net/minecraft/src","1" +"func_28115_a","setExitLocation","a","(LWorld;LEntity;)V","(Lfi;Lrn;)V","Teleporter","ti","net/minecraft/src","1" +"func_28114_b","findExitLocation","b","(LWorld;LEntity;)Z","(Lfi;Lrn;)Z","Teleporter","ti","net/minecraft/src","1" +"func_28116_c","createExitLocation","c","(LWorld;LEntity;)Z","(Lfi;Lrn;)Z","Teleporter","ti","net/minecraft/src","1" +"func_35625_a","prepareStructurePieces","a","()V","()V","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35626_c","canAddStructurePieces","c","()Z","()Z","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35620_a","getStrongholdComponentFromWeightedPiece","a","(Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIIII)LComponentStronghold;","(Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIIII)Lhc;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35623_b","func_35623_b","b","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LComponentStronghold;","(Lw;Ljava/util/List;Ljava/util/Random;IIIII)Lhc;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35621_c","func_35621_c","c","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35624_a","func_35624_a","a","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;IIIII)Ljx;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_40541_a","func_40541_a","a","(Ljava/lang/Class;)Ljava/lang/Class;","(Ljava/lang/Class;)Ljava/lang/Class;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_35622_b","getStrongholdStones","b","()LStructureStrongholdStones;","()Lue;","StructureStrongholdPieces","jn","net/minecraft/src","1" +"func_27083_a","setConnections","a","(I)V","(I)V","RailLogic","uo","net/minecraft/src","1" +"func_591_b","refreshConnectedTracks","a","()V","()V","RailLogic","uo","net/minecraft/src","1" +"func_589_a","isMinecartTrack","a","(III)Z","(III)Z","RailLogic","uo","net/minecraft/src","1" +"func_595_a","getMinecartTrackLogic","a","(LChunkPosition;)LRailLogic;","(Lvo;)Luo;","RailLogic","uo","net/minecraft/src","1" +"func_590_b","isConnectedTo","b","(LRailLogic;)Z","(Luo;)Z","RailLogic","uo","net/minecraft/src","1" +"func_599_b","isInTrack","b","(III)Z","(III)Z","RailLogic","uo","net/minecraft/src","1" +"func_594_c","getAdjacentTracks","b","()I","()I","RailLogic","uo","net/minecraft/src","1" +"func_597_c","canConnectTo","c","(LRailLogic;)Z","(Luo;)Z","RailLogic","uo","net/minecraft/src","1" +"func_598_d","connectToNeighbor","d","(LRailLogic;)V","(Luo;)V","RailLogic","uo","net/minecraft/src","1" +"func_592_c","canConnectFrom","c","(III)Z","(III)Z","RailLogic","uo","net/minecraft/src","1" +"func_596_a","refreshTrackShape","a","(ZZ)V","(ZZ)V","RailLogic","uo","net/minecraft/src","1" +"func_600_a","getNAdjacentTracks","a","(LRailLogic;)I","(Luo;)I","RailLogic","uo","net/minecraft/src","1" +"func_27059_a","setIndependent","a","()LAchievement;","()Lni;","Achievement","ni","net/minecraft/src","1" +"func_27060_b","setSpecial","b","()LAchievement;","()Lni;","Achievement","ni","net/minecraft/src","1" +"func_27061_c","registerAchievement","c","()LAchievement;","()Lni;","Achievement","ni","net/minecraft/src","1" +"func_35397_a","func_35397_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse1;","(Ljava/util/List;Ljava/util/Random;IIIII)Lve;","ComponentVillageHouse1","ve","net/minecraft/src","1" +"func_42_a","handlePackets","a","()V","()V","NetServerHandler","kt","net/minecraft/src","1" +"func_43_c","kickPlayer","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","NetServerHandler","kt","net/minecraft/src","1" +"func_41_a","teleportTo","a","(DDDFF)V","(DDDFF)V","NetServerHandler","kt","net/minecraft/src","1" +"func_39_b","sendPacket","b","(LPacket;)V","(Lkf;)V","NetServerHandler","kt","net/minecraft/src","1" +"func_4010_d","handleSlashCommand","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","NetServerHandler","kt","net/minecraft/src","1" +"func_38_b","getNumChunkDataPackets","b","()I","()I","NetServerHandler","kt","net/minecraft/src","1" +"func_35255_a","decorate","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","BiomeDecorator","go","net/minecraft/src","1" +"func_35256_b","decorate","a","()V","()V","BiomeDecorator","go","net/minecraft/src","1" +"func_35257_a","genStandardOre1","a","(ILWorldGenerator;II)V","(ILor;II)V","BiomeDecorator","go","net/minecraft/src","1" +"func_35254_b","genStandardOre2","b","(ILWorldGenerator;II)V","(ILor;II)V","BiomeDecorator","go","net/minecraft/src","1" +"func_35253_a","generateOres","b","()V","()V","BiomeDecorator","go","net/minecraft/src","1" +"func_41005_c","func_41005_c","g","(LWorld;III)V","(Lfi;III)V","BlockDragonEgg","eb","net/minecraft/src","1" +"func_41004_h","func_41004_h","h","(LWorld;III)V","(Lfi;III)V","BlockDragonEgg","eb","net/minecraft/src","1" +"func_22114_a","handleCommand","a","(LServerCommand;)V","(Lay;)V","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_22113_a","handleWhitelist","a","(Ljava/lang/String;Ljava/lang/String;LICommandListener;)V","(Ljava/lang/String;Ljava/lang/String;Lsb;)V","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_22111_a","printHelp","a","(LICommandListener;)V","(Lsb;)V","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_22115_a","sendNoticeToOps","a","(Ljava/lang/String;Ljava/lang/String;)V","(Ljava/lang/String;Ljava/lang/String;)V","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_22112_a","tryParse","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_40648_a","func_40648_a","a","([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","ConsoleCommandHandler","sc","net/minecraft/src","1" +"func_31030_a","getTileEntity","a","(IIIZZ)LTileEntity;","(IIIZZ)Loh;","BlockPistonMoving","tk","net/minecraft/src","1" +"func_31032_a","func_31032_a","b","(LWorld;IIIIFI)LAxisAlignedBB;","(Lfi;IIIIFI)Leu;","BlockPistonMoving","tk","net/minecraft/src","1" +"func_31031_b","getTileEntityAtLocation","b","(LIBlockAccess;III)LTileEntityPiston;","(Lwy;III)Ltf;","BlockPistonMoving","tk","net/minecraft/src","1" +"func_413_a","addPoint","a","(LPathPoint;)LPathPoint;","(Le;)Le;","Path","kv","net/minecraft/src","1" +"func_417_a","clearPath","a","()V","()V","Path","kv","net/minecraft/src","1" +"func_415_b","dequeue","b","()LPathPoint;","()Le;","Path","kv","net/minecraft/src","1" +"func_414_a","changeDistance","a","(LPathPoint;F)V","(Le;F)V","Path","kv","net/minecraft/src","1" +"func_412_a","sortBack","a","(I)V","(I)V","Path","kv","net/minecraft/src","1" +"func_416_b","sortForward","b","(I)V","(I)V","Path","kv","net/minecraft/src","1" +"func_418_c","isPathEmpty","c","()Z","()Z","Path","kv","net/minecraft/src","1" +"func_40420_e","initClientTh","e","()V","()V","RConThreadMain","pd","net/minecraft/src","1" +"func_40421_f","cleanClientThreadsMap","f","()V","()V","RConThreadMain","pd","net/minecraft/src","1" +"func_78_a","onItemUse","a","(LItemStack;LEntityPlayer;LWorld;IIII)Z","(Ljb;Lgz;Lfi;IIII)Z","Item","gw","net/minecraft/src","1" +"func_35405_b","onFoodEaten","b","(LItemStack;LWorld;LEntityPlayer;)LItemStack;","(Ljb;Lfi;Lgz;)Ljb;","Item","gw","net/minecraft/src","1" +"func_35404_c","getMaxItemUseDuration","c","(LItemStack;)I","(Ljb;)I","Item","gw","net/minecraft/src","1" +"func_35406_b","getAction","d","(LItemStack;)LEnumAction;","(Ljb;)Ljf;","Item","gw","net/minecraft/src","1" +"func_6152_a","onItemRightClick","a","(LItemStack;LWorld;LEntityPlayer;)LItemStack;","(Ljb;Lfi;Lgz;)Ljb;","Item","gw","net/minecraft/src","1" +"func_21089_a","getMetadata","a","(I)I","(I)I","Item","gw","net/minecraft/src","1" +"func_35407_a","func_35407_a","a","(LItemStack;)Ljava/lang/String;","(Ljb;)Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"func_25007_a","onBlockDestroyed","a","(LItemStack;IIIILEntityLiving;)Z","(Ljb;IIIILlk;)Z","Item","gw","net/minecraft/src","1" +"func_80_a","canHarvestBlock","a","(LBlock;)Z","(Ltl;)Z","Item","gw","net/minecraft/src","1" +"func_79_a","getStrVsBlock","a","(LItemStack;LBlock;)F","(Ljb;Ltl;)F","Item","gw","net/minecraft/src","1" +"func_40224_c","getItemEnchantability","c","()I","()I","Item","gw","net/minecraft/src","1" +"func_4049_a","setIconIndex","d","(I)LItem;","(I)Lgw;","Item","gw","net/minecraft/src","1" +"func_21086_c","setMaxStackSize","e","(I)LItem;","(I)Lgw;","Item","gw","net/minecraft/src","1" +"func_20104_a","setIconCoord","a","(II)LItem;","(II)Lgw;","Item","gw","net/minecraft/src","1" +"func_81_a","getItemStackLimit","d","()I","()I","Item","gw","net/minecraft/src","1" +"func_21092_c","getHasSubtypes","e","()Z","()Z","Item","gw","net/minecraft/src","1" +"func_21091_a","setHasSubtypes","a","(Z)LItem;","(Z)Lgw;","Item","gw","net/minecraft/src","1" +"func_77_b","getMaxDamage","f","()I","()I","Item","gw","net/minecraft/src","1" +"func_21090_d","setMaxDamage","f","(I)LItem;","(I)Lgw;","Item","gw","net/minecraft/src","1" +"func_25005_e","isDamageable","g","()Z","()Z","Item","gw","net/minecraft/src","1" +"func_9201_a","hitEntity","a","(LItemStack;LEntityLiving;LEntityLiving;)Z","(Ljb;Llk;Llk;)Z","Item","gw","net/minecraft/src","1" +"func_9203_a","getDamageVsEntity","a","(LEntity;)I","(Lrn;)I","Item","gw","net/minecraft/src","1" +"func_9202_b","saddleEntity","a","(LItemStack;LEntityLiving;)V","(Ljb;Llk;)V","Item","gw","net/minecraft/src","1" +"func_4050_c","setFull3D","h","()LItem;","()Lgw;","Item","gw","net/minecraft/src","1" +"func_20105_a","setItemName","a","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lgw;","Item","gw","net/minecraft/src","1" +"func_20106_a","getItemName","b","()Ljava/lang/String;","()Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"func_21093_a","setContainerItem","a","(LItem;)LItem;","(Lgw;)Lgw;","Item","gw","net/minecraft/src","1" +"func_21087_f","getContainerItem","i","()LItem;","()Lgw;","Item","gw","net/minecraft/src","1" +"func_21088_g","hasContainerItem","j","()Z","()Z","Item","gw","net/minecraft/src","1" +"func_25006_i","getStatName","k","()Ljava/lang/String;","()Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"func_28018_a","onUpdate","a","(LItemStack;LWorld;LEntity;IZ)V","(Ljb;Lfi;Lrn;IZ)V","Item","gw","net/minecraft/src","1" +"func_28020_c","onCreated","d","(LItemStack;LWorld;LEntityPlayer;)V","(Ljb;Lfi;Lgz;)V","Item","gw","net/minecraft/src","1" +"func_28019_b","func_28019_b","n_","()Z","()Z","Item","gw","net/minecraft/src","1" +"func_35408_a","onPlayerStoppedUsing","a","(LItemStack;LWorld;LEntityPlayer;I)V","(Ljb;Lfi;Lgz;I)V","Item","gw","net/minecraft/src","1" +"func_40223_b","setPotionInfo","b","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lgw;","Item","gw","net/minecraft/src","1" +"func_40221_l","getPotionInfo","l","()Ljava/lang/String;","()Ljava/lang/String;","Item","gw","net/minecraft/src","1" +"func_40220_m","isPotionIngredient","m","()Z","()Z","Item","gw","net/minecraft/src","1" +"func_40222_e","func_40222_e","e","(LItemStack;)Z","(Ljb;)Z","Item","gw","net/minecraft/src","1" +"func_40225_a","func_40225_a","a","(LWorld;LEntityPlayer;Z)LMovingObjectPosition;","(Lfi;Lgz;Z)Luc;","Item","gw","net/minecraft/src","1" +"func_184_b","updateEntity","l_","()V","()V","TileEntity","oh","net/minecraft/src","1" +"func_186_a","readFromNBT","a","(LNBTTagCompound;)V","(Lng;)V","TileEntity","oh","net/minecraft/src","1" +"func_188_b","writeToNBT","b","(LNBTTagCompound;)V","(Lng;)V","TileEntity","oh","net/minecraft/src","1" +"func_20070_f","getDescriptionPacket","k","()LPacket;","()Lkf;","TileEntity","oh","net/minecraft/src","1" +"func_31005_e","getBlockMetadata","j","()I","()I","TileEntity","oh","net/minecraft/src","1" +"func_187_a","addMapping","a","(Ljava/lang/Class;Ljava/lang/String;)V","(Ljava/lang/Class;Ljava/lang/String;)V","TileEntity","oh","net/minecraft/src","1" +"func_185_c","createAndLoadEntity","c","(LNBTTagCompound;)LTileEntity;","(Lng;)Loh;","TileEntity","oh","net/minecraft/src","1" +"func_31004_g","isInvalid","l","()Z","()Z","TileEntity","oh","net/minecraft/src","1" +"func_31003_h","invalidate","i","()V","()V","TileEntity","oh","net/minecraft/src","1" +"func_31002_j","validate","m","()V","()V","TileEntity","oh","net/minecraft/src","1" +"func_35163_b","func_35163_b","b","(II)V","(II)V","TileEntity","oh","net/minecraft/src","1" +"func_35164_g","func_35164_g","d","()V","()V","TileEntity","oh","net/minecraft/src","1" +"func_30004_i","updateFlow","i","(LWorld;III)V","(Lfi;III)V","BlockFlowing","nx","net/minecraft/src","1" +"func_311_f","flowIntoBlock","g","(LWorld;IIII)V","(Lfi;IIII)V","BlockFlowing","nx","net/minecraft/src","1" +"func_4034_a","calculateFlowCost","c","(LWorld;IIIII)I","(Lfi;IIIII)I","BlockFlowing","nx","net/minecraft/src","1" +"func_4035_j","getOptimalFlowDirections","j","(LWorld;III)[Z","(Lfi;III)[Z","BlockFlowing","nx","net/minecraft/src","1" +"func_309_k","blockBlocksFlow","k","(LWorld;III)Z","(Lfi;III)Z","BlockFlowing","nx","net/minecraft/src","1" +"func_307_e","getSmallestFlowDecay","f","(LWorld;IIII)I","(Lfi;IIII)I","BlockFlowing","nx","net/minecraft/src","1" +"func_312_l","liquidCanDisplaceBlock","l","(LWorld;III)Z","(Lfi;III)Z","BlockFlowing","nx","net/minecraft/src","1" +"func_40311_a","func_40311_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdChestCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgx;","ComponentStrongholdChestCorridor","gx","net/minecraft/src","1" +"func_213_b","getCurrentItem","d","()LItemStack;","()Ljb;","InventoryPlayer","ja","net/minecraft/src","1" +"func_25054_e","func_25054_e","h","()I","()I","InventoryPlayer","ja","net/minecraft/src","1" +"func_6126_d","getInventorySlotContainItem","e","(I)I","(I)I","InventoryPlayer","ja","net/minecraft/src","1" +"func_21082_c","storeItemStack","d","(LItemStack;)I","(Ljb;)I","InventoryPlayer","ja","net/minecraft/src","1" +"func_205_g","getFirstEmptyStack","m","()I","()I","InventoryPlayer","ja","net/minecraft/src","1" +"func_21083_d","storePartialItemStack","e","(LItemStack;)I","(Ljb;)I","InventoryPlayer","ja","net/minecraft/src","1" +"func_210_c","decrementAnimations","i","()V","()V","InventoryPlayer","ja","net/minecraft/src","1" +"func_6127_b","consumeInventoryItem","b","(I)Z","(I)Z","InventoryPlayer","ja","net/minecraft/src","1" +"func_35177_c","hasItemInInventory","c","(I)Z","(I)Z","InventoryPlayer","ja","net/minecraft/src","1" +"func_201_a","addItemStackToInventory","a","(LItemStack;)Z","(Ljb;)Z","InventoryPlayer","ja","net/minecraft/src","1" +"func_208_a","getStrVsBlock","a","(LBlock;)F","(Ltl;)F","InventoryPlayer","ja","net/minecraft/src","1" +"func_200_a","writeToNBT","a","(LNBTTagList;)LNBTTagList;","(Lrp;)Lrp;","InventoryPlayer","ja","net/minecraft/src","1" +"func_203_b","readFromNBT","b","(LNBTTagList;)V","(Lrp;)V","InventoryPlayer","ja","net/minecraft/src","1" +"func_9157_a","getDamageVsEntity","a","(LEntity;)I","(Lrn;)I","InventoryPlayer","ja","net/minecraft/src","1" +"func_207_b","canHarvestBlock","b","(LBlock;)Z","(Ltl;)Z","InventoryPlayer","ja","net/minecraft/src","1" +"func_212_e","getTotalArmorValue","j","()I","()I","InventoryPlayer","ja","net/minecraft/src","1" +"func_211_b","damageArmor","d","(I)V","(I)V","InventoryPlayer","ja","net/minecraft/src","1" +"func_199_f","dropAllItems","k","()V","()V","InventoryPlayer","ja","net/minecraft/src","1" +"func_20073_b","setItemStack","b","(LItemStack;)V","(Ljb;)V","InventoryPlayer","ja","net/minecraft/src","1" +"func_20072_i","getItemStack","l","()LItemStack;","()Ljb;","InventoryPlayer","ja","net/minecraft/src","1" +"func_28010_c","hasItemStack","c","(LItemStack;)Z","(Ljb;)Z","InventoryPlayer","ja","net/minecraft/src","1" +"func_41013_a","func_41013_a","a","(LInventoryPlayer;)V","(Lja;)V","InventoryPlayer","ja","net/minecraft/src","1" +"func_20095_a","isItemValid","a","(LItemStack;)Z","(Ljb;)Z","Slot","gy","net/minecraft/src","1" +"func_20091_b","onPickupFromSlot","b","(LItemStack;)V","(Ljb;)V","Slot","gy","net/minecraft/src","1" +"func_20093_a","getSlotStackLimit","a","()I","()I","Slot","gy","net/minecraft/src","1" +"func_20092_c","getStack","b","()LItemStack;","()Ljb;","Slot","gy","net/minecraft/src","1" +"func_27006_b","getHasStack","c","()Z","()Z","Slot","gy","net/minecraft/src","1" +"func_20089_b","putStack","c","(LItemStack;)V","(Ljb;)V","Slot","gy","net/minecraft/src","1" +"func_20094_d","onSlotChanged","d","()V","()V","Slot","gy","net/minecraft/src","1" +"func_20088_a","decrStackSize","a","(I)LItemStack;","(I)Ljb;","Slot","gy","net/minecraft/src","1" +"func_20090_a","isHere","a","(LIInventory;I)Z","(Llp;I)Z","Slot","gy","net/minecraft/src","1" +"func_27014_t","getPowered","u","()Z","()Z","EntityCreeper","gj","net/minecraft/src","1" +"func_21048_K","getCreeperState","A","()I","()I","EntityCreeper","gj","net/minecraft/src","1" +"func_21049_a","setCreeperState","b","(I)V","(I)V","EntityCreeper","gj","net/minecraft/src","1" +"func_28118_a","func_28118_a","a","(LItemStack;)[B","(Ljb;)[B","MapInfo","ri","net/minecraft/src","1" +"func_20128_a","onCraftGuiOpened","a","(LICrafting;)V","(Lej;)V","Container","ea","net/minecraft/src","1" +"func_20125_a","updateCraftingResults","a","()V","()V","Container","ea","net/minecraft/src","1" +"func_20121_a","onCraftMatrixChanged","a","(LIInventory;)V","(Llp;)V","Container","ea","net/minecraft/src","1" +"func_40331_a","func_40331_a","a","(LEntityPlayer;I)Z","(Lgz;I)Z","Container","ea","net/minecraft/src","1" +"func_20130_a","onCraftGuiClosed","a","(LEntityPlayer;)V","(Lgz;)V","Container","ea","net/minecraft/src","1" +"func_20126_b","canInteractWith","b","(LEntityPlayer;)Z","(Lgz;)Z","Container","ea","net/minecraft/src","1" +"func_27086_a","transferStackInSlot","a","(I)LItemStack;","(I)Ljb;","Container","ea","net/minecraft/src","1" +"func_20122_a","addSlot","a","(LSlot;)V","(Lgy;)V","Container","ea","net/minecraft/src","1" +"func_28127_b","func_28127_b","b","()Ljava/util/List;","()Ljava/util/List;","Container","ea","net/minecraft/src","1" +"func_20127_a","func_20127_a","a","(LIInventory;I)LSlot;","(Llp;I)Lgy;","Container","ea","net/minecraft/src","1" +"func_20120_a","getSlot","b","(I)LSlot;","(I)Lgy;","Container","ea","net/minecraft/src","1" +"func_27085_a","slotClick","a","(IIZLEntityPlayer;)LItemStack;","(IIZLgz;)Ljb;","Container","ea","net/minecraft/src","1" +"func_35497_b","func_35497_b","b","(IIZLEntityPlayer;)V","(IIZLgz;)V","Container","ea","net/minecraft/src","1" +"func_35498_a","putStackInSlot","a","(ILItemStack;)V","(ILjb;)V","Container","ea","net/minecraft/src","1" +"func_20124_c","getCanCraft","c","(LEntityPlayer;)Z","(Lgz;)Z","Container","ea","net/minecraft/src","1" +"func_20129_a","setCanCraft","a","(LEntityPlayer;Z)V","(Lgz;Z)V","Container","ea","net/minecraft/src","1" +"func_28126_a","mergeItemStack","a","(LItemStack;IIZ)Z","(Ljb;IIZ)Z","Container","ea","net/minecraft/src","1" +"func_21065_K","getSaddled","y","()Z","()Z","EntityPig","vr","net/minecraft/src","1" +"func_21064_a","setSaddled","a","(Z)V","(Z)V","EntityPig","vr","net/minecraft/src","1" +"func_648_a","generateNoiseOctaves","a","([DIIIIIIDDD)[D","([DIIIIIIDDD)[D","NoiseGeneratorOctaves","sw","net/minecraft/src","1" +"func_4103_a","func_4103_a","a","([DIIIIDDD)[D","([DIIIIDDD)[D","NoiseGeneratorOctaves","sw","net/minecraft/src","1" +"func_35419_a","func_35419_a","a","()I","()I","ItemBlock","cl","net/minecraft/src","1" +"func_40537_b","func_40537_b","b","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lrr;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"func_40538_a","func_40538_a","a","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lrr;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"func_40536_a","func_40536_a","a","()[LStructureNetherBridgePieceWeight;","()[Lrr;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"func_40535_b","func_40535_b","b","()[LStructureNetherBridgePieceWeight;","()[Lrr;","StructureNetherBridgePieces","lu","net/minecraft/src","1" +"func_25009_j","getHealAmount","n","()I","()I","ItemFood","yf","net/minecraft/src","1" +"func_35424_l","getSaturationFactor","o","()F","()F","ItemFood","yf","net/minecraft/src","1" +"func_25010_k","getIsWolfsFavoriteMeat","p","()Z","()Z","ItemFood","yf","net/minecraft/src","1" +"func_35422_a","setPotionEffect","a","(IIIF)LItemFood;","(IIIF)Lyf;","ItemFood","yf","net/minecraft/src","1" +"func_35423_n","func_35423_n","q","()LItemFood;","()Lyf;","ItemFood","yf","net/minecraft/src","1" +"func_40041_a","onImpact","a","(LMovingObjectPosition;)V","(Luc;)V","EntityThrowable","bc","net/minecraft/src","1" +"func_40042_e","func_40042_e","e","()F","()F","EntityThrowable","bc","net/minecraft/src","1" +"func_40044_c","func_40044_c","c","()F","()F","EntityThrowable","bc","net/minecraft/src","1" +"func_40040_d","func_40040_d","d","()F","()F","EntityThrowable","bc","net/minecraft/src","1" +"func_40043_a","func_40043_a","a","(DDDFF)V","(DDDFF)V","EntityThrowable","bc","net/minecraft/src","1" +"func_424_a","generateLeafNodeList","a","()V","()V","WorldGenBigTree","im","net/minecraft/src","1" +"func_426_a","func_426_a","a","(IIIFBI)V","(IIIFBI)V","WorldGenBigTree","im","net/minecraft/src","1" +"func_431_a","func_431_a","a","(I)F","(I)F","WorldGenBigTree","im","net/minecraft/src","1" +"func_429_b","func_429_b","b","(I)F","(I)F","WorldGenBigTree","im","net/minecraft/src","1" +"func_423_a","generateLeafNode","a","(III)V","(III)V","WorldGenBigTree","im","net/minecraft/src","1" +"func_425_a","placeBlockLine","a","([I[II)V","([I[II)V","WorldGenBigTree","im","net/minecraft/src","1" +"func_421_b","generateLeaves","b","()V","()V","WorldGenBigTree","im","net/minecraft/src","1" +"func_430_c","leafNodeNeedsBase","c","(I)Z","(I)Z","WorldGenBigTree","im","net/minecraft/src","1" +"func_432_c","generateTrunk","c","()V","()V","WorldGenBigTree","im","net/minecraft/src","1" +"func_428_d","generateLeafNodeBases","d","()V","()V","WorldGenBigTree","im","net/minecraft/src","1" +"func_427_a","checkBlockLine","a","([I[I)I","([I[I)I","WorldGenBigTree","im","net/minecraft/src","1" +"func_422_e","validTreeLocation","e","()Z","()Z","WorldGenBigTree","im","net/minecraft/src","1" +"func_40011_a","getIntProperty","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","IServer","vp","net/minecraft/src","1" +"func_40023_a","getStringProperty","a","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40017_a","setProperty","a","(Ljava/lang/String;Ljava/lang/Object;)V","(Ljava/lang/String;Ljava/lang/Object;)V","IServer","vp","net/minecraft/src","1" +"func_40019_c","saveProperties","c","()V","()V","IServer","vp","net/minecraft/src","1" +"func_40013_e","getSettingsFilename","e","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40009_f","getHostname","f","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40022_g","getPort","g","()I","()I","IServer","vp","net/minecraft/src","1" +"func_40014_h","getMotd","h","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40012_i","getVersionString","i","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40018_j","playersOnline","j","()I","()I","IServer","vp","net/minecraft/src","1" +"func_40015_k","getMaxPlayers","k","()I","()I","IServer","vp","net/minecraft/src","1" +"func_40016_l","getPlayerNamesAsList","l","()[Ljava/lang/String;","()[Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40024_m","getWorldName","m","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40020_n","getPlugin","n","()Ljava/lang/String;","()Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40010_o","func_40010_o","o","()V","()V","IServer","vp","net/minecraft/src","1" +"func_40008_d","handleRConCommand","d","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","IServer","vp","net/minecraft/src","1" +"func_40021_p","isDebuggingEnabled","p","()Z","()Z","IServer","vp","net/minecraft/src","1" +"func_25002_c","logWarning","c","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IServer","vp","net/minecraft/src","1" +"func_40007_e","logSevere","e","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IServer","vp","net/minecraft/src","1" +"func_40006_f","logIn","f","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IServer","vp","net/minecraft/src","1" +"func_20177_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesFood","no","net/minecraft/src","1" +"func_40307_a","func_40307_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeEntrance;","(Ljava/util/List;Ljava/util/Random;IIIII)Ltv;","ComponentNetherBridgeEntrance","tv","net/minecraft/src","1" +"func_540_a","getMinecraftServer","a","()LWorldServer;","()Lfp;","PlayerManager","wi","net/minecraft/src","1" +"func_538_a","updatePlayerInstances","b","()V","()V","PlayerManager","wi","net/minecraft/src","1" +"func_537_a","getPlayerInstance","a","(IIZ)LPlayerInstance;","(IIZ)Lal;","PlayerManager","wi","net/minecraft/src","1" +"func_535_a","markBlockNeedsUpdate","a","(III)V","(III)V","PlayerManager","wi","net/minecraft/src","1" +"func_9214_a","addPlayer","a","(LEntityPlayerMP;)V","(Lfl;)V","PlayerManager","wi","net/minecraft/src","1" +"func_9213_b","removePlayer","b","(LEntityPlayerMP;)V","(Lfl;)V","PlayerManager","wi","net/minecraft/src","1" +"func_544_a","isOutsidePlayerViewRadius","a","(IIII)Z","(IIII)Z","PlayerManager","wi","net/minecraft/src","1" +"func_543_c","updateMountedMovingPlayer","c","(LEntityPlayerMP;)V","(Lfl;)V","PlayerManager","wi","net/minecraft/src","1" +"func_542_b","getMaxTrackingDistance","c","()I","()I","PlayerManager","wi","net/minecraft/src","1" +"func_539_b","getPlayerInstances","a","(LPlayerManager;)LLongHashMap;","(Lwi;)Lgc;","PlayerManager","wi","net/minecraft/src","1" +"func_533_c","getPlayerInstancesToUpdate","b","(LPlayerManager;)Ljava/util/List;","(Lwi;)Ljava/util/List;","PlayerManager","wi","net/minecraft/src","1" +"func_4046_a","isCourseTraversable","a","(DDDD)Z","(DDDD)Z","EntityGhast","bv","net/minecraft/src","1" +"func_40301_a","func_40301_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LStructureNetherBridgeEnd;","(Ljava/util/List;Ljava/util/Random;IIIII)Lko;","StructureNetherBridgeEnd","ko","net/minecraft/src","1" +"func_177_a","setArrowHeading","a","(DDDFF)V","(DDDFF)V","EntityArrow","rk","net/minecraft/src","1" +"func_22141_a","debug","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RegionFile","pj","net/minecraft/src","1" +"func_22134_b","debugln","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RegionFile","pj","net/minecraft/src","1" +"func_22129_a","debug","a","(Ljava/lang/String;IILjava/lang/String;)V","(Ljava/lang/String;IILjava/lang/String;)V","RegionFile","pj","net/minecraft/src","1" +"func_22127_a","debug","a","(Ljava/lang/String;IIILjava/lang/String;)V","(Ljava/lang/String;IIILjava/lang/String;)V","RegionFile","pj","net/minecraft/src","1" +"func_22131_b","debugln","b","(Ljava/lang/String;IILjava/lang/String;)V","(Ljava/lang/String;IILjava/lang/String;)V","RegionFile","pj","net/minecraft/src","1" +"func_22140_a","getChunkDataInputStream","a","(II)Ljava/io/DataInputStream;","(II)Ljava/io/DataInputStream;","RegionFile","pj","net/minecraft/src","1" +"func_22135_b","getChunkDataOutputStream","b","(II)Ljava/io/DataOutputStream;","(II)Ljava/io/DataOutputStream;","RegionFile","pj","net/minecraft/src","1" +"func_22133_a","write","a","(II[BI)V","(II[BI)V","RegionFile","pj","net/minecraft/src","1" +"func_22130_a","write","a","(I[BI)V","(I[BI)V","RegionFile","pj","net/minecraft/src","1" +"func_22136_d","outOfBounds","d","(II)Z","(II)Z","RegionFile","pj","net/minecraft/src","1" +"func_22137_e","getOffset","e","(II)I","(II)I","RegionFile","pj","net/minecraft/src","1" +"func_22132_c","isChunkSaved","c","(II)Z","(II)Z","RegionFile","pj","net/minecraft/src","1" +"func_22128_a","setOffset","a","(III)V","(III)V","RegionFile","pj","net/minecraft/src","1" +"func_22138_b","setChunkTimestamp","b","(III)V","(III)V","RegionFile","pj","net/minecraft/src","1" +"func_22126_b","close","a","()V","()V","RegionFile","pj","net/minecraft/src","1" +"func_280_a","checkForBurnout","a","(LWorld;IIIZ)Z","(Lfi;IIIZ)Z","BlockRedstoneTorch","df","net/minecraft/src","1" +"func_30003_g","func_30003_g","g","(LWorld;III)Z","(Lfi;III)Z","BlockRedstoneTorch","df","net/minecraft/src","1" +"func_22026_g","getOrientation","g","(LWorld;III)I","(Lfi;III)I","BlockButton","ns","net/minecraft/src","1" +"func_322_g","redundantCanPlaceBlockAt","h","(LWorld;III)Z","(Lfi;III)Z","BlockButton","ns","net/minecraft/src","1" +"func_22017_f","setBounds","q","()V","()V","BlockBed","ub","net/minecraft/src","1" +"func_22019_c","getDirectionFromMetadata","d","(I)I","(I)I","BlockBed","ub","net/minecraft/src","1" +"func_22020_d","isBlockFootOfBed","e","(I)Z","(I)Z","BlockBed","ub","net/minecraft/src","1" +"func_22018_f","isBedOccupied","f","(I)Z","(I)Z","BlockBed","ub","net/minecraft/src","1" +"func_22022_a","setBedOccupied","a","(LWorld;IIIZ)V","(Lfi;IIIZ)V","BlockBed","ub","net/minecraft/src","1" +"func_22021_g","getNearestEmptyChunkCoordinates","f","(LWorld;IIII)LChunkCoordinates;","(Lfi;IIII)Lbu;","BlockBed","ub","net/minecraft/src","1" +"func_645_b","lerp","a","(DDD)D","(DDD)D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"func_4102_a","func_4102_a","a","(IDD)D","(IDD)D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"func_644_a","grad","a","(IDDD)D","(IDDD)D","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"func_646_a","func_646_a","a","([DDDDIIIDDDD)V","([DDDDIIIDDDD)V","NoiseGeneratorPerlin","ap","net/minecraft/src","1" +"func_25136_a","translateToLocal","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StatCollector","dr","net/minecraft/src","1" +"func_25135_a","translateToLocalFormatted","a","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","StatCollector","dr","net/minecraft/src","1" +"func_35018_a","func_35018_a","a","(IIII)[I","(IIII)[I","GenLayer","el","net/minecraft/src","1" +"func_35015_b","func_35015_b","b","(J)V","(J)V","GenLayer","el","net/minecraft/src","1" +"func_35019_a","func_35019_a","a","(J)[LGenLayer;","(J)[Lel;","GenLayer","el","net/minecraft/src","1" +"func_35017_a","func_35017_a","a","(JJ)V","(JJ)V","GenLayer","el","net/minecraft/src","1" +"func_35016_a","nextInt","a","(I)I","(I)I","GenLayer","el","net/minecraft/src","1" +"func_22123_a","createOrLoadRegionFile","a","(Ljava/io/File;II)LRegionFile;","(Ljava/io/File;II)Lpj;","RegionFileCache","qk","net/minecraft/src","1" +"func_22122_a","clearRegionFileReferences","a","()V","()V","RegionFileCache","qk","net/minecraft/src","1" +"func_22124_c","getChunkInputStream","b","(Ljava/io/File;II)Ljava/io/DataInputStream;","(Ljava/io/File;II)Ljava/io/DataInputStream;","RegionFileCache","qk","net/minecraft/src","1" +"func_22120_d","getChunkOutputStream","c","(Ljava/io/File;II)Ljava/io/DataOutputStream;","(Ljava/io/File;II)Ljava/io/DataOutputStream;","RegionFileCache","qk","net/minecraft/src","1" +"values","values","values","()[LEnumArmorMaterial;","()[Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumArmorMaterial;","(Ljava/lang/String;)Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" +"func_40497_a","func_40497_a","a","(I)I","(I)I","EnumArmorMaterial","cx","net/minecraft/src","1" +"func_40495_b","func_40495_b","b","(I)I","(I)I","EnumArmorMaterial","cx","net/minecraft/src","1" +"func_40496_a","getEnchantability","a","()I","()I","EnumArmorMaterial","cx","net/minecraft/src","1" +"func_35401_a","func_35401_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse4_Garden;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgp;","ComponentVillageHouse4_Garden","gp","net/minecraft/src","1" +"func_40300_a","func_40300_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor5;","(Ljava/util/List;Ljava/util/Random;IIIII)Lne;","ComponentNetherBridgeCorridor5","ne","net/minecraft/src","1" +"func_31041_g","updatePistonState","g","(LWorld;III)V","(Lfi;III)V","BlockPistonBase","jp","net/minecraft/src","1" +"func_31039_f","isIndirectlyPowered","f","(LWorld;IIII)Z","(Lfi;IIII)Z","BlockPistonBase","jp","net/minecraft/src","1" +"func_31042_c","getOrientation","d","(I)I","(I)I","BlockPistonBase","jp","net/minecraft/src","1" +"func_31035_d","isExtended","e","(I)Z","(I)Z","BlockPistonBase","jp","net/minecraft/src","1" +"func_31037_c","determineOrientation","c","(LWorld;IIILEntityPlayer;)I","(Lfi;IIILgz;)I","BlockPistonBase","jp","net/minecraft/src","1" +"func_31040_a","canPushBlock","a","(ILWorld;IIIZ)Z","(ILfi;IIIZ)Z","BlockPistonBase","jp","net/minecraft/src","1" +"func_31036_h","canExtend","g","(LWorld;IIII)Z","(Lfi;IIII)Z","BlockPistonBase","jp","net/minecraft/src","1" +"func_31038_i","tryExtend","h","(LWorld;IIII)Z","(Lfi;IIII)Z","BlockPistonBase","jp","net/minecraft/src","1" +"func_20151_a","getInstance","a","()LCraftingManager;","()Lhq;","CraftingManager","hq","net/minecraft/src","1" +"func_20153_a","addRecipe","a","(LItemStack;[Ljava/lang/Object;)V","(Ljb;[Ljava/lang/Object;)V","CraftingManager","hq","net/minecraft/src","1" +"func_21146_b","addShapelessRecipe","b","(LItemStack;[Ljava/lang/Object;)V","(Ljb;[Ljava/lang/Object;)V","CraftingManager","hq","net/minecraft/src","1" +"func_21147_a","findMatchingRecipe","a","(LInventoryCrafting;)LItemStack;","(Lmc;)Ljb;","CraftingManager","hq","net/minecraft/src","1" +"func_25126_b","getRecipeList","b","()Ljava/util/List;","()Ljava/util/List;","CraftingManager","hq","net/minecraft/src","1" +"func_21162_a","smelting","a","()LFurnaceRecipes;","()Lfb;","FurnaceRecipes","fb","net/minecraft/src","1" +"func_21160_a","addSmelting","a","(ILItemStack;)V","(ILjb;)V","FurnaceRecipes","fb","net/minecraft/src","1" +"func_21161_a","getSmeltingResult","a","(I)LItemStack;","(I)Ljb;","FurnaceRecipes","fb","net/minecraft/src","1" +"func_25127_b","getSmeltingList","b","()Ljava/util/Map;","()Ljava/util/Map;","FurnaceRecipes","fb","net/minecraft/src","1" +"func_611_a","trackEntity","a","(LEntity;)V","(Lrn;)V","EntityTracker","uh","net/minecraft/src","1" +"func_6187_a","trackEntity","a","(LEntity;II)V","(Lrn;II)V","EntityTracker","uh","net/minecraft/src","1" +"func_6186_a","trackEntity","a","(LEntity;IIZ)V","(Lrn;IIZ)V","EntityTracker","uh","net/minecraft/src","1" +"func_610_b","untrackEntity","b","(LEntity;)V","(Lrn;)V","EntityTracker","uh","net/minecraft/src","1" +"func_607_a","updateTrackedEntities","a","()V","()V","EntityTracker","uh","net/minecraft/src","1" +"func_12021_a","sendPacketToTrackedPlayers","a","(LEntity;LPacket;)V","(Lrn;Lkf;)V","EntityTracker","uh","net/minecraft/src","1" +"func_609_a","sendPacketToTrackedPlayersAndTrackedEntity","b","(LEntity;LPacket;)V","(Lrn;Lkf;)V","EntityTracker","uh","net/minecraft/src","1" +"func_9238_a","removeTrackedPlayerSymmetric","a","(LEntityPlayerMP;)V","(Lfl;)V","EntityTracker","uh","net/minecraft/src","1" +"func_35344_a","func_35344_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStairsStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","ComponentStrongholdStairsStraight","nk","net/minecraft/src","1" +"values","values","values","()[LEnumMovingObjectType;","()[Lji;","EnumMovingObjectType","ji","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMovingObjectType;","(Ljava/lang/String;)Lji;","EnumMovingObjectType","ji","net/minecraft/src","1" +"format","format","format","(Ljava/util/logging/LogRecord;)Ljava/lang/String;","(Ljava/util/logging/LogRecord;)Ljava/lang/String;","ConsoleLogFormatter","vy","net/minecraft/src","1" +"func_35308_a","buildComponent","a","(LStructureComponent;Ljava/util/List;Ljava/util/Random;)V","(Ljx;Ljava/util/List;Ljava/util/Random;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35310_a","addComponentParts","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;)Z","(Lfi;Ljava/util/Random;Lvb;)Z","StructureComponent","jx","net/minecraft/src","1" +"func_40281_b_","func_40281_b_","b_","()LChunkPosition;","()Lvo;","StructureComponent","jx","net/minecraft/src","1" +"func_35313_b","getStructureBoundingBox","b","()LStructureBoundingBox;","()Lvb;","StructureComponent","jx","net/minecraft/src","1" +"func_35305_c","func_35305_c","c","()I","()I","StructureComponent","jx","net/minecraft/src","1" +"func_35312_a","canFitInside","a","(Ljava/util/List;LStructureBoundingBox;)LStructureComponent;","(Ljava/util/List;Lvb;)Ljx;","StructureComponent","jx","net/minecraft/src","1" +"func_35295_a","isLiquidInStructureBoundingBox","a","(LWorld;LStructureBoundingBox;)Z","(Lfi;Lvb;)Z","StructureComponent","jx","net/minecraft/src","1" +"func_35306_a","func_35306_a","a","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" +"func_35300_a","func_35300_a","b","(I)I","(I)I","StructureComponent","jx","net/minecraft/src","1" +"func_35296_b","func_35296_b","b","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" +"func_35301_c","func_35301_c","c","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" +"func_35309_a","func_35309_a","a","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35297_a","func_35297_a","a","(LWorld;IIILStructureBoundingBox;)I","(Lfi;IIILvb;)I","StructureComponent","jx","net/minecraft/src","1" +"func_35294_a","fillWithBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIIIZ)V","(Lfi;Lvb;IIIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" +"func_35307_a","func_35307_a","a","(LWorld;LStructureBoundingBox;IIIIIIZLjava/util/Random;LStructurePieceBlockSelector;)V","(Lfi;Lvb;IIIIIIZLjava/util/Random;Lcb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35315_a","randomlyFillWithBlocks","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIIIIIIZ)V","(Lfi;Lvb;Ljava/util/Random;FIIIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" +"func_35302_a","randomlyPlaceBlock","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIII)V","(Lfi;Lvb;Ljava/util/Random;FIIIII)V","StructureComponent","jx","net/minecraft/src","1" +"func_35304_a","func_35304_a","a","(LWorld;LStructureBoundingBox;IIIIIIIZ)V","(Lfi;Lvb;IIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" +"func_35314_b","func_35314_b","b","(LWorld;IIILStructureBoundingBox;)V","(Lfi;IIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35303_b","func_35303_b","b","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35299_a","func_35299_a","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;III[LStructurePieceTreasure;I)V","(Lfi;Lvb;Ljava/util/Random;III[Lib;I)V","StructureComponent","jx","net/minecraft/src","1" +"func_35311_a","func_35311_a","a","(Ljava/util/Random;[LStructurePieceTreasure;LTileEntityChest;I)V","(Ljava/util/Random;[Lib;Ljs;I)V","StructureComponent","jx","net/minecraft/src","1" +"func_35298_a","func_35298_a","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;IIII)V","(Lfi;Lvb;Ljava/util/Random;IIII)V","StructureComponent","jx","net/minecraft/src","1" +"func_20057_k","func_20057_k","u","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_21073_a","getEquipmentInSlot","c","(I)LItemStack;","(I)Ljb;","EntityPlayerMP","fl","net/minecraft/src","1" +"func_22070_a","onUpdateEntity","a","(Z)V","(Z)V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_20063_a","getTileEntityInfo","a","(LTileEntity;)V","(Loh;)V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_22068_s","func_22068_s","A","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_9153_b","handleFalling","b","(DZ)V","(DZ)V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_20060_R","getNextWidowId","aH","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_28017_a","func_28017_a","a","(LContainer;)V","(Lea;)V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_20058_J","updateHeldItem","C","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_20059_K","closeCraftingGui","D","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_22069_a","setMovementType","a","(FFZZFF)V","(FFZZFF)V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_30002_A","func_30002_A","E","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_30001_B","func_30001_B","s_","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" +"func_35692_a","func_35692_a","a","(Ljava/util/Collection;)I","(Ljava/util/Collection;)I","WeightedRandom","tx","net/minecraft/src","1" +"func_35693_a","func_35693_a","a","(Ljava/util/Random;Ljava/util/Collection;I)LWeightedRandomChoice;","(Ljava/util/Random;Ljava/util/Collection;I)Lcp;","WeightedRandom","tx","net/minecraft/src","1" +"func_35689_a","func_35689_a","a","(Ljava/util/Random;Ljava/util/Collection;)LWeightedRandomChoice;","(Ljava/util/Random;Ljava/util/Collection;)Lcp;","WeightedRandom","tx","net/minecraft/src","1" +"func_35690_a","func_35690_a","a","([LWeightedRandomChoice;)I","([Lcp;)I","WeightedRandom","tx","net/minecraft/src","1" +"func_35688_a","func_35688_a","a","(Ljava/util/Random;[LWeightedRandomChoice;I)LWeightedRandomChoice;","(Ljava/util/Random;[Lcp;I)Lcp;","WeightedRandom","tx","net/minecraft/src","1" +"func_35691_a","func_35691_a","a","(Ljava/util/Random;[LWeightedRandomChoice;)LWeightedRandomChoice;","(Ljava/util/Random;[Lcp;)Lcp;","WeightedRandom","tx","net/minecraft/src","1" +"func_21033_c","getBlockFromDye","d","(I)I","(I)I","BlockCloth","ek","net/minecraft/src","1" +"func_21034_d","getDyeFromBlock","e","(I)I","(I)I","BlockCloth","ek","net/minecraft/src","1" +"func_35080_a","getEntity","a","()LEntity;","()Lrn;","DamageSource","po","net/minecraft/src","1" +"func_35075_a","func_35075_a","a","(LEntityPlayer;)Ljava/lang/String;","(Lgz;)Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" +"func_35072_a","causeMobDamage","a","(LEntityLiving;)LDamageSource;","(Llk;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35076_b","causePlayerDamage","b","(LEntityPlayer;)LDamageSource;","(Lgz;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35073_a","causeArrowDamage","a","(LEntityArrow;LEntity;)LDamageSource;","(Lrk;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35082_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Lch;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35081_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40271_b","func_40271_b","b","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40275_b","func_40275_b","b","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_40273_c","func_40273_c","c","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35083_b","unblockable","d","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_35074_c","getHungerDamage","e","()F","()F","DamageSource","po","net/minecraft/src","1" +"func_35077_d","canHarmInCreative","f","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_35079_e","getSourceOfDamage","g","()LEntity;","()Lrn;","DamageSource","po","net/minecraft/src","1" +"func_35078_f","setDamageBypassesArmor","h","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_35084_g","setDamageAllowedInCreativeMode","i","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40276_j","func_40276_j","j","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40272_k","func_40272_k","k","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_40274_l","func_40274_l","l","()Ljava/lang/String;","()Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" +"func_40297_a","func_40297_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Llo;","ComponentNetherBridgeCorridor","lo","net/minecraft/src","1" +"func_20115_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesCrafting","jy","net/minecraft/src","1" +"func_21075_a","changePitch","c","()V","()V","TileEntityNote","si","net/minecraft/src","1" +"func_21074_a","triggerNote","a","(LWorld;III)V","(Lfi;III)V","TileEntityNote","si","net/minecraft/src","1" +"func_21139_a","func_21139_a","a","(LInventoryCrafting;IIZ)Z","(Lmc;IIZ)Z","ShapedRecipes","ix","net/minecraft/src","1" +"func_35038_a","getSeed","a","()J","()J","WorldSettings","hg","net/minecraft/src","1" +"func_35039_b","getGameType","b","()I","()I","WorldSettings","hg","net/minecraft/src","1" +"func_40279_c","getHardcoreEnabled","c","()Z","()Z","WorldSettings","hg","net/minecraft/src","1" +"func_35040_c","getMapFeaturesEnabled","d","()Z","()Z","WorldSettings","hg","net/minecraft/src","1" +"func_35037_a","validGameType","a","(I)I","(I)I","WorldSettings","hg","net/minecraft/src","1" +"values","values","values","()[LEnumStatus;","()[Ldc;","EnumStatus","dc","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumStatus;","(Ljava/lang/String;)Ldc;","EnumStatus","dc","net/minecraft/src","1" +"func_35030_a","func_35030_a","a","(JLGenLayer;I)LGenLayer;","(JLel;I)Lel;","GenLayerSmoothZoom","li","net/minecraft/src","1" +"func_282_g","isCropsNearby","g","(LWorld;III)Z","(Lfi;III)Z","BlockFarmland","um","net/minecraft/src","1" +"func_283_h","isWaterNearby","h","(LWorld;III)Z","(Lfi;III)Z","BlockFarmland","um","net/minecraft/src","1" +"func_21165_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesDyes","mo","net/minecraft/src","1" +"func_40324_c","func_40324_c","c","()Z","()Z","IThreadedFileIO","gm","net/minecraft/src","1" +"close","close","close","()V","()V","GuiLogOutputHandler","dt","net/minecraft/src","1" +"flush","flush","flush","()V","()V","GuiLogOutputHandler","dt","net/minecraft/src","1" +"publish","publish","publish","(Ljava/util/logging/LogRecord;)V","(Ljava/util/logging/LogRecord;)V","GuiLogOutputHandler","dt","net/minecraft/src","1" +"func_40518_a","startSection","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Profiler","pf","net/minecraft/src","1" +"func_40517_a","endSection","a","()V","()V","Profiler","pf","net/minecraft/src","1" +"func_40519_b","endStartSection","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","Profiler","pf","net/minecraft/src","1" +"func_4077_a","getWorldChunkManager","a","()LWorldChunkManager;","()Lxe;","World","fi","net/minecraft/src","1" +"func_22086_b","createChunkProvider","b","()LIChunkProvider;","()Lco;","World","fi","net/minecraft/src","1" +"func_25072_c","generateSpawnPoint","c","()V","()V","World","fi","net/minecraft/src","1" +"func_40212_d","func_40212_d","d","()LChunkCoordinates;","()Lbu;","World","fi","net/minecraft/src","1" +"func_528_f","getFirstUncoveredBlock","a","(II)I","(II)I","World","fi","net/minecraft/src","1" +"func_485_a","saveWorld","a","(ZLIProgressUpdate;)V","(ZLxk;)V","World","fi","net/minecraft/src","1" +"func_478_h","saveLevel","y","()V","()V","World","fi","net/minecraft/src","1" +"func_20111_e","isAirBlock","f","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_530_e","blockExists","g","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_21118_a","doChunksNearChunkExist","a","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_466_a","checkChunksExist","a","(IIIIII)Z","(IIIIII)Z","World","fi","net/minecraft/src","1" +"func_447_g","chunkExists","g","(II)Z","(II)Z","World","fi","net/minecraft/src","1" +"func_492_a","getChunkFromBlockCoords","b","(II)LChunk;","(II)Lle;","World","fi","net/minecraft/src","1" +"func_525_b","getChunkFromChunkCoords","c","(II)LChunk;","(II)Lle;","World","fi","net/minecraft/src","1" +"func_470_a","setBlockAndMetadata","a","(IIIII)Z","(IIIII)Z","World","fi","net/minecraft/src","1" +"func_462_a","setBlock","b","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_511_b","setBlockMetadataWithNotify","c","(IIII)V","(IIII)V","World","fi","net/minecraft/src","1" +"func_463_c","setBlockMetadata","d","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_508_d","setBlockWithNotify","e","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_507_b","setBlockAndMetadataWithNotify","b","(IIIII)Z","(IIIII)Z","World","fi","net/minecraft/src","1" +"func_521_f","markBlockNeedsUpdate","h","(III)V","(III)V","World","fi","net/minecraft/src","1" +"func_454_e","notifyBlockChange","f","(IIII)V","(IIII)V","World","fi","net/minecraft/src","1" +"func_498_f","markBlocksDirtyVertical","g","(IIII)V","(IIII)V","World","fi","net/minecraft/src","1" +"func_21119_h","markBlockAsNeedsUpdate","i","(III)V","(III)V","World","fi","net/minecraft/src","1" +"func_519_b","markBlocksDirty","b","(IIIIII)V","(IIIIII)V","World","fi","net/minecraft/src","1" +"func_449_g","notifyBlocksOfNeighborChange","h","(IIII)V","(IIII)V","World","fi","net/minecraft/src","1" +"func_527_k","notifyBlockOfNeighborChange","k","(IIII)V","(IIII)V","World","fi","net/minecraft/src","1" +"func_497_g","canBlockSeeTheSky","j","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_28098_j","getFullBlockLightValue","k","(III)I","(III)I","World","fi","net/minecraft/src","1" +"func_495_h","getBlockLightValue","l","(III)I","(III)I","World","fi","net/minecraft/src","1" +"func_517_a","getBlockLightValue_do","a","(IIIZ)I","(IIIZ)I","World","fi","net/minecraft/src","1" +"func_488_c","getHeightValue","d","(II)I","(II)I","World","fi","net/minecraft/src","1" +"func_512_a","getSavedLightValue","a","(LEnumSkyBlock;III)I","(Lei;III)I","World","fi","net/minecraft/src","1" +"func_529_b","setLightValue","a","(LEnumSkyBlock;IIII)V","(Lei;IIII)V","World","fi","net/minecraft/src","1" +"func_455_j","getLightBrightness","m","(III)F","(III)F","World","fi","net/minecraft/src","1" +"func_453_a","isDaytime","e","()Z","()Z","World","fi","net/minecraft/src","1" +"func_486_a","rayTraceBlocks","a","(LVec3D;LVec3D;)LMovingObjectPosition;","(Lbx;Lbx;)Luc;","World","fi","net/minecraft/src","1" +"func_505_a","rayTraceBlocks_do","a","(LVec3D;LVec3D;Z)LMovingObjectPosition;","(Lbx;Lbx;Z)Luc;","World","fi","net/minecraft/src","1" +"func_28099_a","rayTraceBlocks_do_do","a","(LVec3D;LVec3D;ZZ)LMovingObjectPosition;","(Lbx;Lbx;ZZ)Luc;","World","fi","net/minecraft/src","1" +"func_506_a","playSoundAtEntity","a","(LEntity;Ljava/lang/String;FF)V","(Lrn;Ljava/lang/String;FF)V","World","fi","net/minecraft/src","1" +"func_502_a","playSoundEffect","a","(DDDLjava/lang/String;FF)V","(DDDLjava/lang/String;FF)V","World","fi","net/minecraft/src","1" +"func_491_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","World","fi","net/minecraft/src","1" +"func_514_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","World","fi","net/minecraft/src","1" +"func_27073_a","addLightningBolt","a","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1" +"func_526_a","entityJoinedWorld","b","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1" +"func_479_b","obtainEntitySkin","c","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" +"func_531_c","releaseEntitySkin","d","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" +"func_22085_d","removePlayerForLogoff","e","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" +"func_22073_e","removePlayer","f","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" +"func_4072_a","addWorldAccess","a","(LIWorldAccess;)V","(Low;)V","World","fi","net/minecraft/src","1" +"func_481_a","getCollidingBoundingBoxes","a","(LEntity;LAxisAlignedBB;)Ljava/util/List;","(Lrn;Leu;)Ljava/util/List;","World","fi","net/minecraft/src","1" +"func_493_a","calculateSkylightSubtracted","a","(F)I","(F)I","World","fi","net/minecraft/src","1" +"func_477_b","getCelestialAngle","b","(F)F","(F)F","World","fi","net/minecraft/src","1" +"func_28100_e","getTopSolidOrLiquidBlock","e","(II)I","(II)I","World","fi","net/minecraft/src","1" +"func_4075_e","findTopSolidBlock","f","(II)I","(II)I","World","fi","net/minecraft/src","1" +"func_22074_c","scheduleBlockUpdate","c","(IIIII)V","(IIIII)V","World","fi","net/minecraft/src","1" +"func_41045_d","func_41045_d","d","(IIIII)V","(IIIII)V","World","fi","net/minecraft/src","1" +"func_459_b","updateEntities","f","()V","()V","World","fi","net/minecraft/src","1" +"func_31047_a","addTileEntity","a","(Ljava/util/Collection;)V","(Ljava/util/Collection;)V","World","fi","net/minecraft/src","1" +"func_520_e","updateEntity","g","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" +"func_4074_a","updateEntityWithOptionalForce","a","(LEntity;Z)V","(Lrn;Z)V","World","fi","net/minecraft/src","1" +"func_522_a","checkIfAABBIsClear","a","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" +"func_27069_b","func_27069_b","b","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" +"func_469_b","getIsAnyLiquid","c","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" +"func_523_c","isBoundingBoxBurning","d","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" +"func_490_a","handleMaterialAcceleration","a","(LAxisAlignedBB;LMaterial;LEntity;)Z","(Leu;Llg;Lrn;)Z","World","fi","net/minecraft/src","1" +"func_500_a","isMaterialInBB","a","(LAxisAlignedBB;LMaterial;)Z","(Leu;Llg;)Z","World","fi","net/minecraft/src","1" +"func_524_b","isAABBInMaterial","b","(LAxisAlignedBB;LMaterial;)Z","(Leu;Llg;)Z","World","fi","net/minecraft/src","1" +"func_12013_a","createExplosion","a","(LEntity;DDDF)LExplosion;","(Lrn;DDDF)Lpy;","World","fi","net/minecraft/src","1" +"func_12015_a","newExplosion","a","(LEntity;DDDFZ)LExplosion;","(Lrn;DDDFZ)Lpy;","World","fi","net/minecraft/src","1" +"func_494_a","func_494_a","a","(LVec3D;LAxisAlignedBB;)F","(Lbx;Leu;)F","World","fi","net/minecraft/src","1" +"func_28096_a","onBlockHit","a","(LEntityPlayer;IIII)V","(Lgz;IIII)V","World","fi","net/minecraft/src","1" +"func_473_a","setBlockTileEntity","a","(IIILTileEntity;)V","(IIILoh;)V","World","fi","net/minecraft/src","1" +"func_513_l","removeBlockTileEntity","n","(III)V","(III)V","World","fi","net/minecraft/src","1" +"func_35239_a","func_35239_a","a","(LTileEntity;)V","(Loh;)V","World","fi","net/minecraft/src","1" +"func_28095_p","isBlockOpaqueCube","o","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_41047_b","func_41047_b","b","(IIIZ)Z","(IIIZ)Z","World","fi","net/minecraft/src","1" +"func_465_d","calculateInitialSkylight","g","()V","()V","World","fi","net/minecraft/src","1" +"func_21116_a","setAllowedSpawnTypes","a","(ZZ)V","(ZZ)V","World","fi","net/minecraft/src","1" +"func_22077_g","tick","h","()V","()V","World","fi","net/minecraft/src","1" +"func_27070_x","func_27070_x","z","()V","()V","World","fi","net/minecraft/src","1" +"func_27066_i","updateWeather","i","()V","()V","World","fi","net/minecraft/src","1" +"func_27071_y","clearWeather","A","()V","()V","World","fi","net/minecraft/src","1" +"func_40218_j","commandToggleDownfall","j","()V","()V","World","fi","net/minecraft/src","1" +"func_4073_g","doRandomUpdateTicks","k","()V","()V","World","fi","net/minecraft/src","1" +"func_40210_p","func_40210_p","p","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_40217_q","func_40217_q","q","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_40213_b","func_40213_b","c","(IIIZ)Z","(IIIZ)Z","World","fi","net/minecraft/src","1" +"func_40215_r","func_40215_r","r","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_35242_p","updateAllLightTypes","s","(III)V","(III)V","World","fi","net/minecraft/src","1" +"func_35240_d","func_35240_d","d","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" +"func_35241_e","func_35241_e","e","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" +"func_35243_b","updateLightByType","b","(LEnumSkyBlock;III)V","(Lei;III)V","World","fi","net/minecraft/src","1" +"func_518_a","TickUpdates","a","(Z)Z","(Z)Z","World","fi","net/minecraft/src","1" +"func_41046_a","func_41046_a","a","(LChunk;Z)Ljava/util/List;","(Lle;Z)Ljava/util/List;","World","fi","net/minecraft/src","1" +"func_450_b","getEntitiesWithinAABBExcludingEntity","b","(LEntity;LAxisAlignedBB;)Ljava/util/List;","(Lrn;Leu;)Ljava/util/List;","World","fi","net/minecraft/src","1" +"func_457_a","getEntitiesWithinAABB","a","(Ljava/lang/Class;LAxisAlignedBB;)Ljava/util/List;","(Ljava/lang/Class;Leu;)Ljava/util/List;","World","fi","net/minecraft/src","1" +"func_515_b","updateTileEntityChunkAndDoNothing","b","(IIILTileEntity;)V","(IIILoh;)V","World","fi","net/minecraft/src","1" +"func_487_a","countEntities","a","(Ljava/lang/Class;)I","(Ljava/lang/Class;)I","World","fi","net/minecraft/src","1" +"func_464_a","addLoadedEntities","a","(Ljava/util/List;)V","(Ljava/util/List;)V","World","fi","net/minecraft/src","1" +"func_461_b","unloadEntities","b","(Ljava/util/List;)V","(Ljava/util/List;)V","World","fi","net/minecraft/src","1" +"func_516_a","canBlockBePlacedAt","a","(IIIIZI)Z","(IIIIZI)Z","World","fi","net/minecraft/src","1" +"func_482_a","getPathToEntity","a","(LEntity;LEntity;F)LPathEntity;","(Lrn;Lrn;F)Ldk;","World","fi","net/minecraft/src","1" +"func_501_a","getEntityPathToXYZ","a","(LEntity;IIIF)LPathEntity;","(Lrn;IIIF)Ldk;","World","fi","net/minecraft/src","1" +"func_448_i","isBlockProvidingPowerTo","i","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_496_m","isBlockGettingPowered","t","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_489_j","isBlockIndirectlyProvidingPowerTo","j","(IIII)Z","(IIII)Z","World","fi","net/minecraft/src","1" +"func_474_n","isBlockIndirectlyGettingPowered","u","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_472_a","getClosestPlayerToEntity","a","(LEntity;D)LEntityPlayer;","(Lrn;D)Lgz;","World","fi","net/minecraft/src","1" +"func_456_a","getClosestPlayer","a","(DDDD)LEntityPlayer;","(DDDD)Lgz;","World","fi","net/minecraft/src","1" +"func_40211_b","getClosestVulnerablePlayerToEntity","b","(LEntity;D)LEntityPlayer;","(Lrn;D)Lgz;","World","fi","net/minecraft/src","1" +"func_40219_b","getClosestVulnerablePlayer","b","(DDDD)LEntityPlayer;","(DDDD)Lgz;","World","fi","net/minecraft/src","1" +"func_25071_a","getPlayerEntityByName","a","(Ljava/lang/String;)LEntityPlayer;","(Ljava/lang/String;)Lgz;","World","fi","net/minecraft/src","1" +"func_504_c","getChunkData","c","(IIIIII)[B","(IIIIII)[B","World","fi","net/minecraft/src","1" +"func_476_g","checkSessionLock","l","()V","()V","World","fi","net/minecraft/src","1" +"func_22076_a","setWorldTime","a","(J)V","(J)V","World","fi","net/minecraft/src","1" +"func_32005_b","advanceTime","b","(J)V","(J)V","World","fi","net/minecraft/src","1" +"func_22079_j","getRandomSeed","m","()J","()J","World","fi","net/minecraft/src","1" +"func_22080_k","getWorldTime","n","()J","()J","World","fi","net/minecraft/src","1" +"func_22078_l","getSpawnPoint","o","()LChunkCoordinates;","()Lbu;","World","fi","net/minecraft/src","1" +"func_6157_a","canMineBlock","a","(LEntityPlayer;III)Z","(Lgz;III)Z","World","fi","net/minecraft/src","1" +"func_9206_a","sendTrackedEntityStatusUpdatePacket","a","(LEntity;B)V","(Lrn;B)V","World","fi","net/minecraft/src","1" +"func_25073_n","getChunkProvider","p","()LIChunkProvider;","()Lco;","World","fi","net/minecraft/src","1" +"func_21117_c","playNoteAt","e","(IIIII)V","(IIIII)V","World","fi","net/minecraft/src","1" +"func_22075_m","getWorldFile","q","()LISaveHandler;","()Lwg;","World","fi","net/minecraft/src","1" +"func_22081_n","getWorldInfo","r","()LWorldInfo;","()Leo;","World","fi","net/minecraft/src","1" +"func_22082_o","updateAllPlayersSleepingFlag","s","()V","()V","World","fi","net/minecraft/src","1" +"func_22083_p","wakeUpAllPlayers","t","()V","()V","World","fi","net/minecraft/src","1" +"func_22084_q","isAllPlayersFullyAsleep","u","()Z","()Z","World","fi","net/minecraft/src","1" +"func_27065_c","getWeightedThunderStrength","c","(F)F","(F)F","World","fi","net/minecraft/src","1" +"func_27074_d","setRainStrength","d","(F)F","(F)F","World","fi","net/minecraft/src","1" +"func_27067_u","getIsThundering","v","()Z","()Z","World","fi","net/minecraft/src","1" +"func_27068_v","isRaining","w","()Z","()Z","World","fi","net/minecraft/src","1" +"func_27072_q","canLightningStrikeAt","v","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_28102_a","setItemData","a","(Ljava/lang/String;LWorldSavedData;)V","(Ljava/lang/String;Lhs;)V","World","fi","net/minecraft/src","1" +"func_28103_a","loadItemData","a","(Ljava/lang/Class;Ljava/lang/String;)LWorldSavedData;","(Ljava/lang/Class;Ljava/lang/String;)Lhs;","World","fi","net/minecraft/src","1" +"func_28104_b","getUniqueDataId","b","(Ljava/lang/String;)I","(Ljava/lang/String;)I","World","fi","net/minecraft/src","1" +"func_28097_e","playAuxSFX","f","(IIIII)V","(IIIII)V","World","fi","net/minecraft/src","1" +"func_28101_a","playAuxSFXAtEntity","a","(LEntityPlayer;IIIII)V","(Lgz;IIIII)V","World","fi","net/minecraft/src","1" +"func_35238_t","func_35238_t","w","(III)Ljava/util/Random;","(III)Ljava/util/Random;","World","fi","net/minecraft/src","1" +"func_6156_d","updatingLighting","x","()Z","()Z","World","fi","net/minecraft/src","1" +"func_483_a","scheduleLightingUpdate","a","(LEnumSkyBlock;IIIIII)V","(Lei;IIIIII)V","World","fi","net/minecraft/src","1" +"func_40216_a","func_40216_a","a","(LEnumCreatureType;III)LSpawnListEntry;","(Lla;III)Lbl;","World","fi","net/minecraft/src","1" +"func_40214_b","func_40214_b","b","(Ljava/lang/String;III)LChunkPosition;","(Ljava/lang/String;III)Lvo;","World","fi","net/minecraft/src","1" +"func_687_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","IWorldAccess","ow","net/minecraft/src","1" +"func_681_a","obtainEntitySkin","a","(LEntity;)V","(Lrn;)V","IWorldAccess","ow","net/minecraft/src","1" +"func_688_b","releaseEntitySkin","b","(LEntity;)V","(Lrn;)V","IWorldAccess","ow","net/minecraft/src","1" +"func_689_a","playSound","a","(Ljava/lang/String;DDDFF)V","(Ljava/lang/String;DDDFF)V","IWorldAccess","ow","net/minecraft/src","1" +"func_685_a","markBlockRangeNeedsUpdate","a","(IIIIII)V","(IIIIII)V","IWorldAccess","ow","net/minecraft/src","1" +"func_683_a","markBlockNeedsUpdate","a","(III)V","(III)V","IWorldAccess","ow","net/minecraft/src","1" +"func_682_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","IWorldAccess","ow","net/minecraft/src","1" +"func_686_a","doNothingWithTileEntity","a","(IIILTileEntity;)V","(IIILoh;)V","IWorldAccess","ow","net/minecraft/src","1" +"func_28133_a","playAuxSFX","a","(LEntityPlayer;IIIII)V","(Lgz;IIIII)V","IWorldAccess","ow","net/minecraft/src","1" +"func_605_a","updatePlayerList","a","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_603_a","sendPacketToTrackedPlayers","a","(LPacket;)V","(Lkf;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_12018_b","sendPacketToTrackedPlayersAndTrackedEntity","b","(LPacket;)V","(Lkf;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_604_a","sendDestroyEntityPacketToTrackedPlayers","a","()V","()V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_12019_a","removeFromTrackedPlayers","a","(LEntityPlayerMP;)V","(Lfl;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_606_a","updatePlayerEntity","b","(LEntityPlayerMP;)V","(Lfl;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_601_b","updatePlayerEntities","b","(Ljava/util/List;)V","(Ljava/util/List;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_602_b","getSpawnPacket","b","()LPacket;","()Lkf;","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_9219_b","removeTrackedPlayerSymmetric","c","(LEntityPlayerMP;)V","(Lfl;)V","EntityTrackerEntry","hy","net/minecraft/src","1" +"func_35026_a","func_35026_a","a","(II)I","(II)I","GenLayerZoom","eh","net/minecraft/src","1" +"func_35024_b","func_35024_b","b","(IIII)I","(IIII)I","GenLayerZoom","eh","net/minecraft/src","1" +"func_35025_a","func_35025_a","a","(JLGenLayer;I)LGenLayer;","(JLel;I)Lel;","GenLayerZoom","eh","net/minecraft/src","1" +"func_21068_e_","getFleeceColor","u","()I","()I","EntitySheep","do","net/minecraft/src","1" +"func_21070_a","setFleeceColor","b","(I)V","(I)V","EntitySheep","do","net/minecraft/src","1" +"func_21069_f_","getSheared","p_","()Z","()Z","EntitySheep","do","net/minecraft/src","1" +"func_21067_a","setSheared","a","(Z)V","(Z)V","EntitySheep","do","net/minecraft/src","1" +"func_21066_a","getRandomFleeceColor","a","(Ljava/util/Random;)I","(Ljava/util/Random;)I","EntitySheep","do","net/minecraft/src","1" +"func_35549_a","getIntCache","a","(I)[I","(I)[I","IntCache","af","net/minecraft/src","1" +"func_35550_a","func_35550_a","a","()V","()V","IntCache","af","net/minecraft/src","1" +"func_22006_a","chunkXZ2Int","a","(II)J","(II)J","ChunkCoordIntPair","yi","net/minecraft/src","1" +"func_40659_a","func_40659_a","a","()I","()I","ChunkCoordIntPair","yi","net/minecraft/src","1" +"func_40660_b","func_40660_b","b","()I","()I","ChunkCoordIntPair","yi","net/minecraft/src","1" +"func_40658_a","func_40658_a","a","(I)LChunkPosition;","(I)Lvo;","ChunkCoordIntPair","yi","net/minecraft/src","1" +"func_35376_a","func_35376_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse2;","(Ljava/util/List;Ljava/util/Random;IIIII)Ldi;","ComponentVillageHouse2","di","net/minecraft/src","1" +"func_294_a_","getBlockEntity","a_","()LTileEntity;","()Loh;","BlockContainer","qx","net/minecraft/src","1" +"func_35057_b","unifyAdjacentChests","b","(LWorld;III)V","(Lfi;III)V","BlockChest","f","net/minecraft/src","1" +"func_297_g","isThereANeighborChest","g","(LWorld;III)Z","(Lfi;III)Z","BlockChest","f","net/minecraft/src","1" +"func_35323_a","placeDoor","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;LEnumDoor;III)V","(Lfi;Ljava/util/Random;Lvb;Lpt;III)V","ComponentStronghold","hc","net/minecraft/src","1" +"func_35322_a","func_35322_a","a","(Ljava/util/Random;)LEnumDoor;","(Ljava/util/Random;)Lpt;","ComponentStronghold","hc","net/minecraft/src","1" +"func_35324_a","func_35324_a","a","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" +"func_35321_b","func_35321_b","b","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" +"func_35320_c","func_35320_c","c","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" +"func_35319_a","func_35319_a","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentStronghold","hc","net/minecraft/src","1" +"func_20107_a","compareRecipes","a","(LIRecipe;LIRecipe;)I","(Ldz;Ldz;)I","RecipeSorter","kn","net/minecraft/src","1" +"compare","compare","compare","(Ljava/lang/Object;Ljava/lang/Object;)I","(Ljava/lang/Object;Ljava/lang/Object;)I","RecipeSorter","kn","net/minecraft/src","1" +"func_760_a","createVectorHelper","a","(DDD)LVec3D;","(DDD)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_761_a","initialize","a","()V","()V","Vec3D","bx","net/minecraft/src","1" +"func_768_b","createVector","b","(DDD)LVec3D;","(DDD)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_756_e","setComponents","e","(DDD)LVec3D;","(DDD)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_758_b","normalize","b","()LVec3D;","()Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_35570_a","dotProduct","a","(LVec3D;)D","(Lbx;)D","Vec3D","bx","net/minecraft/src","1" +"func_757_c","addVector","c","(DDD)LVec3D;","(DDD)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_767_a","distanceTo","b","(LVec3D;)D","(Lbx;)D","Vec3D","bx","net/minecraft/src","1" +"func_764_b","squareDistanceTo","c","(LVec3D;)D","(Lbx;)D","Vec3D","bx","net/minecraft/src","1" +"func_759_d","squareDistanceTo","d","(DDD)D","(DDD)D","Vec3D","bx","net/minecraft/src","1" +"func_765_c","lengthVector","c","()D","()D","Vec3D","bx","net/minecraft/src","1" +"func_766_a","getIntermediateWithXValue","a","(LVec3D;D)LVec3D;","(Lbx;D)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_763_b","getIntermediateWithYValue","b","(LVec3D;D)LVec3D;","(Lbx;D)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_762_c","getIntermediateWithZValue","c","(LVec3D;D)LVec3D;","(Lbx;D)Lbx;","Vec3D","bx","net/minecraft/src","1" +"func_35571_a","rotateAroundX","a","(F)V","(F)V","Vec3D","bx","net/minecraft/src","1" +"func_35572_b","rotateAroundY","b","(F)V","(F)V","Vec3D","bx","net/minecraft/src","1" +"func_381_a","writeTagContents","a","(Ljava/io/DataOutput;)V","(Ljava/io/DataOutput;)V","NBTBase","ik","net/minecraft/src","1" +"func_382_a","readTagContents","a","(Ljava/io/DataInput;)V","(Ljava/io/DataInput;)V","NBTBase","ik","net/minecraft/src","1" +"func_379_a","getType","a","()B","()B","NBTBase","ik","net/minecraft/src","1" +"func_40468_b","func_40468_b","b","()LNBTBase;","()Lik;","NBTBase","ik","net/minecraft/src","1" +"func_385_m","setKey","a","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lik;","NBTBase","ik","net/minecraft/src","1" +"func_384_c","getKey","c","()Ljava/lang/String;","()Ljava/lang/String;","NBTBase","ik","net/minecraft/src","1" +"func_383_b","readTag","b","(Ljava/io/DataInput;)LNBTBase;","(Ljava/io/DataInput;)Lik;","NBTBase","ik","net/minecraft/src","1" +"func_380_a","writeTag","a","(LNBTBase;Ljava/io/DataOutput;)V","(Lik;Ljava/io/DataOutput;)V","NBTBase","ik","net/minecraft/src","1" +"func_378_a","createTagOfType","a","(BLjava/lang/String;)LNBTBase;","(BLjava/lang/String;)Lik;","NBTBase","ik","net/minecraft/src","1" +"func_377_b","getTagName","a","(B)Ljava/lang/String;","(B)Ljava/lang/String;","NBTBase","ik","net/minecraft/src","1" +"func_22098_f","setSessionLock","f","()V","()V","PlayerNBTManager","fs","net/minecraft/src","1" +"func_22097_a","getWorldDir","a","()Ljava/io/File;","()Ljava/io/File;","PlayerNBTManager","fs","net/minecraft/src","1" +"func_25074_a","getPlayerData","a","(Ljava/lang/String;)LNBTTagCompound;","(Ljava/lang/String;)Lng;","PlayerNBTManager","fs","net/minecraft/src","1" +"func_267_a","setBurnRate","a","(III)V","(III)V","BlockFire","xy","net/minecraft/src","1" +"func_266_a","tryToCatchBlockOnFire","a","(LWorld;IIIILjava/util/Random;I)V","(Lfi;IIIILjava/util/Random;I)V","BlockFire","xy","net/minecraft/src","1" +"func_268_g","func_268_g","g","(LWorld;III)Z","(Lfi;III)Z","BlockFire","xy","net/minecraft/src","1" +"func_270_h","getChanceOfNeighborsEncouragingFire","h","(LWorld;III)I","(Lfi;III)I","BlockFire","xy","net/minecraft/src","1" +"func_269_b","canBlockCatchFire","b","(LIBlockAccess;III)Z","(Lwy;III)Z","BlockFire","xy","net/minecraft/src","1" +"func_265_f","getChanceToEncourageFire","f","(LWorld;IIII)I","(Lfi;IIII)I","BlockFire","xy","net/minecraft/src","1" +"func_35680_c","getBiomeCacheBlock","a","(II)LBiomeCacheBlock;","(II)Ltb;","BiomeCache","tz","net/minecraft/src","1" +"func_35683_a","func_35683_a","b","(II)LBiomeGenBase;","(II)Lkb;","BiomeCache","tz","net/minecraft/src","1" +"func_40625_c","func_40625_c","c","(II)F","(II)F","BiomeCache","tz","net/minecraft/src","1" +"func_35681_a","func_35681_a","a","()V","()V","BiomeCache","tz","net/minecraft/src","1" +"func_35682_b","func_35682_b","d","(II)[LBiomeGenBase;","(II)[Lkb;","BiomeCache","tz","net/minecraft/src","1" +"func_35679_a","getChunkManager","a","(LBiomeCache;)LWorldChunkManager;","(Ltz;)Lxe;","BiomeCache","tz","net/minecraft/src","1" +"func_35342_a","func_35342_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentStrongholdCorridor","nm","net/minecraft/src","1" +"func_31028_g","canPlaceTorchOn","g","(LWorld;III)Z","(Lfi;III)Z","BlockTorch","un","net/minecraft/src","1" +"func_279_g","dropTorchIfCantStay","h","(LWorld;III)Z","(Lfi;III)Z","BlockTorch","un","net/minecraft/src","1" +"func_419_a","generate","a","(LWorld;Ljava/util/Random;III)Z","(Lfi;Ljava/util/Random;III)Z","WorldGenerator","or","net/minecraft/src","1" +"func_420_a","func_420_a","a","(DDD)V","(DDD)V","WorldGenerator","or","net/minecraft/src","1" +"func_41043_a","func_41043_a","a","(LWorld;IIIII)V","(Lfi;IIIII)V","WorldGenerator","or","net/minecraft/src","1" +"func_22001_a","handleMovementTypePacket","a","(LPacket27Position;)V","(Lpl;)V","NetHandler","sd","net/minecraft/src","1" +"func_18_a","handleFlying","a","(LPacket10Flying;)V","(Lij;)V","NetHandler","sd","net/minecraft/src","1" +"func_26_a","handleBlockDig","a","(LPacket14BlockDig;)V","(Lju;)V","NetHandler","sd","net/minecraft/src","1" +"func_24_a","handlePlace","a","(LPacket15Place;)V","(Lha;)V","NetHandler","sd","net/minecraft/src","1" +"func_6_a","handleErrorMessage","a","(Ljava/lang/String;[Ljava/lang/Object;)V","(Ljava/lang/String;[Ljava/lang/Object;)V","NetHandler","sd","net/minecraft/src","1" +"func_6001_a","registerPacket","a","(LPacket;)V","(Lkf;)V","NetHandler","sd","net/minecraft/src","1" +"func_11_a","handleBlockItemSwitch","a","(LPacket16BlockItemSwitch;)V","(Lhw;)V","NetHandler","sd","net/minecraft/src","1" +"func_23_a","handleChat","a","(LPacket3Chat;)V","(Lop;)V","NetHandler","sd","net/minecraft/src","1" +"func_3_a","handleArmAnimation","a","(LPacket18Animation;)V","(Lna;)V","NetHandler","sd","net/minecraft/src","1" +"func_21001_a","handleEntityAction","a","(LPacket19EntityAction;)V","(Lsq;)V","NetHandler","sd","net/minecraft/src","1" +"func_4009_a","handleKickDisconnect","a","(LPacket255KickDisconnect;)V","(Lxz;)V","NetHandler","sd","net/minecraft/src","1" +"func_6006_a","handleUseEntity","a","(LPacket7UseEntity;)V","(La;)V","NetHandler","sd","net/minecraft/src","1" +"func_9002_a","handleRespawn","a","(LPacket9Respawn;)V","(Loi;)V","NetHandler","sd","net/minecraft/src","1" +"func_20006_a","handleCraftingGuiClosedPacked","a","(LPacket101CloseWindow;)V","(Lly;)V","NetHandler","sd","net/minecraft/src","1" +"func_20007_a","handleWindowClick","a","(LPacket102WindowClick;)V","(Lpw;)V","NetHandler","sd","net/minecraft/src","1" +"func_40001_a","handleEnchantItem","a","(LPacket108EnchantItem;)V","(Loq;)V","NetHandler","sd","net/minecraft/src","1" +"func_35004_a","handleCreativeSlot","a","(LPacket107CreativeSetSlot;)V","(Ldy;)V","NetHandler","sd","net/minecraft/src","1" +"func_20008_a","handleTransaction","a","(LPacket106Transaction;)V","(Lnv;)V","NetHandler","sd","net/minecraft/src","1" +"func_20005_a","handleUpdateSign","a","(LPacket130UpdateSign;)V","(Ltd;)V","NetHandler","sd","net/minecraft/src","1" +"func_35005_a","handleKeepAlive","a","(LPacket0KeepAlive;)V","(Lls;)V","NetHandler","sd","net/minecraft/src","1" +"func_27003_c","isServerHandler","c","()Z","()Z","NetHandler","sd","net/minecraft/src","1" +"func_4_a","handleMapChunk","a","(LPacket51MapChunk;)V","(Lem;)V","NetHandler","sd","net/minecraft/src","1" +"func_4001_a","handleLogin","a","(LPacket1Login;)V","(Lnl;)V","NetHandler","sd","net/minecraft/src","1" +"func_13_a","handleMultiBlockChange","a","(LPacket52MultiBlockChange;)V","(Lwj;)V","NetHandler","sd","net/minecraft/src","1" +"func_12_a","handleBlockChange","a","(LPacket53BlockChange;)V","(Lss;)V","NetHandler","sd","net/minecraft/src","1" +"func_29_a","handlePreChunk","a","(LPacket50PreChunk;)V","(Lre;)V","NetHandler","sd","net/minecraft/src","1" +"func_4002_a","handleNamedEntitySpawn","a","(LPacket20NamedEntitySpawn;)V","(Llw;)V","NetHandler","sd","net/minecraft/src","1" +"func_30_a","handleEntity","a","(LPacket30Entity;)V","(Lsz;)V","NetHandler","sd","net/minecraft/src","1" +"func_4007_a","handleEntityTeleport","a","(LPacket34EntityTeleport;)V","(Lqh;)V","NetHandler","sd","net/minecraft/src","1" +"func_8_a","handleDestroyEntity","a","(LPacket29DestroyEntity;)V","(Lqw;)V","NetHandler","sd","net/minecraft/src","1" +"func_4004_a","handlePickupSpawn","a","(LPacket21PickupSpawn;)V","(Lmn;)V","NetHandler","sd","net/minecraft/src","1" +"func_28_a","handleCollect","a","(LPacket22Collect;)V","(Ldl;)V","NetHandler","sd","net/minecraft/src","1" +"func_4003_a","handleVehicleSpawn","a","(LPacket23VehicleSpawn;)V","(Lro;)V","NetHandler","sd","net/minecraft/src","1" +"func_6004_a","handleHandshake","a","(LPacket2Handshake;)V","(Lma;)V","NetHandler","sd","net/minecraft/src","1" +"func_4006_a","handleMobSpawn","a","(LPacket24MobSpawn;)V","(Ljl;)V","NetHandler","sd","net/minecraft/src","1" +"func_25_a","handleUpdateTime","a","(LPacket4UpdateTime;)V","(Lhn;)V","NetHandler","sd","net/minecraft/src","1" +"func_15_a","handleSpawnPosition","a","(LPacket6SpawnPosition;)V","(Lqe;)V","NetHandler","sd","net/minecraft/src","1" +"func_6002_a","handleEntityVelocity","a","(LPacket28EntityVelocity;)V","(Lgu;)V","NetHandler","sd","net/minecraft/src","1" +"func_21002_a","handleEntityMetadata","a","(LPacket40EntityMetadata;)V","(Ltp;)V","NetHandler","sd","net/minecraft/src","1" +"func_6003_a","handleAttachEntity","a","(LPacket39AttachEntity;)V","(Lnc;)V","NetHandler","sd","net/minecraft/src","1" +"func_9001_a","handleEntityStatus","a","(LPacket38EntityStatus;)V","(Ljg;)V","NetHandler","sd","net/minecraft/src","1" +"func_9003_a","handleHealth","a","(LPacket8UpdateHealth;)V","(Lew;)V","NetHandler","sd","net/minecraft/src","1" +"func_12001_a","handleExplosion","a","(LPacket60Explosion;)V","(Lqo;)V","NetHandler","sd","net/minecraft/src","1" +"func_20004_a","handleOpenWindow","a","(LPacket100OpenWindow;)V","(Liz;)V","NetHandler","sd","net/minecraft/src","1" +"func_20003_a","handleSetSlot","a","(LPacket103SetSlot;)V","(Lhx;)V","NetHandler","sd","net/minecraft/src","1" +"func_20001_a","handleWindowItems","a","(LPacket104WindowItems;)V","(Lka;)V","NetHandler","sd","net/minecraft/src","1" +"func_20002_a","handleUpdateProgressbar","a","(LPacket105UpdateProgressbar;)V","(Lmj;)V","NetHandler","sd","net/minecraft/src","1" +"func_16_a","handlePlayerInventory","a","(LPacket5PlayerInventory;)V","(Lr;)V","NetHandler","sd","net/minecraft/src","1" +"func_21003_a","handleEntityPainting","a","(LPacket25EntityPainting;)V","(Luy;)V","NetHandler","sd","net/minecraft/src","1" +"func_21004_a","handlePlayNoteBlock","a","(LPacket54PlayNoteBlock;)V","(Lva;)V","NetHandler","sd","net/minecraft/src","1" +"func_27001_a","handleStatistic","a","(LPacket200Statistic;)V","(Lnq;)V","NetHandler","sd","net/minecraft/src","1" +"func_22002_a","handleSleep","a","(LPacket17Sleep;)V","(Ljz;)V","NetHandler","sd","net/minecraft/src","1" +"func_25001_a","handleBed","a","(LPacket70Bed;)V","(Lce;)V","NetHandler","sd","net/minecraft/src","1" +"func_27002_a","handleWeather","a","(LPacket71Weather;)V","(Lfd;)V","NetHandler","sd","net/minecraft/src","1" +"func_28001_a","handleMapData","a","(LPacket131MapData;)V","(Laj;)V","NetHandler","sd","net/minecraft/src","1" +"func_28002_a","handleDoorChange","a","(LPacket61DoorChange;)V","(Lfu;)V","NetHandler","sd","net/minecraft/src","1" +"func_35007_a","handleServerPing","a","(LPacket254ServerPing;)V","(Ldw;)V","NetHandler","sd","net/minecraft/src","1" +"func_35002_a","handleEntityEffect","a","(LPacket41EntityEffect;)V","(Ldx;)V","NetHandler","sd","net/minecraft/src","1" +"func_35003_a","handleRemoveEntityEffect","a","(LPacket42RemoveEntityEffect;)V","(Lmx;)V","NetHandler","sd","net/minecraft/src","1" +"func_35006_a","handlePlayerInfo","a","(LPacket201PlayerInfo;)V","(Lef;)V","NetHandler","sd","net/minecraft/src","1" +"func_35001_a","handleExperience","a","(LPacket43Experience;)V","(Lky;)V","NetHandler","sd","net/minecraft/src","1" +"func_35008_a","handleEntityExpOrb","a","(LPacket26EntityExpOrb;)V","(Lot;)V","NetHandler","sd","net/minecraft/src","1" +"func_40308_a","func_40308_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor3;","(Ljava/util/List;Ljava/util/Random;IIIII)Lye;","ComponentNetherBridgeCorridor3","ye","net/minecraft/src","1" +"values","values","values","()[LEnumCreatureType;","()[Lla;","EnumCreatureType","la","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumCreatureType;","(Ljava/lang/String;)Lla;","EnumCreatureType","la","net/minecraft/src","1" +"func_21105_a","getCreatureClass","a","()Ljava/lang/Class;","()Ljava/lang/Class;","EnumCreatureType","la","net/minecraft/src","1" +"func_21104_b","getMaxNumberOfCreature","b","()I","()I","EnumCreatureType","la","net/minecraft/src","1" +"func_21102_c","getCreatureMaterial","c","()LMaterial;","()Llg;","EnumCreatureType","la","net/minecraft/src","1" +"func_21103_d","getPeacefulCreature","d","()Z","()Z","EnumCreatureType","la","net/minecraft/src","1" +"func_27092_a","func_27092_a","a","()V","()V","StatList","jk","net/minecraft/src","1" +"func_25088_a","initBreakableStats","b","()V","()V","StatList","jk","net/minecraft/src","1" +"func_25086_b","initStats","c","()V","()V","StatList","jk","net/minecraft/src","1" +"func_25091_c","initCraftableStats","d","()V","()V","StatList","jk","net/minecraft/src","1" +"func_25089_a","initMinableStats","a","(Ljava/lang/String;I)[LStatBase;","(Ljava/lang/String;I)[Luv;","StatList","jk","net/minecraft/src","1" +"func_25090_a","initUsableStats","a","([LStatBase;Ljava/lang/String;III)[LStatBase;","([Luv;Ljava/lang/String;III)[Luv;","StatList","jk","net/minecraft/src","1" +"func_25087_b","func_25087_b","b","([LStatBase;Ljava/lang/String;III)[LStatBase;","([Luv;Ljava/lang/String;III)[Luv;","StatList","jk","net/minecraft/src","1" +"func_25092_a","replaceAllSimilarBlocks","a","([LStatBase;)V","([Luv;)V","StatList","jk","net/minecraft/src","1" +"func_25085_a","replaceSimilarBlocks","a","([LStatBase;II)V","([Luv;II)V","StatList","jk","net/minecraft/src","1" +"func_22206_a","compareChunks","a","(LChunkFile;)I","(Lee;)I","ChunkFile","ee","net/minecraft/src","1" +"func_22207_a","getChunkFile","a","()Ljava/io/File;","()Ljava/io/File;","ChunkFile","ee","net/minecraft/src","1" +"func_22205_b","getXChunk","b","()I","()I","ChunkFile","ee","net/minecraft/src","1" +"func_22204_c","getYChunk","c","()I","()I","ChunkFile","ee","net/minecraft/src","1" +"func_585_a","sin","a","(F)F","(F)F","MathHelper","in","net/minecraft/src","1" +"func_582_b","cos","b","(F)F","(F)F","MathHelper","in","net/minecraft/src","1" +"func_586_c","sqrt_float","c","(F)F","(F)F","MathHelper","in","net/minecraft/src","1" +"func_583_a","sqrt_double","a","(D)F","(D)F","MathHelper","in","net/minecraft/src","1" +"func_588_d","floor_float","d","(F)I","(F)I","MathHelper","in","net/minecraft/src","1" +"func_584_b","floor_double","b","(D)I","(D)I","MathHelper","in","net/minecraft/src","1" +"func_35477_c","floor_double_long","c","(D)J","(D)J","MathHelper","in","net/minecraft/src","1" +"func_587_e","abs","e","(F)F","(F)F","MathHelper","in","net/minecraft/src","1" +"func_35475_a","getUnsigned","a","(I)I","(I)I","MathHelper","in","net/minecraft/src","1" +"func_41051_a","func_41051_a","a","(III)I","(III)I","MathHelper","in","net/minecraft/src","1" +"func_581_a","abs_max","a","(DD)D","(DD)D","MathHelper","in","net/minecraft/src","1" +"func_35476_a","func_35476_a","a","(Ljava/util/Random;II)I","(Ljava/util/Random;II)I","MathHelper","in","net/minecraft/src","1" +"func_35224_c","attackEntityAsMob","d","(LEntity;)Z","(Lrn;)Z","EntityMob","hb","net/minecraft/src","1" +"func_40123_y","func_40123_y","y","()Z","()Z","EntityMob","hb","net/minecraft/src","1" +"func_21079_e","getRandomStackFromInventory","k_","()LItemStack;","()Ljb;","TileEntityDispenser","be","net/minecraft/src","1" +"func_4037_g","checkBlockCoordValid","g","(LWorld;III)V","(Lfi;III)V","BlockReed","qj","net/minecraft/src","1" +"func_40303_a","func_40303_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing2;","(Ljava/util/List;Ljava/util/Random;IIIII)Lxl;","ComponentNetherBridgeCrossing2","xl","net/minecraft/src","1" +"func_351_a","isAtLocation","a","(II)Z","(II)Z","Chunk","le","net/minecraft/src","1" +"func_337_b","getHeightValue","b","(II)I","(II)I","Chunk","le","net/minecraft/src","1" +"func_348_a","func_348_a","a","()V","()V","Chunk","le","net/minecraft/src","1" +"func_353_b","generateSkylightMap","b","()V","()V","Chunk","le","net/minecraft/src","1" +"func_4053_c","func_4053_c","c","()V","()V","Chunk","le","net/minecraft/src","1" +"func_344_a","getBlockID","a","(III)I","(III)I","Chunk","le","net/minecraft/src","1" +"func_346_a","setBlockIDWithMetadata","a","(IIIII)Z","(IIIII)Z","Chunk","le","net/minecraft/src","1" +"func_357_a","setBlockID","a","(IIII)Z","(IIII)Z","Chunk","le","net/minecraft/src","1" +"func_356_b","getBlockMetadata","b","(III)I","(III)I","Chunk","le","net/minecraft/src","1" +"func_345_b","setBlockMetadata","b","(IIII)Z","(IIII)Z","Chunk","le","net/minecraft/src","1" +"func_341_a","getSavedLightValue","a","(LEnumSkyBlock;III)I","(Lei;III)I","Chunk","le","net/minecraft/src","1" +"func_330_a","setLightValue","a","(LEnumSkyBlock;IIII)V","(Lei;IIII)V","Chunk","le","net/minecraft/src","1" +"func_354_c","getBlockLightValue","c","(IIII)I","(IIII)I","Chunk","le","net/minecraft/src","1" +"func_335_a","addEntity","a","(LEntity;)V","(Lrn;)V","Chunk","le","net/minecraft/src","1" +"func_350_b","removeEntity","b","(LEntity;)V","(Lrn;)V","Chunk","le","net/minecraft/src","1" +"func_332_a","removeEntityAtIndex","a","(LEntity;I)V","(Lrn;I)V","Chunk","le","net/minecraft/src","1" +"func_343_c","canBlockSeeTheSky","c","(III)Z","(III)Z","Chunk","le","net/minecraft/src","1" +"func_338_d","getChunkBlockTileEntity","d","(III)LTileEntity;","(III)Loh;","Chunk","le","net/minecraft/src","1" +"func_349_a","addTileEntity","a","(LTileEntity;)V","(Loh;)V","Chunk","le","net/minecraft/src","1" +"func_352_a","setChunkBlockTileEntity","a","(IIILTileEntity;)V","(IIILoh;)V","Chunk","le","net/minecraft/src","1" +"func_359_e","removeChunkBlockTileEntity","e","(III)V","(III)V","Chunk","le","net/minecraft/src","1" +"func_358_c","onChunkLoad","d","()V","()V","Chunk","le","net/minecraft/src","1" +"func_331_d","onChunkUnload","e","()V","()V","Chunk","le","net/minecraft/src","1" +"func_336_e","setChunkModified","f","()V","()V","Chunk","le","net/minecraft/src","1" +"func_329_a","getEntitiesWithinAABBForEntity","a","(LEntity;LAxisAlignedBB;Ljava/util/List;)V","(Lrn;Leu;Ljava/util/List;)V","Chunk","le","net/minecraft/src","1" +"func_342_a","getEntitiesOfTypeWithinAAAB","a","(Ljava/lang/Class;LAxisAlignedBB;Ljava/util/List;)V","(Ljava/lang/Class;Leu;Ljava/util/List;)V","Chunk","le","net/minecraft/src","1" +"func_347_a","needsSaving","a","(Z)Z","(Z)Z","Chunk","le","net/minecraft/src","1" +"func_340_a","getChunkData","a","([BIIIIIII)I","([BIIIIIII)I","Chunk","le","net/minecraft/src","1" +"func_334_a","getRandomWithSeed","a","(J)Ljava/util/Random;","(J)Ljava/util/Random;","Chunk","le","net/minecraft/src","1" +"func_41049_g","isEmpty","g","()Z","()Z","Chunk","le","net/minecraft/src","1" +"func_333_c","propagateSkylightOcclusion","d","(II)V","(II)V","Chunk","le","net/minecraft/src","1" +"func_35633_i","func_35633_i","k","()V","()V","Chunk","le","net/minecraft/src","1" +"func_355_f","checkSkylightNeighborHeight","f","(III)V","(III)V","Chunk","le","net/minecraft/src","1" +"func_35634_d","func_35634_d","d","(IIII)V","(IIII)V","Chunk","le","net/minecraft/src","1" +"func_339_g","relightBlock","g","(III)V","(III)V","Chunk","le","net/minecraft/src","1" +"func_25083_h","func_25083_h","h","()V","()V","Chunk","le","net/minecraft/src","1" +"func_35632_a","populateChunk","a","(LIChunkProvider;LIChunkProvider;II)V","(Lco;Lco;II)V","Chunk","le","net/minecraft/src","1" +"func_35631_c","func_35631_c","c","(II)I","(II)I","Chunk","le","net/minecraft/src","1" +"func_35635_h","func_35635_h","i","()V","()V","Chunk","le","net/minecraft/src","1" +"func_40543_i","func_40543_i","j","()LChunkCoordIntPair;","()Lyi;","Chunk","le","net/minecraft/src","1" +"values","values","values","()[LEnumMobType;","()[Lqu;","EnumMobType","qu","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMobType;","(Ljava/lang/String;)Lqu;","EnumMobType","qu","net/minecraft/src","1" +"func_386_a","setTag","a","(LNBTBase;)V","(Lik;)V","NBTTagList","rp","net/minecraft/src","1" +"func_388_a","tagAt","a","(I)LNBTBase;","(I)Lik;","NBTTagList","rp","net/minecraft/src","1" +"func_387_b","tagCount","d","()I","()I","NBTTagList","rp","net/minecraft/src","1" +"func_641_a","init","a","()V","()V","ConsoleLogManager","hm","net/minecraft/src","1" +"func_35167_h","func_35167_h","h","()V","()V","TileEntityChest","js","net/minecraft/src","1" +"func_21027_b","growTree","b","(LWorld;IIILjava/util/Random;)V","(Lfi;IIILjava/util/Random;)V","BlockSapling","hk","net/minecraft/src","1" +"func_35032_a","func_35032_a","a","(II)I","(II)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" +"func_35031_b","func_35031_b","b","(IIII)I","(IIII)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" +"func_83_a","getSizeInventory","c","()I","()I","IInventory","lp","net/minecraft/src","1" +"func_82_a","getStackInSlot","c_","(I)LItemStack;","(I)Ljb;","IInventory","lp","net/minecraft/src","1" +"func_20068_b","getInvName","e","()Ljava/lang/String;","()Ljava/lang/String;","IInventory","lp","net/minecraft/src","1" +"func_20069_a","decrStackSize","a","(II)LItemStack;","(II)Ljb;","IInventory","lp","net/minecraft/src","1" +"func_206_a","setInventorySlotContents","a","(ILItemStack;)V","(ILjb;)V","IInventory","lp","net/minecraft/src","1" +"func_202_d","getInventoryStackLimit","a","()I","()I","IInventory","lp","net/minecraft/src","1" +"func_183_c","onInventoryChanged","x_","()V","()V","IInventory","lp","net/minecraft/src","1" +"func_20067_a_","isUseableByPlayer","a","(LEntityPlayer;)Z","(Lgz;)Z","IInventory","lp","net/minecraft/src","1" +"func_35161_e","openChest","f","()V","()V","IInventory","lp","net/minecraft/src","1" +"func_35162_t_","closeChest","g","()V","()V","IInventory","lp","net/minecraft/src","1" +"func_35542_a","isSizeableStructure","a","()Z","()Z","StructureStart","tr","net/minecraft/src","1" +"func_35543_b","getBoundingBox","b","()LStructureBoundingBox;","()Lvb;","StructureStart","tr","net/minecraft/src","1" +"func_40208_c","func_40208_c","c","()Ljava/util/LinkedList;","()Ljava/util/LinkedList;","StructureStart","tr","net/minecraft/src","1" +"func_35541_a","generateStructure","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;)V","(Lfi;Ljava/util/Random;Lvb;)V","StructureStart","tr","net/minecraft/src","1" +"func_35544_c","updateBoundingBox","d","()V","()V","StructureStart","tr","net/minecraft/src","1" +"func_35545_a","func_35545_a","a","(LWorld;Ljava/util/Random;I)V","(Lfi;Ljava/util/Random;I)V","StructureStart","tr","net/minecraft/src","1" +"func_40209_a","func_40209_a","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","StructureStart","tr","net/minecraft/src","1" +"func_27053_d","registerStat","d","()LStatBase;","()Luv;","StatBase","uv","net/minecraft/src","1" +"func_27052_e","initIndependentStat","e","()LStatBase;","()Luv;","StatBase","uv","net/minecraft/src","1" +"func_35505_a","func_35505_a","a","(Ljava/net/Socket;)V","(Ljava/net/Socket;)V","NetworkListenThread","ep","net/minecraft/src","1" +"func_4108_a","addPlayer","a","(LNetServerHandler;)V","(Lkt;)V","NetworkListenThread","ep","net/minecraft/src","1" +"func_717_a","addPendingConnection","a","(LNetLoginHandler;)V","(Lgq;)V","NetworkListenThread","ep","net/minecraft/src","1" +"func_715_a","handleNetworkListenThread","a","()V","()V","NetworkListenThread","ep","net/minecraft/src","1" +"func_713_a","getServerSocket","a","(LNetworkListenThread;)Ljava/net/ServerSocket;","(Lep;)Ljava/net/ServerSocket;","NetworkListenThread","ep","net/minecraft/src","1" +"func_35504_b","func_35504_b","b","(LNetworkListenThread;)Ljava/util/HashMap;","(Lep;)Ljava/util/HashMap;","NetworkListenThread","ep","net/minecraft/src","1" +"func_712_b","func_712_b","c","(LNetworkListenThread;)I","(Lep;)I","NetworkListenThread","ep","net/minecraft/src","1" +"func_716_a","func_716_a","a","(LNetworkListenThread;LNetLoginHandler;)V","(Lep;Lgq;)V","NetworkListenThread","ep","net/minecraft/src","1" +"func_20112_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesWeapons","wp","net/minecraft/src","1" +"func_35372_a","func_35372_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse3;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgi;","ComponentVillageHouse3","gi","net/minecraft/src","1" +"func_40621_a","writeCapabilitiesToNBT","a","(LNBTTagCompound;)V","(Lng;)V","PlayerCapabilities","vv","net/minecraft/src","1" +"func_40620_b","readCapabilitiesFromNBT","b","(LNBTTagCompound;)V","(Lng;)V","PlayerCapabilities","vv","net/minecraft/src","1" +"func_40482_a","calculateModifier","a","(LEnchantment;I)V","(Lmq;I)V","IEnchantmentModifier","y","net/minecraft/src","1" +"compareTo","compareTo","compareTo","(Ljava/lang/Object;)I","(Ljava/lang/Object;)I","ChunkCoordinates","bu","net/minecraft/src","1" +"func_22215_a","compareChunkCoordinate","a","(LChunkCoordinates;)I","(Lbu;)I","ChunkCoordinates","bu","net/minecraft/src","1" +"func_27127_a","getSqDistanceTo","a","(III)D","(III)D","ChunkCoordinates","bu","net/minecraft/src","1" +"func_35058_c","func_35058_c","d","(I)Z","(I)Z","BlockVine","nw","net/minecraft/src","1" +"func_35059_g","func_35059_g","g","(LWorld;III)Z","(Lfi;III)Z","BlockVine","nw","net/minecraft/src","1" +"accept","accept","accept","(Ljava/io/File;)Z","(Ljava/io/File;)Z","ChunkFolderPattern","cm","net/minecraft/src","1" +"func_27097_a","func_27097_a","a","()V","()V","AchievementList","et","net/minecraft/src","1" +"func_25077_b","getRecipeOutput","b","()LItemStack;","()Ljb;","IRecipe","dz","net/minecraft/src","1" +"func_21134_a","matches","a","(LInventoryCrafting;)Z","(Lmc;)Z","IRecipe","dz","net/minecraft/src","1" +"func_21136_b","getCraftingResult","b","(LInventoryCrafting;)LItemStack;","(Lmc;)Ljb;","IRecipe","dz","net/minecraft/src","1" +"func_20165_a","getRecipeSize","a","()I","()I","IRecipe","dz","net/minecraft/src","1" +"func_4062_a","func_4062_a","a","(II[B)V","(II[B)V","ChunkProviderHell","pp","net/minecraft/src","1" +"func_4061_b","func_4061_b","b","(II[B)V","(II[B)V","ChunkProviderHell","pp","net/minecraft/src","1" +"func_4060_a","func_4060_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderHell","pp","net/minecraft/src","1" +"func_35556_d","dropChunk","d","(II)V","(II)V","ChunkProvider","nt","net/minecraft/src","1" +"func_28058_d","loadChunkFromFile","e","(II)LChunk;","(II)Lle;","ChunkProvider","nt","net/minecraft/src","1" +"func_28060_a","unloadAndSaveChunkData","a","(LChunk;)V","(Lle;)V","ChunkProvider","nt","net/minecraft/src","1" +"func_28059_b","unloadAndSaveChunk","b","(LChunk;)V","(Lle;)V","ChunkProvider","nt","net/minecraft/src","1" +"values","values","values","()[LEnumEnchantmentType;","()[Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumEnchantmentType;","(Ljava/lang/String;)Lpn;","EnumEnchantmentType","pn","net/minecraft/src","1" +"func_40525_a","canEnchantItem","a","(LItem;)Z","(Lgw;)Z","EnumEnchantmentType","pn","net/minecraft/src","1" +"func_4030_a_","tryToCreatePortal","b_","(LWorld;III)Z","(Lfi;III)Z","BlockPortal","am","net/minecraft/src","1" +"func_28039_c","setBlockBoundsForBlockRender","d","(I)V","(I)V","BlockTrapDoor","ny","net/minecraft/src","1" +"func_28040_a","onPoweredBlockChange","a","(LWorld;IIIZ)V","(Lfi;IIIZ)V","BlockTrapDoor","ny","net/minecraft/src","1" +"func_28038_d","isTrapdoorOpen","e","(I)Z","(I)Z","BlockTrapDoor","ny","net/minecraft/src","1" +"func_41006_g","func_41006_g","f","(I)Z","(I)Z","BlockTrapDoor","ny","net/minecraft/src","1" +"func_28023_a","getMapData","a","(LItemStack;LWorld;)LMapData;","(Ljb;Lfi;)Liy;","ItemMap","wd","net/minecraft/src","1" +"func_28024_a","updateMapData","a","(LWorld;LEntity;LMapData;)V","(Lfi;Lrn;Liy;)V","ItemMap","wd","net/minecraft/src","1" +"func_178_b","explode","j","()V","()V","EntityTNTPrimed","pz","net/minecraft/src","1" +"func_40385_a","hasExpired","a","(J)Ljava/lang/Boolean;","(J)Ljava/lang/Boolean;","RConThreadQueryAuth","g","net/minecraft/src","1" +"func_40384_a","getRandomChallenge","a","()I","()I","RConThreadQueryAuth","g","net/minecraft/src","1" +"func_40386_b","getChallengeValue","b","()[B","()[B","RConThreadQueryAuth","g","net/minecraft/src","1" +"func_40383_c","getRequestID","c","()[B","()[B","RConThreadQueryAuth","g","net/minecraft/src","1" +"func_179_a","func_179_a","b","(I)V","(I)V","EntityPainting","px","net/minecraft/src","1" +"func_180_c","func_180_c","c","(I)F","(I)F","EntityPainting","px","net/minecraft/src","1" +"func_181_b","onValidSurface","j","()Z","()Z","EntityPainting","px","net/minecraft/src","1" +"func_296_g","setDefaultDirection","g","(LWorld;III)V","(Lfi;III)V","BlockFurnace","rx","net/minecraft/src","1" +"func_295_a","updateFurnaceBlockState","a","(ZLWorld;III)V","(ZLfi;III)V","BlockFurnace","rx","net/minecraft/src","1" +"func_4090_a","registerWorldChunkManager","a","()V","()V","WorldProvider","wn","net/minecraft/src","1" +"func_4087_c","getChunkProvider","b","()LIChunkProvider;","()Lco;","WorldProvider","wn","net/minecraft/src","1" +"func_4089_a","calculateCelestialAngle","a","(JF)F","(JF)F","WorldProvider","wn","net/minecraft/src","1" +"func_28108_d","canRespawnHere","c","()Z","()Z","WorldProvider","wn","net/minecraft/src","1" +"func_4092_a","canCoordinateBeSpawn","a","(II)Z","(II)Z","WorldProvider","wn","net/minecraft/src","1" +"func_40545_d","func_40545_d","d","()LChunkCoordinates;","()Lbu;","WorldProvider","wn","net/minecraft/src","1" +"func_4088_b","generateLightBrightnessTable","e","()V","()V","WorldProvider","wn","net/minecraft/src","1" +"func_4093_a","registerWorld","a","(LWorld;)V","(Lfi;)V","WorldProvider","wn","net/minecraft/src","1" +"func_4091_a","getProviderForDimension","a","(I)LWorldProvider;","(I)Lwn;","WorldProvider","wn","net/minecraft/src","1" +"func_275_g","reduntantonNeighborBlockChange","g","(LWorld;III)Z","(Lfi;III)Z","BlockSnow","jr","net/minecraft/src","1" +"func_40179_c","func_40179_c","d","(I)Z","(I)Z","BlockEndPortalFrame","yc","net/minecraft/src","1" +"func_274_g","checkIfAttachedToBlock","g","(LWorld;III)Z","(Lfi;III)Z","BlockLever","xa","net/minecraft/src","1" +"func_40306_a","func_40306_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Luw;","ComponentNetherBridgeCrossing","uw","net/minecraft/src","1" +"func_20156_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesTools","hd","net/minecraft/src","1" +"func_667_a","generate","a","(LIChunkProvider;LWorld;II[B)V","(Lco;Lfi;II[B)V","MapGenBase","gd","net/minecraft/src","1" +"func_666_a","recursiveGenerate","a","(LWorld;IIII[B)V","(Lfi;IIII[B)V","MapGenBase","gd","net/minecraft/src","1" +"func_33_a","tryLogin","a","()V","()V","NetLoginHandler","gq","net/minecraft/src","1" +"func_34_b","kickUser","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","NetLoginHandler","gq","net/minecraft/src","1" +"func_6007_b","doLogin","b","(LPacket1Login;)V","(Lnl;)V","NetLoginHandler","gq","net/minecraft/src","1" +"func_35_b","getUserAndIPString","b","()Ljava/lang/String;","()Ljava/lang/String;","NetLoginHandler","gq","net/minecraft/src","1" +"func_32_a","getServerId","a","(LNetLoginHandler;)Ljava/lang/String;","(Lgq;)Ljava/lang/String;","NetLoginHandler","gq","net/minecraft/src","1" +"func_31_a","setLoginPacket","a","(LNetLoginHandler;LPacket1Login;)LPacket1Login;","(Lgq;Lnl;)Lnl;","NetLoginHandler","gq","net/minecraft/src","1" +"func_35346_a","func_35346_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdRoomCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Lkk;","ComponentStrongholdRoomCrossing","kk","net/minecraft/src","1" +"func_40396_a","writeByteArray","a","([B)V","([B)V","RConOutputStream","ez","net/minecraft/src","1" +"func_40397_a","writeString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","RConOutputStream","ez","net/minecraft/src","1" +"func_40393_a","writeInt","a","(I)V","(I)V","RConOutputStream","ez","net/minecraft/src","1" +"func_40394_a","writeShort","a","(S)V","(S)V","RConOutputStream","ez","net/minecraft/src","1" +"func_40398_a","toByteArray","a","()[B","()[B","RConOutputStream","ez","net/minecraft/src","1" +"func_40395_b","reset","b","()V","()V","RConOutputStream","ez","net/minecraft/src","1" +"actionPerformed","actionPerformed","actionPerformed","(Ljava/awt/event/ActionEvent;)V","(Ljava/awt/event/ActionEvent;)V","GuiStatsListener","ll","net/minecraft/src","1" +"func_4112_a","getRandomSpawningPointInChunk","a","(LWorld;II)LChunkPosition;","(Lfi;II)Lvo;","SpawnerAnimals","cs","net/minecraft/src","1" +"func_4111_a","performSpawning","a","(LWorld;ZZ)I","(Lfi;ZZ)I","SpawnerAnimals","cs","net/minecraft/src","1" +"func_21167_a","canCreatureTypeSpawnAtLocation","a","(LEnumCreatureType;LWorld;III)Z","(Lla;Lfi;III)Z","SpawnerAnimals","cs","net/minecraft/src","1" +"func_21166_a","creatureSpecificInit","a","(LEntityLiving;LWorld;FFF)V","(Llk;Lfi;FFF)V","SpawnerAnimals","cs","net/minecraft/src","1" +"func_35573_a","func_35573_a","a","(LWorld;LBiomeGenBase;IIIILjava/util/Random;)V","(Lfi;Lkb;IIIILjava/util/Random;)V","SpawnerAnimals","cs","net/minecraft/src","1" +"func_35060_c","func_35060_c","d","(I)Z","(I)Z","BlockSilverfish","pu","net/minecraft/src","1" +"func_35061_d","func_35061_d","e","(I)I","(I)I","BlockSilverfish","pu","net/minecraft/src","1" +"func_754_a","setNetHandler","a","(LNetHandler;)V","(Lsd;)V","NetworkManager","oo","net/minecraft/src","1" +"func_745_a","addToSendQueue","a","(LPacket;)V","(Lkf;)V","NetworkManager","oo","net/minecraft/src","1" +"func_746_e","sendPacket","g","()Z","()Z","NetworkManager","oo","net/minecraft/src","1" +"func_28138_a","wakeThreads","a","()V","()V","NetworkManager","oo","net/minecraft/src","1" +"func_741_f","readPacket","h","()Z","()Z","NetworkManager","oo","net/minecraft/src","1" +"func_750_a","onNetworkError","a","(Ljava/lang/Exception;)V","(Ljava/lang/Exception;)V","NetworkManager","oo","net/minecraft/src","1" +"func_753_a","networkShutdown","a","(Ljava/lang/String;[Ljava/lang/Object;)V","(Ljava/lang/String;[Ljava/lang/Object;)V","NetworkManager","oo","net/minecraft/src","1" +"func_747_a","processReadPackets","b","()V","()V","NetworkManager","oo","net/minecraft/src","1" +"func_755_b","getRemoteAddress","c","()Ljava/net/SocketAddress;","()Ljava/net/SocketAddress;","NetworkManager","oo","net/minecraft/src","1" +"func_752_c","serverShutdown","d","()V","()V","NetworkManager","oo","net/minecraft/src","1" +"func_744_d","getNumChunkDataPackets","e","()I","()I","NetworkManager","oo","net/minecraft/src","1" +"func_35596_f","getSocket","f","()Ljava/net/Socket;","()Ljava/net/Socket;","NetworkManager","oo","net/minecraft/src","1" +"func_743_a","isRunning","a","(LNetworkManager;)Z","(Loo;)Z","NetworkManager","oo","net/minecraft/src","1" +"func_740_b","isServerTerminating","b","(LNetworkManager;)Z","(Loo;)Z","NetworkManager","oo","net/minecraft/src","1" +"func_751_c","readNetworkPacket","c","(LNetworkManager;)Z","(Loo;)Z","NetworkManager","oo","net/minecraft/src","1" +"func_749_d","sendNetworkPacket","d","(LNetworkManager;)Z","(Loo;)Z","NetworkManager","oo","net/minecraft/src","1" +"func_28136_f","getOutputStream","e","(LNetworkManager;)Ljava/io/DataOutputStream;","(Loo;)Ljava/io/DataOutputStream;","NetworkManager","oo","net/minecraft/src","1" +"func_28135_e","getIsTerminating","f","(LNetworkManager;)Z","(Loo;)Z","NetworkManager","oo","net/minecraft/src","1" +"func_30007_a","func_30007_a","a","(LNetworkManager;Ljava/lang/Exception;)V","(Loo;Ljava/lang/Exception;)V","NetworkManager","oo","net/minecraft/src","1" +"func_742_e","getReadThread","g","(LNetworkManager;)Ljava/lang/Thread;","(Loo;)Ljava/lang/Thread;","NetworkManager","oo","net/minecraft/src","1" +"func_748_f","getWriteThread","h","(LNetworkManager;)Ljava/lang/Thread;","(Loo;)Ljava/lang/Thread;","NetworkManager","oo","net/minecraft/src","1" +"func_723_a","generateNewProperties","a","()V","()V","PropertyManager","qt","net/minecraft/src","1" +"func_721_b","saveProperties","b","()V","()V","PropertyManager","qt","net/minecraft/src","1" +"func_40656_c","func_40656_c","c","()Ljava/io/File;","()Ljava/io/File;","PropertyManager","qt","net/minecraft/src","1" +"func_720_a","getStringProperty","a","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","PropertyManager","qt","net/minecraft/src","1" +"func_722_a","getIntProperty","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","PropertyManager","qt","net/minecraft/src","1" +"func_724_a","getBooleanProperty","a","(Ljava/lang/String;Z)Z","(Ljava/lang/String;Z)Z","PropertyManager","qt","net/minecraft/src","1" +"func_40657_a","setProperty","a","(Ljava/lang/String;Ljava/lang/Object;)V","(Ljava/lang/String;Ljava/lang/Object;)V","PropertyManager","qt","net/minecraft/src","1" +"func_22118_b","setProperty","b","(Ljava/lang/String;Z)V","(Ljava/lang/String;Z)V","PropertyManager","qt","net/minecraft/src","1" +"func_40063_a","func_40063_a","a","(LMovingObjectPosition;)V","(Luc;)V","EntityFireball","ch","net/minecraft/src","1" +"func_4066_a","getBiomeGenAtChunkCoord","a","(LChunkCoordIntPair;)LBiomeGenBase;","(Lyi;)Lkb;","WorldChunkManager","xe","net/minecraft/src","1" +"func_4067_a","getBiomeGenAt","a","(II)LBiomeGenBase;","(II)Lkb;","WorldChunkManager","xe","net/minecraft/src","1" +"func_4068_a","getTemperatures","a","([FIIII)[F","([FIIII)[F","WorldChunkManager","xe","net/minecraft/src","1" +"func_40578_a","func_40578_a","a","(IIII)[F","(IIII)[F","WorldChunkManager","xe","net/minecraft/src","1" +"func_4065_a","func_4065_a","b","([FIIII)[F","([FIIII)[F","WorldChunkManager","xe","net/minecraft/src","1" +"func_4064_a","loadBlockGeneratorData","a","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lkb;IIII)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" +"func_35140_a","func_35140_a","a","([LBiomeGenBase;IIIIZ)[LBiomeGenBase;","([Lkb;IIIIZ)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" +"func_35139_a","func_35139_a","a","(IIILjava/util/List;Ljava/util/Random;)LChunkPosition;","(IIILjava/util/List;Ljava/util/Random;)Lvo;","WorldChunkManager","xe","net/minecraft/src","1" +"func_35141_a","func_35141_a","a","(IIILjava/util/List;)Z","(IIILjava/util/List;)Z","WorldChunkManager","xe","net/minecraft/src","1" +"func_35137_a","func_35137_a","a","()Ljava/util/List;","()Ljava/util/List;","WorldChunkManager","xe","net/minecraft/src","1" +"func_40579_a","func_40579_a","a","(III)F","(III)F","WorldChunkManager","xe","net/minecraft/src","1" +"func_40577_a","func_40577_a","a","(FI)F","(FI)F","WorldChunkManager","xe","net/minecraft/src","1" +"func_35142_b","func_35142_b","b","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lkb;IIII)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" +"func_35138_b","func_35138_b","b","()V","()V","WorldChunkManager","xe","net/minecraft/src","1" +"func_35374_a","func_35374_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHall;","(Ljava/util/List;Ljava/util/Random;IIIII)Ls;","ComponentVillageHall","s","net/minecraft/src","1" +"func_40638_b","func_40638_b","b","(ILItemStack;)I","(ILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40639_a","func_40639_a","a","(I[LItemStack;)I","(I[Ljb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40627_a","func_40627_a","a","(LIEnchantmentModifier;LItemStack;)V","(Ly;Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40640_a","func_40640_a","a","(LIEnchantmentModifier;[LItemStack;)V","(Ly;[Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40634_a","func_40634_a","a","(LInventoryPlayer;LDamageSource;)I","(Lja;Lpo;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40641_a","func_40641_a","a","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40637_b","func_40637_b","b","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40636_c","func_40636_c","c","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40628_a","func_40628_a","a","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40630_b","getEfficiencyModifier","b","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40643_c","func_40643_c","c","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40644_d","func_40644_d","d","(LInventoryPlayer;)Z","(Lja;)Z","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40635_e","getFortuneModifier","e","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40633_f","func_40633_f","f","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40632_g","getAquaAffinityModifier","g","(LInventoryPlayer;)Z","(Lja;)Z","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40642_a","func_40642_a","a","(Ljava/util/Random;IILItemStack;)I","(Ljava/util/Random;IILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40629_a","func_40629_a","a","(Ljava/util/Random;LItemStack;I)Ljava/util/List;","(Ljava/util/Random;Ljb;I)Ljava/util/List;","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40631_a","func_40631_a","a","(ILItemStack;)Ljava/util/Map;","(ILjb;)Ljava/util/Map;","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40345_a","getMinEnchantability","a","(I)I","(I)I","Enchantment","mq","net/minecraft/src","1" +"func_40342_b","getMaxEnchantability","b","(I)I","(I)I","Enchantment","mq","net/minecraft/src","1" +"func_40344_a","getMaxLevel","a","()I","()I","Enchantment","mq","net/minecraft/src","1" +"func_40343_a","canApplyTogether","a","(LEnchantment;)Z","(Lmq;)Z","Enchantment","mq","net/minecraft/src","1" +"func_40350_a","calcModifierDamage","a","(ILDamageSource;)I","(ILpo;)I","Enchantment","mq","net/minecraft/src","1" +"func_40346_a","calcModifierLiving","a","(ILEntityLiving;)I","(ILlk;)I","Enchantment","mq","net/minecraft/src","1" +"func_40348_b","getWeight","b","()I","()I","Enchantment","mq","net/minecraft/src","1" +"func_40347_c","getMinLevel","c","()I","()I","Enchantment","mq","net/minecraft/src","1" +"func_40349_a","setName","a","(Ljava/lang/String;)LEnchantment;","(Ljava/lang/String;)Lmq;","Enchantment","mq","net/minecraft/src","1" +"func_40205_b","func_40205_b","b","()Ljava/util/List;","()Ljava/util/List;","MapGenNetherBridge","kh","net/minecraft/src","1" +"func_21035_g","setDispenserDefaultDirection","g","(LWorld;III)V","(Lfi;III)V","BlockDispenser","wz","net/minecraft/src","1" +"func_21036_b","dispenseItem","b","(LWorld;IIILjava/util/Random;)V","(Lfi;IIILjava/util/Random;)V","BlockDispenser","wz","net/minecraft/src","1" +"func_35063_c","func_35063_c","d","(I)Z","(I)Z","BlockPane","wh","net/minecraft/src","1" +"equals","equals","equals","(Ljava/lang/Object;)Z","(Ljava/lang/Object;)Z","IntHashMapEntry","vx","net/minecraft/src","1" +"hashCode","hashCode","hashCode","()I","()I","IntHashMapEntry","vx","net/minecraft/src","1" +"toString","toString","toString","()Ljava/lang/String;","()Ljava/lang/String;","IntHashMapEntry","vx","net/minecraft/src","1" +"func_559_a","getHash","a","()I","()I","IntHashMapEntry","vx","net/minecraft/src","1" +"func_558_b","getValue","b","()Ljava/lang/Object;","()Ljava/lang/Object;","IntHashMapEntry","vx","net/minecraft/src","1" +"func_545_g","computeHash","g","(I)I","(I)I","IntHashMap","jw","net/minecraft/src","1" +"func_555_a","getSlotIndex","a","(II)I","(II)I","IntHashMap","jw","net/minecraft/src","1" +"func_550_a","lookup","a","(I)Ljava/lang/Object;","(I)Ljava/lang/Object;","IntHashMap","jw","net/minecraft/src","1" +"func_556_b","containsItem","b","(I)Z","(I)Z","IntHashMap","jw","net/minecraft/src","1" +"func_548_c","lookupEntry","c","(I)LIntHashMapEntry;","(I)Lvx;","IntHashMap","jw","net/minecraft/src","1" +"func_554_a","addKey","a","(ILjava/lang/Object;)V","(ILjava/lang/Object;)V","IntHashMap","jw","net/minecraft/src","1" +"func_552_h","grow","h","(I)V","(I)V","IntHashMap","jw","net/minecraft/src","1" +"func_549_a","copyTo","a","([LIntHashMapEntry;)V","([Lvx;)V","IntHashMap","jw","net/minecraft/src","1" +"func_553_d","removeObject","d","(I)Ljava/lang/Object;","(I)Ljava/lang/Object;","IntHashMap","jw","net/minecraft/src","1" +"func_557_e","removeEntry","e","(I)LIntHashMapEntry;","(I)Lvx;","IntHashMap","jw","net/minecraft/src","1" +"func_551_a","clearMap","a","()V","()V","IntHashMap","jw","net/minecraft/src","1" +"func_547_a","insert","a","(IILjava/lang/Object;I)V","(IILjava/lang/Object;I)V","IntHashMap","jw","net/minecraft/src","1" +"func_546_f","getHash","f","(I)I","(I)I","IntHashMap","jw","net/minecraft/src","1" +"func_28022_b","getUpdatePacket","c","(LItemStack;LWorld;LEntityPlayer;)LPacket;","(Ljb;Lfi;Lgz;)Lkf;","ItemMapBase","cr","net/minecraft/src","1" +"func_562_a","getNibble","a","(III)I","(III)I","NibbleArray","vq","net/minecraft/src","1" +"func_561_a","setNibble","a","(IIII)V","(IIII)V","NibbleArray","vq","net/minecraft/src","1" +"func_560_a","isValid","a","()Z","()Z","NibbleArray","vq","net/minecraft/src","1" +"func_41024_b","func_41024_b","b","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41025_i","func_41025_i","j","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_41027_c","func_41027_c","c","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41028_k","func_41028_k","k","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_41026_d","func_41026_d","d","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41029_m","func_41029_m","l","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_28025_b","isACube","b","()Z","()Z","Block","tl","net/minecraft/src","1" +"func_259_a","canPlaceBlockAt","c","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1" +"func_220_f","canBlockStay","f","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1" +"func_221_a","updateTick","a","(LWorld;IIILjava/util/Random;)V","(Lfi;IIILjava/util/Random;)V","Block","tl","net/minecraft/src","1" +"func_22009_a","getBlockTextureFromSideAndMetadata","a","(II)I","(II)I","Block","tl","net/minecraft/src","1" +"func_40161_b","getRenderType","c","()I","()I","Block","tl","net/minecraft/src","1" +"func_241_a","getBlockTextureFromSide","a","(I)I","(I)I","Block","tl","net/minecraft/src","1" +"func_238_d","isIndirectlyPoweringTo","d","(LWorld;IIII)Z","(Lfi;IIII)Z","Block","tl","net/minecraft/src","1" +"func_239_b","isPoweringTo","a","(LIBlockAccess;IIII)Z","(Lwy;IIII)Z","Block","tl","net/minecraft/src","1" +"func_234_b","onNeighborBlockChange","a","(LWorld;IIII)V","(Lfi;IIII)V","Block","tl","net/minecraft/src","1" +"func_246_a","blockActivated","a","(LWorld;IIILEntityPlayer;)Z","(Lfi;IIILgz;)Z","Block","tl","net/minecraft/src","1" +"func_225_d","canProvidePower","e","()Z","()Z","Block","tl","net/minecraft/src","1" +"func_4027_a","onBlockPlacedBy","a","(LWorld;IIILEntityLiving;)V","(Lfi;IIILlk;)V","Block","tl","net/minecraft/src","1" +"func_250_e","onBlockAdded","a","(LWorld;III)V","(Lfi;III)V","Block","tl","net/minecraft/src","1" +"func_251_a","onBlockDestroyedByPlayer","c","(LWorld;IIII)V","(Lfi;IIII)V","Block","tl","net/minecraft/src","1" +"func_240_b","isOpaqueCube","a","()Z","()Z","Block","tl","net/minecraft/src","1" +"func_252_a","idDropped","a","(ILjava/util/Random;I)I","(ILjava/util/Random;I)I","Block","tl","net/minecraft/src","1" +"func_40162_a","func_40162_a","a","(ILjava/util/Random;)I","(ILjava/util/Random;)I","Block","tl","net/minecraft/src","1" +"func_12007_g","harvestBlock","a","(LWorld;LEntityPlayer;IIII)V","(Lfi;Lgz;IIII)V","Block","tl","net/minecraft/src","1" +"func_244_a","quantityDropped","a","(Ljava/util/Random;)I","(Ljava/util/Random;)I","Block","tl","net/minecraft/src","1" +"func_4029_c","onBlockDestroyedByExplosion","a_","(LWorld;III)V","(Lfi;III)V","Block","tl","net/minecraft/src","1" +"func_235_b","onBlockClicked","b","(LWorld;IIILEntityPlayer;)V","(Lfi;IIILgz;)V","Block","tl","net/minecraft/src","1" +"func_41001_e","func_41001_e","a_","(I)LItemStack;","(I)Ljb;","Block","tl","net/minecraft/src","1" +"func_248_d","getCollisionBoundingBoxFromPool","e","(LWorld;III)LAxisAlignedBB;","(Lfi;III)Leu;","Block","tl","net/minecraft/src","1" +"func_233_a","setBlockBoundsBasedOnState","a","(LIBlockAccess;III)V","(Lwy;III)V","Block","tl","net/minecraft/src","1" +"func_242_b","onBlockRemoval","d","(LWorld;III)V","(Lfi;III)V","Block","tl","net/minecraft/src","1" +"func_21025_b","damageDropped","c","(I)I","(I)I","Block","tl","net/minecraft/src","1" +"func_249_b","onEntityWalking","b","(LWorld;IIILEntity;)V","(Lfi;IIILrn;)V","Block","tl","net/minecraft/src","1" +"func_21024_a","playBlock","a","(LWorld;IIIII)V","(Lfi;IIIII)V","Block","tl","net/minecraft/src","1" +"func_263_a","onEntityCollidedWithBlock","a","(LWorld;IIILEntity;)V","(Lfi;IIILrn;)V","Block","tl","net/minecraft/src","1" +"func_31025_e","getMobilityFlag","g","()I","()I","Block","tl","net/minecraft/src","1" +"func_4028_b","tickRate","d","()I","()I","Block","tl","net/minecraft/src","1" +"func_40163_f","func_40163_f","f","()V","()V","Block","tl","net/minecraft/src","1" +"func_243_a","canCollideCheck","a","(IZ)Z","(IZ)Z","Block","tl","net/minecraft/src","1" +"func_253_a","shouldSideBeRendered","b","(LIBlockAccess;IIII)Z","(Lwy;IIII)Z","Block","tl","net/minecraft/src","1" +"func_230_a","velocityToAddToEntity","a","(LWorld;IIILEntity;LVec3D;)V","(Lfi;IIILrn;Lbx;)V","Block","tl","net/minecraft/src","1" +"func_227_a","dropBlockAsItemWithChance","a","(LWorld;IIIIFI)V","(Lfi;IIIIFI)V","Block","tl","net/minecraft/src","1" +"func_262_a","collisionRayTrace","a","(LWorld;IIILVec3D;LVec3D;)LMovingObjectPosition;","(Lfi;IIILbx;Lbx;)Luc;","Block","tl","net/minecraft/src","1" +"func_28026_e","canPlaceBlockOnSide","b","(LWorld;IIII)Z","(Lfi;IIII)Z","Block","tl","net/minecraft/src","1" +"func_264_a","getCollidingBoundingBoxes","a","(LWorld;IIILAxisAlignedBB;Ljava/util/ArrayList;)V","(Lfi;IIILeu;Ljava/util/ArrayList;)V","Block","tl","net/minecraft/src","1" +"func_255_c","onBlockPlaced","e","(LWorld;IIII)V","(Lfi;IIII)V","Block","tl","net/minecraft/src","1" +"func_226_a","getExplosionResistance","a","(LEntity;)F","(Lrn;)F","Block","tl","net/minecraft/src","1" +"func_245_e","isCollidable","v_","()Z","()Z","Block","tl","net/minecraft/src","1" +"func_28028_f","setFireBurnRates","j","()V","()V","Block","tl","net/minecraft/src","1" +"func_28027_k","setRequiresSelfNotify","i","()LBlock;","()Ltl;","Block","tl","net/minecraft/src","1" +"func_4026_a","setStepSound","a","(LStepSound;)LBlock;","(Ldb;)Ltl;","Block","tl","net/minecraft/src","1" +"func_258_c","setLightOpacity","g","(I)LBlock;","(I)Ltl;","Block","tl","net/minecraft/src","1" +"func_224_a","setLightValue","a","(F)LBlock;","(F)Ltl;","Block","tl","net/minecraft/src","1" +"func_232_b","setResistance","b","(F)LBlock;","(F)Ltl;","Block","tl","net/minecraft/src","1" +"func_237_c","setHardness","c","(F)LBlock;","(F)Ltl;","Block","tl","net/minecraft/src","1" +"func_31027_i","setBlockUnbreakable","k","()LBlock;","()Ltl;","Block","tl","net/minecraft/src","1" +"func_31026_j","getHardness","l","()F","()F","Block","tl","net/minecraft/src","1" +"func_231_a","setTickOnLoad","a","(Z)LBlock;","(Z)Ltl;","Block","tl","net/minecraft/src","1" +"func_229_a","setBlockBounds","a","(FFFFFF)V","(FFFFFF)V","Block","tl","net/minecraft/src","1" +"func_254_a","blockStrength","a","(LEntityPlayer;)F","(Lgz;)F","Block","tl","net/minecraft/src","1" +"func_247_a_","dropBlockAsItem","b","(LWorld;IIIII)V","(Lfi;IIIII)V","Block","tl","net/minecraft/src","1" +"func_31024_a","dropBlockAsItem_do","a","(LWorld;IIILItemStack;)V","(Lfi;IIILjb;)V","Block","tl","net/minecraft/src","1" +"func_223_a","isVecInsideYZBounds","a","(LVec3D;)Z","(Lbx;)Z","Block","tl","net/minecraft/src","1" +"func_228_b","isVecInsideXZBounds","b","(LVec3D;)Z","(Lbx;)Z","Block","tl","net/minecraft/src","1" +"func_236_c","isVecInsideXYBounds","c","(LVec3D;)Z","(Lbx;)Z","Block","tl","net/minecraft/src","1" +"func_20037_a","setBlockName","a","(Ljava/lang/String;)LBlock;","(Ljava/lang/String;)Ltl;","Block","tl","net/minecraft/src","1" +"func_25012_e","translateBlockName","m","()Ljava/lang/String;","()Ljava/lang/String;","Block","tl","net/minecraft/src","1" +"func_20036_e","getBlockName","n","()Ljava/lang/String;","()Ljava/lang/String;","Block","tl","net/minecraft/src","1" +"func_27022_g","getEnableStats","o","()Z","()Z","Block","tl","net/minecraft/src","1" +"func_27021_h","disableStats","p","()LBlock;","()Ltl;","Block","tl","net/minecraft/src","1" +"func_671_e","getHashedKey","g","(J)I","(J)I","LongHashMap","gc","net/minecraft/src","1" +"func_676_a","hash","a","(I)I","(I)I","LongHashMap","gc","net/minecraft/src","1" +"func_678_a","getHashIndex","a","(II)I","(II)I","LongHashMap","gc","net/minecraft/src","1" +"func_677_a","getValueByKey","a","(J)Ljava/lang/Object;","(J)Ljava/lang/Object;","LongHashMap","gc","net/minecraft/src","1" +"func_35508_b","containsKey","b","(J)Z","(J)Z","LongHashMap","gc","net/minecraft/src","1" +"func_35507_c","getEntry","c","(J)LLongHashMapEntry;","(J)Lpv;","LongHashMap","gc","net/minecraft/src","1" +"func_675_a","add","a","(JLjava/lang/Object;)V","(JLjava/lang/Object;)V","LongHashMap","gc","net/minecraft/src","1" +"func_680_b","resizeTable","b","(I)V","(I)V","LongHashMap","gc","net/minecraft/src","1" +"func_673_a","copyHashTableTo","a","([LLongHashMapEntry;)V","([Lpv;)V","LongHashMap","gc","net/minecraft/src","1" +"func_670_b","remove","d","(J)Ljava/lang/Object;","(J)Ljava/lang/Object;","LongHashMap","gc","net/minecraft/src","1" +"func_672_c","removeKey","e","(J)LLongHashMapEntry;","(J)Lpv;","LongHashMap","gc","net/minecraft/src","1" +"func_679_a","createKey","a","(IJLjava/lang/Object;I)V","(IJLjava/lang/Object;I)V","LongHashMap","gc","net/minecraft/src","1" +"func_674_d","getHashCode","f","(J)I","(J)I","LongHashMap","gc","net/minecraft/src","1" +"func_40298_a","func_40298_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor4;","(Ljava/util/List;Ljava/util/Random;IIIII)Lmk;","ComponentNetherBridgeCorridor4","mk","net/minecraft/src","1" +"func_40290_a","func_40290_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor2;","(Ljava/util/List;Ljava/util/Random;IIIII)Ldh;","ComponentNetherBridgeCorridor2","dh","net/minecraft/src","1" +"func_40126_A","func_40126_A","A","()Z","()Z","EntityBlaze","mh","net/minecraft/src","1" +"func_40127_a","func_40127_a","a","(Z)V","(Z)V","EntityBlaze","mh","net/minecraft/src","1" +"func_28155_a","func_28155_a","a","(LEntityPlayer;LItemStack;)V","(Lgz;Ljb;)V","MapData","iy","net/minecraft/src","1" +"func_28154_a","func_28154_a","a","(LItemStack;LWorld;LEntityPlayer;)[B","(Ljb;Lfi;Lgz;)[B","MapData","iy","net/minecraft/src","1" +"func_28153_a","func_28153_a","a","(III)V","(III)V","MapData","iy","net/minecraft/src","1" +"func_277_b","canThisPlantGrowOnThisBlockID","d","(I)Z","(I)Z","BlockFlower","vg","net/minecraft/src","1" +"func_276_g","checkFlowerChange","h","(LWorld;III)V","(Lfi;III)V","BlockFlower","vg","net/minecraft/src","1" +"func_25079_a","getInstance","a","()LStringTranslate;","()Lmr;","StringTranslate","mr","net/minecraft/src","1" +"func_25080_a","translateKey","a","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StringTranslate","mr","net/minecraft/src","1" +"func_25078_a","translateKeyFormat","a","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;","StringTranslate","mr","net/minecraft/src","1" +"func_46_a","initGui","a","(LMinecraftServer;)V","(Lnet/minecraft/server/MinecraftServer;)V","ServerGUI","tw","net/minecraft/src","1" +"func_45_a","getStatsComponent","a","()Ljavax/swing/JComponent;","()Ljavax/swing/JComponent;","ServerGUI","tw","net/minecraft/src","1" +"func_48_b","getPlayerListComponent","b","()Ljavax/swing/JComponent;","()Ljavax/swing/JComponent;","ServerGUI","tw","net/minecraft/src","1" +"func_47_d","getLogComponent","c","()Ljavax/swing/JComponent;","()Ljavax/swing/JComponent;","ServerGUI","tw","net/minecraft/src","1" +"func_44_a","getMinecraftServer","a","(LServerGUI;)LMinecraftServer;","(Ltw;)Lnet/minecraft/server/MinecraftServer;","ServerGUI","tw","net/minecraft/src","1" +"func_2_b","log","b","(Ljava/lang/String;)V","(Ljava/lang/String;)V","ICommandListener","sb","net/minecraft/src","1" +"func_1_c","getUsername","d","()Ljava/lang/String;","()Ljava/lang/String;","ICommandListener","sb","net/minecraft/src","1" +"func_28148_a","readFromNBT","a","(LNBTTagCompound;)V","(Lng;)V","WorldSavedData","hs","net/minecraft/src","1" +"func_28147_b","writeToNBT","b","(LNBTTagCompound;)V","(Lng;)V","WorldSavedData","hs","net/minecraft/src","1" +"func_28146_a","markDirty","a","()V","()V","WorldSavedData","hs","net/minecraft/src","1" +"func_28149_a","setDirty","a","(Z)V","(Z)V","WorldSavedData","hs","net/minecraft/src","1" +"func_28150_b","isDirty","b","()Z","()Z","WorldSavedData","hs","net/minecraft/src","1" +"func_40453_a","sendResponse","a","(IILjava/lang/String;)V","(IILjava/lang/String;)V","RConThreadClient","o","net/minecraft/src","1" +"func_40454_e","sendLoginFailedResponse","e","()V","()V","RConThreadClient","o","net/minecraft/src","1" +"func_40455_a","sendMultipacketResponse","a","(ILjava/lang/String;)V","(ILjava/lang/String;)V","RConThreadClient","o","net/minecraft/src","1" +"func_40456_f","closeSocket","f","()V","()V","RConThreadClient","o","net/minecraft/src","1" +"func_35590_a","addFoodAndSaturationLevel","a","(IF)V","(IF)V","FoodStats","rd","net/minecraft/src","1" +"func_35582_a","eatFood","a","(LItemFood;)V","(Lyf;)V","FoodStats","rd","net/minecraft/src","1" +"func_35584_a","update","a","(LEntityPlayer;)V","(Lgz;)V","FoodStats","rd","net/minecraft/src","1" +"func_35589_a","readNBT","a","(LNBTTagCompound;)V","(Lng;)V","FoodStats","rd","net/minecraft/src","1" +"func_35588_b","writeNBT","b","(LNBTTagCompound;)V","(Lng;)V","FoodStats","rd","net/minecraft/src","1" +"func_35585_a","getFoodLevel","a","()I","()I","FoodStats","rd","net/minecraft/src","1" +"func_35587_b","mustEat","b","()Z","()Z","FoodStats","rd","net/minecraft/src","1" +"func_35583_a","addExhaustion","a","(F)V","(F)V","FoodStats","rd","net/minecraft/src","1" +"func_35586_c","getSaturationLevel","c","()F","()F","FoodStats","rd","net/minecraft/src","1" +"func_35565_a","selectBlocks","a","(Ljava/util/Random;IIIZ)V","(Ljava/util/Random;IIIZ)V","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"func_35566_a","func_35566_a","a","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"func_35567_b","func_35567_b","b","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"func_669_a","generateLargeCaveNode","a","(JII[BDDD)V","(JII[BDDD)V","MapGenCaves","rq","net/minecraft/src","1" +"func_668_a","generateCaveNode","a","(JII[BDDDFFFIID)V","(JII[BDDDFFFIID)V","MapGenCaves","rq","net/minecraft/src","1" +"func_374_c","func_374_c","d","(II)V","(II)V","ChunkProviderServer","kw","net/minecraft/src","1" +"func_4063_e","func_4063_e","e","(II)LChunk;","(II)Lle;","ChunkProviderServer","kw","net/minecraft/src","1" +"func_375_a","func_375_a","a","(LChunk;)V","(Lle;)V","ChunkProviderServer","kw","net/minecraft/src","1" +"func_373_b","func_373_b","b","(LChunk;)V","(Lle;)V","ChunkProviderServer","kw","net/minecraft/src","1" +"func_563_a","addMapping","a","(Ljava/lang/Class;Ljava/lang/String;I)V","(Ljava/lang/Class;Ljava/lang/String;I)V","EntityList","jd","net/minecraft/src","1" +"func_567_a","createEntityInWorld","a","(Ljava/lang/String;LWorld;)LEntity;","(Ljava/lang/String;Lfi;)Lrn;","EntityList","jd","net/minecraft/src","1" +"func_566_a","createEntityFromNBT","a","(LNBTTagCompound;LWorld;)LEntity;","(Lng;Lfi;)Lrn;","EntityList","jd","net/minecraft/src","1" +"func_565_a","getEntityID","a","(LEntity;)I","(Lrn;)I","EntityList","jd","net/minecraft/src","1" +"func_564_b","getEntityString","b","(LEntity;)Ljava/lang/String;","(Lrn;)Ljava/lang/String;","EntityList","jd","net/minecraft/src","1" +"func_31045_b","func_31045_b","b","(I)I","(I)I","BlockPistonExtension","k","net/minecraft/src","1" +"func_40184_a","func_40184_a","a","(II[B[LBiomeGenBase;)V","(II[B[Lkb;)V","ChunkProviderEnd","fy","net/minecraft/src","1" +"func_40185_b","func_40185_b","b","(II[B[LBiomeGenBase;)V","(II[B[Lkb;)V","ChunkProviderEnd","fy","net/minecraft/src","1" +"func_40186_a","func_40186_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderEnd","fy","net/minecraft/src","1" +"func_35365_a","func_35365_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentMineshaftStairs","kq","net/minecraft/src","1" +"func_12017_b","func_12017_b","b","(LEntity;Z)V","(Lrn;Z)V","WorldServer","fp","net/minecraft/src","1" +"func_532_d","getTileEntityList","d","(IIIIII)Ljava/util/List;","(IIIIII)Ljava/util/List;","WorldServer","fp","net/minecraft/src","1" +"func_6158_a","func_6158_a","a","(I)LEntity;","(I)Lrn;","WorldServer","fp","net/minecraft/src","1" +"func_30006_w","func_30006_w","y","()V","()V","WorldServer","fp","net/minecraft/src","1" +"focusGained","focusGained","focusGained","(Ljava/awt/event/FocusEvent;)V","(Ljava/awt/event/FocusEvent;)V","ServerGuiFocusAdapter","ae","net/minecraft/src","1" +"func_35386_a","func_35386_a","a","()LWorldChunkManager;","()Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"func_35334_a","func_35334_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLibrary;","(Ljava/util/List;Ljava/util/Random;IIIII)Lmg;","ComponentStrongholdLibrary","mg","net/minecraft/src","1" +"func_4057_a","generateTerrain","a","(II[B)V","(II[B)V","ChunkProviderGenerate","xo","net/minecraft/src","1" +"func_4056_a","replaceBlocksForBiome","a","(II[B[LBiomeGenBase;)V","(II[B[Lkb;)V","ChunkProviderGenerate","xo","net/minecraft/src","1" +"func_4058_a","func_4058_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderGenerate","xo","net/minecraft/src","1" +"run","run","run","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6008_d","startServer","s","()Z","()Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6017_c","initWorld","a","(LISaveFormat;Ljava/lang/String;J)V","(Lmz;Ljava/lang/String;J)V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6019_a","outputPercentRemaining","b","(Ljava/lang/String;I)V","(Ljava/lang/String;I)V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6011_e","clearCurrentTask","t","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6012_f","saveServerWorld","u","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6013_g","stopServer","v","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6016_a","initiateShutdown","a","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6018_h","doTick","w","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6010_a","addCommand","a","(Ljava/lang/String;LICommandListener;)V","(Ljava/lang/String;Lsb;)V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6021_b","commandLineParser","b","()V","()V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6022_a","addToOnlinePlayerList","a","(LIUpdatePlayerListBox;)V","(Lfe;)V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"main","main","main","([Ljava/lang/String;)V","([Ljava/lang/String;)V","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6009_a","getFile","a","(Ljava/lang/String;)Ljava/io/File;","(Ljava/lang/String;)Ljava/io/File;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_28004_a","getWorldManager","a","(I)LWorldServer;","(I)Lfp;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_28003_b","getEntityTracker","b","(I)LEntityTracker;","(I)Luh;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_40026_q","getBannedIPsList","q","()[Ljava/lang/String;","()[Ljava/lang/String;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_40025_r","getBannedPlayersList","r","()[Ljava/lang/String;","()[Ljava/lang/String;","MinecraftServer","MinecraftServer","net/minecraft/server","1" +"func_6015_a","isServerRunning","a","(LMinecraftServer;)Z","(Lnet/minecraft/server/MinecraftServer;)Z","MinecraftServer","MinecraftServer","net/minecraft/server","1" diff --git a/forge/conf/patches/Start.java b/forge/conf/patches/Start.java new file mode 100644 index 0000000000..1ad9a6c6ed --- /dev/null +++ b/forge/conf/patches/Start.java @@ -0,0 +1,27 @@ +import java.io.File; +import java.lang.reflect.Field; + +import net.minecraft.client.Minecraft; + +public class Start +{ + public static void main(String[] args) + { + try + { + // set new minecraft data folder to prevent it from using the .minecraft folder + // this makes it a portable version + Field f = Minecraft.class.getDeclaredField("minecraftDir"); + Field.setAccessible(new Field[] { f }, true); + f.set(null, new File(".")); + } + catch (Exception e) + { + e.printStackTrace(); + return; + } + + // start minecraft game application + Minecraft.main(args); + } +} diff --git a/forge/conf/patches/me.java b/forge/conf/patches/me.java new file mode 100644 index 0000000000..df7f73b931 --- /dev/null +++ b/forge/conf/patches/me.java @@ -0,0 +1,10 @@ +// this is needed for the sound engine to work with deobfuscated sourcecode without crashing + +public class me +{ + public static int c(double d) + { + int i = (int)d; + return d >= (double)i ? i : i - 1; + } +} diff --git a/forge/conf/patches/minecraft.patch b/forge/conf/patches/minecraft.patch new file mode 100644 index 0000000000..cdda5e946c --- /dev/null +++ b/forge/conf/patches/minecraft.patch @@ -0,0 +1,2989 @@ +diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java +--- minecraft\net\minecraft\client\Minecraft.java Fri Nov 25 12:26:48 2011 ++++ minecraft_patched\net\minecraft\client\Minecraft.java Fri Nov 25 13:06:05 2011 +@@ -833,42 +833,28 @@ + return; + } + profilerresult = (ProfilerResult)list.remove(0); +- if(i != 0) goto _L2; else goto _L1 +-_L1: +- if(profilerresult.field_40703_c.length() > 0) ++ if(i == 0) + { +- int j = field_40006_ak.lastIndexOf("."); +- if(j >= 0) ++ if(profilerresult.field_40703_c.length() > 0) + { +- field_40006_ak = field_40006_ak.substring(0, j); ++ int j = field_40006_ak.lastIndexOf("."); ++ if(j >= 0) ++ { ++ field_40006_ak = field_40006_ak.substring(0, j); ++ } ++ } ++ } ++ else ++ { ++ if(--i < list.size() && !((ProfilerResult)list.get(i)).field_40703_c.equals("unspecified")) ++ { ++ if(field_40006_ak.length() > 0) ++ { ++ field_40006_ak += "."; ++ } ++ field_40006_ak += ((ProfilerResult)list.get(i)).field_40703_c; + } + } +- goto _L3 +-_L2: +- if(--i >= list.size() || ((ProfilerResult)list.get(i)).field_40703_c.equals("unspecified")) goto _L3; else goto _L4 +-_L4: +- if(field_40006_ak.length() <= 0) goto _L6; else goto _L5 +-_L5: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_40006_ak; +- append(); +- "."; +- append(); +- toString(); +- field_40006_ak; +-_L6: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_40006_ak; +- append(); +- ((ProfilerResult)list.get(i)).field_40703_c; +- append(); +- toString(); +- field_40006_ak; +-_L3: + } + + private void func_6238_a(long l) +diff -r -U 3 minecraft\net\minecraft\client\MinecraftApplet.java minecraft_patched\net\minecraft\client\MinecraftApplet.java +--- minecraft\net\minecraft\client\MinecraftApplet.java Fri Nov 25 12:26:48 2011 ++++ minecraft_patched\net\minecraft\client\MinecraftApplet.java Fri Nov 25 13:01:51 2011 +@@ -36,20 +36,10 @@ + } + field_6234_b = new MinecraftAppletImpl(this, this, field_6235_a, this, getWidth(), getHeight(), flag); + field_6234_b.field_6319_j = getDocumentBase().getHost(); +- if(getDocumentBase().getPort() <= 0) goto _L2; else goto _L1 +-_L1: +- new StringBuilder(); +- field_6234_b; +- JVM INSTR dup_x1 ; +- field_6319_j; +- append(); +- ":"; +- append(); +- getDocumentBase().getPort(); +- append(); +- toString(); +- field_6319_j; +-_L2: ++ if(getDocumentBase().getPort() > 0) ++ { ++ field_6234_b.field_6319_j += ":" + getDocumentBase().getPort(); ++ } + if(getParameter("username") != null && getParameter("sessionid") != null) + { + field_6234_b.field_6320_i = new Session(getParameter("username"), getParameter("sessionid")); +diff -r -U 3 minecraft\net\minecraft\src\BiomeCacheBlock.java minecraft_patched\net\minecraft\src\BiomeCacheBlock.java +--- minecraft\net\minecraft\src\BiomeCacheBlock.java Fri Nov 25 12:26:48 2011 ++++ minecraft_patched\net\minecraft\src\BiomeCacheBlock.java Fri Nov 25 12:58:44 2011 +@@ -22,7 +22,7 @@ + public BiomeCacheBlock(BiomeCache biomecache, int i, int j) + { + field_35654_g = biomecache; +- super(); ++// super(); + field_35659_a = new float[256]; + field_35657_b = new float[256]; + field_35658_c = new BiomeGenBase[256]; +diff -r -U 3 minecraft\net\minecraft\src\Block.java minecraft_patched\net\minecraft\src\Block.java +--- minecraft\net\minecraft\src\Block.java Fri Nov 25 12:26:48 2011 ++++ minecraft_patched\net\minecraft\src\Block.java Fri Nov 25 13:54:21 2011 +@@ -83,18 +83,18 @@ + public static final Block field_9266_O; + public static final Block field_9265_P; + public static final Block field_9264_Q; +- public static final Block field_9263_R = (new BlockNote(25)).func_222_c(0.8F).func_20012_a("musicBlock").func_28031_n(); +- public static final Block field_9262_S = (new BlockBed(26)).func_222_c(0.2F).func_20012_a("bed").func_27032_l().func_28031_n(); ++ public static final Block field_9263_R; ++ public static final Block field_9262_S; + public static final Block field_9261_T; + public static final Block field_9260_U; + public static final Block field_9259_V; +- public static final Block field_9258_W = (new BlockWeb(30, 11)).func_256_d(1).func_222_c(4F).func_20012_a("web"); ++ public static final Block field_9258_W; + public static final BlockTallGrass field_9257_X; + public static final BlockDeadBush field_9256_Y; + public static final Block field_9255_Z; +- public static final BlockPistonExtension field_9269_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28031_n(); ++ public static final BlockPistonExtension field_9269_aa; + public static final Block field_419_ac; +- public static final BlockPistonMoving field_9268_ac = new BlockPistonMoving(36); ++ public static final BlockPistonMoving field_9268_ac; + public static final BlockFlower field_417_ae; + public static final BlockFlower field_416_af; + public static final BlockFlower field_415_ag; +@@ -155,7 +155,7 @@ + public static final Block field_22020_bi; + public static final Block field_25017_bj; + public static final Block field_28033_bl; +- public static final Block field_35289_bm = (new BlockSilverfish(97)).func_222_c(0.75F); ++ public static final Block field_35289_bm; + public static final Block field_35285_bn; + public static final Block field_35286_bo; + public static final Block field_35287_bp; +@@ -173,10 +173,10 @@ + public static final Block field_40206_bB; + public static final Block field_40207_bC; + public static final Block field_40204_bD; +- public static final Block field_40205_bE = (new BlockNetherStalk(115)).func_20012_a("netherStalk").func_28031_n(); +- public static final Block field_40210_bF = (new BlockEnchantmentTable(116)).func_222_c(5F).func_219_b(2000F).func_20012_a("enchantmentTable"); +- public static final Block field_40211_bG = (new BlockBrewingStand(117)).func_222_c(0.5F).func_215_a(0.125F).func_20012_a("brewingStand").func_28031_n(); +- public static final Block field_40208_bH = (new BlockCauldron(118)).func_222_c(2.0F).func_20012_a("cauldron").func_28031_n(); ++ public static final Block field_40205_bE; ++ public static final Block field_40210_bF; ++ public static final Block field_40211_bG; ++ public static final Block field_40208_bH; + public static final Block field_40209_bI; + public static final Block field_40202_bJ; + public static final Block field_40203_bK; +@@ -855,13 +855,18 @@ + field_9266_O = (new Block(22, 144, Material.field_1334_d)).func_222_c(3F).func_219_b(5F).func_4024_a(field_9251_h).func_20012_a("blockLapis"); + field_9265_P = (new BlockDispenser(23)).func_222_c(3.5F).func_4024_a(field_9251_h).func_20012_a("dispenser").func_28031_n(); + field_9264_Q = (new BlockSandStone(24)).func_4024_a(field_9251_h).func_222_c(0.8F).func_20012_a("sandStone"); ++ field_9263_R = (new BlockNote(25)).func_222_c(0.8F).func_20012_a("musicBlock").func_28031_n(); ++ field_9262_S = (new BlockBed(26)).func_222_c(0.2F).func_20012_a("bed").func_27032_l().func_28031_n(); + field_9261_T = (new BlockRail(27, 179, true)).func_222_c(0.7F).func_4024_a(field_9250_i).func_20012_a("goldenRail").func_28031_n(); + field_9260_U = (new BlockDetectorRail(28, 195)).func_222_c(0.7F).func_4024_a(field_9250_i).func_20012_a("detectorRail").func_28031_n(); + field_9259_V = (new BlockPistonBase(29, 106, true)).func_20012_a("pistonStickyBase").func_28031_n(); ++ field_9258_W = (new BlockWeb(30, 11)).func_256_d(1).func_222_c(4F).func_20012_a("web"); + field_9257_X = (BlockTallGrass)(new BlockTallGrass(31, 39)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("tallgrass"); + field_9256_Y = (BlockDeadBush)(new BlockDeadBush(32, 55)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("deadbush"); + field_9255_Z = (new BlockPistonBase(33, 107, false)).func_20012_a("pistonBase").func_28031_n(); ++ field_9269_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28031_n(); + field_419_ac = (new BlockCloth()).func_222_c(0.8F).func_4024_a(field_9248_k).func_20012_a("cloth").func_28031_n(); ++ field_9268_ac = new BlockPistonMoving(36); + field_417_ae = (BlockFlower)(new BlockFlower(37, 13)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("flower"); + field_416_af = (BlockFlower)(new BlockFlower(38, 12)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("rose"); + field_415_ag = (BlockFlower)(new BlockMushroom(39, 29)).func_222_c(0.0F).func_4024_a(field_9252_g).func_215_a(0.125F).func_20012_a("mushroom"); +@@ -922,6 +927,7 @@ + field_22020_bi = (new BlockRedstoneRepeater(94, true)).func_222_c(0.0F).func_215_a(0.625F).func_4024_a(field_9254_e).func_20012_a("diode").func_27032_l().func_28031_n(); + field_25017_bj = (new BlockLockedChest(95)).func_222_c(0.0F).func_215_a(1.0F).func_4024_a(field_9254_e).func_20012_a("lockedchest").func_253_b(true).func_28031_n(); + field_28033_bl = (new BlockTrapDoor(96, Material.field_1335_c)).func_222_c(3F).func_4024_a(field_9254_e).func_20012_a("trapdoor").func_27032_l().func_28031_n(); ++ field_35289_bm = (new BlockSilverfish(97)).func_222_c(0.75F); + field_35285_bn = (new BlockStoneBrick(98)).func_222_c(1.5F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("stonebricksmooth"); + field_35286_bo = (new BlockMushroomCap(99, Material.field_1335_c, 142, 0)).func_222_c(0.2F).func_4024_a(field_9254_e).func_20012_a("mushroom").func_28031_n(); + field_35287_bp = (new BlockMushroomCap(100, Material.field_1335_c, 142, 1)).func_222_c(0.2F).func_4024_a(field_9254_e).func_20012_a("mushroom").func_28031_n(); +@@ -939,6 +945,10 @@ + field_40206_bB = (new Block(112, 224, Material.field_1334_d)).func_222_c(2.0F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("netherBrick"); + field_40207_bC = (new BlockFence(113, 224, Material.field_1334_d)).func_222_c(2.0F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("netherFence"); + field_40204_bD = (new BlockStairs(114, field_40206_bB)).func_20012_a("stairsNetherBrick").func_28031_n(); ++ field_40205_bE = (new BlockNetherStalk(115)).func_20012_a("netherStalk").func_28031_n(); ++ field_40210_bF = (new BlockEnchantmentTable(116)).func_222_c(5F).func_219_b(2000F).func_20012_a("enchantmentTable"); ++ field_40211_bG = (new BlockBrewingStand(117)).func_222_c(0.5F).func_215_a(0.125F).func_20012_a("brewingStand").func_28031_n(); ++ field_40208_bH = (new BlockCauldron(118)).func_222_c(2.0F).func_20012_a("cauldron").func_28031_n(); + field_40209_bI = (new BlockEndPortal(119, Material.field_4260_x)).func_222_c(-1F).func_219_b(6000000F); + field_40202_bJ = (new BlockEndPortalFrame(120)).func_4024_a(field_9249_j).func_215_a(0.125F).func_222_c(-1F).func_20012_a("endPortalFrame").func_28031_n().func_219_b(6000000F); + field_40203_bK = (new Block(121, 175, Material.field_1334_d)).func_222_c(3F).func_219_b(15F).func_4024_a(field_9251_h).func_20012_a("whiteStone"); +diff -r -U 3 minecraft\net\minecraft\src\CanvasMinecraftApplet.java minecraft_patched\net\minecraft\src\CanvasMinecraftApplet.java +--- minecraft\net\minecraft\src\CanvasMinecraftApplet.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\CanvasMinecraftApplet.java Fri Nov 25 12:58:44 2011 +@@ -15,7 +15,7 @@ + public CanvasMinecraftApplet(MinecraftApplet minecraftapplet) + { + field_1696_a = minecraftapplet; +- super(); ++// super(); + } + + public synchronized void addNotify() +diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java +--- minecraft\net\minecraft\src\CodecMus.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\CodecMus.java Fri Nov 25 13:00:26 2011 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import java.io.IOException; + import java.io.InputStream; + import java.net.URLConnection; + import paulscode.sound.codecs.CodecJOrbis; +@@ -20,6 +21,13 @@ + + protected InputStream openInputStream() + { +- return new MusInputStream(this, url, urlConnection.getInputStream()); ++ try ++ { ++ return new MusInputStream(this, url, urlConnection.getInputStream()); ++ } ++ catch (IOException e) ++ { ++ return null; ++ } + } + } +diff -r -U 3 minecraft\net\minecraft\src\ComponentNetherBridgePiece.java minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java +--- minecraft\net\minecraft\src\ComponentNetherBridgePiece.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java Fri Nov 25 13:38:59 2011 +@@ -35,47 +35,47 @@ + return flag ? i : -1; + } + +- private ComponentNetherBridgePiece func_40020_a(ComponentNetherBridgeStartPiece componentnetherbridgestartpiece, List list, List list1, Random random, int i, int j, int k, +- int l, int i1) ++ private ComponentNetherBridgePiece func_40020_a(ComponentNetherBridgeStartPiece var1, List var2, List var3, Random var4, int var5, int var6, int var7, int var8, int var9) + { +- int j1; +- boolean flag; +- int k1; +- j1 = func_40017_a(list); +- flag = j1 > 0 && i1 <= 30; +- k1 = 0; +-_L2: +- int l1; +- Iterator iterator; +- if(k1 >= 5 || !flag) ++ int var10 = this.func_40017_a(var2); ++ boolean var11 = var10 > 0 && var9 <= 30; ++ int var12 = 0; ++ ++ while(var12 < 5 && var11) + { +- break MISSING_BLOCK_LABEL_195; ++ ++var12; ++ int var13 = var4.nextInt(var10); ++ Iterator var14 = var2.iterator(); ++ ++ while(var14.hasNext()) ++ { ++ StructureNetherBridgePieceWeight var15 = (StructureNetherBridgePieceWeight)var14.next(); ++ var13 -= var15.field_40697_b; ++ if(var13 < 0) ++ { ++ if(!var15.func_40693_a(var9) || var15 == var1.field_40037_a && !var15.field_40696_e) ++ { ++ break; ++ } ++ ++ ComponentNetherBridgePiece var16 = StructureNetherBridgePieces.func_40688_a(var15, var3, var4, var5, var6, var7, var8, var9); ++ if(var16 != null) ++ { ++ ++var15.field_40698_c; ++ var1.field_40037_a = var15; ++ if(!var15.func_40694_a()) ++ { ++ var2.remove(var15); ++ } ++ ++ return var16; ++ } ++ } ++ } + } +- k1++; +- l1 = random.nextInt(j1); +- iterator = list.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureNetherBridgePieceWeight structurenetherbridgepieceweight; +- structurenetherbridgepieceweight = (StructureNetherBridgePieceWeight)iterator.next(); +- l1 -= structurenetherbridgepieceweight.field_40697_b; +- if(l1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurenetherbridgepieceweight.func_40693_a(i1) && (structurenetherbridgepieceweight != componentnetherbridgestartpiece.field_40037_a || structurenetherbridgepieceweight.field_40696_e)) goto _L5; else goto _L2 +-_L5: +- ComponentNetherBridgePiece componentnetherbridgepiece = StructureNetherBridgePieces.func_40688_a(structurenetherbridgepieceweight, list1, random, i, j, k, l, i1); +- if(componentnetherbridgepiece == null) goto _L4; else goto _L6 +-_L6: +- structurenetherbridgepieceweight.field_40698_c++; +- componentnetherbridgestartpiece.field_40037_a = structurenetherbridgepieceweight; +- if(!structurenetherbridgepieceweight.func_40694_a()) +- { +- list.remove(structurenetherbridgepieceweight); +- } +- return componentnetherbridgepiece; +- StructureNetherBridgeEnd structurenetherbridgeend = StructureNetherBridgeEnd.func_40023_a(list1, random, i, j, k, l, i1); +- return structurenetherbridgeend; ++ ++ StructureNetherBridgeEnd var17 = StructureNetherBridgeEnd.func_40023_a(var3, var4, var5, var6, var7, var8, var9); ++ return var17; + } + + private StructureComponent func_40018_a(ComponentNetherBridgeStartPiece componentnetherbridgestartpiece, List list, Random random, int i, int j, int k, int l, +diff -r -U 3 minecraft\net\minecraft\src\EnumAction.java minecraft_patched\net\minecraft\src\EnumAction.java +--- minecraft\net\minecraft\src\EnumAction.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumAction.java Fri Nov 25 12:34:03 2011 +@@ -5,16 +5,22 @@ + package net.minecraft.src; + + +-public final class EnumAction extends Enum ++public enum EnumAction + { +- ++ none("none", 0), ++ eat("eat", 1), ++ drink("drink", 2), ++ block("block", 3), ++ bow("bow", 4); ++/* + public static final EnumAction none; + public static final EnumAction eat; + public static final EnumAction drink; + public static final EnumAction block; + public static final EnumAction bow; ++*/ + private static final EnumAction field_35873_e[]; /* synthetic field */ +- ++/* + public static final EnumAction[] values() + { + return (EnumAction[])field_35873_e.clone(); +@@ -24,19 +30,21 @@ + { + return (EnumAction)Enum.valueOf(net.minecraft.src.EnumAction.class, s); + } +- ++*/ + private EnumAction(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + none = new EnumAction("none", 0); + eat = new EnumAction("eat", 1); + drink = new EnumAction("drink", 2); + block = new EnumAction("block", 3); + bow = new EnumAction("bow", 4); ++*/ + field_35873_e = (new EnumAction[] { + none, eat, drink, block, bow + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumArmorMaterial.java minecraft_patched\net\minecraft\src\EnumArmorMaterial.java +--- minecraft\net\minecraft\src\EnumArmorMaterial.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumArmorMaterial.java Fri Nov 25 12:35:31 2011 +@@ -8,19 +8,35 @@ + // Referenced classes of package net.minecraft.src: + // ItemArmor + +-public final class EnumArmorMaterial extends Enum ++public enum EnumArmorMaterial + { +- ++ CLOTH("CLOTH", 0, 5, new int[] { ++ 1, 3, 2, 1 ++ }, 15), ++ CHAIN("CHAIN", 1, 15, new int[] { ++ 2, 5, 4, 1 ++ }, 12), ++ IRON("IRON", 2, 15, new int[] { ++ 2, 6, 5, 2 ++ }, 9), ++ GOLD("GOLD", 3, 7, new int[] { ++ 2, 5, 3, 1 ++ }, 25), ++ DIAMOND("DIAMOND", 4, 33, new int[] { ++ 3, 8, 6, 3 ++ }, 10); ++/* + public static final EnumArmorMaterial CLOTH; + public static final EnumArmorMaterial CHAIN; + public static final EnumArmorMaterial IRON; + public static final EnumArmorMaterial GOLD; + public static final EnumArmorMaterial DIAMOND; ++*/ + private int field_40577_f; + private int field_40578_g[]; + private int field_40584_h; + private static final EnumArmorMaterial field_40585_i[]; /* synthetic field */ +- ++/* + public static final EnumArmorMaterial[] values() + { + return (EnumArmorMaterial[])field_40585_i.clone(); +@@ -30,10 +46,10 @@ + { + return (EnumArmorMaterial)Enum.valueOf(net.minecraft.src.EnumArmorMaterial.class, s); + } +- ++*/ + private EnumArmorMaterial(String s, int i, int j, int ai[], int k) + { +- super(s, i); ++// super(s, i); + field_40577_f = j; + field_40578_g = ai; + field_40584_h = k; +@@ -56,6 +72,7 @@ + + static + { ++/* + CLOTH = new EnumArmorMaterial("CLOTH", 0, 5, new int[] { + 1, 3, 2, 1 + }, 15); +@@ -71,6 +88,7 @@ + DIAMOND = new EnumArmorMaterial("DIAMOND", 4, 33, new int[] { + 3, 8, 6, 3 + }, 10); ++*/ + field_40585_i = (new EnumArmorMaterial[] { + CLOTH, CHAIN, IRON, GOLD, DIAMOND + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumArt.java minecraft_patched\net\minecraft\src\EnumArt.java +--- minecraft\net\minecraft\src\EnumArt.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumArt.java Fri Nov 25 12:37:13 2011 +@@ -5,9 +5,34 @@ + package net.minecraft.src; + + +-public final class EnumArt extends Enum ++public enum EnumArt + { +- ++ Kebab("Kebab", 0, "Kebab", 16, 16, 0, 0), ++ Aztec("Aztec", 1, "Aztec", 16, 16, 16, 0), ++ Alban("Alban", 2, "Alban", 16, 16, 32, 0), ++ Aztec2("Aztec2", 3, "Aztec2", 16, 16, 48, 0), ++ Bomb("Bomb", 4, "Bomb", 16, 16, 64, 0), ++ Plant("Plant", 5, "Plant", 16, 16, 80, 0), ++ Wasteland("Wasteland", 6, "Wasteland", 16, 16, 96, 0), ++ Pool("Pool", 7, "Pool", 32, 16, 0, 32), ++ Courbet("Courbet", 8, "Courbet", 32, 16, 32, 32), ++ Sea("Sea", 9, "Sea", 32, 16, 64, 32), ++ Sunset("Sunset", 10, "Sunset", 32, 16, 96, 32), ++ Creebet("Creebet", 11, "Creebet", 32, 16, 128, 32), ++ Wanderer("Wanderer", 12, "Wanderer", 16, 32, 0, 64), ++ Graham("Graham", 13, "Graham", 16, 32, 16, 64), ++ Match("Match", 14, "Match", 32, 32, 0, 128), ++ Bust("Bust", 15, "Bust", 32, 32, 32, 128), ++ Stage("Stage", 16, "Stage", 32, 32, 64, 128), ++ Void("Void", 17, "Void", 32, 32, 96, 128), ++ SkullAndRoses("SkullAndRoses", 18, "SkullAndRoses", 32, 32, 128, 128), ++ Fighters("Fighters", 19, "Fighters", 64, 32, 0, 96), ++ Pointer("Pointer", 20, "Pointer", 64, 64, 0, 192), ++ Pigscene("Pigscene", 21, "Pigscene", 64, 64, 64, 192), ++ BurningSkull("BurningSkull", 22, "BurningSkull", 64, 64, 128, 192), ++ Skeleton("Skeleton", 23, "Skeleton", 64, 48, 192, 64), ++ DonkeyKong("DonkeyKong", 24, "DonkeyKong", 64, 48, 192, 112); ++/* + public static final EnumArt Kebab; + public static final EnumArt Aztec; + public static final EnumArt Alban; +@@ -33,6 +58,7 @@ + public static final EnumArt BurningSkull; + public static final EnumArt Skeleton; + public static final EnumArt DonkeyKong; ++*/ + public static final int field_27365_z = "SkullAndRoses".length(); + public final String field_1624_y; + public final int field_1623_z; +@@ -40,7 +66,7 @@ + public final int field_1634_B; + public final int field_1632_C; + private static final EnumArt field_1630_D[]; /* synthetic field */ +- ++/* + public static final EnumArt[] values() + { + return (EnumArt[])field_1630_D.clone(); +@@ -50,10 +76,10 @@ + { + return (EnumArt)Enum.valueOf(net.minecraft.src.EnumArt.class, s); + } +- ++*/ + private EnumArt(String s, int i, String s1, int j, int k, int l, int i1) + { +- super(s, i); ++// super(s, i); + field_1624_y = s1; + field_1623_z = j; + field_1636_A = k; +@@ -63,6 +89,7 @@ + + static + { ++/* + Kebab = new EnumArt("Kebab", 0, "Kebab", 16, 16, 0, 0); + Aztec = new EnumArt("Aztec", 1, "Aztec", 16, 16, 16, 0); + Alban = new EnumArt("Alban", 2, "Alban", 16, 16, 32, 0); +@@ -88,6 +115,7 @@ + BurningSkull = new EnumArt("BurningSkull", 22, "BurningSkull", 64, 64, 128, 192); + Skeleton = new EnumArt("Skeleton", 23, "Skeleton", 64, 48, 192, 64); + DonkeyKong = new EnumArt("DonkeyKong", 24, "DonkeyKong", 64, 48, 192, 112); ++*/ + field_1630_D = (new EnumArt[] { + Kebab, Aztec, Alban, Aztec2, Bomb, Plant, Wasteland, Pool, Courbet, Sea, + Sunset, Creebet, Wanderer, Graham, Match, Bust, Stage, Void, SkullAndRoses, Fighters, +diff -r -U 3 minecraft\net\minecraft\src\EnumCreatureAttribute.java minecraft_patched\net\minecraft\src\EnumCreatureAttribute.java +--- minecraft\net\minecraft\src\EnumCreatureAttribute.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumCreatureAttribute.java Fri Nov 25 12:38:20 2011 +@@ -5,14 +5,18 @@ + package net.minecraft.src; + + +-public final class EnumCreatureAttribute extends Enum ++public enum EnumCreatureAttribute + { +- ++ UNDEFINED("UNDEFINED", 0), ++ UNDEAD("UNDEAD", 1), ++ ARTHROPOD("ARTHROPOD", 2); ++/* + public static final EnumCreatureAttribute UNDEFINED; + public static final EnumCreatureAttribute UNDEAD; + public static final EnumCreatureAttribute ARTHROPOD; ++*/ + private static final EnumCreatureAttribute field_40586_d[]; /* synthetic field */ +- ++/* + public static final EnumCreatureAttribute[] values() + { + return (EnumCreatureAttribute[])field_40586_d.clone(); +@@ -22,17 +26,19 @@ + { + return (EnumCreatureAttribute)Enum.valueOf(net.minecraft.src.EnumCreatureAttribute.class, s); + } +- ++*/ + private EnumCreatureAttribute(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + UNDEFINED = new EnumCreatureAttribute("UNDEFINED", 0); + UNDEAD = new EnumCreatureAttribute("UNDEAD", 1); + ARTHROPOD = new EnumCreatureAttribute("ARTHROPOD", 2); ++*/ + field_40586_d = (new EnumCreatureAttribute[] { + UNDEFINED, UNDEAD, ARTHROPOD + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumCreatureType.java minecraft_patched\net\minecraft\src\EnumCreatureType.java +--- minecraft\net\minecraft\src\EnumCreatureType.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumCreatureType.java Fri Nov 25 12:39:25 2011 +@@ -8,18 +8,22 @@ + // Referenced classes of package net.minecraft.src: + // IMob, Material, EntityAnimal, EntityWaterMob + +-public final class EnumCreatureType extends Enum ++public enum EnumCreatureType + { +- ++ monster("monster", 0, net.minecraft.src.IMob.class, 70, Material.field_1337_a, false), ++ creature("creature", 1, net.minecraft.src.EntityAnimal.class, 15, Material.field_1337_a, true), ++ waterCreature("waterCreature", 2, net.minecraft.src.EntityWaterMob.class, 5, Material.field_1332_f, true); ++/* + public static final EnumCreatureType monster; + public static final EnumCreatureType creature; + public static final EnumCreatureType waterCreature; ++*/ + private final Class field_4278_c; + private final int field_4277_d; + private final Material field_21173_f; + private final boolean field_21172_g; + private static final EnumCreatureType field_6518_e[]; /* synthetic field */ +- ++/* + public static final EnumCreatureType[] values() + { + return (EnumCreatureType[])field_6518_e.clone(); +@@ -29,10 +33,10 @@ + { + return (EnumCreatureType)Enum.valueOf(net.minecraft.src.EnumCreatureType.class, s); + } +- ++*/ + private EnumCreatureType(String s, int i, Class class1, int j, Material material, boolean flag) + { +- super(s, i); ++// super(s, i); + field_4278_c = class1; + field_4277_d = j; + field_21173_f = material; +@@ -61,9 +65,11 @@ + + static + { ++/* + monster = new EnumCreatureType("monster", 0, net.minecraft.src.IMob.class, 70, Material.field_1337_a, false); + creature = new EnumCreatureType("creature", 1, net.minecraft.src.EntityAnimal.class, 15, Material.field_1337_a, true); + waterCreature = new EnumCreatureType("waterCreature", 2, net.minecraft.src.EntityWaterMob.class, 5, Material.field_1332_f, true); ++*/ + field_6518_e = (new EnumCreatureType[] { + monster, creature, waterCreature + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumDoor.java minecraft_patched\net\minecraft\src\EnumDoor.java +--- minecraft\net\minecraft\src\EnumDoor.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumDoor.java Fri Nov 25 12:41:04 2011 +@@ -5,15 +5,20 @@ + package net.minecraft.src; + + +-public final class EnumDoor extends Enum ++public enum EnumDoor + { +- ++ OPENING("OPENING", 0), ++ WOOD_DOOR("WOOD_DOOR", 1), ++ GRATES("GRATES", 2), ++ IRON_DOOR("IRON_DOOR", 3); ++/* + public static final EnumDoor OPENING; + public static final EnumDoor WOOD_DOOR; + public static final EnumDoor GRATES; + public static final EnumDoor IRON_DOOR; ++*/ + private static final EnumDoor field_35825_e[]; /* synthetic field */ +- ++/* + public static final EnumDoor[] values() + { + return (EnumDoor[])field_35825_e.clone(); +@@ -23,18 +28,20 @@ + { + return (EnumDoor)Enum.valueOf(net.minecraft.src.EnumDoor.class, s); + } +- ++*/ + private EnumDoor(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + OPENING = new EnumDoor("OPENING", 0); + WOOD_DOOR = new EnumDoor("WOOD_DOOR", 1); + GRATES = new EnumDoor("GRATES", 2); + IRON_DOOR = new EnumDoor("IRON_DOOR", 3); ++*/ + field_35825_e = (new EnumDoor[] { + OPENING, WOOD_DOOR, GRATES, IRON_DOOR + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumEnchantmentType.java minecraft_patched\net\minecraft\src\EnumEnchantmentType.java +--- minecraft\net\minecraft\src\EnumEnchantmentType.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumEnchantmentType.java Fri Nov 25 12:42:05 2011 +@@ -8,9 +8,17 @@ + // Referenced classes of package net.minecraft.src: + // ItemArmor, ItemSword, ItemTool, Item + +-public final class EnumEnchantmentType extends Enum ++public enum EnumEnchantmentType + { +- ++ all("all", 0), ++ armor("armor", 1), ++ armor_feet("armor_feet", 2), ++ armor_legs("armor_legs", 3), ++ armor_torso("armor_torso", 4), ++ armor_head("armor_head", 5), ++ weapon("weapon", 6), ++ digger("digger", 7); ++/* + public static final EnumEnchantmentType all; + public static final EnumEnchantmentType armor; + public static final EnumEnchantmentType armor_feet; +@@ -19,8 +27,9 @@ + public static final EnumEnchantmentType armor_head; + public static final EnumEnchantmentType weapon; + public static final EnumEnchantmentType digger; ++*/ + private static final EnumEnchantmentType field_40659_i[]; /* synthetic field */ +- ++/* + public static final EnumEnchantmentType[] values() + { + return (EnumEnchantmentType[])field_40659_i.clone(); +@@ -30,10 +39,10 @@ + { + return (EnumEnchantmentType)Enum.valueOf(net.minecraft.src.EnumEnchantmentType.class, s); + } +- ++*/ + private EnumEnchantmentType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + public boolean func_40650_a(Item item) +@@ -84,6 +93,7 @@ + + static + { ++/* + all = new EnumEnchantmentType("all", 0); + armor = new EnumEnchantmentType("armor", 1); + armor_feet = new EnumEnchantmentType("armor_feet", 2); +@@ -92,6 +102,7 @@ + armor_head = new EnumEnchantmentType("armor_head", 5); + weapon = new EnumEnchantmentType("weapon", 6); + digger = new EnumEnchantmentType("digger", 7); ++*/ + field_40659_i = (new EnumEnchantmentType[] { + all, armor, armor_feet, armor_legs, armor_torso, armor_head, weapon, digger + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumJsonNodeType.java minecraft_patched\net\minecraft\src\EnumJsonNodeType.java +--- minecraft\net\minecraft\src\EnumJsonNodeType.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumJsonNodeType.java Fri Nov 25 12:43:17 2011 +@@ -5,9 +5,16 @@ + package net.minecraft.src; + + +-public final class EnumJsonNodeType extends Enum ++public enum EnumJsonNodeType + { +- ++ OBJECT("OBJECT", 0), ++ ARRAY("ARRAY", 1), ++ STRING("STRING", 2), ++ NUMBER("NUMBER", 3), ++ TRUE("TRUE", 4), ++ FALSE("FALSE", 5), ++ NULL("NULL", 6); ++/* + public static final EnumJsonNodeType OBJECT; + public static final EnumJsonNodeType ARRAY; + public static final EnumJsonNodeType STRING; +@@ -15,8 +22,9 @@ + public static final EnumJsonNodeType TRUE; + public static final EnumJsonNodeType FALSE; + public static final EnumJsonNodeType NULL; ++*/ + private static final EnumJsonNodeType field_27442_h[]; /* synthetic field */ +- ++/* + public static final EnumJsonNodeType[] values() + { + return (EnumJsonNodeType[])field_27442_h.clone(); +@@ -26,14 +34,15 @@ + { + return (EnumJsonNodeType)Enum.valueOf(net.minecraft.src.EnumJsonNodeType.class, s); + } +- ++*/ + private EnumJsonNodeType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + OBJECT = new EnumJsonNodeType("OBJECT", 0); + ARRAY = new EnumJsonNodeType("ARRAY", 1); + STRING = new EnumJsonNodeType("STRING", 2); +@@ -41,6 +50,7 @@ + TRUE = new EnumJsonNodeType("TRUE", 4); + FALSE = new EnumJsonNodeType("FALSE", 5); + NULL = new EnumJsonNodeType("NULL", 6); ++*/ + field_27442_h = (new EnumJsonNodeType[] { + OBJECT, ARRAY, STRING, NUMBER, TRUE, FALSE, NULL + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumMobType.java minecraft_patched\net\minecraft\src\EnumMobType.java +--- minecraft\net\minecraft\src\EnumMobType.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumMobType.java Fri Nov 25 12:44:15 2011 +@@ -5,14 +5,18 @@ + package net.minecraft.src; + + +-public final class EnumMobType extends Enum ++public enum EnumMobType + { +- ++ everything("everything", 0), ++ mobs("mobs", 1), ++ players("players", 2); ++/* + public static final EnumMobType everything; + public static final EnumMobType mobs; + public static final EnumMobType players; ++*/ + private static final EnumMobType field_1340_d[]; /* synthetic field */ +- ++/* + public static final EnumMobType[] values() + { + return (EnumMobType[])field_1340_d.clone(); +@@ -22,17 +26,19 @@ + { + return (EnumMobType)Enum.valueOf(net.minecraft.src.EnumMobType.class, s); + } +- ++*/ + private EnumMobType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + everything = new EnumMobType("everything", 0); + mobs = new EnumMobType("mobs", 1); + players = new EnumMobType("players", 2); ++*/ + field_1340_d = (new EnumMobType[] { + everything, mobs, players + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumMovingObjectType.java minecraft_patched\net\minecraft\src\EnumMovingObjectType.java +--- minecraft\net\minecraft\src\EnumMovingObjectType.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumMovingObjectType.java Fri Nov 25 12:45:14 2011 +@@ -5,13 +5,16 @@ + package net.minecraft.src; + + +-public final class EnumMovingObjectType extends Enum ++public enum EnumMovingObjectType + { +- ++ TILE("TILE", 0), ++ ENTITY("ENTITY", 1); ++/* + public static final EnumMovingObjectType TILE; + public static final EnumMovingObjectType ENTITY; ++*/ + private static final EnumMovingObjectType field_21178_c[]; /* synthetic field */ +- ++/* + public static final EnumMovingObjectType[] values() + { + return (EnumMovingObjectType[])field_21178_c.clone(); +@@ -21,16 +24,18 @@ + { + return (EnumMovingObjectType)Enum.valueOf(net.minecraft.src.EnumMovingObjectType.class, s); + } +- ++*/ + private EnumMovingObjectType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + TILE = new EnumMovingObjectType("TILE", 0); + ENTITY = new EnumMovingObjectType("ENTITY", 1); ++*/ + field_21178_c = (new EnumMovingObjectType[] { + TILE, ENTITY + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumOptions.java minecraft_patched\net\minecraft\src\EnumOptions.java +--- minecraft\net\minecraft\src\EnumOptions.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumOptions.java Fri Nov 25 12:50:19 2011 +@@ -5,9 +5,26 @@ + package net.minecraft.src; + + +-public final class EnumOptions extends Enum ++public enum EnumOptions + { +- ++ MUSIC("MUSIC", 0, "options.music", true, false), ++ SOUND("SOUND", 1, "options.sound", true, false), ++ INVERT_MOUSE("INVERT_MOUSE", 2, "options.invertMouse", false, true), ++ SENSITIVITY("SENSITIVITY", 3, "options.sensitivity", true, false), ++ FOV("FOV", 4, "options.fov", true, false), ++ GAMMA("GAMMA", 5, "options.gamma", true, false), ++ RENDER_DISTANCE("RENDER_DISTANCE", 6, "options.renderDistance", false, false), ++ VIEW_BOBBING("VIEW_BOBBING", 7, "options.viewBobbing", false, true), ++ ANAGLYPH("ANAGLYPH", 8, "options.anaglyph", false, true), ++ ADVANCED_OPENGL("ADVANCED_OPENGL", 9, "options.advancedOpengl", false, true), ++ FRAMERATE_LIMIT("FRAMERATE_LIMIT", 10, "options.framerateLimit", false, false), ++ DIFFICULTY("DIFFICULTY", 11, "options.difficulty", false, false), ++ GRAPHICS("GRAPHICS", 12, "options.graphics", false, false), ++ AMBIENT_OCCLUSION("AMBIENT_OCCLUSION", 13, "options.ao", false, true), ++ GUI_SCALE("GUI_SCALE", 14, "options.guiScale", false, false), ++ RENDER_CLOUDS("RENDER_CLOUDS", 15, "options.renderClouds", false, true), ++ PARTICLES("PARTICLES", 16, "options.particles", false, false); ++/* + public static final EnumOptions MUSIC; + public static final EnumOptions SOUND; + public static final EnumOptions INVERT_MOUSE; +@@ -25,11 +42,12 @@ + public static final EnumOptions GUI_SCALE; + public static final EnumOptions RENDER_CLOUDS; + public static final EnumOptions PARTICLES; ++*/ + private final boolean field_20144_k; + private final boolean field_20143_l; + private final String field_20142_m; + private static final EnumOptions field_20141_n[]; /* synthetic field */ +- ++/* + public static final EnumOptions[] values() + { + return (EnumOptions[])field_20141_n.clone(); +@@ -39,7 +57,7 @@ + { + return (EnumOptions)Enum.valueOf(net.minecraft.src.EnumOptions.class, s); + } +- ++*/ + public static EnumOptions func_20137_a(int i) + { + EnumOptions aenumoptions[] = values(); +@@ -58,7 +76,7 @@ + + private EnumOptions(String s, int i, String s1, boolean flag, boolean flag1) + { +- super(s, i); ++// super(s, i); + field_20142_m = s1; + field_20144_k = flag; + field_20143_l = flag1; +@@ -86,6 +104,7 @@ + + static + { ++/* + MUSIC = new EnumOptions("MUSIC", 0, "options.music", true, false); + SOUND = new EnumOptions("SOUND", 1, "options.sound", true, false); + INVERT_MOUSE = new EnumOptions("INVERT_MOUSE", 2, "options.invertMouse", false, true); +@@ -103,6 +122,7 @@ + GUI_SCALE = new EnumOptions("GUI_SCALE", 14, "options.guiScale", false, false); + RENDER_CLOUDS = new EnumOptions("RENDER_CLOUDS", 15, "options.renderClouds", false, true); + PARTICLES = new EnumOptions("PARTICLES", 16, "options.particles", false, false); ++*/ + field_20141_n = (new EnumOptions[] { + MUSIC, SOUND, INVERT_MOUSE, SENSITIVITY, FOV, GAMMA, RENDER_DISTANCE, VIEW_BOBBING, ANAGLYPH, ADVANCED_OPENGL, + FRAMERATE_LIMIT, DIFFICULTY, GRAPHICS, AMBIENT_OCCLUSION, GUI_SCALE, RENDER_CLOUDS, PARTICLES +diff -r -U 3 minecraft\net\minecraft\src\EnumOS2.java minecraft_patched\net\minecraft\src\EnumOS2.java +--- minecraft\net\minecraft\src\EnumOS2.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumOS2.java Fri Nov 25 12:50:56 2011 +@@ -5,16 +5,22 @@ + package net.minecraft.src; + + +-public final class EnumOS2 extends Enum ++public enum EnumOS2 + { +- ++ linux("linux", 0), ++ solaris("solaris", 1), ++ windows("windows", 2), ++ macos("macos", 3), ++ unknown("unknown", 4); ++/* + public static final EnumOS2 linux; + public static final EnumOS2 solaris; + public static final EnumOS2 windows; + public static final EnumOS2 macos; + public static final EnumOS2 unknown; ++*/ + private static final EnumOS2 field_6511_f[]; /* synthetic field */ +- ++/* + public static final EnumOS2[] values() + { + return (EnumOS2[])field_6511_f.clone(); +@@ -24,19 +30,21 @@ + { + return (EnumOS2)Enum.valueOf(net.minecraft.src.EnumOS2.class, s); + } +- ++*/ + private EnumOS2(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + linux = new EnumOS2("linux", 0); + solaris = new EnumOS2("solaris", 1); + windows = new EnumOS2("windows", 2); + macos = new EnumOS2("macos", 3); + unknown = new EnumOS2("unknown", 4); ++*/ + field_6511_f = (new EnumOS2[] { + linux, solaris, windows, macos, unknown + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumRarity.java minecraft_patched\net\minecraft\src\EnumRarity.java +--- minecraft\net\minecraft\src\EnumRarity.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumRarity.java Fri Nov 25 12:51:34 2011 +@@ -5,17 +5,22 @@ + package net.minecraft.src; + + +-public final class EnumRarity extends Enum ++public enum EnumRarity + { +- ++ common("common", 0, 15, "Common"), ++ uncommon("uncommon", 1, 14, "Uncommon"), ++ rare("rare", 2, 11, "Rare"), ++ epic("epic", 3, 13, "Epic"); ++/* + public static final EnumRarity common; + public static final EnumRarity uncommon; + public static final EnumRarity rare; + public static final EnumRarity epic; ++*/ + public final int field_40535_e; + public final String field_40532_f; + private static final EnumRarity field_40533_g[]; /* synthetic field */ +- ++/* + public static final EnumRarity[] values() + { + return (EnumRarity[])field_40533_g.clone(); +@@ -25,20 +30,22 @@ + { + return (EnumRarity)Enum.valueOf(net.minecraft.src.EnumRarity.class, s); + } +- ++*/ + private EnumRarity(String s, int i, int j, String s1) + { +- super(s, i); ++// super(s, i); + field_40535_e = j; + field_40532_f = s1; + } + + static + { ++/* + common = new EnumRarity("common", 0, 15, "Common"); + uncommon = new EnumRarity("uncommon", 1, 14, "Uncommon"); + rare = new EnumRarity("rare", 2, 11, "Rare"); + epic = new EnumRarity("epic", 3, 13, "Epic"); ++*/ + field_40533_g = (new EnumRarity[] { + common, uncommon, rare, epic + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumSkyBlock.java minecraft_patched\net\minecraft\src\EnumSkyBlock.java +--- minecraft\net\minecraft\src\EnumSkyBlock.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumSkyBlock.java Fri Nov 25 12:46:12 2011 +@@ -5,14 +5,17 @@ + package net.minecraft.src; + + +-public final class EnumSkyBlock extends Enum ++public enum EnumSkyBlock + { +- ++ Sky("Sky", 0, 15), ++ Block("Block", 1, 0); ++/* + public static final EnumSkyBlock Sky; + public static final EnumSkyBlock Block; ++*/ + public final int field_1722_c; + private static final EnumSkyBlock field_1721_d[]; /* synthetic field */ +- ++/* + public static final EnumSkyBlock[] values() + { + return (EnumSkyBlock[])field_1721_d.clone(); +@@ -22,17 +25,19 @@ + { + return (EnumSkyBlock)Enum.valueOf(net.minecraft.src.EnumSkyBlock.class, s); + } +- ++*/ + private EnumSkyBlock(String s, int i, int j) + { +- super(s, i); ++// super(s, i); + field_1722_c = j; + } + + static + { ++/* + Sky = new EnumSkyBlock("Sky", 0, 15); + Block = new EnumSkyBlock("Block", 1, 0); ++*/ + field_1721_d = (new EnumSkyBlock[] { + Sky, Block + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumStatus.java minecraft_patched\net\minecraft\src\EnumStatus.java +--- minecraft\net\minecraft\src\EnumStatus.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumStatus.java Fri Nov 25 12:47:47 2011 +@@ -5,17 +5,24 @@ + package net.minecraft.src; + + +-public final class EnumStatus extends Enum ++public enum EnumStatus + { +- ++ OK("OK", 0), ++ NOT_POSSIBLE_HERE("NOT_POSSIBLE_HERE", 1), ++ NOT_POSSIBLE_NOW("NOT_POSSIBLE_NOW", 2), ++ TOO_FAR_AWAY("TOO_FAR_AWAY", 3), ++ OTHER_PROBLEM("OTHER_PROBLEM", 4), ++ NOT_SAFE("NOT_SAFE", 5); ++/* + public static final EnumStatus OK; + public static final EnumStatus NOT_POSSIBLE_HERE; + public static final EnumStatus NOT_POSSIBLE_NOW; + public static final EnumStatus TOO_FAR_AWAY; + public static final EnumStatus OTHER_PROBLEM; + public static final EnumStatus NOT_SAFE; ++*/ + private static final EnumStatus field_25204_f[]; /* synthetic field */ +- ++/* + public static final EnumStatus[] values() + { + return (EnumStatus[])field_25204_f.clone(); +@@ -25,20 +32,22 @@ + { + return (EnumStatus)Enum.valueOf(net.minecraft.src.EnumStatus.class, s); + } +- ++*/ + private EnumStatus(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + OK = new EnumStatus("OK", 0); + NOT_POSSIBLE_HERE = new EnumStatus("NOT_POSSIBLE_HERE", 1); + NOT_POSSIBLE_NOW = new EnumStatus("NOT_POSSIBLE_NOW", 2); + TOO_FAR_AWAY = new EnumStatus("TOO_FAR_AWAY", 3); + OTHER_PROBLEM = new EnumStatus("OTHER_PROBLEM", 4); + NOT_SAFE = new EnumStatus("NOT_SAFE", 5); ++*/ + field_25204_f = (new EnumStatus[] { + OK, NOT_POSSIBLE_HERE, NOT_POSSIBLE_NOW, TOO_FAR_AWAY, OTHER_PROBLEM, NOT_SAFE + }); +diff -r -U 3 minecraft\net\minecraft\src\EnumToolMaterial.java minecraft_patched\net\minecraft\src\EnumToolMaterial.java +--- minecraft\net\minecraft\src\EnumToolMaterial.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\EnumToolMaterial.java Fri Nov 25 12:49:02 2011 +@@ -5,21 +5,27 @@ + package net.minecraft.src; + + +-public final class EnumToolMaterial extends Enum ++public enum EnumToolMaterial + { +- ++ WOOD("WOOD", 0, 0, 59, 2.0F, 0, 15), ++ STONE("STONE", 1, 1, 131, 4F, 1, 5), ++ IRON("IRON", 2, 2, 250, 6F, 2, 14), ++ EMERALD("EMERALD", 3, 3, 1561, 8F, 3, 10), ++ GOLD("GOLD", 4, 0, 32, 12F, 0, 22); ++/* + public static final EnumToolMaterial WOOD; + public static final EnumToolMaterial STONE; + public static final EnumToolMaterial IRON; + public static final EnumToolMaterial EMERALD; + public static final EnumToolMaterial GOLD; ++*/ + private final int field_21213_f; + private final int field_21212_g; + private final float field_21211_h; + private final int field_21210_i; + private final int field_40732_j; + private static final EnumToolMaterial field_21209_j[]; /* synthetic field */ +- ++/* + public static final EnumToolMaterial[] values() + { + return (EnumToolMaterial[])field_21209_j.clone(); +@@ -29,10 +35,10 @@ + { + return (EnumToolMaterial)Enum.valueOf(net.minecraft.src.EnumToolMaterial.class, s); + } +- ++*/ + private EnumToolMaterial(String s, int i, int j, int k, float f, int l, int i1) + { +- super(s, i); ++// super(s, i); + field_21213_f = j; + field_21212_g = k; + field_21211_h = f; +@@ -67,11 +73,13 @@ + + static + { ++/* + WOOD = new EnumToolMaterial("WOOD", 0, 0, 59, 2.0F, 0, 15); + STONE = new EnumToolMaterial("STONE", 1, 1, 131, 4F, 1, 5); + IRON = new EnumToolMaterial("IRON", 2, 2, 250, 6F, 2, 14); + EMERALD = new EnumToolMaterial("EMERALD", 3, 3, 1561, 8F, 3, 10); + GOLD = new EnumToolMaterial("GOLD", 4, 0, 32, 12F, 0, 22); ++*/ + field_21209_j = (new EnumToolMaterial[] { + WOOD, STONE, IRON, EMERALD, GOLD + }); +diff -r -U 3 minecraft\net\minecraft\src\GameWindowListener.java minecraft_patched\net\minecraft\src\GameWindowListener.java +--- minecraft\net\minecraft\src\GameWindowListener.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GameWindowListener.java Fri Nov 25 12:58:44 2011 +@@ -18,7 +18,7 @@ + { + field_1587_a = minecraft; + field_1586_b = thread; +- super(); ++// super(); + } + + public void windowClosing(WindowEvent windowevent) +diff -r -U 3 minecraft\net\minecraft\src\GenLayer.java minecraft_patched\net\minecraft\src\GenLayer.java +--- minecraft\net\minecraft\src\GenLayer.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GenLayer.java Fri Nov 25 13:08:11 2011 +@@ -22,7 +22,7 @@ + + public static GenLayer[] func_35497_a(long l) + { +- Object obj = new LayerIsland(1L); ++ GenLayer obj = new LayerIsland(1L); + obj = new GenLayerZoomFuzzy(2000L, ((GenLayer) (obj))); + obj = new GenLayerIsland(1L, ((GenLayer) (obj))); + obj = new GenLayerZoom(2001L, ((GenLayer) (obj))); +@@ -34,18 +34,18 @@ + obj = new GenLayerIsland(4L, ((GenLayer) (obj))); + obj = new GenLayerMushroomIsland(5L, ((GenLayer) (obj))); + byte byte0 = 4; +- Object obj1 = obj; ++ GenLayer obj1 = obj; + obj1 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj1)), 0); + obj1 = new GenLayerRiverInit(100L, ((GenLayer) (obj1))); + obj1 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj1)), byte0 + 2); + obj1 = new GenLayerRiver(1L, ((GenLayer) (obj1))); + obj1 = new GenLayerSmooth(1000L, ((GenLayer) (obj1))); +- Object obj2 = obj; ++ GenLayer obj2 = obj; + obj2 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj2)), 0); + obj2 = new GenLayerVillageLandscape(200L, ((GenLayer) (obj2))); + obj2 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj2)), 2); +- Object obj3 = new GenLayerTemperature(((GenLayer) (obj2))); +- Object obj4 = new GenLayerDownfall(((GenLayer) (obj2))); ++ GenLayer obj3 = new GenLayerTemperature(((GenLayer) (obj2))); ++ GenLayer obj4 = new GenLayerDownfall(((GenLayer) (obj2))); + for(int i = 0; i < byte0; i++) + { + obj2 = new GenLayerZoom(1000 + i, ((GenLayer) (obj2))); +diff -r -U 3 minecraft\net\minecraft\src\GuiChat.java minecraft_patched\net\minecraft\src\GuiChat.java +--- minecraft\net\minecraft\src\GuiChat.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GuiChat.java Fri Nov 25 13:17:29 2011 +@@ -63,18 +63,10 @@ + { + field_985_a = field_985_a.substring(0, field_985_a.length() - 1); + } +- if(field_20082_i.indexOf(c) < 0 || field_985_a.length() >= 100) goto _L2; else goto _L1 +-_L1: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_985_a; +- append(); +- c; +- append(); +- toString(); +- field_985_a; +-_L2: ++ if(field_20082_i.indexOf(c) >= 0 && field_985_a.length() < 100) ++ { ++ field_985_a += c; ++ } + } + + public void func_571_a(int i, int j, float f) +@@ -86,42 +78,25 @@ + + protected void func_565_a(int i, int j, int k) + { ++ super.func_565_a(i, j, k); + if(k != 0) + { +- break MISSING_BLOCK_LABEL_139; ++ return; + } + if(field_945_b.field_6308_u.field_933_a == null) + { +- break MISSING_BLOCK_LABEL_132; ++ return; + } +- if(field_985_a.length() <= 0 || field_985_a.endsWith(" ")) goto _L2; else goto _L1 +-_L1: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_985_a; +- append(); +- " "; +- append(); +- toString(); +- field_985_a; +-_L2: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_985_a; +- append(); +- field_945_b.field_6308_u.field_933_a; +- append(); +- toString(); +- field_985_a; ++ if(field_985_a.length() > 0 && !field_985_a.endsWith(" ")) ++ { ++ field_985_a += " "; ++ } ++ field_985_a += field_945_b.field_6308_u.field_933_a; + byte byte0 = 100; + if(field_985_a.length() > byte0) + { + field_985_a = field_985_a.substring(0, byte0); + } +- break MISSING_BLOCK_LABEL_139; +- super.func_565_a(i, j, k); + } + + static +diff -r -U 3 minecraft\net\minecraft\src\GuiCreateWorld.java minecraft_patched\net\minecraft\src\GuiCreateWorld.java +--- minecraft\net\minecraft\src\GuiCreateWorld.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GuiCreateWorld.java Fri Nov 25 13:18:44 2011 +@@ -99,29 +99,14 @@ + field_35370_u = stringtranslate.func_20163_a((new StringBuilder()).append("selectWorld.gameMode.").append(field_35364_f).append(".line1").toString()); + field_35369_v = stringtranslate.func_20163_a((new StringBuilder()).append("selectWorld.gameMode.").append(field_35364_f).append(".line2").toString()); + field_35372_s.field_939_e = (new StringBuilder()).append(stringtranslate.func_20163_a("selectWorld.mapFeatures")).append(" ").toString(); +- if(!field_35365_g) goto _L2; else goto _L1 +-_L1: +- new StringBuilder(); +- field_35372_s; +- JVM INSTR dup_x1 ; +- field_939_e; +- append(); +- stringtranslate.func_20163_a("options.on"); +- append(); +- toString(); +- field_939_e; +- goto _L3 +-_L2: +- new StringBuilder(); +- field_35372_s; +- JVM INSTR dup_x1 ; +- field_939_e; +- append(); +- stringtranslate.func_20163_a("options.off"); +- append(); +- toString(); +- field_939_e; +-_L3: ++ if(field_35365_g) ++ { ++ field_35372_s.field_939_e += stringtranslate.func_20163_a("options.on"); ++ } ++ else ++ { ++ field_35372_s.field_939_e += stringtranslate.func_20163_a("options.off"); ++ } + field_35371_t.field_939_e = (new StringBuilder()).append(stringtranslate.func_20163_a("selectWorld.mapType")).append(" ").append(stringtranslate.func_20163_a("selectWorld.mapType.normal")).toString(); + return; + } +diff -r -U 3 minecraft\net\minecraft\src\GuiEditSign.java minecraft_patched\net\minecraft\src\GuiEditSign.java +--- minecraft\net\minecraft\src\GuiEditSign.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GuiEditSign.java Fri Nov 25 13:19:51 2011 +@@ -78,19 +78,10 @@ + { + field_1002_h.field_826_a[field_1000_j] = field_1002_h.field_826_a[field_1000_j].substring(0, field_1002_h.field_826_a[field_1000_j].length() - 1); + } +- if(field_20083_l.indexOf(c) < 0 || field_1002_h.field_826_a[field_1000_j].length() >= 15) goto _L2; else goto _L1 +-_L1: +- new StringBuilder(); +- field_1002_h.field_826_a; +- field_1000_j; +- JVM INSTR dup2_x1 ; +- JVM INSTR aaload ; +- append(); +- c; +- append(); +- toString(); +- JVM INSTR aastore ; +-_L2: ++ if(field_20083_l.indexOf(c) >= 0 && field_1002_h.field_826_a[field_1000_j].length() < 15) ++ { ++ field_1002_h.field_826_a[field_1000_j] += c; ++ } + } + + public void func_571_a(int i, int j, float f) +diff -r -U 3 minecraft\net\minecraft\src\GuiSlotServer.java minecraft_patched\net\minecraft\src\GuiSlotServer.java +--- minecraft\net\minecraft\src\GuiSlotServer.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GuiSlotServer.java Fri Nov 25 12:58:44 2011 +@@ -19,8 +19,8 @@ + + public GuiSlotServer(GuiMultiplayer guimultiplayer) + { +- field_35410_a = guimultiplayer; + super(guimultiplayer.field_945_b, guimultiplayer.field_951_c, guimultiplayer.field_950_d, 32, guimultiplayer.field_950_d - 64, 36); ++ field_35410_a = guimultiplayer; + } + + protected int func_22249_a() +diff -r -U 3 minecraft\net\minecraft\src\GuiSlotStats.java minecraft_patched\net\minecraft\src\GuiSlotStats.java +--- minecraft\net\minecraft\src\GuiSlotStats.java Fri Nov 25 12:26:49 2011 ++++ minecraft_patched\net\minecraft\src\GuiSlotStats.java Fri Nov 25 12:58:44 2011 +@@ -25,8 +25,8 @@ + + protected GuiSlotStats(GuiStats guistats) + { +- field_27269_g = guistats; + super(GuiStats.func_27143_f(guistats), guistats.field_951_c, guistats.field_950_d, 32, guistats.field_950_d - 64, 20); ++ field_27269_g = guistats; + field_27268_b = -1; + field_27271_e = -1; + field_27270_f = 0; +diff -r -U 3 minecraft\net\minecraft\src\GuiSlotStatsBlock.java minecraft_patched\net\minecraft\src\GuiSlotStatsBlock.java +--- minecraft\net\minecraft\src\GuiSlotStatsBlock.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiSlotStatsBlock.java Fri Nov 25 12:58:44 2011 +@@ -17,8 +17,8 @@ + + public GuiSlotStatsBlock(GuiStats guistats) + { +- field_27274_a = guistats; + super(guistats); ++ field_27274_a = guistats; + field_27273_c = new ArrayList(); + Iterator iterator = StatList.field_25185_d.iterator(); + do +diff -r -U 3 minecraft\net\minecraft\src\GuiSlotStatsGeneral.java minecraft_patched\net\minecraft\src\GuiSlotStatsGeneral.java +--- minecraft\net\minecraft\src\GuiSlotStatsGeneral.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiSlotStatsGeneral.java Fri Nov 25 12:58:44 2011 +@@ -17,8 +17,8 @@ + + public GuiSlotStatsGeneral(GuiStats guistats) + { +- field_27276_a = guistats; + super(GuiStats.func_27141_a(guistats), guistats.field_951_c, guistats.field_950_d, 32, guistats.field_950_d - 64, 10); ++ field_27276_a = guistats; + func_27258_a(false); + } + +diff -r -U 3 minecraft\net\minecraft\src\GuiSlotStatsItem.java minecraft_patched\net\minecraft\src\GuiSlotStatsItem.java +--- minecraft\net\minecraft\src\GuiSlotStatsItem.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiSlotStatsItem.java Fri Nov 25 12:58:44 2011 +@@ -17,8 +17,8 @@ + + public GuiSlotStatsItem(GuiStats guistats) + { +- field_27275_a = guistats; + super(guistats); ++ field_27275_a = guistats; + field_27273_c = new ArrayList(); + Iterator iterator = StatList.field_25186_c.iterator(); + do +diff -r -U 3 minecraft\net\minecraft\src\GuiTextField.java minecraft_patched\net\minecraft\src\GuiTextField.java +--- minecraft\net\minecraft\src\GuiTextField.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiTextField.java Fri Nov 25 13:23:36 2011 +@@ -61,48 +61,33 @@ + { + field_27107_l.func_27108_j(); + } +- if(c != '\026') goto _L2; else goto _L1 +-_L1: +- String s; +- int j; +- s = GuiScreen.func_574_c(); +- if(s == null) ++ if(c == '\026') + { +- s = ""; ++ String s; ++ int j; ++ s = GuiScreen.func_574_c(); ++ if(s == null) ++ { ++ s = ""; ++ } ++ j = 32 - field_22075_h.length(); ++ if(j > s.length()) ++ { ++ j = s.length(); ++ } ++ if(j > 0) ++ { ++ field_22075_h += s.substring(0, j); ++ } + } +- j = 32 - field_22075_h.length(); +- if(j > s.length()) +- { +- j = s.length(); +- } +- if(j <= 0) goto _L2; else goto _L3 +-_L3: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_22075_h; +- append(); +- s.substring(0, j); +- append(); +- toString(); +- field_22075_h; +-_L2: + if(i == 14 && field_22075_h.length() > 0) + { + field_22075_h = field_22075_h.substring(0, field_22075_h.length() - 1); + } +- if(ChatAllowedCharacters.field_20157_a.indexOf(c) < 0 || field_22075_h.length() >= field_22074_i && field_22074_i != 0) goto _L5; else goto _L4 +-_L4: +- new StringBuilder(); +- this; +- JVM INSTR dup_x1 ; +- field_22075_h; +- append(); +- c; +- append(); +- toString(); +- field_22075_h; +-_L5: ++ if(ChatAllowedCharacters.field_20157_a.indexOf(c) >= 0 && (field_22075_h.length() < field_22074_i || field_22074_i == 0)) ++ { ++ field_22075_h += c; ++ } + } + + public void func_22069_a(int i, int j, int k) +diff -r -U 3 minecraft\net\minecraft\src\GuiTexturePackSlot.java minecraft_patched\net\minecraft\src\GuiTexturePackSlot.java +--- minecraft\net\minecraft\src\GuiTexturePackSlot.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiTexturePackSlot.java Fri Nov 25 12:58:44 2011 +@@ -19,8 +19,8 @@ + + public GuiTexturePackSlot(GuiTexturePacks guitexturepacks) + { +- field_22265_a = guitexturepacks; + super(GuiTexturePacks.func_22124_a(guitexturepacks), guitexturepacks.field_951_c, guitexturepacks.field_950_d, 32, (guitexturepacks.field_950_d - 55) + 4, 36); ++ field_22265_a = guitexturepacks; + } + + protected int func_22249_a() +diff -r -U 3 minecraft\net\minecraft\src\GuiVideoSettings.java minecraft_patched\net\minecraft\src\GuiVideoSettings.java +--- minecraft\net\minecraft\src\GuiVideoSettings.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiVideoSettings.java Fri Nov 25 13:24:30 2011 +@@ -34,7 +34,7 @@ + StringTranslate stringtranslate = StringTranslate.func_20162_a(); + field_22107_a = stringtranslate.func_20163_a("options.videoTitle"); + int i = 0; +- Object aobj[] = field_22108_k; ++ EnumOptions aobj[] = field_22108_k; + int j = aobj.length; + for(int k = 0; k < j; k++) + { +@@ -51,10 +51,10 @@ + + field_949_e.add(new GuiButton(200, field_951_c / 2 - 100, field_950_d / 6 + 168, stringtranslate.func_20163_a("gui.done"))); + field_40231_d = false; +- aobj = (new String[] { ++ String[] aobja = (new String[] { + "sun.arch.data.model", "com.ibm.vm.bitmode", "os.arch" + }); +- String as[] = ((String []) (aobj)); ++ String as[] = ((String []) (aobja)); + int l = as.length; + int i1 = 0; + do +diff -r -U 3 minecraft\net\minecraft\src\GuiWorldSlot.java minecraft_patched\net\minecraft\src\GuiWorldSlot.java +--- minecraft\net\minecraft\src\GuiWorldSlot.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\GuiWorldSlot.java Fri Nov 25 12:58:44 2011 +@@ -19,8 +19,8 @@ + + public GuiWorldSlot(GuiSelectWorld guiselectworld) + { +- field_22266_a = guiselectworld; + super(guiselectworld.field_945_b, guiselectworld.field_951_c, guiselectworld.field_950_d, 32, guiselectworld.field_950_d - 64, 36); ++ field_22266_a = guiselectworld; + } + + protected int func_22249_a() +diff -r -U 3 minecraft\net\minecraft\src\J_ArrayNodeContainer.java minecraft_patched\net\minecraft\src\J_ArrayNodeContainer.java +--- minecraft\net\minecraft\src\J_ArrayNodeContainer.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_ArrayNodeContainer.java Fri Nov 25 12:58:44 2011 +@@ -20,7 +20,7 @@ + { + field_27293_b = j_jsonlistenertojdomadapter; + field_27294_a = j_jsonarraynodebuilder; +- super(); ++// super(); + } + + public void func_27290_a(J_JsonNodeBuilder j_jsonnodebuilder) +diff -r -U 3 minecraft\net\minecraft\src\J_FieldNodeContainer.java minecraft_patched\net\minecraft\src\J_FieldNodeContainer.java +--- minecraft\net\minecraft\src\J_FieldNodeContainer.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_FieldNodeContainer.java Fri Nov 25 12:58:44 2011 +@@ -19,7 +19,7 @@ + { + field_27291_b = j_jsonlistenertojdomadapter; + field_27292_a = j_jsonfieldbuilder; +- super(); ++// super(); + } + + public void func_27290_a(J_JsonNodeBuilder j_jsonnodebuilder) +diff -r -U 3 minecraft\net\minecraft\src\J_JsonElementNodeSelector.java minecraft_patched\net\minecraft\src\J_JsonElementNodeSelector.java +--- minecraft\net\minecraft\src\J_JsonElementNodeSelector.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_JsonElementNodeSelector.java Fri Nov 25 12:58:44 2011 +@@ -17,7 +17,7 @@ + J_JsonElementNodeSelector(int i) + { + field_27069_a = i; +- super(); ++// super(); + } + + public boolean func_27067_a(List list) +diff -r -U 3 minecraft\net\minecraft\src\J_JsonFieldNodeSelector.java minecraft_patched\net\minecraft\src\J_JsonFieldNodeSelector.java +--- minecraft\net\minecraft\src\J_JsonFieldNodeSelector.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_JsonFieldNodeSelector.java Fri Nov 25 12:58:44 2011 +@@ -17,7 +17,7 @@ + J_JsonFieldNodeSelector(J_JsonStringNode j_jsonstringnode) + { + field_27066_a = j_jsonstringnode; +- super(); ++// super(); + } + + public boolean func_27065_a(Map map) +diff -r -U 3 minecraft\net\minecraft\src\J_JsonNodeList.java minecraft_patched\net\minecraft\src\J_JsonNodeList.java +--- minecraft\net\minecraft\src\J_JsonNodeList.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_JsonNodeList.java Fri Nov 25 12:58:44 2011 +@@ -18,7 +18,7 @@ + J_JsonNodeList(Iterable iterable) + { + field_27405_a = iterable; +- super(); ++// super(); + J_JsonNode j_jsonnode; + for(Iterator iterator = field_27405_a.iterator(); iterator.hasNext(); add(j_jsonnode)) + { +diff -r -U 3 minecraft\net\minecraft\src\J_JsonObjectNodeList.java minecraft_patched\net\minecraft\src\J_JsonObjectNodeList.java +--- minecraft\net\minecraft\src\J_JsonObjectNodeList.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_JsonObjectNodeList.java Fri Nov 25 12:58:44 2011 +@@ -17,7 +17,7 @@ + J_JsonObjectNodeList(J_JsonObjectNodeBuilder j_jsonobjectnodebuilder) + { + field_27308_a = j_jsonobjectnodebuilder; +- super(); ++// super(); + J_JsonFieldBuilder j_jsonfieldbuilder; + for(Iterator iterator = J_JsonObjectNodeBuilder.func_27236_a(field_27308_a).iterator(); iterator.hasNext(); put(j_jsonfieldbuilder.func_27303_b(), j_jsonfieldbuilder.func_27302_c())) + { +diff -r -U 3 minecraft\net\minecraft\src\J_ObjectNodeContainer.java minecraft_patched\net\minecraft\src\J_ObjectNodeContainer.java +--- minecraft\net\minecraft\src\J_ObjectNodeContainer.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\J_ObjectNodeContainer.java Fri Nov 25 12:58:44 2011 +@@ -20,7 +20,7 @@ + { + field_27295_b = j_jsonlistenertojdomadapter; + field_27296_a = j_jsonobjectnodebuilder; +- super(); ++// super(); + } + + public void func_27290_a(J_JsonNodeBuilder j_jsonnodebuilder) +diff -r -U 3 minecraft\net\minecraft\src\MapCoord.java minecraft_patched\net\minecraft\src\MapCoord.java +--- minecraft\net\minecraft\src\MapCoord.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MapCoord.java Fri Nov 25 12:58:44 2011 +@@ -20,7 +20,7 @@ + public MapCoord(MapData mapdata, byte byte0, byte byte1, byte byte2, byte byte3) + { + field_28218_e = mapdata; +- super(); ++// super(); + field_28217_a = byte0; + field_28216_b = byte1; + field_28220_c = byte2; +diff -r -U 3 minecraft\net\minecraft\src\MapGenCaves.java minecraft_patched\net\minecraft\src\MapGenCaves.java +--- minecraft\net\minecraft\src\MapGenCaves.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MapGenCaves.java Fri Nov 25 13:11:41 2011 +@@ -77,11 +77,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = i1 - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = i1 - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -89,11 +89,11 @@ + { + continue; + } +- d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; + int l1 = (MathHelper.func_1108_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_1108_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_1108_b(d1 - d7) - 1; + int i2 = MathHelper.func_1108_b(d1 + d7) + 1; +- d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; + int j2 = (MathHelper.func_1108_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft\net\minecraft\src\MapGenCavesHell.java minecraft_patched\net\minecraft\src\MapGenCavesHell.java +--- minecraft\net\minecraft\src\MapGenCavesHell.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MapGenCavesHell.java Fri Nov 25 13:12:09 2011 +@@ -77,11 +77,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = l - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = l - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -89,11 +89,11 @@ + { + continue; + } +- d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; + int k1 = (MathHelper.func_1108_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_1108_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_1108_b(d1 - d7) - 1; + int l1 = MathHelper.func_1108_b(d1 + d7) + 1; +- d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; + int i2 = (MathHelper.func_1108_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft\net\minecraft\src\MapGenRavine.java minecraft_patched\net\minecraft\src\MapGenRavine.java +--- minecraft\net\minecraft\src\MapGenRavine.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MapGenRavine.java Fri Nov 25 13:12:36 2011 +@@ -72,11 +72,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = i1 - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = i1 - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -84,11 +84,11 @@ + { + continue; + } +- d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_1108_b(d - d6) - i * 16 - 1; + int l1 = (MathHelper.func_1108_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_1108_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_1108_b(d1 - d7) - 1; + int i2 = MathHelper.func_1108_b(d1 + d7) + 1; +- d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_1108_b(d2 - d6) - j * 16 - 1; + int j2 = (MathHelper.func_1108_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft\net\minecraft\src\MapInfo.java minecraft_patched\net\minecraft\src\MapInfo.java +--- minecraft\net\minecraft\src\MapInfo.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MapInfo.java Fri Nov 25 12:58:44 2011 +@@ -21,7 +21,7 @@ + public MapInfo(MapData mapdata, EntityPlayer entityplayer) + { + field_28123_d = mapdata; +- super(); ++// super(); + field_28119_b = new int[128]; + field_28124_c = new int[128]; + field_28122_e = 0; +diff -r -U 3 minecraft\net\minecraft\src\MinecraftAppletImpl.java minecraft_patched\net\minecraft\src\MinecraftAppletImpl.java +--- minecraft\net\minecraft\src\MinecraftAppletImpl.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MinecraftAppletImpl.java Fri Nov 25 12:58:44 2011 +@@ -18,8 +18,8 @@ + + public MinecraftAppletImpl(MinecraftApplet minecraftapplet, Component component, Canvas canvas, MinecraftApplet minecraftapplet1, int i, int j, boolean flag) + { +- field_186_a = minecraftapplet; + super(component, canvas, minecraftapplet1, i, j, flag); ++ field_186_a = minecraftapplet; + } + + public void func_4007_a(UnexpectedThrowable unexpectedthrowable) +diff -r -U 3 minecraft\net\minecraft\src\MinecraftImpl.java minecraft_patched\net\minecraft\src\MinecraftImpl.java +--- minecraft\net\minecraft\src\MinecraftImpl.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MinecraftImpl.java Fri Nov 25 12:58:44 2011 +@@ -18,8 +18,8 @@ + + public MinecraftImpl(Component component, Canvas canvas, MinecraftApplet minecraftapplet, int i, int j, boolean flag, Frame frame) + { +- field_20919_a = frame; + super(component, canvas, minecraftapplet, i, j, flag); ++ field_20919_a = frame; + } + + public void func_4007_a(UnexpectedThrowable unexpectedthrowable) +diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java +--- minecraft\net\minecraft\src\MusInputStream.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\MusInputStream.java Fri Nov 25 13:25:04 2011 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import java.io.IOException; + import java.io.InputStream; + import java.net.URL; + +@@ -21,7 +22,7 @@ + public MusInputStream(CodecMus codecmus, URL url, InputStream inputstream) + { + field_1513_b = codecmus; +- super(); ++// super(); + field_1514_a = new byte[1]; + field_1515_d = inputstream; + String s = url.getPath(); +@@ -43,7 +44,14 @@ + + public int read(byte abyte0[], int i, int j) + { +- j = field_1515_d.read(abyte0, i, j); ++ try ++ { ++ j = field_1515_d.read(abyte0, i, j); ++ } ++ catch (IOException e) ++ { ++ return 0; ++ } + for(int k = 0; k < j; k++) + { + byte byte0 = abyte0[i + k] ^= field_1516_c >> 8; +diff -r -U 3 minecraft\net\minecraft\src\NetClientHandler.java minecraft_patched\net\minecraft\src\NetClientHandler.java +--- minecraft\net\minecraft\src\NetClientHandler.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\NetClientHandler.java Fri Nov 25 13:26:05 2011 +@@ -113,7 +113,7 @@ + double d = (double)packet23vehiclespawn.field_499_b / 32D; + double d1 = (double)packet23vehiclespawn.field_503_c / 32D; + double d2 = (double)packet23vehiclespawn.field_502_d / 32D; +- Object obj = null; ++ Entity obj = null; + if(packet23vehiclespawn.field_501_e == 10) + { + obj = new EntityMinecart(field_1211_f, d, d1, d2, 0); +diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patched\net\minecraft\src\NetworkMasterThread.java +--- minecraft\net\minecraft\src\NetworkMasterThread.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java Fri Nov 25 12:58:44 2011 +@@ -16,7 +16,7 @@ + NetworkMasterThread(NetworkManager networkmanager) + { + field_1086_a = networkmanager; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\NetworkReaderThread.java minecraft_patched\net\minecraft\src\NetworkReaderThread.java +--- minecraft\net\minecraft\src\NetworkReaderThread.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\NetworkReaderThread.java Fri Nov 25 13:27:31 2011 +@@ -15,8 +15,8 @@ + + NetworkReaderThread(NetworkManager networkmanager, String s) + { +- field_1085_a = networkmanager; + super(s); ++ field_1085_a = networkmanager; + } + + public void run() +@@ -25,26 +25,24 @@ + { + NetworkManager.field_1477_b++; + } +- while(NetworkManager.func_971_a(field_1085_a) && !NetworkManager.func_968_b(field_1085_a)) ++ try + { +- while(NetworkManager.func_966_c(field_1085_a)) ; +- try ++ while(NetworkManager.func_971_a(field_1085_a) && !NetworkManager.func_968_b(field_1085_a)) + { +- sleep(2L); ++ while(NetworkManager.func_966_c(field_1085_a)) ; ++ try ++ { ++ sleep(2L); ++ } ++ catch(InterruptedException interruptedexception) { } + } +- catch(InterruptedException interruptedexception) { } +- } +- synchronized(NetworkManager.field_1478_a) +- { +- NetworkManager.field_1477_b--; + } +- break MISSING_BLOCK_LABEL_131; +- Exception exception2; +- exception2; +- synchronized(NetworkManager.field_1478_a) ++ finally + { +- NetworkManager.field_1477_b--; ++ synchronized(NetworkManager.field_1478_a) ++ { ++ NetworkManager.field_1477_b--; ++ } + } +- throw exception2; + } + } +diff -r -U 3 minecraft\net\minecraft\src\NetworkWriterThread.java minecraft_patched\net\minecraft\src\NetworkWriterThread.java +--- minecraft\net\minecraft\src\NetworkWriterThread.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\NetworkWriterThread.java Fri Nov 25 13:27:53 2011 +@@ -17,8 +17,8 @@ + + NetworkWriterThread(NetworkManager networkmanager, String s) + { +- field_1063_a = networkmanager; + super(s); ++ field_1063_a = networkmanager; + } + + public void run() +@@ -27,41 +27,39 @@ + { + NetworkManager.field_1476_c++; + } +- while(NetworkManager.func_971_a(field_1063_a)) ++ try + { +- while(NetworkManager.func_965_d(field_1063_a)) ; +- try ++ while(NetworkManager.func_971_a(field_1063_a)) + { +- if(NetworkManager.func_28140_f(field_1063_a) != null) ++ while(NetworkManager.func_965_d(field_1063_a)) ; ++ try + { +- NetworkManager.func_28140_f(field_1063_a).flush(); ++ if(NetworkManager.func_28140_f(field_1063_a) != null) ++ { ++ NetworkManager.func_28140_f(field_1063_a).flush(); ++ } + } +- } +- catch(IOException ioexception) +- { +- if(!NetworkManager.func_28138_e(field_1063_a)) ++ catch(IOException ioexception) + { +- NetworkManager.func_30005_a(field_1063_a, ioexception); ++ if(!NetworkManager.func_28138_e(field_1063_a)) ++ { ++ NetworkManager.func_30005_a(field_1063_a, ioexception); ++ } ++ ioexception.printStackTrace(); + } +- ioexception.printStackTrace(); +- } +- try +- { +- sleep(2L); ++ try ++ { ++ sleep(2L); ++ } ++ catch(InterruptedException interruptedexception) { } + } +- catch(InterruptedException interruptedexception) { } + } +- synchronized(NetworkManager.field_1478_a) ++ finally + { +- NetworkManager.field_1476_c--; +- } +- break MISSING_BLOCK_LABEL_167; +- Exception exception2; +- exception2; +- synchronized(NetworkManager.field_1478_a) +- { +- NetworkManager.field_1476_c--; ++ synchronized(NetworkManager.field_1478_a) ++ { ++ NetworkManager.field_1476_c--; ++ } + } +- throw exception2; + } + } +diff -r -U 3 minecraft\net\minecraft\src\RailLogic.java minecraft_patched\net\minecraft\src\RailLogic.java +--- minecraft\net\minecraft\src\RailLogic.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\RailLogic.java Fri Nov 25 12:58:45 2011 +@@ -24,7 +24,7 @@ + public RailLogic(BlockRail blockrail, World world, int i, int j, int k) + { + field_1160_a = blockrail; +- super(); ++// super(); + field_1161_g = new ArrayList(); + field_1159_b = world; + field_1165_c = i; +diff -r -U 3 minecraft\net\minecraft\src\RecipeSorter.java minecraft_patched\net\minecraft\src\RecipeSorter.java +--- minecraft\net\minecraft\src\RecipeSorter.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\RecipeSorter.java Fri Nov 25 12:58:45 2011 +@@ -18,7 +18,7 @@ + RecipeSorter(CraftingManager craftingmanager) + { + field_1557_a = craftingmanager; +- super(); ++// super(); + } + + public int func_1040_a(IRecipe irecipe, IRecipe irecipe1) +diff -r -U 3 minecraft\net\minecraft\src\RegionFileChunkBuffer.java minecraft_patched\net\minecraft\src\RegionFileChunkBuffer.java +--- minecraft\net\minecraft\src\RegionFileChunkBuffer.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\RegionFileChunkBuffer.java Fri Nov 25 12:58:45 2011 +@@ -18,8 +18,8 @@ + + public RegionFileChunkBuffer(RegionFile regionfile, int i, int j) + { +- field_22284_a = regionfile; + super(8096); ++ field_22284_a = regionfile; + field_22283_b = i; + field_22285_c = j; + } +diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java +--- minecraft\net\minecraft\src\RenderBlocks.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\RenderBlocks.java Fri Nov 25 13:29:48 2011 +@@ -1972,12 +1972,12 @@ + tessellator.func_35835_b(block.func_35275_c(field_1772_a, i, j, k)); + int i1 = block.func_207_d(field_1772_a, i, j, k); + float f1 = (float)(i1 >> 16 & 0xff) / 255F; +- double d = (float)(i1 >> 8 & 0xff) / 255F; ++ float da = (float)(i1 >> 8 & 0xff) / 255F; + float f2 = (float)(i1 & 0xff) / 255F; +- tessellator.func_987_a(f * f1, f * d, f * f2); ++ tessellator.func_987_a(f * f1, f * da, f * f2); + i1 = (l & 0xf) << 4; + f1 = l & 0xf0; +- d = (float)i1 / 256F; ++ double d = (float)i1 / 256F; + double d1 = ((float)i1 + 15.99F) / 256F; + double d2 = (float)f1 / 256F; + double d3 = ((float)f1 + 15.99F) / 256F; +diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java +--- minecraft\net\minecraft\src\RenderGlobal.java Fri Nov 25 12:26:50 2011 ++++ minecraft_patched\net\minecraft\src\RenderGlobal.java Fri Nov 25 13:31:29 2011 +@@ -521,7 +521,7 @@ + do + { + Profiler.func_40661_c("occ"); +- byte byte0 = i1; ++ int byte0 = i1; + i1 *= 2; + if(i1 > field_1445_n.length) + { +@@ -841,11 +841,11 @@ + GL11.glEnable(3553); + GL11.glBlendFunc(770, 1); + GL11.glPushMatrix(); +- double d = 1.0F - field_1448_k.func_27162_g(f); ++ float da = 1.0F - field_1448_k.func_27162_g(f); + float f8 = 0.0F; + float f10 = 0.0F; + float f13 = 0.0F; +- GL11.glColor4f(1.0F, 1.0F, 1.0F, d); ++ GL11.glColor4f(1.0F, 1.0F, 1.0F, da); + GL11.glTranslatef(f8, f10, f13); + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(field_1448_k.func_619_c(f) * 360F, 1.0F, 0.0F, 0.0F); +@@ -859,9 +859,9 @@ + tessellator1.func_982_a(); + f16 = 20F; + GL11.glBindTexture(3553, field_1447_l.func_1070_a("/terrain/moon_phases.png")); +- float f19 = field_1448_k.func_40475_d(f); +- int l = f19 % 4; +- int i1 = (f19 / 4) % 2; ++ int f19a = field_1448_k.func_40475_d(f); ++ int l = f19a % 4; ++ int i1 = (f19a / 4) % 2; + float f25 = (float)(l + 0) / 4F; + float f26 = (float)(i1 + 0) / 2.0F; + float f27 = (float)(l + 1) / 4F; +@@ -873,7 +873,7 @@ + tessellator1.func_983_a(-f16, -100D, -f16, f27, f26); + tessellator1.func_982_a(); + GL11.glDisable(3553); +- f19 = field_1448_k.func_679_f(f) * d; ++ float f19 = field_1448_k.func_679_f(f) * da; + if(f19 > 0.0F) + { + GL11.glColor4f(f19, f19, f19, f19); +@@ -886,7 +886,7 @@ + GL11.glPopMatrix(); + GL11.glDisable(3553); + GL11.glColor3f(0.0F, 0.0F, 0.0F); +- d = field_1439_t.field_6322_g.func_427_e(f).field_1775_b - 63D; ++ double d = field_1439_t.field_6322_g.func_427_e(f).field_1775_b - 63D; + if(d < 0.0D) + { + GL11.glPushMatrix(); +diff -r -U 3 minecraft\net\minecraft\src\RenderXPOrb.java minecraft_patched\net\minecraft\src\RenderXPOrb.java +--- minecraft\net\minecraft\src\RenderXPOrb.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\RenderXPOrb.java Fri Nov 25 13:33:36 2011 +@@ -39,12 +39,12 @@ + float f6 = 1.0F; + float f7 = 0.5F; + float f8 = 0.25F; +- float f9 = entityxporb.func_35115_a(f1); +- float f10 = f9 % 0x10000; +- int j = f9 / 0x10000; ++ int f9a = entityxporb.func_35115_a(f1); ++ float f10 = f9a % 0x10000; ++ int j = f9a / 0x10000; + OpenGlHelper.func_40454_a(OpenGlHelper.field_40455_b, (float)f10 / 1.0F, (float)j / 1.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); +- f9 = 255F; ++ float f9 = 255F; + f10 = ((float)entityxporb.field_35127_a + f1) / 2.0F; + j = (int)((MathHelper.func_1106_a(f10 + 0.0F) + 1.0F) * 0.5F * f9); + int k = (int)f9; +diff -r -U 3 minecraft\net\minecraft\src\SlotArmor.java minecraft_patched\net\minecraft\src\SlotArmor.java +--- minecraft\net\minecraft\src\SlotArmor.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SlotArmor.java Fri Nov 25 12:58:45 2011 +@@ -17,9 +17,9 @@ + + SlotArmor(ContainerPlayer containerplayer, IInventory iinventory, int i, int j, int k, int l) + { ++ super(iinventory, i, j, k); + field_1123_d = containerplayer; + field_1124_c = l; +- super(iinventory, i, j, k); + } + + public int func_4104_e() +diff -r -U 3 minecraft\net\minecraft\src\SlotBrewingStandIngredient.java minecraft_patched\net\minecraft\src\SlotBrewingStandIngredient.java +--- minecraft\net\minecraft\src\SlotBrewingStandIngredient.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SlotBrewingStandIngredient.java Fri Nov 25 12:58:45 2011 +@@ -16,8 +16,8 @@ + + public SlotBrewingStandIngredient(ContainerBrewingStand containerbrewingstand, IInventory iinventory, int i, int j, int k) + { +- field_40442_a = containerbrewingstand; + super(iinventory, i, j, k); ++ field_40442_a = containerbrewingstand; + } + + public boolean func_4105_a(ItemStack itemstack) +diff -r -U 3 minecraft\net\minecraft\src\SlotBrewingStandPotion.java minecraft_patched\net\minecraft\src\SlotBrewingStandPotion.java +--- minecraft\net\minecraft\src\SlotBrewingStandPotion.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SlotBrewingStandPotion.java Fri Nov 25 12:58:45 2011 +@@ -17,8 +17,8 @@ + + public SlotBrewingStandPotion(ContainerBrewingStand containerbrewingstand, EntityPlayer entityplayer, IInventory iinventory, int i, int j, int k) + { +- field_40441_a = containerbrewingstand; + super(iinventory, i, j, k); ++ field_40441_a = containerbrewingstand; + field_40440_f = entityplayer; + } + +diff -r -U 3 minecraft\net\minecraft\src\SlotEnchantment.java minecraft_patched\net\minecraft\src\SlotEnchantment.java +--- minecraft\net\minecraft\src\SlotEnchantment.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SlotEnchantment.java Fri Nov 25 12:58:45 2011 +@@ -15,8 +15,8 @@ + + SlotEnchantment(ContainerEnchantment containerenchantment, IInventory iinventory, int i, int j, int k) + { +- field_40443_a = containerenchantment; + super(iinventory, i, j, k); ++ field_40443_a = containerenchantment; + } + + public boolean func_4105_a(ItemStack itemstack) +diff -r -U 3 minecraft\net\minecraft\src\SlotEnchantmentTable.java minecraft_patched\net\minecraft\src\SlotEnchantmentTable.java +--- minecraft\net\minecraft\src\SlotEnchantmentTable.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SlotEnchantmentTable.java Fri Nov 25 12:58:45 2011 +@@ -15,8 +15,8 @@ + + SlotEnchantmentTable(ContainerEnchantment containerenchantment, String s, int i) + { +- field_40070_a = containerenchantment; + super(s, i); ++ field_40070_a = containerenchantment; + } + + public int func_470_e() +diff -r -U 3 minecraft\net\minecraft\src\SorterStatsBlock.java minecraft_patched\net\minecraft\src\SorterStatsBlock.java +--- minecraft\net\minecraft\src\SorterStatsBlock.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SorterStatsBlock.java Fri Nov 25 12:58:45 2011 +@@ -21,7 +21,7 @@ + { + field_27298_b = guislotstatsblock; + field_27299_a = guistats; +- super(); ++// super(); + } + + public int func_27297_a(StatCrafting statcrafting, StatCrafting statcrafting1) +diff -r -U 3 minecraft\net\minecraft\src\SorterStatsItem.java minecraft_patched\net\minecraft\src\SorterStatsItem.java +--- minecraft\net\minecraft\src\SorterStatsItem.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SorterStatsItem.java Fri Nov 25 12:58:45 2011 +@@ -21,7 +21,7 @@ + { + field_27372_b = guislotstatsitem; + field_27373_a = guistats; +- super(); ++// super(); + } + + public int func_27371_a(StatCrafting statcrafting, StatCrafting statcrafting1) +diff -r -U 3 minecraft\net\minecraft\src\SpawnerAnimals.java minecraft_patched\net\minecraft\src\SpawnerAnimals.java +--- minecraft\net\minecraft\src\SpawnerAnimals.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\SpawnerAnimals.java Fri Nov 25 13:43:12 2011 +@@ -31,167 +31,155 @@ + return new ChunkPosition(k, l, i1); + } + +- public static final int func_4154_a(World world, boolean flag, boolean flag1) ++ public static final int func_4154_a(World var0, boolean var1, boolean var2) + { +- int j; +- ChunkCoordinates chunkcoordinates; +- EnumCreatureType aenumcreaturetype[]; +- int i1; +- int j1; +- if(!flag && !flag1) ++ if(!var1 && !var2) + { + return 0; + } +- field_6544_a.clear(); +- for(int i = 0; i < world.field_1040_k.size(); i++) ++ else + { +- EntityPlayer entityplayer = (EntityPlayer)world.field_1040_k.get(i); +- int k = MathHelper.func_1108_b(entityplayer.field_611_ak / 16D); +- int l = MathHelper.func_1108_b(entityplayer.field_609_am / 16D); +- byte byte0 = 8; +- for(int k1 = -byte0; k1 <= byte0; k1++) ++ field_6544_a.clear(); ++ ++ int var3; ++ int var6; ++ for(var3 = 0; var3 < var0.field_1040_k.size(); ++var3) + { +- for(int l1 = -byte0; l1 <= byte0; l1++) ++ EntityPlayer var4 = (EntityPlayer)var0.field_1040_k.get(var3); ++ int var5 = MathHelper.func_1108_b(var4.field_611_ak / 16.0D); ++ var6 = MathHelper.func_1108_b(var4.field_609_am / 16.0D); ++ byte var7 = 8; ++ ++ for(int var8 = -var7; var8 <= var7; ++var8) + { +- boolean flag2 = k1 == -byte0 || k1 == byte0 || l1 == -byte0 || l1 == byte0; +- ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(k1 + k, l1 + l); +- if(!flag2) +- { +- field_6544_a.put(chunkcoordintpair1, Boolean.valueOf(false)); +- continue; +- } +- if(!field_6544_a.containsKey(chunkcoordintpair1)) ++ for(int var9 = -var7; var9 <= var7; ++var9) + { +- field_6544_a.put(chunkcoordintpair1, Boolean.valueOf(true)); ++ boolean var10 = var8 == -var7 || var8 == var7 || var9 == -var7 || var9 == var7; ++ ChunkCoordIntPair var11 = new ChunkCoordIntPair(var8 + var5, var9 + var6); ++ if(!var10) ++ { ++ field_6544_a.put(var11, Boolean.valueOf(false)); ++ } ++ else if(!field_6544_a.containsKey(var11)) ++ { ++ field_6544_a.put(var11, Boolean.valueOf(true)); ++ } + } + } +- + } + +- } ++ var3 = 0; ++ ChunkCoordinates var31 = var0.func_22137_s(); ++ EnumCreatureType[] var32 = EnumCreatureType.values(); ++ var6 = var32.length; + +- j = 0; +- chunkcoordinates = world.func_22137_s(); +- aenumcreaturetype = EnumCreatureType.values(); +- i1 = aenumcreaturetype.length; +- j1 = 0; +-_L10: +- if(j1 >= i1) goto _L2; else goto _L1 +-_L1: +- EnumCreatureType enumcreaturetype; +- Iterator iterator; +- enumcreaturetype = aenumcreaturetype[j1]; +- if(enumcreaturetype.func_21168_d() && !flag1 || !enumcreaturetype.func_21168_d() && !flag || world.func_621_b(enumcreaturetype.func_21170_a()) > (enumcreaturetype.func_21169_b() * field_6544_a.size()) / 256) +- { +- continue; /* Loop/switch isn't completed */ +- } +- iterator = field_6544_a.keySet().iterator(); +-_L4: +- int i2; +- int j2; +- int k2; +- int l2; +- int i3; +- do +- { +- ChunkCoordIntPair chunkcoordintpair; +- do ++ for(int var33 = 0; var33 < var6; ++var33) + { +- if(!iterator.hasNext()) ++ EnumCreatureType var34 = var32[var33]; ++ if((!var34.func_21168_d() || var2) && (var34.func_21168_d() || var1) && var0.func_621_b(var34.func_21170_a()) <= var34.func_21169_b() * field_6544_a.size() / 256) + { +- continue; /* Loop/switch isn't completed */ ++ Iterator var35 = field_6544_a.keySet().iterator(); ++ ++ label108: ++ while(var35.hasNext()) ++ { ++ ChunkCoordIntPair var37 = (ChunkCoordIntPair)var35.next(); ++ if(!((Boolean)field_6544_a.get(var37)).booleanValue()) ++ { ++ ChunkPosition var36 = func_4153_a(var0, var37.field_189_a * 16, var37.field_188_b * 16); ++ int var12 = var36.field_1111_a; ++ int var13 = var36.field_1110_b; ++ int var14 = var36.field_1112_c; ++ if(!var0.func_28100_h(var12, var13, var14) && var0.func_599_f(var12, var13, var14) == var34.func_21171_c()) ++ { ++ int var15 = 0; ++ int var16 = 0; ++ ++ while(var16 < 3) ++ { ++ int var17 = var12; ++ int var18 = var13; ++ int var19 = var14; ++ byte var20 = 6; ++ SpawnListEntry var21 = null; ++ int var22 = 0; ++ ++ while(true) ++ { ++ if(var22 < 4) ++ { ++ label101: ++ { ++ var17 += var0.field_1037_n.nextInt(var20) - var0.field_1037_n.nextInt(var20); ++ var18 += var0.field_1037_n.nextInt(1) - var0.field_1037_n.nextInt(1); ++ var19 += var0.field_1037_n.nextInt(var20) - var0.field_1037_n.nextInt(var20); ++ if(func_21203_a(var34, var0, var17, var18, var19)) ++ { ++ float var23 = (float)var17 + 0.5F; ++ float var24 = (float)var18; ++ float var25 = (float)var19 + 0.5F; ++ if(var0.func_683_a((double)var23, (double)var24, (double)var25, 24.0D) == null) ++ { ++ float var26 = var23 - (float)var31.field_22395_a; ++ float var27 = var24 - (float)var31.field_22394_b; ++ float var28 = var25 - (float)var31.field_22396_c; ++ float var29 = var26 * var26 + var27 * var27 + var28 * var28; ++ if(var29 >= 576.0F) ++ { ++ if(var21 == null) ++ { ++ var21 = var0.func_40474_a(var34, var17, var18, var19); ++ if(var21 == null) ++ { ++ break label101; ++ } ++ } ++ ++ EntityLiving var38; ++ try ++ { ++ var38 = (EntityLiving)var21.field_25212_a.getConstructor(new Class[]{World.class}).newInstance(new Object[]{var0}); ++ } ++ catch (Exception var30) ++ { ++ var30.printStackTrace(); ++ return var3; ++ } ++ ++ var38.func_365_c((double)var23, (double)var24, (double)var25, var0.field_1037_n.nextFloat() * 360.0F, 0.0F); ++ if(var38.func_433_a()) ++ { ++ ++var15; ++ var0.func_674_a(var38); ++ func_21204_a(var38, var0, var23, var24, var25); ++ if(var15 >= var38.func_6391_i()) ++ { ++ continue label108; ++ } ++ } ++ ++ var3 += var15; ++ } ++ } ++ } ++ ++ ++var22; ++ continue; ++ } ++ } ++ ++ ++var16; ++ break; ++ } ++ } ++ } ++ } ++ } + } +- chunkcoordintpair = (ChunkCoordIntPair)iterator.next(); +- } while(((Boolean)field_6544_a.get(chunkcoordintpair)).booleanValue()); +- ChunkPosition chunkposition = func_4153_a(world, chunkcoordintpair.field_189_a * 16, chunkcoordintpair.field_188_b * 16); +- i2 = chunkposition.field_1111_a; +- j2 = chunkposition.field_1110_b; +- k2 = chunkposition.field_1112_c; +- } while(world.func_28100_h(i2, j2, k2) || world.func_599_f(i2, j2, k2) != enumcreaturetype.func_21171_c()); +- l2 = 0; +- i3 = 0; +-_L9: +- if(i3 >= 3) goto _L4; else goto _L3 +-_L3: +- int j3; +- int k3; +- int l3; +- byte byte1; +- SpawnListEntry spawnlistentry; +- int i4; +- j3 = i2; +- k3 = j2; +- l3 = k2; +- byte1 = 6; +- spawnlistentry = null; +- i4 = 0; +-_L8: +- if(i4 >= 4) goto _L6; else goto _L5 +-_L5: +- EntityLiving entityliving; +- j3 += world.field_1037_n.nextInt(byte1) - world.field_1037_n.nextInt(byte1); +- k3 += world.field_1037_n.nextInt(1) - world.field_1037_n.nextInt(1); +- l3 += world.field_1037_n.nextInt(byte1) - world.field_1037_n.nextInt(byte1); +- if(!func_21203_a(enumcreaturetype, world, j3, k3, l3)) +- { +- continue; /* Loop/switch isn't completed */ +- } +- float f = (float)j3 + 0.5F; +- float f1 = k3; +- float f2 = (float)l3 + 0.5F; +- if(world.func_683_a(f, f1, f2, 24D) != null) +- { +- continue; /* Loop/switch isn't completed */ +- } +- float f3 = f - (float)chunkcoordinates.field_22395_a; +- float f4 = f1 - (float)chunkcoordinates.field_22394_b; +- float f5 = f2 - (float)chunkcoordinates.field_22396_c; +- float f6 = f3 * f3 + f4 * f4 + f5 * f5; +- if(f6 < 576F) +- { +- continue; /* Loop/switch isn't completed */ +- } +- if(spawnlistentry == null) +- { +- spawnlistentry = world.func_40474_a(enumcreaturetype, j3, k3, l3); +- if(spawnlistentry == null) +- { +- break; /* Loop/switch isn't completed */ + } ++ ++ return var3; + } +- try +- { +- entityliving = (EntityLiving)spawnlistentry.field_25212_a.getConstructor(new Class[] { +- net.minecraft.src.World.class +- }).newInstance(new Object[] { +- world +- }); +- } +- catch(Exception exception) +- { +- exception.printStackTrace(); +- return j; +- } +- entityliving.func_365_c(f, f1, f2, world.field_1037_n.nextFloat() * 360F, 0.0F); +- if(!entityliving.func_433_a()) +- { +- break; /* Loop/switch isn't completed */ +- } +- l2++; +- world.func_674_a(entityliving); +- func_21204_a(entityliving, world, f, f1, f2); +- if(l2 < entityliving.func_6391_i()) goto _L7; else goto _L4 +-_L7: +- j += l2; +- i4++; +- goto _L8 +-_L6: +- i3++; +- goto _L9 +- j1++; +- goto _L10 +-_L2: +- return j; + } + + private static boolean func_21203_a(EnumCreatureType enumcreaturetype, World world, int i, int j, int k) +diff -r -U 3 minecraft\net\minecraft\src\StatStringFormatKeyInv.java minecraft_patched\net\minecraft\src\StatStringFormatKeyInv.java +--- minecraft\net\minecraft\src\StatStringFormatKeyInv.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\StatStringFormatKeyInv.java Fri Nov 25 12:58:45 2011 +@@ -18,7 +18,7 @@ + public StatStringFormatKeyInv(Minecraft minecraft) + { + field_27344_a = minecraft; +- super(); ++// super(); + } + + public String func_27343_a(String s) +diff -r -U 3 minecraft\net\minecraft\src\StructureStrongholdPieces.java minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java +--- minecraft\net\minecraft\src\StructureStrongholdPieces.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java Fri Nov 25 13:47:42 2011 +@@ -108,60 +108,68 @@ + return ((ComponentStronghold) (obj)); + } + +- private static ComponentStronghold func_35847_b(ComponentStrongholdStairs2 componentstrongholdstairs2, List list, Random random, int i, int j, int k, int l, int i1) ++ private static ComponentStronghold func_35847_b(ComponentStrongholdStairs2 var0, List var1, Random var2, int var3, int var4, int var5, int var6, int var7) + { +- int j1; + if(!func_35853_c()) + { + return null; + } +- if(field_40752_d != null) ++ else + { +- ComponentStronghold componentstronghold = func_35851_a(field_40752_d, list, random, i, j, k, l, i1); +- field_40752_d = null; +- if(componentstronghold != null) ++ if(field_40752_d != null) + { +- return componentstronghold; ++ ComponentStronghold var8 = func_35851_a(field_40752_d, var1, var2, var3, var4, var5, var6, var7); ++ field_40752_d = null; ++ if(var8 != null) ++ { ++ return var8; ++ } ++ } ++ ++ int var13 = 0; ++ ++ while(var13 < 5) ++ { ++ ++var13; ++ int var9 = var2.nextInt(field_35857_a); ++ Iterator var10 = field_35856_c.iterator(); ++ ++ while(var10.hasNext()) ++ { ++ StructureStrongholdPieceWeight var11 = (StructureStrongholdPieceWeight)var10.next(); ++ var9 -= var11.field_35616_b; ++ if(var9 < 0) ++ { ++ if(!var11.func_35613_a(var7) || var11 == var0.field_35038_a) ++ { ++ break; ++ } ++ ++ ComponentStronghold var12 = func_35851_a(var11.field_35618_a, var1, var2, var3, var4, var5, var6, var7); ++ if(var12 != null) ++ { ++ ++var11.field_35617_c; ++ var0.field_35038_a = var11; ++ if(!var11.func_35614_a()) ++ { ++ field_35856_c.remove(var11); ++ } ++ ++ return var12; ++ } ++ } ++ } ++ } ++ ++ StructureBoundingBox var14 = ComponentStrongholdCorridor.func_35051_a(var1, var2, var3, var4, var5, var6); ++ if(var14 != null && var14.field_35751_b > 1) ++ { ++ return new ComponentStrongholdCorridor(var7, var2, var14, var6); ++ } ++ else ++ { ++ return null; + } +- } +- j1 = 0; +-_L2: +- int k1; +- Iterator iterator; +- if(j1 >= 5) +- { +- break MISSING_BLOCK_LABEL_206; +- } +- j1++; +- k1 = random.nextInt(field_35857_a); +- iterator = field_35856_c.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureStrongholdPieceWeight structurestrongholdpieceweight; +- structurestrongholdpieceweight = (StructureStrongholdPieceWeight)iterator.next(); +- k1 -= structurestrongholdpieceweight.field_35616_b; +- if(k1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurestrongholdpieceweight.func_35613_a(i1) && structurestrongholdpieceweight != componentstrongholdstairs2.field_35038_a) goto _L5; else goto _L2 +-_L5: +- ComponentStronghold componentstronghold1 = func_35851_a(structurestrongholdpieceweight.field_35618_a, list, random, i, j, k, l, i1); +- if(componentstronghold1 == null) goto _L4; else goto _L6 +-_L6: +- structurestrongholdpieceweight.field_35617_c++; +- componentstrongholdstairs2.field_35038_a = structurestrongholdpieceweight; +- if(!structurestrongholdpieceweight.func_35614_a()) +- { +- field_35856_c.remove(structurestrongholdpieceweight); +- } +- return componentstronghold1; +- StructureBoundingBox structureboundingbox = ComponentStrongholdCorridor.func_35051_a(list, random, i, j, k, l); +- if(structureboundingbox != null && structureboundingbox.field_35751_b > 1) +- { +- return new ComponentStrongholdCorridor(i1, random, structureboundingbox, l); +- } else +- { +- return null; + } + } + +diff -r -U 3 minecraft\net\minecraft\src\StructureVillagePieces.java minecraft_patched\net\minecraft\src\StructureVillagePieces.java +--- minecraft\net\minecraft\src\StructureVillagePieces.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\StructureVillagePieces.java Fri Nov 25 13:50:07 2011 +@@ -107,53 +107,59 @@ + return ((ComponentVillage) (obj)); + } + +- private static ComponentVillage func_35700_c(ComponentVillageStartPiece componentvillagestartpiece, List list, Random random, int i, int j, int k, int l, int i1) ++ private static ComponentVillage func_35700_c(ComponentVillageStartPiece var0, List var1, Random var2, int var3, int var4, int var5, int var6, int var7) + { +- int j1; +- int k1; +- j1 = func_35703_a(componentvillagestartpiece.field_35107_d); +- if(j1 <= 0) ++ int var8 = func_35703_a(var0.field_35107_d); ++ if(var8 <= 0) + { + return null; + } +- k1 = 0; +-_L2: +- int l1; +- Iterator iterator; +- if(k1 >= 5) ++ else + { +- break MISSING_BLOCK_LABEL_182; +- } +- k1++; +- l1 = random.nextInt(j1); +- iterator = componentvillagestartpiece.field_35107_d.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureVillagePieceWeight structurevillagepieceweight; +- structurevillagepieceweight = (StructureVillagePieceWeight)iterator.next(); +- l1 -= structurevillagepieceweight.field_35605_b; +- if(l1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurevillagepieceweight.func_35602_a(i1) && (structurevillagepieceweight != componentvillagestartpiece.field_35110_c || componentvillagestartpiece.field_35107_d.size() <= 1)) goto _L5; else goto _L2 +-_L5: +- ComponentVillage componentvillage = func_35699_a(structurevillagepieceweight, list, random, i, j, k, l, i1); +- if(componentvillage == null) goto _L4; else goto _L6 +-_L6: +- structurevillagepieceweight.field_35606_c++; +- componentvillagestartpiece.field_35110_c = structurevillagepieceweight; +- if(!structurevillagepieceweight.func_35603_a()) +- { +- componentvillagestartpiece.field_35107_d.remove(structurevillagepieceweight); +- } +- return componentvillage; +- StructureBoundingBox structureboundingbox = ComponentVillageTorch.func_35099_a(list, random, i, j, k, l); +- if(structureboundingbox != null) +- { +- return new ComponentVillageTorch(i1, random, structureboundingbox, l); +- } else +- { +- return null; ++ int var9 = 0; ++ ++ while(var9 < 5) ++ { ++ ++var9; ++ int var10 = var2.nextInt(var8); ++ Iterator var11 = var0.field_35107_d.iterator(); ++ ++ while(var11.hasNext()) ++ { ++ StructureVillagePieceWeight var12 = (StructureVillagePieceWeight)var11.next(); ++ var10 -= var12.field_35605_b; ++ if(var10 < 0) ++ { ++ if(!var12.func_35602_a(var7) || var12 == var0.field_35110_c && var0.field_35107_d.size() > 1) ++ { ++ break; ++ } ++ ++ ComponentVillage var13 = func_35699_a(var12, var1, var2, var3, var4, var5, var6, var7); ++ if(var13 != null) ++ { ++ ++var12.field_35606_c; ++ var0.field_35110_c = var12; ++ if(!var12.func_35603_a()) ++ { ++ var0.field_35107_d.remove(var12); ++ } ++ ++ return var13; ++ } ++ } ++ } ++ } ++ ++ StructureBoundingBox var14 = ComponentVillageTorch.func_35099_a(var1, var2, var3, var4, var5, var6); ++ if(var14 != null) ++ { ++ return new ComponentVillageTorch(var7, var2, var14, var6); ++ } ++ else ++ { ++ return null; ++ } + } + } + +diff -r -U 3 minecraft\net\minecraft\src\ThreadCheckHasPaid.java minecraft_patched\net\minecraft\src\ThreadCheckHasPaid.java +--- minecraft\net\minecraft\src\ThreadCheckHasPaid.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadCheckHasPaid.java Fri Nov 25 12:58:45 2011 +@@ -19,7 +19,7 @@ + public ThreadCheckHasPaid(Minecraft minecraft) + { + field_28146_a = minecraft; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\ThreadCloseConnection.java minecraft_patched\net\minecraft\src\ThreadCloseConnection.java +--- minecraft\net\minecraft\src\ThreadCloseConnection.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadCloseConnection.java Fri Nov 25 12:58:45 2011 +@@ -16,7 +16,7 @@ + ThreadCloseConnection(NetworkManager networkmanager) + { + field_28109_a = networkmanager; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\ThreadConnectToServer.java minecraft_patched\net\minecraft\src\ThreadConnectToServer.java +--- minecraft\net\minecraft\src\ThreadConnectToServer.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadConnectToServer.java Fri Nov 25 12:58:45 2011 +@@ -26,7 +26,7 @@ + field_1102_a = minecraft; + field_1101_b = s; + field_1104_c = i; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\ThreadDownloadImage.java minecraft_patched\net\minecraft\src\ThreadDownloadImage.java +--- minecraft\net\minecraft\src\ThreadDownloadImage.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadDownloadImage.java Fri Nov 25 12:58:45 2011 +@@ -23,7 +23,7 @@ + field_1217_c = threaddownloadimagedata; + field_1216_a = s; + field_1215_b = imagebuffer; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\ThreadPollServers.java minecraft_patched\net\minecraft\src\ThreadPollServers.java +--- minecraft\net\minecraft\src\ThreadPollServers.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadPollServers.java Fri Nov 25 13:34:37 2011 +@@ -20,7 +20,7 @@ + { + field_35600_b = guislotserver; + field_35601_a = servernbtstorage; +- super(); ++// super(); + } + + public void run() +@@ -37,63 +37,33 @@ + { + field_35601_a.field_35792_e = -1L; + field_35601_a.field_35791_d = "\2474Can't resolve hostname"; +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); +- } +- break MISSING_BLOCK_LABEL_345; + } + catch(SocketTimeoutException sockettimeoutexception) + { + field_35601_a.field_35792_e = -1L; + field_35601_a.field_35791_d = "\2474Can't reach server"; +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); +- } +- break MISSING_BLOCK_LABEL_345; + } + catch(ConnectException connectexception) + { + field_35601_a.field_35792_e = -1L; + field_35601_a.field_35791_d = "\2474Can't reach server"; +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); +- } +- break MISSING_BLOCK_LABEL_345; + } + catch(IOException ioexception) + { + field_35601_a.field_35792_e = -1L; + field_35601_a.field_35791_d = "\2474Communication error"; +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); +- } +- break MISSING_BLOCK_LABEL_345; + } + catch(Exception exception) + { + field_35601_a.field_35792_e = -1L; + field_35601_a.field_35791_d = (new StringBuilder()).append("ERROR: ").append(exception.getClass()).toString(); ++ } ++ finally ++ { + synchronized(GuiMultiplayer.func_35321_g()) + { + GuiMultiplayer.func_35335_o(); + } +- break MISSING_BLOCK_LABEL_345; +- } +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); +- } +- break MISSING_BLOCK_LABEL_345; +- Exception exception7; +- exception7; +- synchronized(GuiMultiplayer.func_35321_g()) +- { +- GuiMultiplayer.func_35335_o(); + } +- throw exception7; + } + } +diff -r -U 3 minecraft\net\minecraft\src\ThreadSleepForever.java minecraft_patched\net\minecraft\src\ThreadSleepForever.java +--- minecraft\net\minecraft\src\ThreadSleepForever.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadSleepForever.java Fri Nov 25 12:58:45 2011 +@@ -13,8 +13,8 @@ + + public ThreadSleepForever(Minecraft minecraft, String s) + { +- field_1588_a = minecraft; + super(s); ++ field_1588_a = minecraft; + setDaemon(true); + start(); + } +diff -r -U 3 minecraft\net\minecraft\src\ThreadStatSyncherReceive.java minecraft_patched\net\minecraft\src\ThreadStatSyncherReceive.java +--- minecraft\net\minecraft\src\ThreadStatSyncherReceive.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadStatSyncherReceive.java Fri Nov 25 12:58:45 2011 +@@ -17,7 +17,7 @@ + ThreadStatSyncherReceive(StatsSyncher statssyncher) + { + field_27231_a = statssyncher; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\ThreadStatSyncherSend.java minecraft_patched\net\minecraft\src\ThreadStatSyncherSend.java +--- minecraft\net\minecraft\src\ThreadStatSyncherSend.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\ThreadStatSyncherSend.java Fri Nov 25 12:58:45 2011 +@@ -19,7 +19,7 @@ + { + field_27232_b = statssyncher; + field_27233_a = map; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft\net\minecraft\src\WorldBlockPositionType.java minecraft_patched\net\minecraft\src\WorldBlockPositionType.java +--- minecraft\net\minecraft\src\WorldBlockPositionType.java Fri Nov 25 12:26:51 2011 ++++ minecraft_patched\net\minecraft\src\WorldBlockPositionType.java Fri Nov 25 12:58:45 2011 +@@ -22,7 +22,7 @@ + public WorldBlockPositionType(WorldClient worldclient, int i, int j, int k, int l, int i1) + { + field_1203_g = worldclient; +- super(); ++// super(); + field_1202_a = i; + field_1201_b = j; + field_1207_c = k; diff --git a/forge/conf/patches/minecraft_ff.patch b/forge/conf/patches/minecraft_ff.patch new file mode 100644 index 0000000000..87c9d08519 --- /dev/null +++ b/forge/conf/patches/minecraft_ff.patch @@ -0,0 +1,109 @@ +diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java +--- minecraft\net\minecraft\client\Minecraft.java Tue Nov 22 23:21:44 2011 ++++ minecraft_patched\net\minecraft\client\Minecraft.java Wed Nov 23 00:09:14 2011 +@@ -1600,11 +1600,13 @@ + + this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8); + if(!this.field_6327_b.func_35643_e()) { ++/* + while(true) { + if(this.field_6324_e.func_6465_g()) { + continue; + } + } ++*/ + } + } + } +diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java +--- minecraft\net\minecraft\src\CodecMus.java Tue Nov 22 23:21:36 2011 ++++ minecraft_patched\net\minecraft\src\CodecMus.java Wed Nov 23 00:09:14 2011 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import java.io.IOException; + import java.io.InputStream; + import net.minecraft.src.MusInputStream; + import paulscode.sound.codecs.CodecJOrbis; +@@ -7,6 +8,11 @@ + public class CodecMus extends CodecJOrbis { + + protected InputStream openInputStream() { +- return new MusInputStream(this, this.url, this.urlConnection.getInputStream()); ++ try { ++ return new MusInputStream(this, this.url, this.urlConnection.getInputStream()); ++ } ++ catch (IOException e) { ++ return null; ++ } + } + } +diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java +--- minecraft\net\minecraft\src\ItemMap.java Tue Nov 22 23:21:24 2011 ++++ minecraft_patched\net\minecraft\src\ItemMap.java Wed Nov 23 00:09:14 2011 +@@ -19,7 +19,6 @@ + } + + public static MapData func_28013_a(short var0, World var1) { +- "map_" + var0; + MapData var3 = (MapData)var1.func_28103_a(MapData.class, "map_" + var0); + if(var3 == null) { + int var4 = var1.func_28101_b("map"); +@@ -32,7 +31,6 @@ + } + + public MapData func_28012_a(ItemStack var1, World var2) { +- "map_" + var1.func_21181_i(); + MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21181_i()); + if(var4 == null) { + var1.func_28156_b(var2.func_28101_b("map")); +diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java +--- minecraft\net\minecraft\src\MusInputStream.java Tue Nov 22 23:21:24 2011 ++++ minecraft_patched\net\minecraft\src\MusInputStream.java Wed Nov 23 00:09:14 2011 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import java.io.IOException; + import java.io.InputStream; + import java.net.URL; + import net.minecraft.src.CodecMus; +@@ -28,7 +29,12 @@ + } + + public int read(byte[] var1, int var2, int var3) { +- var3 = this.field_1515_d.read(var1, var2, var3); ++ try { ++ var3 = this.field_1515_d.read(var1, var2, var3); ++ } ++ catch (IOException e) { ++ return 0; ++ } + + for(int var4 = 0; var4 < var3; ++var4) { + byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8); +diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java +--- minecraft\net\minecraft\src\RenderGlobal.java Tue Nov 22 23:21:20 2011 ++++ minecraft_patched\net\minecraft\src\RenderGlobal.java Wed Nov 23 00:10:20 2011 +@@ -1466,7 +1466,7 @@ + double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2; + double var17 = this.field_1439_t.field_22009_h.field_610_al - var4; + double var19 = this.field_1439_t.field_22009_h.field_609_am - var6; +- Object var21 = null; ++ EntityFX var21 = null; + if(var1.equals("hugeexplosion")) { + this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12)); + } else if(var1.equals("largeexplode")) { +diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java +--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Tue Nov 22 23:21:30 2011 ++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Nov 23 00:09:14 2011 +@@ -21,7 +21,9 @@ + } + + public void run() { +- this.func_40568_b(); ++ while (true) { ++ this.func_40568_b(); ++ } + } + + private void func_40568_b() { diff --git a/forge/conf/patches/minecraft_server.patch b/forge/conf/patches/minecraft_server.patch new file mode 100644 index 0000000000..0164626ccd --- /dev/null +++ b/forge/conf/patches/minecraft_server.patch @@ -0,0 +1,2024 @@ +diff -r -U 3 minecraft_server\net\minecraft\server\MinecraftServer.java minecraft_server_patched\net\minecraft\server\MinecraftServer.java +--- minecraft_server\net\minecraft\server\MinecraftServer.java Fri Nov 25 12:27:06 2011 ++++ minecraft_server_patched\net\minecraft\server\MinecraftServer.java Fri Nov 25 13:10:41 2011 +@@ -384,6 +384,9 @@ + interruptedexception1.printStackTrace(); + } + } ++ } ++ finally ++ { + try + { + func_6013_g(); +@@ -397,38 +400,7 @@ + { + System.exit(0); + } +- break MISSING_BLOCK_LABEL_346; +- } +- try +- { +- func_6013_g(); +- field_6032_g = true; +- } +- catch(Throwable throwable) +- { +- throwable.printStackTrace(); +- } +- finally +- { +- System.exit(0); +- } +- break MISSING_BLOCK_LABEL_346; +- Exception exception2; +- exception2; +- try +- { +- func_6013_g(); +- field_6032_g = true; +- } +- catch(Throwable throwable3) +- { +- throwable3.printStackTrace(); +- } +- finally +- { +- System.exit(0); + } +- throw exception2; + } + + private void func_6018_h() +diff -r -U 3 minecraft_server\net\minecraft\src\BiomeCacheBlock.java minecraft_server_patched\net\minecraft\src\BiomeCacheBlock.java +--- minecraft_server\net\minecraft\src\BiomeCacheBlock.java Fri Nov 25 12:27:06 2011 ++++ minecraft_server_patched\net\minecraft\src\BiomeCacheBlock.java Fri Nov 25 12:58:45 2011 +@@ -22,7 +22,7 @@ + public BiomeCacheBlock(BiomeCache biomecache, int i, int j) + { + field_35702_g = biomecache; +- super(); ++// super(); + field_35707_a = new float[256]; + field_35705_b = new float[256]; + field_35706_c = new BiomeGenBase[256]; +diff -r -U 3 minecraft_server\net\minecraft\src\Block.java minecraft_server_patched\net\minecraft\src\Block.java +--- minecraft_server\net\minecraft\src\Block.java Fri Nov 25 12:27:06 2011 ++++ minecraft_server_patched\net\minecraft\src\Block.java Fri Nov 25 13:56:52 2011 +@@ -83,18 +83,18 @@ + public static final Block field_9041_O; + public static final Block field_9040_P; + public static final Block field_9039_Q; +- public static final Block field_9038_R = (new BlockNote(25)).func_237_c(0.8F).func_20037_a("musicBlock").func_28027_k(); +- public static final Block field_9037_S = (new BlockBed(26)).func_237_c(0.2F).func_20037_a("bed").func_27021_h().func_28027_k(); ++ public static final Block field_9038_R; ++ public static final Block field_9037_S; + public static final Block field_9036_T; + public static final Block field_9034_U; + public static final Block field_9033_V; +- public static final Block field_9032_W = (new BlockWeb(30, 11)).func_258_c(1).func_237_c(4F).func_20037_a("web"); ++ public static final Block field_9032_W; + public static final BlockTallGrass field_9031_X; + public static final BlockDeadBush field_9030_Y; + public static final Block field_9029_Z; +- public static final BlockPistonExtension field_9049_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28027_k(); ++ public static final BlockPistonExtension field_9049_aa; + public static final Block field_616_ac; +- public static final BlockPistonMoving field_9048_ac = new BlockPistonMoving(36); ++ public static final BlockPistonMoving field_9048_ac; + public static final BlockFlower field_4072_ae; + public static final BlockFlower field_4071_af; + public static final BlockFlower field_4070_ag; +@@ -155,7 +155,7 @@ + public static final Block field_22010_bi; + public static final Block field_25013_bj; + public static final Block field_28030_bl; +- public static final Block field_35056_bm = (new BlockSilverfish(97)).func_237_c(0.75F); ++ public static final Block field_35056_bm; + public static final Block field_35052_bn; + public static final Block field_35053_bo; + public static final Block field_35054_bp; +@@ -173,10 +173,10 @@ + public static final Block field_40171_bB; + public static final Block field_40172_bC; + public static final Block field_40169_bD; +- public static final Block field_40170_bE = (new BlockNetherStalk(115)).func_20037_a("netherStalk").func_28027_k(); +- public static final Block field_40175_bF = (new BlockEnchantmentTable(116)).func_237_c(5F).func_232_b(2000F).func_20037_a("enchantmentTable"); +- public static final Block field_40176_bG = (new BlockBrewingStand(117)).func_237_c(0.5F).func_224_a(0.125F).func_20037_a("brewingStand").func_28027_k(); +- public static final Block field_40173_bH = (new BlockCauldron(118)).func_237_c(2.0F).func_20037_a("cauldron").func_28027_k(); ++ public static final Block field_40170_bE; ++ public static final Block field_40175_bF; ++ public static final Block field_40176_bG; ++ public static final Block field_40173_bH; + public static final Block field_40174_bI; + public static final Block field_40167_bJ; + public static final Block field_40168_bK; +@@ -775,13 +775,18 @@ + field_9041_O = (new Block(22, 144, Material.field_523_d)).func_237_c(3F).func_232_b(5F).func_4026_a(field_9025_h).func_20037_a("blockLapis"); + field_9040_P = (new BlockDispenser(23)).func_237_c(3.5F).func_4026_a(field_9025_h).func_20037_a("dispenser").func_28027_k(); + field_9039_Q = (new BlockSandStone(24)).func_4026_a(field_9025_h).func_237_c(0.8F).func_20037_a("sandStone"); ++ field_9038_R = (new BlockNote(25)).func_237_c(0.8F).func_20037_a("musicBlock").func_28027_k(); ++ field_9037_S = (new BlockBed(26)).func_237_c(0.2F).func_20037_a("bed").func_27021_h().func_28027_k(); + field_9036_T = (new BlockRail(27, 179, true)).func_237_c(0.7F).func_4026_a(field_9024_i).func_20037_a("goldenRail").func_28027_k(); + field_9034_U = (new BlockDetectorRail(28, 195)).func_237_c(0.7F).func_4026_a(field_9024_i).func_20037_a("detectorRail").func_28027_k(); + field_9033_V = (new BlockPistonBase(29, 106, true)).func_20037_a("pistonStickyBase").func_28027_k(); ++ field_9032_W = (new BlockWeb(30, 11)).func_258_c(1).func_237_c(4F).func_20037_a("web"); + field_9031_X = (BlockTallGrass)(new BlockTallGrass(31, 39)).func_237_c(0.0F).func_4026_a(field_9026_g).func_20037_a("tallgrass"); + field_9030_Y = (BlockDeadBush)(new BlockDeadBush(32, 55)).func_237_c(0.0F).func_4026_a(field_9026_g).func_20037_a("deadbush"); + field_9029_Z = (new BlockPistonBase(33, 107, false)).func_20037_a("pistonBase").func_28027_k(); ++ field_9049_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28027_k(); + field_616_ac = (new BlockCloth()).func_237_c(0.8F).func_4026_a(field_9022_k).func_20037_a("cloth").func_28027_k(); ++ field_9048_ac = new BlockPistonMoving(36); + field_4072_ae = (BlockFlower)(new BlockFlower(37, 13)).func_237_c(0.0F).func_4026_a(field_9026_g).func_20037_a("flower"); + field_4071_af = (BlockFlower)(new BlockFlower(38, 12)).func_237_c(0.0F).func_4026_a(field_9026_g).func_20037_a("rose"); + field_4070_ag = (BlockFlower)(new BlockMushroom(39, 29)).func_237_c(0.0F).func_4026_a(field_9026_g).func_224_a(0.125F).func_20037_a("mushroom"); +@@ -842,6 +847,7 @@ + field_22010_bi = (new BlockRedstoneRepeater(94, true)).func_237_c(0.0F).func_224_a(0.625F).func_4026_a(field_9028_e).func_20037_a("diode").func_27021_h().func_28027_k(); + field_25013_bj = (new BlockLockedChest(95)).func_237_c(0.0F).func_224_a(1.0F).func_4026_a(field_9028_e).func_20037_a("lockedchest").func_231_a(true).func_28027_k(); + field_28030_bl = (new BlockTrapDoor(96, Material.field_524_c)).func_237_c(3F).func_4026_a(field_9028_e).func_20037_a("trapdoor").func_27021_h().func_28027_k(); ++ field_35056_bm = (new BlockSilverfish(97)).func_237_c(0.75F); + field_35052_bn = (new BlockStoneBrick(98)).func_237_c(1.5F).func_232_b(10F).func_4026_a(field_9025_h).func_20037_a("stonebricksmooth"); + field_35053_bo = (new BlockMushroomCap(99, Material.field_524_c, 142, 0)).func_237_c(0.2F).func_4026_a(field_9028_e).func_20037_a("mushroom").func_28027_k(); + field_35054_bp = (new BlockMushroomCap(100, Material.field_524_c, 142, 1)).func_237_c(0.2F).func_4026_a(field_9028_e).func_20037_a("mushroom").func_28027_k(); +@@ -859,6 +865,10 @@ + field_40171_bB = (new Block(112, 224, Material.field_523_d)).func_237_c(2.0F).func_232_b(10F).func_4026_a(field_9025_h).func_20037_a("netherBrick"); + field_40172_bC = (new BlockFence(113, 224, Material.field_523_d)).func_237_c(2.0F).func_232_b(10F).func_4026_a(field_9025_h).func_20037_a("netherFence"); + field_40169_bD = (new BlockStairs(114, field_40171_bB)).func_20037_a("stairsNetherBrick").func_28027_k(); ++ field_40170_bE = (new BlockNetherStalk(115)).func_20037_a("netherStalk").func_28027_k(); ++ field_40175_bF = (new BlockEnchantmentTable(116)).func_237_c(5F).func_232_b(2000F).func_20037_a("enchantmentTable"); ++ field_40176_bG = (new BlockBrewingStand(117)).func_237_c(0.5F).func_224_a(0.125F).func_20037_a("brewingStand").func_28027_k(); ++ field_40173_bH = (new BlockCauldron(118)).func_237_c(2.0F).func_20037_a("cauldron").func_28027_k(); + field_40174_bI = (new BlockEndPortal(119, Material.field_4212_x)).func_237_c(-1F).func_232_b(6000000F); + field_40167_bJ = (new BlockEndPortalFrame(120)).func_4026_a(field_9023_j).func_224_a(0.125F).func_237_c(-1F).func_20037_a("endPortalFrame").func_28027_k().func_232_b(6000000F); + field_40168_bK = (new Block(121, 175, Material.field_523_d)).func_237_c(3F).func_232_b(15F).func_4026_a(field_9025_h).func_20037_a("whiteStone"); +diff -r -U 3 minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java minecraft_server_patched\net\minecraft\src\ComponentNetherBridgePiece.java +--- minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\ComponentNetherBridgePiece.java Fri Nov 25 13:40:10 2011 +@@ -35,47 +35,47 @@ + return flag ? i : -1; + } + +- private ComponentNetherBridgePiece func_40284_a(ComponentNetherBridgeStartPiece componentnetherbridgestartpiece, List list, List list1, Random random, int i, int j, int k, +- int l, int i1) ++ private ComponentNetherBridgePiece func_40284_a(ComponentNetherBridgeStartPiece var1, List var2, List var3, Random var4, int var5, int var6, int var7, int var8, int var9) + { +- int j1; +- boolean flag; +- int k1; +- j1 = func_40282_a(list); +- flag = j1 > 0 && i1 <= 30; +- k1 = 0; +-_L2: +- int l1; +- Iterator iterator; +- if(k1 >= 5 || !flag) ++ int var10 = this.func_40282_a(var2); ++ boolean var11 = var10 > 0 && var9 <= 30; ++ int var12 = 0; ++ ++ while(var12 < 5 && var11) + { +- break MISSING_BLOCK_LABEL_195; ++ ++var12; ++ int var13 = var4.nextInt(var10); ++ Iterator var14 = var2.iterator(); ++ ++ while(var14.hasNext()) ++ { ++ StructureNetherBridgePieceWeight var15 = (StructureNetherBridgePieceWeight)var14.next(); ++ var13 -= var15.field_40653_b; ++ if(var13 < 0) ++ { ++ if(!var15.func_40649_a(var9) || var15 == var1.field_40296_a && !var15.field_40652_e) ++ { ++ break; ++ } ++ ++ ComponentNetherBridgePiece var16 = StructureNetherBridgePieces.func_40538_a(var15, var3, var4, var5, var6, var7, var8, var9); ++ if(var16 != null) ++ { ++ ++var15.field_40654_c; ++ var1.field_40296_a = var15; ++ if(!var15.func_40650_a()) ++ { ++ var2.remove(var15); ++ } ++ ++ return var16; ++ } ++ } ++ } + } +- k1++; +- l1 = random.nextInt(j1); +- iterator = list.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureNetherBridgePieceWeight structurenetherbridgepieceweight; +- structurenetherbridgepieceweight = (StructureNetherBridgePieceWeight)iterator.next(); +- l1 -= structurenetherbridgepieceweight.field_40653_b; +- if(l1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurenetherbridgepieceweight.func_40649_a(i1) && (structurenetherbridgepieceweight != componentnetherbridgestartpiece.field_40296_a || structurenetherbridgepieceweight.field_40652_e)) goto _L5; else goto _L2 +-_L5: +- ComponentNetherBridgePiece componentnetherbridgepiece = StructureNetherBridgePieces.func_40538_a(structurenetherbridgepieceweight, list1, random, i, j, k, l, i1); +- if(componentnetherbridgepiece == null) goto _L4; else goto _L6 +-_L6: +- structurenetherbridgepieceweight.field_40654_c++; +- componentnetherbridgestartpiece.field_40296_a = structurenetherbridgepieceweight; +- if(!structurenetherbridgepieceweight.func_40650_a()) +- { +- list.remove(structurenetherbridgepieceweight); +- } +- return componentnetherbridgepiece; +- StructureNetherBridgeEnd structurenetherbridgeend = StructureNetherBridgeEnd.func_40301_a(list1, random, i, j, k, l, i1); +- return structurenetherbridgeend; ++ ++ StructureNetherBridgeEnd var17 = StructureNetherBridgeEnd.func_40301_a(var3, var4, var5, var6, var7, var8, var9); ++ return var17; + } + + private StructureComponent func_40283_a(ComponentNetherBridgeStartPiece componentnetherbridgestartpiece, List list, Random random, int i, int j, int k, int l, +diff -r -U 3 minecraft_server\net\minecraft\src\ConvertProgressUpdater.java minecraft_server_patched\net\minecraft\src\ConvertProgressUpdater.java +--- minecraft_server\net\minecraft\src\ConvertProgressUpdater.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\ConvertProgressUpdater.java Fri Nov 25 12:58:45 2011 +@@ -20,7 +20,7 @@ + public ConvertProgressUpdater(MinecraftServer minecraftserver) + { + field_22072_a = minecraftserver; +- super(); ++// super(); + field_22071_b = System.currentTimeMillis(); + } + +diff -r -U 3 minecraft_server\net\minecraft\src\EnumAction.java minecraft_server_patched\net\minecraft\src\EnumAction.java +--- minecraft_server\net\minecraft\src\EnumAction.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumAction.java Fri Nov 25 12:34:03 2011 +@@ -5,16 +5,22 @@ + package net.minecraft.src; + + +-public final class EnumAction extends Enum ++public enum EnumAction + { +- ++ none("none", 0), ++ eat("eat", 1), ++ drink("drink", 2), ++ block("block", 3), ++ bow("bow", 4); ++/* + public static final EnumAction none; + public static final EnumAction eat; + public static final EnumAction drink; + public static final EnumAction block; + public static final EnumAction bow; ++*/ + private static final EnumAction field_35603_e[]; /* synthetic field */ +- ++/* + public static EnumAction[] values() + { + return (EnumAction[])field_35603_e.clone(); +@@ -24,19 +30,21 @@ + { + return (EnumAction)Enum.valueOf(net.minecraft.src.EnumAction.class, s); + } +- ++*/ + private EnumAction(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + none = new EnumAction("none", 0); + eat = new EnumAction("eat", 1); + drink = new EnumAction("drink", 2); + block = new EnumAction("block", 3); + bow = new EnumAction("bow", 4); ++*/ + field_35603_e = (new EnumAction[] { + none, eat, drink, block, bow + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumArmorMaterial.java minecraft_server_patched\net\minecraft\src\EnumArmorMaterial.java +--- minecraft_server\net\minecraft\src\EnumArmorMaterial.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumArmorMaterial.java Fri Nov 25 12:35:31 2011 +@@ -8,19 +8,35 @@ + // Referenced classes of package net.minecraft.src: + // ItemArmor + +-public final class EnumArmorMaterial extends Enum ++public enum EnumArmorMaterial + { +- ++ CLOTH("CLOTH", 0, 5, new int[] { ++ 1, 3, 2, 1 ++ }, 15), ++ CHAIN("CHAIN", 1, 15, new int[] { ++ 2, 5, 4, 1 ++ }, 12), ++ IRON("IRON", 2, 15, new int[] { ++ 2, 6, 5, 2 ++ }, 9), ++ GOLD("GOLD", 3, 7, new int[] { ++ 2, 5, 3, 1 ++ }, 25), ++ DIAMOND("DIAMOND", 4, 33, new int[] { ++ 3, 8, 6, 3 ++ }, 10); ++/* + public static final EnumArmorMaterial CLOTH; + public static final EnumArmorMaterial CHAIN; + public static final EnumArmorMaterial IRON; + public static final EnumArmorMaterial GOLD; + public static final EnumArmorMaterial DIAMOND; ++*/ + private int field_40498_f; + private int field_40499_g[]; + private int field_40505_h; + private static final EnumArmorMaterial field_40506_i[]; /* synthetic field */ +- ++/* + public static EnumArmorMaterial[] values() + { + return (EnumArmorMaterial[])field_40506_i.clone(); +@@ -30,10 +46,10 @@ + { + return (EnumArmorMaterial)Enum.valueOf(net.minecraft.src.EnumArmorMaterial.class, s); + } +- ++*/ + private EnumArmorMaterial(String s, int i, int j, int ai[], int k) + { +- super(s, i); ++// super(s, i); + field_40498_f = j; + field_40499_g = ai; + field_40505_h = k; +@@ -56,6 +72,7 @@ + + static + { ++/* + CLOTH = new EnumArmorMaterial("CLOTH", 0, 5, new int[] { + 1, 3, 2, 1 + }, 15); +@@ -71,6 +88,7 @@ + DIAMOND = new EnumArmorMaterial("DIAMOND", 4, 33, new int[] { + 3, 8, 6, 3 + }, 10); ++*/ + field_40506_i = (new EnumArmorMaterial[] { + CLOTH, CHAIN, IRON, GOLD, DIAMOND + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumArt.java minecraft_server_patched\net\minecraft\src\EnumArt.java +--- minecraft_server\net\minecraft\src\EnumArt.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumArt.java Fri Nov 25 12:37:13 2011 +@@ -5,9 +5,34 @@ + package net.minecraft.src; + + +-public final class EnumArt extends Enum ++public enum EnumArt + { +- ++ Kebab("Kebab", 0, "Kebab", 16, 16, 0, 0), ++ Aztec("Aztec", 1, "Aztec", 16, 16, 16, 0), ++ Alban("Alban", 2, "Alban", 16, 16, 32, 0), ++ Aztec2("Aztec2", 3, "Aztec2", 16, 16, 48, 0), ++ Bomb("Bomb", 4, "Bomb", 16, 16, 64, 0), ++ Plant("Plant", 5, "Plant", 16, 16, 80, 0), ++ Wasteland("Wasteland", 6, "Wasteland", 16, 16, 96, 0), ++ Pool("Pool", 7, "Pool", 32, 16, 0, 32), ++ Courbet("Courbet", 8, "Courbet", 32, 16, 32, 32), ++ Sea("Sea", 9, "Sea", 32, 16, 64, 32), ++ Sunset("Sunset", 10, "Sunset", 32, 16, 96, 32), ++ Creebet("Creebet", 11, "Creebet", 32, 16, 128, 32), ++ Wanderer("Wanderer", 12, "Wanderer", 16, 32, 0, 64), ++ Graham("Graham", 13, "Graham", 16, 32, 16, 64), ++ Match("Match", 14, "Match", 32, 32, 0, 128), ++ Bust("Bust", 15, "Bust", 32, 32, 32, 128), ++ Stage("Stage", 16, "Stage", 32, 32, 64, 128), ++ Void("Void", 17, "Void", 32, 32, 96, 128), ++ SkullAndRoses("SkullAndRoses", 18, "SkullAndRoses", 32, 32, 128, 128), ++ Fighters("Fighters", 19, "Fighters", 64, 32, 0, 96), ++ Pointer("Pointer", 20, "Pointer", 64, 64, 0, 192), ++ Pigscene("Pigscene", 21, "Pigscene", 64, 64, 64, 192), ++ BurningSkull("BurningSkull", 22, "BurningSkull", 64, 64, 128, 192), ++ Skeleton("Skeleton", 23, "Skeleton", 64, 48, 192, 64), ++ DonkeyKong("DonkeyKong", 24, "DonkeyKong", 64, 48, 192, 112); ++/* + public static final EnumArt Kebab; + public static final EnumArt Aztec; + public static final EnumArt Alban; +@@ -33,6 +58,7 @@ + public static final EnumArt BurningSkull; + public static final EnumArt Skeleton; + public static final EnumArt DonkeyKong; ++*/ + public static final int field_27096_z = "SkullAndRoses".length(); + public final String field_857_y; + public final int field_856_z; +@@ -40,7 +66,7 @@ + public final int field_867_B; + public final int field_865_C; + private static final EnumArt field_863_D[]; /* synthetic field */ +- ++/* + public static EnumArt[] values() + { + return (EnumArt[])field_863_D.clone(); +@@ -50,10 +76,10 @@ + { + return (EnumArt)Enum.valueOf(net.minecraft.src.EnumArt.class, s); + } +- ++*/ + private EnumArt(String s, int i, String s1, int j, int k, int l, int i1) + { +- super(s, i); ++// super(s, i); + field_857_y = s1; + field_856_z = j; + field_869_A = k; +@@ -63,6 +89,7 @@ + + static + { ++/* + Kebab = new EnumArt("Kebab", 0, "Kebab", 16, 16, 0, 0); + Aztec = new EnumArt("Aztec", 1, "Aztec", 16, 16, 16, 0); + Alban = new EnumArt("Alban", 2, "Alban", 16, 16, 32, 0); +@@ -88,6 +115,7 @@ + BurningSkull = new EnumArt("BurningSkull", 22, "BurningSkull", 64, 64, 128, 192); + Skeleton = new EnumArt("Skeleton", 23, "Skeleton", 64, 48, 192, 64); + DonkeyKong = new EnumArt("DonkeyKong", 24, "DonkeyKong", 64, 48, 192, 112); ++*/ + field_863_D = (new EnumArt[] { + Kebab, Aztec, Alban, Aztec2, Bomb, Plant, Wasteland, Pool, Courbet, Sea, + Sunset, Creebet, Wanderer, Graham, Match, Bust, Stage, Void, SkullAndRoses, Fighters, +diff -r -U 3 minecraft_server\net\minecraft\src\EnumCreatureAttribute.java minecraft_server_patched\net\minecraft\src\EnumCreatureAttribute.java +--- minecraft_server\net\minecraft\src\EnumCreatureAttribute.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumCreatureAttribute.java Fri Nov 25 12:37:58 2011 +@@ -5,14 +5,18 @@ + package net.minecraft.src; + + +-public final class EnumCreatureAttribute extends Enum ++public enum EnumCreatureAttribute + { +- ++ UNDEFINED("UNDEFINED", 0), ++ UNDEAD("UNDEAD", 1), ++ ARTHROPOD("ARTHROPOD", 2); ++/* + public static final EnumCreatureAttribute UNDEFINED; + public static final EnumCreatureAttribute UNDEAD; + public static final EnumCreatureAttribute ARTHROPOD; ++*/ + private static final EnumCreatureAttribute field_40489_d[]; /* synthetic field */ +- ++/* + public static EnumCreatureAttribute[] values() + { + return (EnumCreatureAttribute[])field_40489_d.clone(); +@@ -22,17 +26,19 @@ + { + return (EnumCreatureAttribute)Enum.valueOf(net.minecraft.src.EnumCreatureAttribute.class, s); + } +- ++*/ + private EnumCreatureAttribute(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + UNDEFINED = new EnumCreatureAttribute("UNDEFINED", 0); + UNDEAD = new EnumCreatureAttribute("UNDEAD", 1); + ARTHROPOD = new EnumCreatureAttribute("ARTHROPOD", 2); ++*/ + field_40489_d = (new EnumCreatureAttribute[] { + UNDEFINED, UNDEAD, ARTHROPOD + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumCreatureType.java minecraft_server_patched\net\minecraft\src\EnumCreatureType.java +--- minecraft_server\net\minecraft\src\EnumCreatureType.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumCreatureType.java Fri Nov 25 12:39:42 2011 +@@ -8,18 +8,22 @@ + // Referenced classes of package net.minecraft.src: + // IMob, Material, EntityAnimal, EntityWaterMob + +-public final class EnumCreatureType extends Enum ++public enum EnumCreatureType + { +- ++ monster("monster", 0, net.minecraft.src.IMob.class, 70, Material.field_526_a, false), ++ creature("creature", 1, net.minecraft.src.EntityAnimal.class, 15, Material.field_526_a, true), ++ waterCreature("waterCreature", 2, net.minecraft.src.EntityWaterMob.class, 5, Material.field_521_f, true); ++/* + public static final EnumCreatureType monster; + public static final EnumCreatureType creature; + public static final EnumCreatureType waterCreature; ++*/ + private final Class field_21109_d; + private final int field_21108_e; + private final Material field_21107_f; + private final boolean field_21106_g; + private static final EnumCreatureType field_6155_e[]; /* synthetic field */ +- ++/* + public static EnumCreatureType[] values() + { + return (EnumCreatureType[])field_6155_e.clone(); +@@ -29,10 +33,10 @@ + { + return (EnumCreatureType)Enum.valueOf(net.minecraft.src.EnumCreatureType.class, s); + } +- ++*/ + private EnumCreatureType(String s, int i, Class class1, int j, Material material, boolean flag) + { +- super(s, i); ++// super(s, i); + field_21109_d = class1; + field_21108_e = j; + field_21107_f = material; +@@ -61,9 +65,11 @@ + + static + { ++/* + monster = new EnumCreatureType("monster", 0, net.minecraft.src.IMob.class, 70, Material.field_526_a, false); + creature = new EnumCreatureType("creature", 1, net.minecraft.src.EntityAnimal.class, 15, Material.field_526_a, true); + waterCreature = new EnumCreatureType("waterCreature", 2, net.minecraft.src.EntityWaterMob.class, 5, Material.field_521_f, true); ++*/ + field_6155_e = (new EnumCreatureType[] { + monster, creature, waterCreature + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumDoor.java minecraft_server_patched\net\minecraft\src\EnumDoor.java +--- minecraft_server\net\minecraft\src\EnumDoor.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumDoor.java Fri Nov 25 12:41:04 2011 +@@ -5,15 +5,20 @@ + package net.minecraft.src; + + +-public final class EnumDoor extends Enum ++public enum EnumDoor + { +- ++ OPENING("OPENING", 0), ++ WOOD_DOOR("WOOD_DOOR", 1), ++ GRATES("GRATES", 2), ++ IRON_DOOR("IRON_DOOR", 3); ++/* + public static final EnumDoor OPENING; + public static final EnumDoor WOOD_DOOR; + public static final EnumDoor GRATES; + public static final EnumDoor IRON_DOOR; ++*/ + private static final EnumDoor field_35598_e[]; /* synthetic field */ +- ++/* + public static EnumDoor[] values() + { + return (EnumDoor[])field_35598_e.clone(); +@@ -23,18 +28,20 @@ + { + return (EnumDoor)Enum.valueOf(net.minecraft.src.EnumDoor.class, s); + } +- ++*/ + private EnumDoor(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + OPENING = new EnumDoor("OPENING", 0); + WOOD_DOOR = new EnumDoor("WOOD_DOOR", 1); + GRATES = new EnumDoor("GRATES", 2); + IRON_DOOR = new EnumDoor("IRON_DOOR", 3); ++*/ + field_35598_e = (new EnumDoor[] { + OPENING, WOOD_DOOR, GRATES, IRON_DOOR + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumEnchantmentType.java minecraft_server_patched\net\minecraft\src\EnumEnchantmentType.java +--- minecraft_server\net\minecraft\src\EnumEnchantmentType.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumEnchantmentType.java Fri Nov 25 12:42:31 2011 +@@ -8,9 +8,17 @@ + // Referenced classes of package net.minecraft.src: + // ItemArmor, ItemSword, ItemTool, Item + +-public final class EnumEnchantmentType extends Enum ++public enum EnumEnchantmentType + { +- ++ all("all", 0), ++ armor("armor", 1), ++ armor_feet("armor_feet", 2), ++ armor_legs("armor_legs", 3), ++ armor_torso("armor_torso", 4), ++ armor_head("armor_head", 5), ++ weapon("weapon", 6), ++ digger("digger", 7); ++/* + public static final EnumEnchantmentType all; + public static final EnumEnchantmentType armor; + public static final EnumEnchantmentType armor_feet; +@@ -19,8 +27,9 @@ + public static final EnumEnchantmentType armor_head; + public static final EnumEnchantmentType weapon; + public static final EnumEnchantmentType digger; ++*/ + private static final EnumEnchantmentType field_40534_i[]; /* synthetic field */ +- ++/* + public static EnumEnchantmentType[] values() + { + return (EnumEnchantmentType[])field_40534_i.clone(); +@@ -30,10 +39,10 @@ + { + return (EnumEnchantmentType)Enum.valueOf(net.minecraft.src.EnumEnchantmentType.class, s); + } +- ++*/ + private EnumEnchantmentType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + public boolean func_40525_a(Item item) +@@ -84,6 +93,7 @@ + + static + { ++/* + all = new EnumEnchantmentType("all", 0); + armor = new EnumEnchantmentType("armor", 1); + armor_feet = new EnumEnchantmentType("armor_feet", 2); +@@ -92,6 +102,7 @@ + armor_head = new EnumEnchantmentType("armor_head", 5); + weapon = new EnumEnchantmentType("weapon", 6); + digger = new EnumEnchantmentType("digger", 7); ++*/ + field_40534_i = (new EnumEnchantmentType[] { + all, armor, armor_feet, armor_legs, armor_torso, armor_head, weapon, digger + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumMobType.java minecraft_server_patched\net\minecraft\src\EnumMobType.java +--- minecraft_server\net\minecraft\src\EnumMobType.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumMobType.java Fri Nov 25 12:44:16 2011 +@@ -5,14 +5,18 @@ + package net.minecraft.src; + + +-public final class EnumMobType extends Enum ++public enum EnumMobType + { +- ++ everything("everything", 0), ++ mobs("mobs", 1), ++ players("players", 2); ++/* + public static final EnumMobType everything; + public static final EnumMobType mobs; + public static final EnumMobType players; ++*/ + private static final EnumMobType field_990_d[]; /* synthetic field */ +- ++/* + public static EnumMobType[] values() + { + return (EnumMobType[])field_990_d.clone(); +@@ -22,17 +26,19 @@ + { + return (EnumMobType)Enum.valueOf(net.minecraft.src.EnumMobType.class, s); + } +- ++*/ + private EnumMobType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + everything = new EnumMobType("everything", 0); + mobs = new EnumMobType("mobs", 1); + players = new EnumMobType("players", 2); ++*/ + field_990_d = (new EnumMobType[] { + everything, mobs, players + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumMovingObjectType.java minecraft_server_patched\net\minecraft\src\EnumMovingObjectType.java +--- minecraft_server\net\minecraft\src\EnumMovingObjectType.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumMovingObjectType.java Fri Nov 25 12:45:14 2011 +@@ -5,13 +5,16 @@ + package net.minecraft.src; + + +-public final class EnumMovingObjectType extends Enum ++public enum EnumMovingObjectType + { +- ++ TILE("TILE", 0), ++ ENTITY("ENTITY", 1); ++/* + public static final EnumMovingObjectType TILE; + public static final EnumMovingObjectType ENTITY; ++*/ + private static final EnumMovingObjectType field_21124_c[]; /* synthetic field */ +- ++/* + public static EnumMovingObjectType[] values() + { + return (EnumMovingObjectType[])field_21124_c.clone(); +@@ -21,16 +24,18 @@ + { + return (EnumMovingObjectType)Enum.valueOf(net.minecraft.src.EnumMovingObjectType.class, s); + } +- ++*/ + private EnumMovingObjectType(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + TILE = new EnumMovingObjectType("TILE", 0); + ENTITY = new EnumMovingObjectType("ENTITY", 1); ++*/ + field_21124_c = (new EnumMovingObjectType[] { + TILE, ENTITY + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumSkyBlock.java minecraft_server_patched\net\minecraft\src\EnumSkyBlock.java +--- minecraft_server\net\minecraft\src\EnumSkyBlock.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumSkyBlock.java Fri Nov 25 12:46:12 2011 +@@ -5,14 +5,17 @@ + package net.minecraft.src; + + +-public final class EnumSkyBlock extends Enum ++public enum EnumSkyBlock + { +- ++ Sky("Sky", 0, 15), ++ Block("Block", 1, 0); ++/* + public static final EnumSkyBlock Sky; + public static final EnumSkyBlock Block; ++*/ + public final int field_984_c; + private static final EnumSkyBlock field_983_d[]; /* synthetic field */ +- ++/* + public static EnumSkyBlock[] values() + { + return (EnumSkyBlock[])field_983_d.clone(); +@@ -22,17 +25,19 @@ + { + return (EnumSkyBlock)Enum.valueOf(net.minecraft.src.EnumSkyBlock.class, s); + } +- ++*/ + private EnumSkyBlock(String s, int i, int j) + { +- super(s, i); ++// super(s, i); + field_984_c = j; + } + + static + { ++/* + Sky = new EnumSkyBlock("Sky", 0, 15); + Block = new EnumSkyBlock("Block", 1, 0); ++*/ + field_983_d = (new EnumSkyBlock[] { + Sky, Block + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumStatus.java minecraft_server_patched\net\minecraft\src\EnumStatus.java +--- minecraft_server\net\minecraft\src\EnumStatus.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumStatus.java Fri Nov 25 12:47:47 2011 +@@ -5,17 +5,24 @@ + package net.minecraft.src; + + +-public final class EnumStatus extends Enum ++public enum EnumStatus + { +- ++ OK("OK", 0), ++ NOT_POSSIBLE_HERE("NOT_POSSIBLE_HERE", 1), ++ NOT_POSSIBLE_NOW("NOT_POSSIBLE_NOW", 2), ++ TOO_FAR_AWAY("TOO_FAR_AWAY", 3), ++ OTHER_PROBLEM("OTHER_PROBLEM", 4), ++ NOT_SAFE("NOT_SAFE", 5); ++/* + public static final EnumStatus OK; + public static final EnumStatus NOT_POSSIBLE_HERE; + public static final EnumStatus NOT_POSSIBLE_NOW; + public static final EnumStatus TOO_FAR_AWAY; + public static final EnumStatus OTHER_PROBLEM; + public static final EnumStatus NOT_SAFE; ++*/ + private static final EnumStatus field_25140_f[]; /* synthetic field */ +- ++/* + public static EnumStatus[] values() + { + return (EnumStatus[])field_25140_f.clone(); +@@ -25,20 +32,22 @@ + { + return (EnumStatus)Enum.valueOf(net.minecraft.src.EnumStatus.class, s); + } +- ++*/ + private EnumStatus(String s, int i) + { +- super(s, i); ++// super(s, i); + } + + static + { ++/* + OK = new EnumStatus("OK", 0); + NOT_POSSIBLE_HERE = new EnumStatus("NOT_POSSIBLE_HERE", 1); + NOT_POSSIBLE_NOW = new EnumStatus("NOT_POSSIBLE_NOW", 2); + TOO_FAR_AWAY = new EnumStatus("TOO_FAR_AWAY", 3); + OTHER_PROBLEM = new EnumStatus("OTHER_PROBLEM", 4); + NOT_SAFE = new EnumStatus("NOT_SAFE", 5); ++*/ + field_25140_f = (new EnumStatus[] { + OK, NOT_POSSIBLE_HERE, NOT_POSSIBLE_NOW, TOO_FAR_AWAY, OTHER_PROBLEM, NOT_SAFE + }); +diff -r -U 3 minecraft_server\net\minecraft\src\EnumToolMaterial.java minecraft_server_patched\net\minecraft\src\EnumToolMaterial.java +--- minecraft_server\net\minecraft\src\EnumToolMaterial.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\EnumToolMaterial.java Fri Nov 25 12:49:02 2011 +@@ -5,21 +5,27 @@ + package net.minecraft.src; + + +-public final class EnumToolMaterial extends Enum ++public enum EnumToolMaterial + { +- ++ WOOD("WOOD", 0, 0, 59, 2.0F, 0, 15), ++ STONE("STONE", 1, 1, 131, 4F, 1, 5), ++ IRON("IRON", 2, 2, 250, 6F, 2, 14), ++ EMERALD("EMERALD", 3, 3, 1561, 8F, 3, 10), ++ GOLD("GOLD", 4, 0, 32, 12F, 0, 22); ++/* + public static final EnumToolMaterial WOOD; + public static final EnumToolMaterial STONE; + public static final EnumToolMaterial IRON; + public static final EnumToolMaterial EMERALD; + public static final EnumToolMaterial GOLD; ++*/ + private final int field_21186_f; + private final int field_21185_g; + private final float field_21184_h; + private final int field_21183_i; + private final int field_40488_j; + private static final EnumToolMaterial field_21182_j[]; /* synthetic field */ +- ++/* + public static EnumToolMaterial[] values() + { + return (EnumToolMaterial[])field_21182_j.clone(); +@@ -29,10 +35,10 @@ + { + return (EnumToolMaterial)Enum.valueOf(net.minecraft.src.EnumToolMaterial.class, s); + } +- ++*/ + private EnumToolMaterial(String s, int i, int j, int k, float f, int l, int i1) + { +- super(s, i); ++// super(s, i); + field_21186_f = j; + field_21185_g = k; + field_21184_h = f; +@@ -67,11 +73,13 @@ + + static + { ++/* + WOOD = new EnumToolMaterial("WOOD", 0, 0, 59, 2.0F, 0, 15); + STONE = new EnumToolMaterial("STONE", 1, 1, 131, 4F, 1, 5); + IRON = new EnumToolMaterial("IRON", 2, 2, 250, 6F, 2, 14); + EMERALD = new EnumToolMaterial("EMERALD", 3, 3, 1561, 8F, 3, 10); + GOLD = new EnumToolMaterial("GOLD", 4, 0, 32, 12F, 0, 22); ++*/ + field_21182_j = (new EnumToolMaterial[] { + WOOD, STONE, IRON, EMERALD, GOLD + }); +diff -r -U 3 minecraft_server\net\minecraft\src\GenLayer.java minecraft_server_patched\net\minecraft\src\GenLayer.java +--- minecraft_server\net\minecraft\src\GenLayer.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\GenLayer.java Fri Nov 25 13:08:33 2011 +@@ -22,7 +22,7 @@ + + public static GenLayer[] func_35019_a(long l) + { +- Object obj = new LayerIsland(1L); ++ GenLayer obj = new LayerIsland(1L); + obj = new GenLayerZoomFuzzy(2000L, ((GenLayer) (obj))); + obj = new GenLayerIsland(1L, ((GenLayer) (obj))); + obj = new GenLayerZoom(2001L, ((GenLayer) (obj))); +@@ -34,18 +34,18 @@ + obj = new GenLayerIsland(4L, ((GenLayer) (obj))); + obj = new GenLayerMushroomIsland(5L, ((GenLayer) (obj))); + byte byte0 = 4; +- Object obj1 = obj; ++ GenLayer obj1 = obj; + obj1 = GenLayerZoom.func_35025_a(1000L, ((GenLayer) (obj1)), 0); + obj1 = new GenLayerRiverInit(100L, ((GenLayer) (obj1))); + obj1 = GenLayerZoom.func_35025_a(1000L, ((GenLayer) (obj1)), byte0 + 2); + obj1 = new GenLayerRiver(1L, ((GenLayer) (obj1))); + obj1 = new GenLayerSmooth(1000L, ((GenLayer) (obj1))); +- Object obj2 = obj; ++ GenLayer obj2 = obj; + obj2 = GenLayerZoom.func_35025_a(1000L, ((GenLayer) (obj2)), 0); + obj2 = new GenLayerVillageLandscape(200L, ((GenLayer) (obj2))); + obj2 = GenLayerZoom.func_35025_a(1000L, ((GenLayer) (obj2)), 2); +- Object obj3 = new GenLayerTemperature(((GenLayer) (obj2))); +- Object obj4 = new GenLayerDownfall(((GenLayer) (obj2))); ++ GenLayer obj3 = new GenLayerTemperature(((GenLayer) (obj2))); ++ GenLayer obj4 = new GenLayerDownfall(((GenLayer) (obj2))); + for(int i = 0; i < byte0; i++) + { + obj2 = new GenLayerZoom(1000 + i, ((GenLayer) (obj2))); +diff -r -U 3 minecraft_server\net\minecraft\src\GuiLogFormatter.java minecraft_server_patched\net\minecraft\src\GuiLogFormatter.java +--- minecraft_server\net\minecraft\src\GuiLogFormatter.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\GuiLogFormatter.java Fri Nov 25 12:58:45 2011 +@@ -19,7 +19,7 @@ + GuiLogFormatter(GuiLogOutputHandler guilogoutputhandler) + { + field_894_a = guilogoutputhandler; +- super(); ++// super(); + } + + public String format(LogRecord logrecord) +diff -r -U 3 minecraft_server\net\minecraft\src\GuiStatsListener.java minecraft_server_patched\net\minecraft\src\GuiStatsListener.java +--- minecraft_server\net\minecraft\src\GuiStatsListener.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\GuiStatsListener.java Fri Nov 25 12:58:45 2011 +@@ -19,7 +19,7 @@ + GuiStatsListener(GuiStatsComponent guistatscomponent) + { + field_527_a = guistatscomponent; +- super(); ++// super(); + } + + public void actionPerformed(ActionEvent actionevent) +diff -r -U 3 minecraft_server\net\minecraft\src\MapCoord.java minecraft_server_patched\net\minecraft\src\MapCoord.java +--- minecraft_server\net\minecraft\src\MapCoord.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\MapCoord.java Fri Nov 25 12:58:45 2011 +@@ -20,7 +20,7 @@ + public MapCoord(MapData mapdata, byte byte0, byte byte1, byte byte2, byte byte3) + { + field_28203_e = mapdata; +- super(); ++// super(); + field_28202_a = byte0; + field_28201_b = byte1; + field_28205_c = byte2; +diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCaves.java minecraft_server_patched\net\minecraft\src\MapGenCaves.java +--- minecraft_server\net\minecraft\src\MapGenCaves.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\MapGenCaves.java Fri Nov 25 13:13:09 2011 +@@ -77,11 +77,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = i1 - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = i1 - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -89,11 +89,11 @@ + { + continue; + } +- d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; + int l1 = (MathHelper.func_584_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_584_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_584_b(d1 - d7) - 1; + int i2 = MathHelper.func_584_b(d1 + d7) + 1; +- d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; + int j2 = (MathHelper.func_584_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCavesHell.java minecraft_server_patched\net\minecraft\src\MapGenCavesHell.java +--- minecraft_server\net\minecraft\src\MapGenCavesHell.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\MapGenCavesHell.java Fri Nov 25 13:13:32 2011 +@@ -77,11 +77,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = l - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = l - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -89,11 +89,11 @@ + { + continue; + } +- d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; + int k1 = (MathHelper.func_584_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_584_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_584_b(d1 - d7) - 1; + int l1 = MathHelper.func_584_b(d1 + d7) + 1; +- d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; + int i2 = (MathHelper.func_584_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft_server\net\minecraft\src\MapGenRavine.java minecraft_server_patched\net\minecraft\src\MapGenRavine.java +--- minecraft_server\net\minecraft\src\MapGenRavine.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\MapGenRavine.java Fri Nov 25 13:13:57 2011 +@@ -72,11 +72,11 @@ + { + continue; + } +- double d8 = d - d4; +- double d9 = d2 - d5; +- double d10 = i1 - k; ++ double d8a = d - d4; ++ double d9a = d2 - d5; ++ double d10a = i1 - k; + double d11 = f + 2.0F + 16F; +- if((d8 * d8 + d9 * d9) - d10 * d10 > d11 * d11) ++ if((d8a * d8a + d9a * d9a) - d10a * d10a > d11 * d11) + { + return; + } +@@ -84,11 +84,11 @@ + { + continue; + } +- d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; ++ int d8 = MathHelper.func_584_b(d - d6) - i * 16 - 1; + int l1 = (MathHelper.func_584_b(d + d6) - i * 16) + 1; +- d9 = MathHelper.func_584_b(d1 - d7) - 1; ++ int d9 = MathHelper.func_584_b(d1 - d7) - 1; + int i2 = MathHelper.func_584_b(d1 + d7) + 1; +- d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; ++ int d10 = MathHelper.func_584_b(d2 - d6) - j * 16 - 1; + int j2 = (MathHelper.func_584_b(d2 + d6) - j * 16) + 1; + if(d8 < 0) + { +diff -r -U 3 minecraft_server\net\minecraft\src\MapInfo.java minecraft_server_patched\net\minecraft\src\MapInfo.java +--- minecraft_server\net\minecraft\src\MapInfo.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\MapInfo.java Fri Nov 25 12:58:45 2011 +@@ -23,7 +23,7 @@ + public MapInfo(MapData mapdata, EntityPlayer entityplayer) + { + field_28124_d = mapdata; +- super(); ++// super(); + field_28119_b = new int[128]; + field_28125_c = new int[128]; + field_28123_e = 0; +diff -r -U 3 minecraft_server\net\minecraft\src\NetworkAcceptThread.java minecraft_server_patched\net\minecraft\src\NetworkAcceptThread.java +--- minecraft_server\net\minecraft\src\NetworkAcceptThread.java Fri Nov 25 12:27:07 2011 ++++ minecraft_server_patched\net\minecraft\src\NetworkAcceptThread.java Fri Nov 25 12:58:45 2011 +@@ -21,9 +21,9 @@ + + NetworkAcceptThread(NetworkListenThread networklistenthread, String s, MinecraftServer minecraftserver) + { ++ super(s); + field_985_b = networklistenthread; + field_986_a = minecraftserver; +- super(s); + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\NetworkMasterThread.java minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java +--- minecraft_server\net\minecraft\src\NetworkMasterThread.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java Fri Nov 25 12:58:45 2011 +@@ -16,7 +16,7 @@ + NetworkMasterThread(NetworkManager networkmanager) + { + field_829_a = networkmanager; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\NetworkReaderThread.java minecraft_server_patched\net\minecraft\src\NetworkReaderThread.java +--- minecraft_server\net\minecraft\src\NetworkReaderThread.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\NetworkReaderThread.java Fri Nov 25 13:36:03 2011 +@@ -15,8 +15,8 @@ + + NetworkReaderThread(NetworkManager networkmanager, String s) + { +- field_827_a = networkmanager; + super(s); ++ field_827_a = networkmanager; + } + + public void run() +@@ -25,26 +25,24 @@ + { + NetworkManager.field_1052_b++; + } +- while(NetworkManager.func_743_a(field_827_a) && !NetworkManager.func_740_b(field_827_a)) ++ try + { +- while(NetworkManager.func_751_c(field_827_a)) ; +- try ++ while(NetworkManager.func_743_a(field_827_a) && !NetworkManager.func_740_b(field_827_a)) + { +- sleep(2L); ++ while(NetworkManager.func_751_c(field_827_a)) ; ++ try ++ { ++ sleep(2L); ++ } ++ catch(InterruptedException interruptedexception) { } + } +- catch(InterruptedException interruptedexception) { } +- } +- synchronized(NetworkManager.field_1053_a) +- { +- NetworkManager.field_1052_b--; + } +- break MISSING_BLOCK_LABEL_131; +- Exception exception2; +- exception2; +- synchronized(NetworkManager.field_1053_a) ++ finally + { +- NetworkManager.field_1052_b--; ++ synchronized(NetworkManager.field_1053_a) ++ { ++ NetworkManager.field_1052_b--; ++ } + } +- throw exception2; + } + } +diff -r -U 3 minecraft_server\net\minecraft\src\NetworkWriterThread.java minecraft_server_patched\net\minecraft\src\NetworkWriterThread.java +--- minecraft_server\net\minecraft\src\NetworkWriterThread.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\NetworkWriterThread.java Fri Nov 25 13:35:43 2011 +@@ -17,8 +17,8 @@ + + NetworkWriterThread(NetworkManager networkmanager, String s) + { +- field_826_a = networkmanager; + super(s); ++ field_826_a = networkmanager; + } + + public void run() +@@ -27,41 +27,39 @@ + { + NetworkManager.field_1051_c++; + } +- while(NetworkManager.func_743_a(field_826_a)) ++ try + { +- while(NetworkManager.func_749_d(field_826_a)) ; +- try ++ while(NetworkManager.func_743_a(field_826_a)) + { +- if(NetworkManager.func_28136_f(field_826_a) != null) ++ while(NetworkManager.func_749_d(field_826_a)) ; ++ try + { +- NetworkManager.func_28136_f(field_826_a).flush(); ++ if(NetworkManager.func_28136_f(field_826_a) != null) ++ { ++ NetworkManager.func_28136_f(field_826_a).flush(); ++ } + } +- } +- catch(IOException ioexception) +- { +- if(!NetworkManager.func_28135_e(field_826_a)) ++ catch(IOException ioexception) + { +- NetworkManager.func_30007_a(field_826_a, ioexception); ++ if(!NetworkManager.func_28135_e(field_826_a)) ++ { ++ NetworkManager.func_30007_a(field_826_a, ioexception); ++ } ++ ioexception.printStackTrace(); + } +- ioexception.printStackTrace(); +- } +- try +- { +- sleep(2L); ++ try ++ { ++ sleep(2L); ++ } ++ catch(InterruptedException interruptedexception) { } + } +- catch(InterruptedException interruptedexception) { } + } +- synchronized(NetworkManager.field_1053_a) ++ finally + { +- NetworkManager.field_1051_c--; +- } +- break MISSING_BLOCK_LABEL_167; +- Exception exception2; +- exception2; +- synchronized(NetworkManager.field_1053_a) +- { +- NetworkManager.field_1051_c--; ++ synchronized(NetworkManager.field_1053_a) ++ { ++ NetworkManager.field_1051_c--; ++ } + } +- throw exception2; + } + } +diff -r -U 3 minecraft_server\net\minecraft\src\PlayerInstance.java minecraft_server_patched\net\minecraft\src\PlayerInstance.java +--- minecraft_server\net\minecraft\src\PlayerInstance.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\PlayerInstance.java Fri Nov 25 12:58:45 2011 +@@ -33,7 +33,7 @@ + public PlayerInstance(PlayerManager playermanager, int i, int j) + { + field_1073_a = playermanager; +- super(); ++// super(); + field_1072_b = new ArrayList(); + field_1068_f = new short[10]; + field_1067_g = 0; +diff -r -U 3 minecraft_server\net\minecraft\src\RailLogic.java minecraft_server_patched\net\minecraft\src\RailLogic.java +--- minecraft_server\net\minecraft\src\RailLogic.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\RailLogic.java Fri Nov 25 12:58:45 2011 +@@ -24,7 +24,7 @@ + public RailLogic(BlockRail blockrail, World world, int i, int j, int k) + { + field_888_a = blockrail; +- super(); ++// super(); + field_889_g = new ArrayList(); + field_887_b = world; + field_893_c = i; +diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadQueryAuth.java minecraft_server_patched\net\minecraft\src\RConThreadQueryAuth.java +--- minecraft_server\net\minecraft\src\RConThreadQueryAuth.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\RConThreadQueryAuth.java Fri Nov 25 12:58:45 2011 +@@ -24,7 +24,7 @@ + public RConThreadQueryAuth(RConThreadQuery rconthreadquery, DatagramPacket datagrampacket) + { + field_40392_a = rconthreadquery; +- super(); ++// super(); + field_40390_b = (new Date()).getTime(); + byte abyte0[] = datagrampacket.getData(); + field_40388_d = new byte[4]; +diff -r -U 3 minecraft_server\net\minecraft\src\RecipeSorter.java minecraft_server_patched\net\minecraft\src\RecipeSorter.java +--- minecraft_server\net\minecraft\src\RecipeSorter.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\RecipeSorter.java Fri Nov 25 12:58:45 2011 +@@ -18,7 +18,7 @@ + RecipeSorter(CraftingManager craftingmanager) + { + field_20108_a = craftingmanager; +- super(); ++// super(); + } + + public int func_20107_a(IRecipe irecipe, IRecipe irecipe1) +diff -r -U 3 minecraft_server\net\minecraft\src\RegionFileChunkBuffer.java minecraft_server_patched\net\minecraft\src\RegionFileChunkBuffer.java +--- minecraft_server\net\minecraft\src\RegionFileChunkBuffer.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\RegionFileChunkBuffer.java Fri Nov 25 12:58:46 2011 +@@ -18,8 +18,8 @@ + + public RegionFileChunkBuffer(RegionFile regionfile, int i, int j) + { +- field_22157_a = regionfile; + super(8096); ++ field_22157_a = regionfile; + field_22156_b = i; + field_22158_c = j; + } +diff -r -U 3 minecraft_server\net\minecraft\src\ServerGuiCommandListener.java minecraft_server_patched\net\minecraft\src\ServerGuiCommandListener.java +--- minecraft_server\net\minecraft\src\ServerGuiCommandListener.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ServerGuiCommandListener.java Fri Nov 25 12:58:46 2011 +@@ -23,7 +23,7 @@ + { + field_992_b = servergui; + field_993_a = jtextfield; +- super(); ++// super(); + } + + public void actionPerformed(ActionEvent actionevent) +diff -r -U 3 minecraft_server\net\minecraft\src\ServerGuiFocusAdapter.java minecraft_server_patched\net\minecraft\src\ServerGuiFocusAdapter.java +--- minecraft_server\net\minecraft\src\ServerGuiFocusAdapter.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ServerGuiFocusAdapter.java Fri Nov 25 12:58:46 2011 +@@ -18,7 +18,7 @@ + ServerGuiFocusAdapter(ServerGUI servergui) + { + field_987_a = servergui; +- super(); ++// super(); + } + + public void focusGained(FocusEvent focusevent) +diff -r -U 3 minecraft_server\net\minecraft\src\ServerWindowAdapter.java minecraft_server_patched\net\minecraft\src\ServerWindowAdapter.java +--- minecraft_server\net\minecraft\src\ServerWindowAdapter.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ServerWindowAdapter.java Fri Nov 25 12:58:46 2011 +@@ -16,7 +16,7 @@ + ServerWindowAdapter(MinecraftServer minecraftserver) + { + field_997_a = minecraftserver; +- super(); ++// super(); + } + + public void windowClosing(WindowEvent windowevent) +diff -r -U 3 minecraft_server\net\minecraft\src\SlotArmor.java minecraft_server_patched\net\minecraft\src\SlotArmor.java +--- minecraft_server\net\minecraft\src\SlotArmor.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SlotArmor.java Fri Nov 25 12:58:46 2011 +@@ -17,9 +17,9 @@ + + SlotArmor(ContainerPlayer containerplayer, IInventory iinventory, int i, int j, int k, int l) + { ++ super(iinventory, i, j, k); + field_20101_b = containerplayer; + field_20102_a = l; +- super(iinventory, i, j, k); + } + + public int func_20093_a() +diff -r -U 3 minecraft_server\net\minecraft\src\SlotBrewingStandIngredient.java minecraft_server_patched\net\minecraft\src\SlotBrewingStandIngredient.java +--- minecraft_server\net\minecraft\src\SlotBrewingStandIngredient.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SlotBrewingStandIngredient.java Fri Nov 25 12:58:46 2011 +@@ -16,8 +16,8 @@ + + public SlotBrewingStandIngredient(ContainerBrewingStand containerbrewingstand, IInventory iinventory, int i, int j, int k) + { +- field_40267_a = containerbrewingstand; + super(iinventory, i, j, k); ++ field_40267_a = containerbrewingstand; + } + + public boolean func_20095_a(ItemStack itemstack) +diff -r -U 3 minecraft_server\net\minecraft\src\SlotBrewingStandPotion.java minecraft_server_patched\net\minecraft\src\SlotBrewingStandPotion.java +--- minecraft_server\net\minecraft\src\SlotBrewingStandPotion.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SlotBrewingStandPotion.java Fri Nov 25 12:58:46 2011 +@@ -17,8 +17,8 @@ + + public SlotBrewingStandPotion(ContainerBrewingStand containerbrewingstand, EntityPlayer entityplayer, IInventory iinventory, int i, int j, int k) + { +- field_40270_a = containerbrewingstand; + super(iinventory, i, j, k); ++ field_40270_a = containerbrewingstand; + field_40269_f = entityplayer; + } + +diff -r -U 3 minecraft_server\net\minecraft\src\SlotEnchantment.java minecraft_server_patched\net\minecraft\src\SlotEnchantment.java +--- minecraft_server\net\minecraft\src\SlotEnchantment.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SlotEnchantment.java Fri Nov 25 12:58:46 2011 +@@ -15,8 +15,8 @@ + + SlotEnchantment(ContainerEnchantment containerenchantment, IInventory iinventory, int i, int j, int k) + { +- field_40268_a = containerenchantment; + super(iinventory, i, j, k); ++ field_40268_a = containerenchantment; + } + + public boolean func_20095_a(ItemStack itemstack) +diff -r -U 3 minecraft_server\net\minecraft\src\SlotEnchantmentTable.java minecraft_server_patched\net\minecraft\src\SlotEnchantmentTable.java +--- minecraft_server\net\minecraft\src\SlotEnchantmentTable.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SlotEnchantmentTable.java Fri Nov 25 12:58:46 2011 +@@ -15,8 +15,8 @@ + + SlotEnchantmentTable(ContainerEnchantment containerenchantment, String s, int i) + { +- field_40088_a = containerenchantment; + super(s, i); ++ field_40088_a = containerenchantment; + } + + public int func_202_d() +diff -r -U 3 minecraft_server\net\minecraft\src\SpawnerAnimals.java minecraft_server_patched\net\minecraft\src\SpawnerAnimals.java +--- minecraft_server\net\minecraft\src\SpawnerAnimals.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\SpawnerAnimals.java Fri Nov 25 13:46:11 2011 +@@ -31,167 +31,155 @@ + return new ChunkPosition(k, l, i1); + } + +- public static final int func_4111_a(World world, boolean flag, boolean flag1) ++ public static final int func_4111_a(World var0, boolean var1, boolean var2) + { +- int j; +- ChunkCoordinates chunkcoordinates; +- EnumCreatureType aenumcreaturetype[]; +- int i1; +- int j1; +- if(!flag && !flag1) ++ if(!var1 && !var2) + { + return 0; + } +- field_4311_a.clear(); +- for(int i = 0; i < world.field_805_k.size(); i++) ++ else + { +- EntityPlayer entityplayer = (EntityPlayer)world.field_805_k.get(i); +- int k = MathHelper.func_584_b(entityplayer.field_322_l / 16D); +- int l = MathHelper.func_584_b(entityplayer.field_320_n / 16D); +- byte byte0 = 8; +- for(int k1 = -byte0; k1 <= byte0; k1++) ++ field_4311_a.clear(); ++ ++ int var3; ++ int var6; ++ for(var3 = 0; var3 < var0.field_805_k.size(); ++var3) + { +- for(int l1 = -byte0; l1 <= byte0; l1++) ++ EntityPlayer var4 = (EntityPlayer)var0.field_805_k.get(var3); ++ int var5 = MathHelper.func_584_b(var4.field_322_l / 16.0D); ++ var6 = MathHelper.func_584_b(var4.field_320_n / 16.0D); ++ byte var7 = 8; ++ ++ for(int var8 = -var7; var8 <= var7; ++var8) + { +- boolean flag2 = k1 == -byte0 || k1 == byte0 || l1 == -byte0 || l1 == byte0; +- ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(k1 + k, l1 + l); +- if(!flag2) +- { +- field_4311_a.put(chunkcoordintpair1, Boolean.valueOf(false)); +- continue; +- } +- if(!field_4311_a.containsKey(chunkcoordintpair1)) ++ for(int var9 = -var7; var9 <= var7; ++var9) + { +- field_4311_a.put(chunkcoordintpair1, Boolean.valueOf(true)); ++ boolean var10 = var8 == -var7 || var8 == var7 || var9 == -var7 || var9 == var7; ++ ChunkCoordIntPair var11 = new ChunkCoordIntPair(var8 + var5, var9 + var6); ++ if(!var10) ++ { ++ field_4311_a.put(var11, Boolean.valueOf(false)); ++ } ++ else if(!field_4311_a.containsKey(var11)) ++ { ++ field_4311_a.put(var11, Boolean.valueOf(true)); ++ } + } + } +- + } + +- } ++ var3 = 0; ++ ChunkCoordinates var31 = var0.func_22078_l(); ++ EnumCreatureType[] var32 = EnumCreatureType.values(); ++ var6 = var32.length; + +- j = 0; +- chunkcoordinates = world.func_22078_l(); +- aenumcreaturetype = EnumCreatureType.values(); +- i1 = aenumcreaturetype.length; +- j1 = 0; +-_L10: +- if(j1 >= i1) goto _L2; else goto _L1 +-_L1: +- EnumCreatureType enumcreaturetype; +- Iterator iterator; +- enumcreaturetype = aenumcreaturetype[j1]; +- if(enumcreaturetype.func_21103_d() && !flag1 || !enumcreaturetype.func_21103_d() && !flag || world.func_487_a(enumcreaturetype.func_21105_a()) > (enumcreaturetype.func_21104_b() * field_4311_a.size()) / 256) +- { +- continue; /* Loop/switch isn't completed */ +- } +- iterator = field_4311_a.keySet().iterator(); +-_L4: +- int i2; +- int j2; +- int k2; +- int l2; +- int i3; +- do +- { +- ChunkCoordIntPair chunkcoordintpair; +- do ++ for(int var33 = 0; var33 < var6; ++var33) + { +- if(!iterator.hasNext()) ++ EnumCreatureType var34 = var32[var33]; ++ if((!var34.func_21103_d() || var2) && (var34.func_21103_d() || var1) && var0.func_487_a(var34.func_21105_a()) <= var34.func_21104_b() * field_4311_a.size() / 256) + { +- continue; /* Loop/switch isn't completed */ ++ Iterator var35 = field_4311_a.keySet().iterator(); ++ ++ label108: ++ while(var35.hasNext()) ++ { ++ ChunkCoordIntPair var37 = (ChunkCoordIntPair)var35.next(); ++ if(!((Boolean)field_4311_a.get(var37)).booleanValue()) ++ { ++ ChunkPosition var36 = func_4112_a(var0, var37.field_152_a * 16, var37.field_151_b * 16); ++ int var12 = var36.field_846_a; ++ int var13 = var36.field_845_b; ++ int var14 = var36.field_847_c; ++ if(!var0.func_445_d(var12, var13, var14) && var0.func_443_c(var12, var13, var14) == var34.func_21102_c()) ++ { ++ int var15 = 0; ++ int var16 = 0; ++ ++ while(var16 < 3) ++ { ++ int var17 = var12; ++ int var18 = var13; ++ int var19 = var14; ++ byte var20 = 6; ++ SpawnListEntry var21 = null; ++ int var22 = 0; ++ ++ while(true) ++ { ++ if(var22 < 4) ++ { ++ label101: ++ { ++ var17 += var0.field_803_m.nextInt(var20) - var0.field_803_m.nextInt(var20); ++ var18 += var0.field_803_m.nextInt(1) - var0.field_803_m.nextInt(1); ++ var19 += var0.field_803_m.nextInt(var20) - var0.field_803_m.nextInt(var20); ++ if(func_21167_a(var34, var0, var17, var18, var19)) ++ { ++ float var23 = (float)var17 + 0.5F; ++ float var24 = (float)var18; ++ float var25 = (float)var19 + 0.5F; ++ if(var0.func_456_a((double)var23, (double)var24, (double)var25, 24.0D) == null) ++ { ++ float var26 = var23 - (float)var31.field_22216_a; ++ float var27 = var24 - (float)var31.field_529_a; ++ float var28 = var25 - (float)var31.field_528_b; ++ float var29 = var26 * var26 + var27 * var27 + var28 * var28; ++ if(var29 >= 576.0F) ++ { ++ if(var21 == null) ++ { ++ var21 = var0.func_40216_a(var34, var17, var18, var19); ++ if(var21 == null) ++ { ++ break label101; ++ } ++ } ++ ++ EntityLiving var38; ++ try ++ { ++ var38 = (EntityLiving)var21.field_25145_a.getConstructor(new Class[]{World.class}).newInstance(new Object[]{var0}); ++ } ++ catch (Exception var30) ++ { ++ var30.printStackTrace(); ++ return var3; ++ } ++ ++ var38.func_107_c((double)var23, (double)var24, (double)var25, var0.field_803_m.nextFloat() * 360.0F, 0.0F); ++ if(var38.func_155_a()) ++ { ++ ++var15; ++ var0.func_526_a(var38); ++ func_21166_a(var38, var0, var23, var24, var25); ++ if(var15 >= var38.func_4045_i()) ++ { ++ continue label108; ++ } ++ } ++ ++ var3 += var15; ++ } ++ } ++ } ++ ++ ++var22; ++ continue; ++ } ++ } ++ ++ ++var16; ++ break; ++ } ++ } ++ } ++ } ++ } + } +- chunkcoordintpair = (ChunkCoordIntPair)iterator.next(); +- } while(((Boolean)field_4311_a.get(chunkcoordintpair)).booleanValue()); +- ChunkPosition chunkposition = func_4112_a(world, chunkcoordintpair.field_152_a * 16, chunkcoordintpair.field_151_b * 16); +- i2 = chunkposition.field_846_a; +- j2 = chunkposition.field_845_b; +- k2 = chunkposition.field_847_c; +- } while(world.func_445_d(i2, j2, k2) || world.func_443_c(i2, j2, k2) != enumcreaturetype.func_21102_c()); +- l2 = 0; +- i3 = 0; +-_L9: +- if(i3 >= 3) goto _L4; else goto _L3 +-_L3: +- int j3; +- int k3; +- int l3; +- byte byte1; +- SpawnListEntry spawnlistentry; +- int i4; +- j3 = i2; +- k3 = j2; +- l3 = k2; +- byte1 = 6; +- spawnlistentry = null; +- i4 = 0; +-_L8: +- if(i4 >= 4) goto _L6; else goto _L5 +-_L5: +- EntityLiving entityliving; +- j3 += world.field_803_m.nextInt(byte1) - world.field_803_m.nextInt(byte1); +- k3 += world.field_803_m.nextInt(1) - world.field_803_m.nextInt(1); +- l3 += world.field_803_m.nextInt(byte1) - world.field_803_m.nextInt(byte1); +- if(!func_21167_a(enumcreaturetype, world, j3, k3, l3)) +- { +- continue; /* Loop/switch isn't completed */ +- } +- float f = (float)j3 + 0.5F; +- float f1 = k3; +- float f2 = (float)l3 + 0.5F; +- if(world.func_456_a(f, f1, f2, 24D) != null) +- { +- continue; /* Loop/switch isn't completed */ +- } +- float f3 = f - (float)chunkcoordinates.field_22216_a; +- float f4 = f1 - (float)chunkcoordinates.field_529_a; +- float f5 = f2 - (float)chunkcoordinates.field_528_b; +- float f6 = f3 * f3 + f4 * f4 + f5 * f5; +- if(f6 < 576F) +- { +- continue; /* Loop/switch isn't completed */ +- } +- if(spawnlistentry == null) +- { +- spawnlistentry = world.func_40216_a(enumcreaturetype, j3, k3, l3); +- if(spawnlistentry == null) +- { +- break; /* Loop/switch isn't completed */ + } ++ ++ return var3; + } +- try +- { +- entityliving = (EntityLiving)spawnlistentry.field_25145_a.getConstructor(new Class[] { +- net.minecraft.src.World.class +- }).newInstance(new Object[] { +- world +- }); +- } +- catch(Exception exception) +- { +- exception.printStackTrace(); +- return j; +- } +- entityliving.func_107_c(f, f1, f2, world.field_803_m.nextFloat() * 360F, 0.0F); +- if(!entityliving.func_155_a()) +- { +- break; /* Loop/switch isn't completed */ +- } +- l2++; +- world.func_526_a(entityliving); +- func_21166_a(entityliving, world, f, f1, f2); +- if(l2 < entityliving.func_4045_i()) goto _L7; else goto _L4 +-_L7: +- j += l2; +- i4++; +- goto _L8 +-_L6: +- i3++; +- goto _L9 +- j1++; +- goto _L10 +-_L2: +- return j; + } + + private static boolean func_21167_a(EnumCreatureType enumcreaturetype, World world, int i, int j, int k) +diff -r -U 3 minecraft_server\net\minecraft\src\StructureStrongholdPieces.java minecraft_server_patched\net\minecraft\src\StructureStrongholdPieces.java +--- minecraft_server\net\minecraft\src\StructureStrongholdPieces.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\StructureStrongholdPieces.java Fri Nov 25 13:48:53 2011 +@@ -108,60 +108,68 @@ + return ((ComponentStronghold) (obj)); + } + +- private static ComponentStronghold func_35623_b(ComponentStrongholdStairs2 componentstrongholdstairs2, List list, Random random, int i, int j, int k, int l, int i1) ++ private static ComponentStronghold func_35623_b(ComponentStrongholdStairs2 var0, List var1, Random var2, int var3, int var4, int var5, int var6, int var7) + { +- int j1; + if(!func_35626_c()) + { + return null; + } +- if(field_40542_d != null) ++ else + { +- ComponentStronghold componentstronghold = func_35620_a(field_40542_d, list, random, i, j, k, l, i1); +- field_40542_d = null; +- if(componentstronghold != null) ++ if(field_40542_d != null) + { +- return componentstronghold; ++ ComponentStronghold var8 = func_35620_a(field_40542_d, var1, var2, var3, var4, var5, var6, var7); ++ field_40542_d = null; ++ if(var8 != null) ++ { ++ return var8; ++ } ++ } ++ ++ int var13 = 0; ++ ++ while(var13 < 5) ++ { ++ ++var13; ++ int var9 = var2.nextInt(field_35630_a); ++ Iterator var10 = field_35629_c.iterator(); ++ ++ while(var10.hasNext()) ++ { ++ StructureStrongholdPieceWeight var11 = (StructureStrongholdPieceWeight)var10.next(); ++ var9 -= var11.field_35578_b; ++ if(var9 < 0) ++ { ++ if(!var11.func_35575_a(var7) || var11 == var0.field_35329_a) ++ { ++ break; ++ } ++ ++ ComponentStronghold var12 = func_35620_a(var11.field_35580_a, var1, var2, var3, var4, var5, var6, var7); ++ if(var12 != null) ++ { ++ ++var11.field_35579_c; ++ var0.field_35329_a = var11; ++ if(!var11.func_35576_a()) ++ { ++ field_35629_c.remove(var11); ++ } ++ ++ return var12; ++ } ++ } ++ } ++ } ++ ++ StructureBoundingBox var14 = ComponentStrongholdCorridor.func_35342_a(var1, var2, var3, var4, var5, var6); ++ if(var14 != null && var14.field_35676_b > 1) ++ { ++ return new ComponentStrongholdCorridor(var7, var2, var14, var6); ++ } ++ else ++ { ++ return null; + } +- } +- j1 = 0; +-_L2: +- int k1; +- Iterator iterator; +- if(j1 >= 5) +- { +- break MISSING_BLOCK_LABEL_206; +- } +- j1++; +- k1 = random.nextInt(field_35630_a); +- iterator = field_35629_c.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureStrongholdPieceWeight structurestrongholdpieceweight; +- structurestrongholdpieceweight = (StructureStrongholdPieceWeight)iterator.next(); +- k1 -= structurestrongholdpieceweight.field_35578_b; +- if(k1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurestrongholdpieceweight.func_35575_a(i1) && structurestrongholdpieceweight != componentstrongholdstairs2.field_35329_a) goto _L5; else goto _L2 +-_L5: +- ComponentStronghold componentstronghold1 = func_35620_a(structurestrongholdpieceweight.field_35580_a, list, random, i, j, k, l, i1); +- if(componentstronghold1 == null) goto _L4; else goto _L6 +-_L6: +- structurestrongholdpieceweight.field_35579_c++; +- componentstrongholdstairs2.field_35329_a = structurestrongholdpieceweight; +- if(!structurestrongholdpieceweight.func_35576_a()) +- { +- field_35629_c.remove(structurestrongholdpieceweight); +- } +- return componentstronghold1; +- StructureBoundingBox structureboundingbox = ComponentStrongholdCorridor.func_35342_a(list, random, i, j, k, l); +- if(structureboundingbox != null && structureboundingbox.field_35676_b > 1) +- { +- return new ComponentStrongholdCorridor(i1, random, structureboundingbox, l); +- } else +- { +- return null; + } + } + +diff -r -U 3 minecraft_server\net\minecraft\src\StructureVillagePieces.java minecraft_server_patched\net\minecraft\src\StructureVillagePieces.java +--- minecraft_server\net\minecraft\src\StructureVillagePieces.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\StructureVillagePieces.java Fri Nov 25 13:51:24 2011 +@@ -107,53 +107,59 @@ + return ((ComponentVillage) (obj)); + } + +- private static ComponentVillage func_35643_c(ComponentVillageStartPiece componentvillagestartpiece, List list, Random random, int i, int j, int k, int l, int i1) ++ private static ComponentVillage func_35643_c(ComponentVillageStartPiece var0, List var1, Random var2, int var3, int var4, int var5, int var6, int var7) + { +- int j1; +- int k1; +- j1 = func_35645_a(componentvillagestartpiece.field_35388_d); +- if(j1 <= 0) ++ int var8 = func_35645_a(var0.field_35388_d); ++ if(var8 <= 0) + { + return null; + } +- k1 = 0; +-_L2: +- int l1; +- Iterator iterator; +- if(k1 >= 5) ++ else + { +- break MISSING_BLOCK_LABEL_182; +- } +- k1++; +- l1 = random.nextInt(j1); +- iterator = componentvillagestartpiece.field_35388_d.iterator(); +-_L4: +- if(!iterator.hasNext()) goto _L2; else goto _L1 +-_L1: +- StructureVillagePieceWeight structurevillagepieceweight; +- structurevillagepieceweight = (StructureVillagePieceWeight)iterator.next(); +- l1 -= structurevillagepieceweight.field_35494_b; +- if(l1 >= 0) goto _L4; else goto _L3 +-_L3: +- if(structurevillagepieceweight.func_35491_a(i1) && (structurevillagepieceweight != componentvillagestartpiece.field_35391_c || componentvillagestartpiece.field_35388_d.size() <= 1)) goto _L5; else goto _L2 +-_L5: +- ComponentVillage componentvillage = func_35639_a(structurevillagepieceweight, list, random, i, j, k, l, i1); +- if(componentvillage == null) goto _L4; else goto _L6 +-_L6: +- structurevillagepieceweight.field_35495_c++; +- componentvillagestartpiece.field_35391_c = structurevillagepieceweight; +- if(!structurevillagepieceweight.func_35492_a()) +- { +- componentvillagestartpiece.field_35388_d.remove(structurevillagepieceweight); +- } +- return componentvillage; +- StructureBoundingBox structureboundingbox = ComponentVillageTorch.func_35382_a(list, random, i, j, k, l); +- if(structureboundingbox != null) +- { +- return new ComponentVillageTorch(i1, random, structureboundingbox, l); +- } else +- { +- return null; ++ int var9 = 0; ++ ++ while(var9 < 5) ++ { ++ ++var9; ++ int var10 = var2.nextInt(var8); ++ Iterator var11 = var0.field_35388_d.iterator(); ++ ++ while(var11.hasNext()) ++ { ++ StructureVillagePieceWeight var12 = (StructureVillagePieceWeight)var11.next(); ++ var10 -= var12.field_35494_b; ++ if(var10 < 0) ++ { ++ if(!var12.func_35491_a(var7) || var12 == var0.field_35391_c && var0.field_35388_d.size() > 1) ++ { ++ break; ++ } ++ ++ ComponentVillage var13 = func_35639_a(var12, var1, var2, var3, var4, var5, var6, var7); ++ if(var13 != null) ++ { ++ ++var12.field_35495_c; ++ var0.field_35391_c = var12; ++ if(!var12.func_35492_a()) ++ { ++ var0.field_35388_d.remove(var12); ++ } ++ ++ return var13; ++ } ++ } ++ } ++ } ++ ++ StructureBoundingBox var14 = ComponentVillageTorch.func_35382_a(var1, var2, var3, var4, var5, var6); ++ if(var14 != null) ++ { ++ return new ComponentVillageTorch(var7, var2, var14, var6); ++ } ++ else ++ { ++ return null; ++ } + } + } + +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadCommandReader.java minecraft_server_patched\net\minecraft\src\ThreadCommandReader.java +--- minecraft_server\net\minecraft\src\ThreadCommandReader.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadCommandReader.java Fri Nov 25 12:58:46 2011 +@@ -15,7 +15,7 @@ + public ThreadCommandReader(MinecraftServer minecraftserver) + { + field_1032_a = minecraftserver; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadLoginVerifier.java minecraft_server_patched\net\minecraft\src\ThreadLoginVerifier.java +--- minecraft_server\net\minecraft\src\ThreadLoginVerifier.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadLoginVerifier.java Fri Nov 25 12:58:46 2011 +@@ -22,7 +22,7 @@ + { + field_971_b = netloginhandler; + field_972_a = packet1login; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadMonitorConnection.java minecraft_server_patched\net\minecraft\src\ThreadMonitorConnection.java +--- minecraft_server\net\minecraft\src\ThreadMonitorConnection.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadMonitorConnection.java Fri Nov 25 12:58:46 2011 +@@ -16,7 +16,7 @@ + ThreadMonitorConnection(NetworkManager networkmanager) + { + field_828_a = networkmanager; +- super(); ++// super(); + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadServerApplication.java minecraft_server_patched\net\minecraft\src\ThreadServerApplication.java +--- minecraft_server\net\minecraft\src\ThreadServerApplication.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadServerApplication.java Fri Nov 25 12:58:46 2011 +@@ -13,8 +13,8 @@ + + public ThreadServerApplication(String s, MinecraftServer minecraftserver) + { +- field_1033_a = minecraftserver; + super(s); ++ field_1033_a = minecraftserver; + } + + public void run() +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadSleepForever.java minecraft_server_patched\net\minecraft\src\ThreadSleepForever.java +--- minecraft_server\net\minecraft\src\ThreadSleepForever.java Fri Nov 25 12:27:08 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadSleepForever.java Fri Nov 25 12:58:46 2011 +@@ -14,7 +14,7 @@ + public ThreadSleepForever(MinecraftServer minecraftserver) + { + field_1031_a = minecraftserver; +- super(); ++// super(); + setDaemon(true); + start(); + } diff --git a/forge/conf/patches/minecraft_server_ff.patch b/forge/conf/patches/minecraft_server_ff.patch new file mode 100644 index 0000000000..4803dca886 --- /dev/null +++ b/forge/conf/patches/minecraft_server_ff.patch @@ -0,0 +1,26 @@ +diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java +--- minecraft_server\net\minecraft\src\ItemMap.java Tue Nov 22 23:21:56 2011 ++++ minecraft_server_patched\net\minecraft\src\ItemMap.java Wed Nov 23 00:09:45 2011 +@@ -22,7 +22,6 @@ + } + + public MapData func_28023_a(ItemStack var1, World var2) { +- "map_" + var1.func_21125_h(); + MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h()); + if(var4 == null) { + var1.func_28145_b(var2.func_28104_b("map")); +diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java +diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java +--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Tue Nov 22 23:22:10 2011 ++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Nov 23 00:09:45 2011 +@@ -21,7 +21,9 @@ + } + + public void run() { +- this.func_40509_b(); ++ while (true) { ++ this.func_40509_b(); ++ } + } + + private void func_40509_b() { diff --git a/forge/conf/patches/splashes.txt b/forge/conf/patches/splashes.txt new file mode 100644 index 0000000000..5bd28c92cd --- /dev/null +++ b/forge/conf/patches/splashes.txt @@ -0,0 +1 @@ +Now it is YOURCRAFT! \ No newline at end of file diff --git a/forge/conf/server.exc b/forge/conf/server.exc new file mode 100644 index 0000000000..a01b51b0f2 --- /dev/null +++ b/forge/conf/server.exc @@ -0,0 +1,202 @@ +net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException +net/minecraft/src/ChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/ChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/ChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_40515_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_40516_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_769_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_770_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_771_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/CompressedStreamTools.func_774_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/DataWatcher.func_21149_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException +net/minecraft/src/DataWatcher.func_21151_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/DataWatcher.func_21152_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/DataWatcher.func_21154_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException +net/minecraft/src/IChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/IChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/IChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException +net/minecraft/src/NBTBase.func_380_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTBase.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException +net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagCompound.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagCompound.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagEnd.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagEnd.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagList.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagList.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException +net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException +net/minecraft/src/NetLoginHandler.(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException +net/minecraft/src/NetworkListenThread.(Lnet/minecraft/server/MinecraftServer;Ljava/net/InetAddress;I)V=java/io/IOException +net/minecraft/src/NetworkManager.(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException +net/minecraft/src/Packet.func_27037_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException +net/minecraft/src/Packet.func_27038_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_40259_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException +net/minecraft/src/Packet.func_40260_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_40261_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_40262_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException +net/minecraft/src/Packet.func_65_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException +net/minecraft/src/Packet.func_66_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet0KeepAlive.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet0KeepAlive.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet100OpenWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet100OpenWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet101CloseWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet101CloseWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet102WindowClick.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet102WindowClick.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet103SetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet103SetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet104WindowItems.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet104WindowItems.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet105UpdateProgressbar.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet105UpdateProgressbar.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet106Transaction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet106Transaction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet107CreativeSetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet107CreativeSetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet108EnchantItem.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet108EnchantItem.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet10Flying.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet10Flying.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet11PlayerPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet11PlayerPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet12PlayerLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet12PlayerLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet130UpdateSign.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet130UpdateSign.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet131MapData.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet131MapData.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet13PlayerLookMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet13PlayerLookMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet14BlockDig.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet14BlockDig.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet15Place.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet15Place.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet16BlockItemSwitch.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet16BlockItemSwitch.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet17Sleep.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet17Sleep.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet18Animation.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet18Animation.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet19EntityAction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet19EntityAction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet1Login.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet1Login.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet200Statistic.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet200Statistic.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet20NamedEntitySpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet21PickupSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet21PickupSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet22Collect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet22Collect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet23VehicleSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet23VehicleSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet24MobSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet24MobSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet255KickDisconnect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet255KickDisconnect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet25EntityPainting.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet25EntityPainting.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet26EntityExpOrb.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet26EntityExpOrb.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet27Position.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet27Position.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet28EntityVelocity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet28EntityVelocity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet29DestroyEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet29DestroyEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet2Handshake.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet2Handshake.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet30Entity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet30Entity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet31RelEntityMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet31RelEntityMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet32EntityLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet32EntityLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet33RelEntityMoveLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet33RelEntityMoveLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet34EntityTeleport.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet34EntityTeleport.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet38EntityStatus.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet38EntityStatus.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet39AttachEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet39AttachEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet3Chat.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet3Chat.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet40EntityMetadata.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet40EntityMetadata.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet41EntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet41EntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet42RemoveEntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet42RemoveEntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet43Experience.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet43Experience.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet4UpdateTime.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet4UpdateTime.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet50PreChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet50PreChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet51MapChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet51MapChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet52MultiBlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet52MultiBlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet53BlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet53BlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet54PlayNoteBlock.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet54PlayNoteBlock.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet5PlayerInventory.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet5PlayerInventory.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet60Explosion.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet60Explosion.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet61DoorChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet61DoorChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet6SpawnPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet6SpawnPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet70Bed.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet70Bed.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet71Weather.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet71Weather.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet7UseEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet7UseEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException +net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException +net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException +net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException +net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException +net/minecraft/src/RConOutputStream.func_40397_a(Ljava/lang/String;)V=java/io/IOException +net/minecraft/src/RConThreadClient.func_40453_a(IILjava/lang/String;)V=java/io/IOException +net/minecraft/src/RConThreadClient.func_40454_e()V=java/io/IOException +net/minecraft/src/RConThreadClient.func_40455_a(ILjava/lang/String;)V=java/io/IOException +net/minecraft/src/RConThreadQuery.func_40428_a([BLjava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException +net/minecraft/src/RConThreadQuery.func_40430_a(Ljava/net/DatagramPacket;)Z=java/io/IOException +net/minecraft/src/RConThreadQuery.func_40431_d(Ljava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException +net/minecraft/src/RConThreadQuery.func_40434_b(Ljava/net/DatagramPacket;)[B=java/io/IOException +net/minecraft/src/RegionFile.func_22126_b()V=java/io/IOException +net/minecraft/src/RegionFile.func_22128_a(III)V=java/io/IOException +net/minecraft/src/RegionFile.func_22130_a(I[BI)V=java/io/IOException +net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException +net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException +net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException +net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException diff --git a/forge/conf/version.cfg b/forge/conf/version.cfg new file mode 100644 index 0000000000..55179687fe --- /dev/null +++ b/forge/conf/version.cfg @@ -0,0 +1,4 @@ +[VERSION] +MCPVersion = 5.0 +ClientVersion = 1.0.0 +ServerVersion = 1.0.1 diff --git a/forge/install/README.txt b/forge/install/README.txt index 7d55174933..640cc3622a 100755 --- a/forge/install/README.txt +++ b/forge/install/README.txt @@ -4,9 +4,16 @@ Extract the download archive directly into your MCP-directiory. It should create a folder "forge" within that directory, containing all extracted files. -You should use freshly decompiled jars, solely including ModLoader & -ModLoaderMP respectively. Anything else can eventually cause conflicts. +You should use freshly downloaded jars, solely including ModLoader & +ModLoaderMP. Anything else can eventually cause conflicts. -Now just start the install-bat, MCForge will install itself into the proper -locations and copy all ned files, as well as modifying the ned baseclasses. +Now just start the install.cmd/.sh, MCForge will install itself into the proper +locations and copy all needed files, as well as modifying the needed baseclasses. + +Forge also includes a snapshot of the MCP mapings, this may not be the current +version of the mapings. But you must use the provided mapings in order for the +patch files to work together. + +The install scripts should take care of everything for you, so you should not need +to run ANY MCP script before installing forge. diff --git a/forge/install/install.cmd b/forge/install/install.cmd index f8a8d3b2d6..052a72795c 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -5,9 +5,15 @@ echo: pushd .. >nul +xcopy /Y /E /I forge\conf\* conf + +if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup + cmd /C cleanup.bat cmd /C decompile.bat +if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar + pushd src >nul del minecraft\net\minecraft\src\MLProp.java copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java @@ -28,4 +34,6 @@ popd >nul xcopy /Y /E forge\src\* src +cmd /C updatemcp.bat +cmd /C updatenames.bat cmd /C updatemd5.bat \ No newline at end of file diff --git a/forge/install/install.sh b/forge/install/install.sh index 5129755ab5..1b9f7fca9a 100644 --- a/forge/install/install.sh +++ b/forge/install/install.sh @@ -5,21 +5,41 @@ echo pushd .. > /dev/null +rm -rf conf +mkdir conf +cp -r forge/conf/* conf + +if [ -f runtime/bin/fernflower.jar ]; +then + mv runtime/bin/fernflower.jar runtime/bin/fernflower.jar-backup +fi + ./cleanup.sh ./decompile.sh +if [ -f runtime/bin/fernflower.jar-backup ]; +then + mv runtime/bin/fernflower.jar-backup runtime/bin/fernflower.jar +fi + + pushd src > /dev/null - find . -name *.java -exec sed -i 's/\r//g' \{\} \; + find . -name *.java -exec sed -i 's/\r//g' \{\} \; cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java - patch -p2 -i ../forge/modLoaderMP.patch - #patch -p1 -i ../forge/mlprop.patch - for i in `find ../forge/patches/ -type f` - do - patch -p2 -i $i - done + + find ../forge/ -name *.patch -exec sed -i 's/\r//g' \{\} \; + patch -p2 -i ../forge/modLoaderMP.patch + + for i in `find ../forge/patches/ -type f` + do + patch -p2 -i $i + done popd > /dev/null cp -r forge/src/* src -./updatemd5.sh + +./updatemcp.sh +./updatenames.sh +./updatemd5.sh \ No newline at end of file diff --git a/forge/minecraftforge_credits.txt b/forge/minecraftforge_credits.txt index eed84fe482..b7ed9933a3 100755 --- a/forge/minecraftforge_credits.txt +++ b/forge/minecraftforge_credits.txt @@ -16,3 +16,5 @@ ScotTools Background: ScotTools was an API that enabled modders to add blocks to * SpaceToad * +* LexManos * + diff --git a/forge/package.sh b/forge/package.sh index 8d337cf53e..e7e059d5a0 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -55,11 +55,13 @@ mkdir src mkdir src/minecraft mkdir src/minecraft_server mkdir patches +mkdir conf cp -r ../forge_client/src/* src/minecraft cp -r ../forge_server/src/* src/minecraft_server cp -r ../forge_common/* src/minecraft cp -r ../forge_common/* src/minecraft_server cp -r ../patches/* patches +cp -r ../conf/* conf cp ../lfcr.py . cp ../install/install.cmd . cp ../install/install.sh . @@ -73,6 +75,8 @@ cd src remove_svn . cd ../patches remove_svn . +cd ../conf +remove_svn . cd .. cd .. diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 4ee7aefd55..b991e0a439 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,56 @@ +@@ -438,25 +441,70 @@ { return 1; } @@ -39,7 +39,14 @@ + } + + /* FORGE: Metadata-sensitive version. ++ * ++ * This is deprecated in MC 1.0+ versions because of the new Enchantment ++ * system requiring a new argument. Will be removed unless a valid reason ++ * for it to remain is brought to light. ++ * ++ * Implementing this in your mod will not do anything! + */ ++ @Deprecated + public int quantityDropped(int meta, Random random) + { + return quantityDropped(meta, 0, random); @@ -87,14 +94,21 @@ + } + + /* FORGE: This function returns the complete list of drops for a block. ++ * ++ * This is deprecated in MC 1.0+ versions because of the new Enchantment ++ * system requiring a new argument. Will be removed unless a valid reason ++ * for it to remain is brought to light. ++ * ++ * Implementing this in your mod will not do anything! + */ ++ @Deprecated + public ArrayList getBlockDropped(World world, + int i, int j, int k, int md) { -+ return getBlockDropped (world, i, j, k, md); ++ return getBlockDropped (world, i, j, k, md, 0); } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +504,13 @@ +@@ -470,18 +518,13 @@ { return; } @@ -116,7 +130,7 @@ } } -@@ -805,6 +834,107 @@ +@@ -805,6 +848,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index b4d38e4ed9..3db91cbc66 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,57 @@ +@@ -384,26 +385,71 @@ return 1; } @@ -20,7 +20,14 @@ + } + + /* FORGE: Metadata-sensitive version. ++ * ++ * This is deprecated in MC 1.0+ versions because of the new Enchantment ++ * system requiring a new argument. Will be removed unless a valid reason ++ * for it to remain is brought to light. ++ * ++ * Implementing this in your mod will not do anything! + */ ++ @Deprecated + public int quantityDropped(int meta, Random random) + { + return quantityDropped(meta, 0, random); @@ -70,16 +77,23 @@ + } + + /* FORGE: This function returns the complete list of drops for a block. ++ * ++ * This is deprecated in MC 1.0+ versions because of the new Enchantment ++ * system requiring a new argument. Will be removed unless a valid reason ++ * for it to remain is brought to light. ++ * ++ * Implementing this in your mod will not do anything! + */ ++ @Deprecated + public ArrayList getBlockDropped(World world, + int i, int j, int k, int md) { -+ return getBlockDropped (world, i, j, k, md); ++ return getBlockDropped (world, i, j, k, md, 0); + } + public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +447,14 @@ +@@ -415,18 +461,14 @@ { return; } @@ -101,7 +115,7 @@ } } -@@ -725,6 +753,99 @@ +@@ -725,6 +767,99 @@ return blockMaterial.getMaterialMobility(); } diff --git a/forge/update_patches.bat b/forge/update_patches.bat index e34aa0bbc2..84fb4f655c 100644 --- a/forge/update_patches.bat +++ b/forge/update_patches.bat @@ -2,6 +2,7 @@ @echo off set PATH=.\bin;%PATH% + echo Creating directories for /f %%i in ('find ../src_work -type d') do ( set file=%%i @@ -16,14 +17,9 @@ for /f %%i in ('find ../src_work -type f') do ( rem echo !file! diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch ) + echo Removing empty patches -for /f %%i in ('find patches -size 0 -type f') do ( - set file=%%i - rem Have to do this to filter out .svn entries - if /I "!file:~-6!" EQU ".patch" ( - del !file:/=\! - ) -) +find patches -size 0 -type f -regex .+\.patch -delete for /f %%i in ('find patches -depth -empty -type d') do ( set file=%%i if "!file:.svn=!" EQU "!file!" ( @@ -31,5 +27,22 @@ for /f %%i in ('find patches -depth -empty -type d') do ( ) ) +echo Grabbing copy of conf folder +for /f %%i in ('find conf -type f') do ( + set file=%%i + if "!file:.svn=!" EQU "!file!" ( + del !file:/=\! + ) +) + +for /f %%i in ('find conf -depth -empty -type d') do ( + set file=%%i + if "!file:.svn=!" EQU "!file!" ( + rmdir "%%i" + ) +) + +xcopy ..\conf conf /E /I /Y + echo Finished pause diff --git a/forge/update_patches.sh b/forge/update_patches.sh index 4dd057b2c6..bf65d91541 100644 --- a/forge/update_patches.sh +++ b/forge/update_patches.sh @@ -13,11 +13,22 @@ do done echo Removing empty patches -for i in `find patches -size 0 -type f -name \*.patch` -do - rm $i -done +find patches -size 0 -type f -name \*.patch -delete for i in `find patches -depth -empty -type d | grep -a -v "svn"` do rmdir "$i" done + +echo Grabbing copy of conf folder +for i in `find conf -type f | grep -a -v "svn"` +do + rm $i +done +for i in `find conf -depth -empty -type d | grep -a -v "svn"` +do + rmdir "$i" +done + +cp -r ../conf/* conf + +echo Finished From e79b5d1937e0c984a0b4c5b4f56f7f4ee0c38773 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 11 Dec 2011 07:37:54 +0000 Subject: [PATCH 151/169] The install scripts will now only patch the client/server if they are there. This allows for people to only worry about getting one side setup correctly if they don't care about the other. --- forge/install/install.cmd | 39 +++++++++++++++++++++++++++------------ forge/install/install.sh | 30 ++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/forge/install/install.cmd b/forge/install/install.cmd index 052a72795c..7c4f21541f 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -15,20 +15,35 @@ cmd /C decompile.bat if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar pushd src >nul - del minecraft\net\minecraft\src\MLProp.java - copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java - del minecraft_server\net\minecraft\src\MLProp.java - copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch - ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + if exist ..\jars\bin\minecraft.jar ( + del minecraft\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java + + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft') do ( + pushd "%%a" 2>nul + if errorlevel 1 ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" + ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" + ) else popd + ) + ) + + if exist ..\jars\minecraft_server.jar ( + del minecraft_server\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java - for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do ( - pushd "%%a" 2>nul - if errorlevel 1 ( - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" - ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" - ) else popd + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch + ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft_server') do ( + pushd "%%a" 2>nul + if errorlevel 1 ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" + ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" + ) else popd + ) + ) popd >nul diff --git a/forge/install/install.sh b/forge/install/install.sh index 1b9f7fca9a..9b09dde9ba 100644 --- a/forge/install/install.sh +++ b/forge/install/install.sh @@ -25,16 +25,30 @@ fi pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; - cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java - cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java - find ../forge/ -name *.patch -exec sed -i 's/\r//g' \{\} \; - patch -p2 -i ../forge/modLoaderMP.patch + + if [ -f ../jars/bin/minecraft.jar ]; + then + cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java - for i in `find ../forge/patches/ -type f` - do - patch -p2 -i $i - done + for i in `find ../forge/patches/minecraft/ -type f` + do + patch -p2 -i $i + done + fi + + + if [ -f ../jars/minecraft_server.jar ]; + then + cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java + + patch -p2 -i ../forge/modLoaderMP.patch + + for i in `find ../forge/patches/minecraft_server/ -type f` + do + patch -p2 -i $i + done + fi popd > /dev/null cp -r forge/src/* src From 5c60c2246cc4752c82a7e48da5d17e29d4f773e7 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 11 Dec 2011 11:50:55 +0000 Subject: [PATCH 152/169] Small fix to decrease the number of glBindTexture calls that are immediately overridden. --- .../minecraft/src/forge/ForgeHooksClient.java | 12 +++++ .../net/minecraft/src/ItemRenderer.java.patch | 19 ++++---- .../net/minecraft/src/RenderItem.java.patch | 44 ++++++++++--------- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index af3871964c..e3c892e8b8 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -160,6 +160,18 @@ public class ForgeHooksClient { } } + public static String getTexture(String def, Object item) + { + if (item instanceof ITextureProvider) + { + return ((ITextureProvider)item).getTextureFile(); + } + else + { + return def; + } + } + public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) { Tessellator tessellator = Tessellator.instance; if (renderBlocks.useInventoryTint) { diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index a38f491e97..a5dbc7acf3 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -19,24 +19,27 @@ + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); + + if (customRenderer != null) { -+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", itemstack.getItem()); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex)); + ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); +- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex)); renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); } else { if(itemstack.itemID < 256) { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); +- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex)); } else { - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]); +- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png")); ++ String tex = ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[itemstack.itemID]); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex)); } Tessellator tessellator = Tessellator.instance; int j = entityliving.getItemIcon(itemstack, i); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index 08da9b35ed..59bf5a751e 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -11,7 +11,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -@@ -54,10 +58,36 @@ +@@ -54,10 +58,34 @@ } GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); @@ -21,8 +21,7 @@ + + if (customRenderer != null) { + GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); -+ loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(itemstack.getItem()); ++ loadTexture(ForgeHooksClient.getTexture("/terrain.png", itemstack.getItem())); + float f4 = 0.25F; + f4 = 0.5F; + GL11.glScalef(f4, f4, f4); @@ -44,24 +43,25 @@ + } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); +- loadTexture("/terrain.png"); ++ loadTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID])); float f4 = 0.25F; int j = Block.blocksList[itemstack.itemID].getRenderType(); if(j == 1 || j == 19 || j == 12 || j == 2) -@@ -108,9 +138,11 @@ +@@ -107,10 +135,10 @@ + int i = itemstack.getIconIndex(); if(itemstack.itemID < 256) { - loadTexture("/terrain.png"); -+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]); +- loadTexture("/terrain.png"); ++ loadTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID])); } else { - loadTexture("/gui/items.png"); -+ ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]); +- loadTexture("/gui/items.png"); ++ loadTexture(ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[itemstack.itemID])); } if(field_27004_a) { -@@ -162,10 +194,37 @@ +@@ -162,10 +190,37 @@ public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) { @@ -69,9 +69,9 @@ + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i); + if (customRenderer != null) { + int j1 = i; -+ renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", Item.itemsList [i]); ++ renderengine.bindTexture(renderengine.getTexture(tex)); + Item item = Item.itemsList[i]; -+ ForgeHooksClient.overrideTexture (Item.itemsList [i]); + GL11.glPushMatrix(); + GL11.glTranslatef(l - 2, i1 + 3, -3F); + GL11.glScalef(10F, 10F, 10F); @@ -95,20 +95,24 @@ + } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) { int j1 = i; - renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[i]); +- renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[i]); ++ renderengine.bindTexture(renderengine.getTexture(tex)); Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel); -@@ -215,9 +274,11 @@ +@@ -214,10 +269,12 @@ + GL11.glDisable(2896 /*GL_LIGHTING*/); if(i < 256) { - renderengine.bindTexture(renderengine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (Block.blocksList[i]); +- renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[i]); ++ renderengine.bindTexture(renderengine.getTexture(tex)); } else { - renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); -+ ForgeHooksClient.overrideTexture(Item.itemsList[i]); +- renderengine.bindTexture(renderengine.getTexture("/gui/items.png")); ++ String tex = ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[i]); ++ renderengine.bindTexture(renderengine.getTexture(tex)); } int k1 = Item.itemsList[i].getColorFromDamage(j); float f = (float)(k1 >> 16 & 0xff) / 255F; From 46a9ba178f676c65c432de751d2fd020564014ba Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 11 Dec 2011 21:55:35 +0000 Subject: [PATCH 153/169] Fixed seeds/wheat not dropping from Crops/TallGrass. All future Forge code should use proper annotations when Overriding. --- .../net/minecraft/src/BlockCrops.java.patch | 29 ++++++++--------- .../minecraft/src/BlockTallGrass.java.patch | 21 ++++++++----- .../net/minecraft/src/BlockCrops.java.patch | 31 ++++++++++--------- .../minecraft/src/BlockTallGrass.java.patch | 21 ++++++++----- 4 files changed, 60 insertions(+), 42 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index b1110702ca..4c7af8d45a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -8,7 +8,7 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, Block, World, EntityItem, -@@ -108,28 +109,16 @@ +@@ -108,28 +109,22 @@ return 6; } @@ -16,22 +16,22 @@ - { - super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0); - if(world.multiplayerWorld) -- { -- return; -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) { + ArrayList tr = new ArrayList(); -+ if (md == 7) tr.add(new ItemStack(Item.wheat)); -+ -+ for(int n = 0; n < 3; n++) { -+ if (world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); ++ if (md == 7) + { +- return; ++ tr.add(new ItemStack(Item.wheat)); } - int j1 = 3 + i1; - for(int k1 = 0; k1 < j1; k1++) -- { ++ ++ for(int n = 0; n < 3; n++) + { - if(world.rand.nextInt(15) <= l) -- { ++ if (world.rand.nextInt(15) <= md) + { - float f1 = 0.7F; - float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; - float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; @@ -39,8 +39,9 @@ - EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); - entityitem.delayBeforeCanPickup = 10; - world.entityJoinedWorld(entityitem); -- } -- } ++ tr.add(new ItemStack(Item.seeds)); + } + } - + return tr; } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index 4a8a12f6a0..e660dd0df5 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -11,7 +11,7 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, -@@ -73,13 +76,17 @@ +@@ -73,13 +76,24 @@ public int idDropped(int i, Random random, int j) { @@ -25,13 +25,20 @@ + return -1; + } + -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(world.rand.nextInt(8)!=0) ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) ++ { ++ ArrayList tr = new ArrayList(); ++ if(world.rand.nextInt(8) != 0) ++ { + return tr; -+ ItemStack ist=ForgeHooks.getGrassSeed(world); -+ if(ist!=null) tr.add(ist); ++ } ++ ++ ItemStack ist = ForgeHooks.getGrassSeed(world); ++ if (ist != null) ++ { ++ tr.add(ist); ++ } + return tr; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 64ee6042a8..91ca055c20 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -8,30 +8,32 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, Block, World, EntityItem, -@@ -108,28 +109,16 @@ +@@ -108,28 +109,23 @@ return 6; } - public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1) -- { ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) + { - super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0); - if(world.singleplayerWorld) -- { -- return; -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { + ArrayList tr = new ArrayList(); -+ if (md == 7) tr.add(new ItemStack(Item.wheat)); ++ if (md == 7) ++ { ++ tr.add(new ItemStack(Item.wheat)); ++ } + -+ for(int n = 0; n < 3; n++) { -+ if (world.rand.nextInt(15) <= md) -+ tr.add(new ItemStack(Item.seeds)); - } ++ for(int n = 0; n < 3; n++) + { +- return; +- } - int j1 = 3 + i1; - for(int k1 = 0; k1 < j1; k1++) - { - if(world.rand.nextInt(15) <= l) -- { ++ if (world.rand.nextInt(15) <= md) + { - float f1 = 0.7F; - float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; - float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F; @@ -39,8 +41,9 @@ - EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds)); - entityitem.delayBeforeCanPickup = 10; - world.entityJoinedWorld(entityitem); -- } -- } ++ tr.add(new ItemStack(Item.seeds)); + } + } - + return tr; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 5af36c4fde..362d5df5de 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -11,7 +11,7 @@ // Referenced classes of package net.minecraft.src: // BlockFlower, Item, World, EntityPlayer, -@@ -41,13 +44,17 @@ +@@ -41,13 +44,24 @@ public int idDropped(int i, Random random, int j) { @@ -24,13 +24,20 @@ - } + } + -+ public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); -+ if(world.rand.nextInt(8)!=0) ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) ++ { ++ ArrayList tr = new ArrayList(); ++ if (world.rand.nextInt(8) != 0) ++ { + return tr; -+ ItemStack ist=ForgeHooks.getGrassSeed(world); -+ if(ist!=null) tr.add(ist); ++ } ++ ++ ItemStack ist = ForgeHooks.getGrassSeed(world); ++ if (ist != null) ++ { ++ tr.add(ist); ++ } + return tr; } From 8bb73671ba2db082c81b0b6c1f0cf49d0463428b Mon Sep 17 00:00:00 2001 From: Space Toad Date: Tue, 13 Dec 2011 19:33:37 +0000 Subject: [PATCH 154/169] bumped version numbers --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- forge/release.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index b5bcac92d9..4ed71df419 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -242,7 +242,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=2; - public static final int revisionVersion=1; + public static final int revisionVersion=2; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); } diff --git a/forge/release.bat b/forge/release.bat index af4ba43a6c..f6086d4ed5 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.2.1 +sh package.sh 1.2.2 pause From d8a14ee92855f7a55ef1ceaf07b7c6309023708a Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 14 Dec 2011 10:45:37 +0000 Subject: [PATCH 155/169] Fixed a zLevel bug with custom item renderers. --- forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index 59bf5a751e..8d476f51ed 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -73,7 +73,7 @@ + renderengine.bindTexture(renderengine.getTexture(tex)); + Item item = Item.itemsList[i]; + GL11.glPushMatrix(); -+ GL11.glTranslatef(l - 2, i1 + 3, -3F); ++ GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel); + GL11.glScalef(10F, 10F, 10F); + GL11.glTranslatef(1.0F, 0.5F, 1.0F); + GL11.glScalef(1.0F, 1.0F, -1F); From 8c9762fd9af61c4d6bae791ebbaa4380478dde64 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 16 Dec 2011 10:06:57 +0000 Subject: [PATCH 156/169] Added missing native library path to forge_client project. Added harvest levels/effectiveness for Axes and Shovels. --- forge/forge_client/.classpath | 19 ++- forge/forge_client/.project | 54 ++++++++ .../net/minecraft/src/forge/ForgeHooks.java | 123 +++++++++++------- 3 files changed, 145 insertions(+), 51 deletions(-) diff --git a/forge/forge_client/.classpath b/forge/forge_client/.classpath index fae6017a3b..609bee1de9 100755 --- a/forge/forge_client/.classpath +++ b/forge/forge_client/.classpath @@ -1,12 +1,25 @@ + - - - + + + + + + + + + + + + + + + diff --git a/forge/forge_client/.project b/forge/forge_client/.project index 12d4bdba87..217be6f527 100755 --- a/forge/forge_client/.project +++ b/forge/forge_client/.project @@ -20,10 +20,64 @@ 2 PARENT-1-PROJECT_LOC/forge_common + + jars + 2 + MCP_LOC/jars + minecraft 2 PARENT-1-WORKSPACE_LOC/src_work/minecraft + + start + 2 + MCP_LOC/conf/patches + + + + 1324024223159 + jars + 9 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-bin + + + + 1324024223163 + jars + 6 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-* + + + + 1324022795404 + start + 5 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.java + + + + 1324024144075 + jars/bin + 5 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.jar + + + + + + MCP_LOC + $%7BPARENT-1-WORKSPACE_LOC%7D + + diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 4ed71df419..9f2f2b2d7b 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -179,72 +179,99 @@ public class ForgeHooks { } public static boolean isToolEffective(ItemStack ist, Block bl, int md) { - List tc=(List)toolClasses.get(ist.itemID); - if(tc==null) return false; - Object[] ta=tc.toArray(); - String cls=(String)ta[0]; - - return toolEffectiveness.contains(Arrays.asList( - bl.blockID,md,cls)); + List tc = (List)toolClasses.get(ist.itemID); + if (tc == null) + { + return false; + } + Object[] ta = tc.toArray(); + String cls = (String)ta[0]; + return toolEffectiveness.contains(Arrays.asList(bl.blockID, md, cls)); } static void initTools() { - if(toolInit) return; - toolInit=true; + if(toolInit) + { + return; + } + toolInit = true; - MinecraftForge.setToolClass(Item.pickaxeWood,"pickaxe",0); - MinecraftForge.setToolClass(Item.pickaxeStone,"pickaxe",1); - MinecraftForge.setToolClass(Item.pickaxeSteel,"pickaxe",2); - MinecraftForge.setToolClass(Item.pickaxeGold,"pickaxe",0); - MinecraftForge.setToolClass(Item.pickaxeDiamond,"pickaxe",3); + MinecraftForge.setToolClass(Item.pickaxeWood, "pickaxe", 0); + MinecraftForge.setToolClass(Item.pickaxeStone, "pickaxe", 1); + MinecraftForge.setToolClass(Item.pickaxeSteel, "pickaxe", 2); + MinecraftForge.setToolClass(Item.pickaxeGold, "pickaxe", 0); + MinecraftForge.setToolClass(Item.pickaxeDiamond, "pickaxe", 3); - MinecraftForge.setToolClass(Item.axeWood,"axe",0); - MinecraftForge.setToolClass(Item.axeStone,"axe",1); - MinecraftForge.setToolClass(Item.axeSteel,"axe",2); - MinecraftForge.setToolClass(Item.axeGold,"axe",0); - MinecraftForge.setToolClass(Item.axeDiamond,"axe",3); + MinecraftForge.setToolClass(Item.axeWood, "axe", 0); + MinecraftForge.setToolClass(Item.axeStone, "axe", 1); + MinecraftForge.setToolClass(Item.axeSteel, "axe", 2); + MinecraftForge.setToolClass(Item.axeGold, "axe", 0); + MinecraftForge.setToolClass(Item.axeDiamond, "axe", 3); - MinecraftForge.setToolClass(Item.shovelWood,"shovel",0); - MinecraftForge.setToolClass(Item.shovelStone,"shovel",1); - MinecraftForge.setToolClass(Item.shovelSteel,"shovel",2); - MinecraftForge.setToolClass(Item.shovelGold,"shovel",0); - MinecraftForge.setToolClass(Item.shovelDiamond,"shovel",3); + MinecraftForge.setToolClass(Item.shovelWood, "shovel", 0); + MinecraftForge.setToolClass(Item.shovelStone, "shovel", 1); + MinecraftForge.setToolClass(Item.shovelSteel, "shovel", 2); + MinecraftForge.setToolClass(Item.shovelGold, "shovel", 0); + MinecraftForge.setToolClass(Item.shovelDiamond, "shovel", 3); - MinecraftForge.setBlockHarvestLevel(Block.obsidian,"pickaxe",3); - MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,"pickaxe",2); - MinecraftForge.setBlockHarvestLevel(Block.blockDiamond,"pickaxe",2); - MinecraftForge.setBlockHarvestLevel(Block.oreGold,"pickaxe",2); - MinecraftForge.setBlockHarvestLevel(Block.blockGold,"pickaxe",2); - MinecraftForge.setBlockHarvestLevel(Block.oreIron,"pickaxe",1); - MinecraftForge.setBlockHarvestLevel(Block.blockSteel,"pickaxe",1); - MinecraftForge.setBlockHarvestLevel(Block.oreLapis,"pickaxe",1); - MinecraftForge.setBlockHarvestLevel(Block.blockLapis,"pickaxe",1); - MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,"pickaxe",2); - MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2); - MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe"); - MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe"); - MinecraftForge.removeBlockEffectiveness(Block.obsidian,"pickaxe"); + MinecraftForge.setBlockHarvestLevel(Block.obsidian, "pickaxe", 3); + MinecraftForge.setBlockHarvestLevel(Block.oreDiamond, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.blockDiamond, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreGold, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.blockGold, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreIron, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.blockSteel, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.oreLapis, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.blockLapis, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstone, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing, "pickaxe", 2); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstone, "pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.obsidian, "pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "pickaxe"); - Block[] pickeff ={ + Block[] pickeff = { Block.cobblestone, Block.stairDouble, - Block.stairSingle, Block.stone, Block.sandStone, - Block.cobblestoneMossy, - Block.oreCoal, - Block.ice, Block.netherrack, Block.oreLapis, + Block.stairSingle, Block.stone, + Block.sandStone, Block.cobblestoneMossy, + Block.oreCoal, Block.ice, + Block.netherrack, Block.oreLapis, Block.blockLapis - }; - for(Block bl : pickeff) { - MinecraftForge.setBlockHarvestLevel(bl,"pickaxe",0); + }; + for (Block bl : pickeff) + { + MinecraftForge.setBlockHarvestLevel(bl, "pickaxe", 0); + } + + Block[] spadeEff = { + Block.grass, Block.dirt, + Block.sand, Block.gravel, + Block.snow, Block.blockSnow, + Block.blockClay, Block.tilledField, + Block.slowSand, Block.mycelium + }; + for (Block bl : spadeEff) + { + MinecraftForge.setBlockHarvestLevel(bl, "shovel", 0); + } + + Block[] axeEff = { + Block.planks, Block.bookShelf, + Block.wood, Block.chest, + Block.stairDouble, Block.stairSingle, + Block.pumpkin, Block.pumpkinLantern + }; + for (Block bl : axeEff) + { + MinecraftForge.setBlockHarvestLevel(bl, "axe", 0); } - // TODO: add other tool tables. } public static final int majorVersion=1; public static final int minorVersion=2; public static final int revisionVersion=2; static { - System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion); + System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion); } static boolean toolInit=false; From c84b8740b4b93278a6631696fd723ec2a4df55dc Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 19 Dec 2011 06:33:20 +0000 Subject: [PATCH 157/169] Implemented ISidedInventory for Brewing Stands. Top is input, 1 slot All other sides are output, 3 slots. --- .../src/TileEntityBrewingStand.java.patch | 35 ++++++++++++++++++ .../src/TileEntityBrewingStand.java.patch | 37 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch new file mode 100644 index 0000000000..af37b2dcec --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch @@ -0,0 +1,35 @@ +--- ../src_base/minecraft/net/minecraft/src/TileEntityBrewingStand.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityBrewingStand.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; ++ + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, World, +@@ -11,7 +13,7 @@ + // NBTTagList, EntityPlayer + + public class TileEntityBrewingStand extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + private ItemStack brewingItemStacks[]; +@@ -280,4 +282,14 @@ + + return i; + } ++ ++ @Override ++ public int getStartInventorySide(int side) { ++ return (side == 1 ? 3 : 0); ++ } ++ ++ @Override ++ public int getSizeInventorySide(int side) { ++ return (side == 1 ? 1 : 3); ++ } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch new file mode 100644 index 0000000000..1d215eb741 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch @@ -0,0 +1,37 @@ +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,8 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ISidedInventory; ++ + + // Referenced classes of package net.minecraft.src: + // TileEntity, IInventory, ItemStack, World, +@@ -11,7 +13,7 @@ + // NBTTagList, EntityPlayer + + public class TileEntityBrewingStand extends TileEntity +- implements IInventory ++ implements IInventory, ISidedInventory + { + + private ItemStack field_40083_a[]; +@@ -274,5 +276,15 @@ + } + + return i; +- } ++ } ++ ++ @Override ++ public int getStartInventorySide(int side) { ++ return (side == 1 ? 3 : 0); ++ } ++ ++ @Override ++ public int getSizeInventorySide(int side) { ++ return (side == 1 ? 1 : 3); ++ } + } From 4c6e03e4ad6910e656ebf248ed15d505fa76213b Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 20 Dec 2011 06:58:29 +0000 Subject: [PATCH 158/169] Updated mappings --- forge/conf/fields.csv | 410 ++++++++-------- forge/conf/methods.csv | 464 +++++++++--------- .../net/minecraft/src/BlockTorch.java.patch | 2 +- .../net/minecraft/src/Chunk.java.patch | 27 +- .../net/minecraft/src/Item.java.patch | 2 +- .../net/minecraft/src/ItemDye.java.patch | 25 +- .../src/PlayerControllerMP.java.patch | 31 +- .../src/PlayerControllerSP.java.patch | 35 +- .../net/minecraft/src/World.java.patch | 2 +- .../minecraft/src/BlockContainer.java.patch | 31 +- .../net/minecraft/src/Chunk.java.patch | 41 +- .../net/minecraft/src/EntityPlayer.java.patch | 4 +- .../src/TileEntityBrewingStand.java.patch | 2 +- .../net/minecraft/src/World.java.patch | 4 +- 14 files changed, 548 insertions(+), 532 deletions(-) diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv index c01a6cada8..b0d3dbb9c3 100644 --- a/forge/conf/fields.csv +++ b/forge/conf/fields.csv @@ -316,10 +316,10 @@ "field_1780_b","soundUrl","b","Ljava/net/URL;","Ljava/net/URL;","SoundPoolEntry","lr","net/minecraft/src","0" "field_20920_e","mainModel","g","LModelBase;","Lal;","RenderLiving","acq","net/minecraft/src","0" "field_6332_f","renderPassModel","h","LModelBase;","Lal;","RenderLiving","acq","net/minecraft/src","0" -"field_40565_a","field_40565_a","a","Z","Z","PacketCount","lg","net/minecraft/src","0" +"field_40565_a","allowCounting","a","Z","Z","PacketCount","lg","net/minecraft/src","0" "field_40563_b","field_40563_b","b","Ljava/util/Map;","Ljava/util/Map;","PacketCount","lg","net/minecraft/src","0" "field_40564_c","field_40564_c","c","Ljava/util/Map;","Ljava/util/Map;","PacketCount","lg","net/minecraft/src","0" -"field_40562_d","field_40562_d","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","lg","net/minecraft/src","0" +"field_40562_d","lock","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","lg","net/minecraft/src","0" "field_778_b","inventory","by","LInventoryPlayer;","Lx;","EntityPlayer","vi","net/minecraft/src","0" "field_20069_g","inventorySlots","bz","LContainer;","Lpj;","EntityPlayer","vi","net/minecraft/src","0" "field_20068_h","craftingInventory","bA","LContainer;","Lpj;","EntityPlayer","vi","net/minecraft/src","0" @@ -407,17 +407,17 @@ "field_1072_e","curBlockZ","e","I","I","PlayerControllerSP","dm","net/minecraft/src","0" "field_1071_f","curBlockDamage","f","F","F","PlayerControllerSP","dm","net/minecraft/src","0" "field_1070_g","prevBlockDamage","g","F","F","PlayerControllerSP","dm","net/minecraft/src","0" -"field_1069_h","field_1069_h","h","F","F","PlayerControllerSP","dm","net/minecraft/src","0" +"field_1069_h","blockDestroySoundCounter","h","F","F","PlayerControllerSP","dm","net/minecraft/src","0" "field_1068_i","blockHitWait","i","I","I","PlayerControllerSP","dm","net/minecraft/src","0" -"field_28109_a","networkManager","a","LNetworkManager;","Lhc;","ThreadCloseConnection","po","net/minecraft/src","0" -"field_40236_a","field_40236_a","a","LIInventory;","Lde;","ContainerEnchantment","ahk","net/minecraft/src","0" -"field_40240_h","field_40240_h","h","LWorld;","Lry;","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_28109_a","netManager","a","LNetworkManager;","Lhc;","ThreadCloseConnection","po","net/minecraft/src","0" +"field_40236_a","tableInventory","a","LIInventory;","Lde;","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40240_h","worldPointer","h","LWorld;","Lry;","ContainerEnchantment","ahk","net/minecraft/src","0" "field_40241_i","field_40241_i","i","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" "field_40238_j","field_40238_j","j","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" "field_40239_k","field_40239_k","k","I","I","ContainerEnchantment","ahk","net/minecraft/src","0" "field_40237_l","field_40237_l","l","Ljava/util/Random;","Ljava/util/Random;","ContainerEnchantment","ahk","net/minecraft/src","0" -"field_40234_b","field_40234_b","b","J","J","ContainerEnchantment","ahk","net/minecraft/src","0" -"field_40235_c","field_40235_c","c","[I","[I","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40234_b","nameSeed","b","J","J","ContainerEnchantment","ahk","net/minecraft/src","0" +"field_40235_c","enchantLevels","c","[I","[I","ContainerEnchantment","ahk","net/minecraft/src","0" "field_1004_a","field_1004_a","a","Ljava/lang/String;","Ljava/lang/String;","LoadingScreenRenderer","xw","net/minecraft/src","0" "field_1003_b","mc","b","LMinecraft;","LMinecraft;","LoadingScreenRenderer","xw","net/minecraft/src","0" "field_1007_c","currentlyDisplayedText","c","Ljava/lang/String;","Ljava/lang/String;","LoadingScreenRenderer","xw","net/minecraft/src","0" @@ -431,7 +431,7 @@ "field_1137_h","field_1137_h","h","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" "field_1136_i","field_1136_i","i","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" "field_1135_j","field_1135_j","j","[F","[F","TextureWaterFlowFX","va","net/minecraft/src","0" -"field_1134_k","field_1134_k","k","I","I","TextureWaterFlowFX","va","net/minecraft/src","0" +"field_1134_k","tickCounter","k","I","I","TextureWaterFlowFX","va","net/minecraft/src","0" "field_35135_a","field_35135_a","a","F","F","EntityCloudFX","kz","net/minecraft/src","0" "field_35127_a","xpColor","a","I","I","EntityXPOrb","fk","net/minecraft/src","0" "field_35124_b","xpOrbAge","b","I","I","EntityXPOrb","fk","net/minecraft/src","0" @@ -471,9 +471,9 @@ "field_41013_bH","field_41013_bH","bH","LEntityEnderCrystal;","Lsf;","EntityDragon","oo","net/minecraft/src","0" "field_28146_a","mc","a","LMinecraft;","LMinecraft;","ThreadCheckHasPaid","hr","net/minecraft/src","0" "field_15235_a","blockIndex","a","I","I","WorldGenLakes","qv","net/minecraft/src","0" -"field_35834_a","field_35834_a","a","J","J","LongHashMapEntry","ahc","net/minecraft/src","0" -"field_35832_b","field_35832_b","b","Ljava/lang/Object;","Ljava/lang/Object;","LongHashMapEntry","ahc","net/minecraft/src","0" -"field_35833_c","field_35833_c","c","LLongHashMapEntry;","Lahc;","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35834_a","key","a","J","J","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35832_b","value","b","Ljava/lang/Object;","Ljava/lang/Object;","LongHashMapEntry","ahc","net/minecraft/src","0" +"field_35833_c","nextEntry","c","LLongHashMapEntry;","Lahc;","LongHashMapEntry","ahc","net/minecraft/src","0" "field_35831_d","field_35831_d","d","I","I","LongHashMapEntry","ahc","net/minecraft/src","0" "field_1763_a","worldObj","a","LWorld;","Lry;","WorldRenderer","ge","net/minecraft/src","0" "field_1744_C","glRenderList","C","I","I","WorldRenderer","ge","net/minecraft/src","0" @@ -656,7 +656,7 @@ "field_25049_a","looksWithInterest","a","Z","Z","EntityWolf","aik","net/minecraft/src","0" "field_25048_b","field_25048_b","b","F","F","EntityWolf","aik","net/minecraft/src","0" "field_25054_c","field_25054_c","c","F","F","EntityWolf","aik","net/minecraft/src","0" -"field_25053_f","isWolfShaking","d","Z","Z","EntityWolf","aik","net/minecraft/src","0" +"field_25053_f","isShaking","d","Z","Z","EntityWolf","aik","net/minecraft/src","0" "field_25052_g","field_25052_g","e","Z","Z","EntityWolf","aik","net/minecraft/src","0" "field_25051_h","timeWolfIsShaking","f","F","F","EntityWolf","aik","net/minecraft/src","0" "field_25050_i","prevTimeWolfIsShaking","g","F","F","EntityWolf","aik","net/minecraft/src","0" @@ -761,7 +761,7 @@ "field_40698_c","field_40698_c","c","I","I","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" "field_40695_d","field_40695_d","d","I","I","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" "field_40696_e","field_40696_e","e","Z","Z","StructureNetherBridgePieceWeight","aaz","net/minecraft/src","0" -"field_41046_a","field_41046_a","a","I","I","GuiWinGame","lt","net/minecraft/src","0" +"field_41046_a","updateCounter","a","I","I","GuiWinGame","lt","net/minecraft/src","0" "field_41044_b","field_41044_b","b","Ljava/util/List;","Ljava/util/List;","GuiWinGame","lt","net/minecraft/src","0" "field_41045_c","field_41045_c","c","[I","[I","GuiWinGame","lt","net/minecraft/src","0" "field_41042_d","field_41042_d","d","I","I","GuiWinGame","lt","net/minecraft/src","0" @@ -821,11 +821,11 @@ "field_499_b","xPosition","b","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" "field_503_c","yPosition","c","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" "field_502_d","zPosition","d","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" -"field_28047_e","field_28047_e","e","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" -"field_28046_f","field_28046_f","f","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" -"field_28045_g","field_28045_g","g","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28047_e","speedX","e","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28046_f","speedY","f","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28045_g","speedZ","g","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" "field_501_e","type","h","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" -"field_28044_i","field_28044_i","i","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" +"field_28044_i","throwerEntityId","i","I","I","Packet23VehicleSpawn","gh","net/minecraft/src","0" "field_1718_a","xCoord","a","I","I","PathPoint","mo","net/minecraft/src","0" "field_1717_b","yCoord","b","I","I","PathPoint","mo","net/minecraft/src","0" "field_1716_c","zCoord","c","I","I","PathPoint","mo","net/minecraft/src","0" @@ -1155,7 +1155,7 @@ "field_9407_s","velocityZ","aw","D","D","EntityMinecart","vm","net/minecraft/src","0" "field_39004_a","inLove","a","I","I","EntityAnimal","fx","net/minecraft/src","0" "field_39005_b","breeding","b","I","I","EntityAnimal","fx","net/minecraft/src","0" -"field_40089_d","field_40089_d","d","I","I","EntityPotion","ab","net/minecraft/src","0" +"field_40089_d","potionDamage","d","I","I","EntityPotion","ab","net/minecraft/src","0" "field_1286_a","bipedHead","g","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" "field_1285_b","bipedHeadwear","h","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" "field_1284_c","bipedBody","i","LModelRenderer;","Lacf;","ModelBiped","fa","net/minecraft/src","0" @@ -1235,12 +1235,12 @@ "field_1515_d","inputStream","d","Ljava/io/InputStream;","Ljava/io/InputStream;","MusInputStream","cm","net/minecraft/src","0" "field_1514_a","buffer","a","[B","[B","MusInputStream","cm","net/minecraft/src","0" "field_1513_b","codec","b","LCodecMus;","Lvo;","MusInputStream","cm","net/minecraft/src","0" -"field_22037_a","field_22037_a","a","[Ljava/lang/String;","[Ljava/lang/String;","BlockStep","xs","net/minecraft/src","0" +"field_22037_a","blockStepTypes","a","[Ljava/lang/String;","[Ljava/lang/String;","BlockStep","xs","net/minecraft/src","0" "field_20922_a","blockType","cb","Z","Z","BlockStep","xs","net/minecraft/src","0" "field_453_a","wiresProvidePower","a","Z","Z","BlockRedstoneWire","kw","net/minecraft/src","0" "field_21031_b","blocksNeedingUpdate","cb","Ljava/util/Set;","Ljava/util/Set;","BlockRedstoneWire","kw","net/minecraft/src","0" "field_12257_a","isFlaming","a","Z","Z","Explosion","xp","net/minecraft/src","0" -"field_12250_h","ExplosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","xp","net/minecraft/src","0" +"field_12250_h","explosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","xp","net/minecraft/src","0" "field_12249_i","worldObj","i","LWorld;","Lry;","Explosion","xp","net/minecraft/src","0" "field_12256_b","explosionX","b","D","D","Explosion","xp","net/minecraft/src","0" "field_12255_c","explosionY","c","D","D","Explosion","xp","net/minecraft/src","0" @@ -1274,16 +1274,16 @@ "field_21132_b","watchedObjects","b","Ljava/util/Map;","Ljava/util/Map;","DataWatcher","cr","net/minecraft/src","0" "field_21134_c","objectChanged","c","Z","Z","DataWatcher","cr","net/minecraft/src","0" "field_40367_a","field_40367_a","a","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40365_b","field_40365_b","b","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40366_c","field_40366_c","c","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40363_d","field_40363_d","d","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40364_e","field_40364_e","e","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40361_f","field_40361_f","f","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40362_g","field_40362_g","g","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40374_h","field_40374_h","h","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40375_i","field_40375_i","i","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40372_j","field_40372_j","j","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" -"field_40373_k","field_40373_k","k","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40365_b","sugarEffect","b","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40366_c","ghastTearEffect","c","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40363_d","spiderEyeEffect","d","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40364_e","fermentedSpiderEyeEffect","e","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40361_f","speckledMelonEffect","f","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40362_g","blazePowderEffect","g","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40374_h","magmaCreamEffect","h","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40375_i","redstoneEffect","i","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40372_j","glowstoneEffect","j","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" +"field_40373_k","gunpowderEffect","k","Ljava/lang/String;","Ljava/lang/String;","PotionHelper","pk","net/minecraft/src","0" "field_40370_l","field_40370_l","l","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" "field_40371_m","field_40371_m","m","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" "field_40368_n","field_40368_n","n","Ljava/util/HashMap;","Ljava/util/HashMap;","PotionHelper","pk","net/minecraft/src","0" @@ -1314,8 +1314,8 @@ "field_40094_b","field_40094_b","b","D","D","EntityEnderEye","bs","net/minecraft/src","0" "field_40095_c","field_40095_c","c","D","D","EntityEnderEye","bs","net/minecraft/src","0" "field_40091_d","field_40091_d","d","D","D","EntityEnderEye","bs","net/minecraft/src","0" -"field_40092_e","field_40092_e","e","I","I","EntityEnderEye","bs","net/minecraft/src","0" -"field_40093_ao","field_40093_ao","f","Z","Z","EntityEnderEye","bs","net/minecraft/src","0" +"field_40092_e","despawnTimer","e","I","I","EntityEnderEye","bs","net/minecraft/src","0" +"field_40093_ao","shatterOrDrop","f","Z","Z","EntityEnderEye","bs","net/minecraft/src","0" "field_517_a","message","a","Ljava/lang/String;","Ljava/lang/String;","Packet3Chat","abb","net/minecraft/src","0" "field_40058_a","brewingItemStacks","a","[LItemStack;","[Ldk;","TileEntityBrewingStand","tt","net/minecraft/src","0" "field_40056_b","brewTime","b","I","I","TileEntityBrewingStand","tt","net/minecraft/src","0" @@ -1363,7 +1363,7 @@ "field_35675_e","digSpeed","e","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" "field_35672_f","digSlowdown","f","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" "field_35673_g","damageBoost","g","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" -"field_35685_h","potionHeal","h","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" +"field_35685_h","heal","h","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" "field_35686_i","harm","i","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" "field_35683_j","jump","j","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" "field_35684_k","confusion","k","LPotion;","Labg;","Potion","abg","net/minecraft/src","0" @@ -1392,10 +1392,10 @@ "field_35670_H","id","H","I","I","Potion","abg","net/minecraft/src","0" "field_35671_I","name","I","Ljava/lang/String;","Ljava/lang/String;","Potion","abg","net/minecraft/src","0" "field_40627_J","statusIconIndex","J","I","I","Potion","abg","net/minecraft/src","0" -"field_40628_K","field_40628_K","K","Z","Z","Potion","abg","net/minecraft/src","0" +"field_40628_K","isBadEffect","K","Z","Z","Potion","abg","net/minecraft/src","0" "field_40624_L","field_40624_L","L","D","D","Potion","abg","net/minecraft/src","0" "field_40625_M","field_40625_M","M","Z","Z","Potion","abg","net/minecraft/src","0" -"field_40626_N","field_40626_N","N","I","I","Potion","abg","net/minecraft/src","0" +"field_40626_N","liquidColor","N","I","I","Potion","abg","net/minecraft/src","0" "field_35100_a","field_35100_a","a","I","I","ComponentVillageTorch","abj","net/minecraft/src","0" "field_40734_a","field_40734_a","a","I","I","TextureOffset","sx","net/minecraft/src","0" "field_40733_b","field_40733_b","b","I","I","TextureOffset","sx","net/minecraft/src","0" @@ -1415,8 +1415,8 @@ "field_21086_f","field_21086_f","d","F","F","EntitySquid","yv","net/minecraft/src","0" "field_21085_g","field_21085_g","e","F","F","EntitySquid","yv","net/minecraft/src","0" "field_21084_h","field_21084_h","f","F","F","EntitySquid","yv","net/minecraft/src","0" -"field_21083_i","field_21083_i","g","F","F","EntitySquid","yv","net/minecraft/src","0" -"field_21082_j","field_21082_j","bz","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21083_i","tentacleAngle","g","F","F","EntitySquid","yv","net/minecraft/src","0" +"field_21082_j","lastTentacleAngle","bz","F","F","EntitySquid","yv","net/minecraft/src","0" "field_21081_k","randomMotionSpeed","bA","F","F","EntitySquid","yv","net/minecraft/src","0" "field_21080_l","field_21080_l","bB","F","F","EntitySquid","yv","net/minecraft/src","0" "field_21079_m","field_21079_m","bC","F","F","EntitySquid","yv","net/minecraft/src","0" @@ -1430,8 +1430,8 @@ "field_22101_l","selectedWorld","e","I","I","GuiSelectWorld","xz","net/minecraft/src","0" "field_22100_m","saveList","f","Ljava/util/List;","Ljava/util/List;","GuiSelectWorld","xz","net/minecraft/src","0" "field_22099_n","worldSlotContainer","g","LGuiWorldSlot;","Lpb;","GuiSelectWorld","xz","net/minecraft/src","0" -"field_22098_o","field_22098_o","h","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" -"field_22097_p","field_22097_p","j","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22098_o","localizedWorldText","h","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" +"field_22097_p","localizedMustConvertText","j","Ljava/lang/String;","Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" "field_35316_k","localizedGameModeText","k","[Ljava/lang/String;","[Ljava/lang/String;","GuiSelectWorld","xz","net/minecraft/src","0" "field_22096_q","deleting","s","Z","Z","GuiSelectWorld","xz","net/minecraft/src","0" "field_22095_r","buttonRename","t","LGuiButton;","Lct;","GuiSelectWorld","xz","net/minecraft/src","0" @@ -1478,7 +1478,7 @@ "field_9339_I","swingProgress","aL","F","F","EntityLiving","nq","net/minecraft/src","0" "field_9337_J","health","aM","I","I","EntityLiving","nq","net/minecraft/src","0" "field_9335_K","prevHealth","aN","I","I","EntityLiving","nq","net/minecraft/src","0" -"field_40129_bA","field_40129_bA","aO","I","I","EntityLiving","nq","net/minecraft/src","0" +"field_40129_bA","carryoverDamage","aO","I","I","EntityLiving","nq","net/minecraft/src","0" "field_4121_a","livingSoundTime","a","I","I","EntityLiving","nq","net/minecraft/src","0" "field_715_G","hurtTime","aP","I","I","EntityLiving","nq","net/minecraft/src","0" "field_9332_M","maxHurtTime","aQ","I","I","EntityLiving","nq","net/minecraft/src","0" @@ -1559,7 +1559,7 @@ "field_35081_a","field_35081_a","a","I","I","ComponentVillageField","ec","net/minecraft/src","0" "field_35090_a","field_35090_a","a","I","I","ComponentVillageField2","agr","net/minecraft/src","0" "field_6461_a","guiScreen","a","LGuiScreen;","Lxe;","GuiTexturePacks","lb","net/minecraft/src","0" -"field_6454_o","field_6454_o","b","I","I","GuiTexturePacks","lb","net/minecraft/src","0" +"field_6454_o","refreshTimer","b","I","I","GuiTexturePacks","lb","net/minecraft/src","0" "field_6453_p","fileLocation","c","Ljava/lang/String;","Ljava/lang/String;","GuiTexturePacks","lb","net/minecraft/src","0" "field_22128_k","guiTexturePackSlot","d","LGuiTexturePackSlot;","Lju;","GuiTexturePacks","lb","net/minecraft/src","0" "field_1098_a","stringValue","a","Ljava/lang/String;","Ljava/lang/String;","NBTTagString","yt","net/minecraft/src","0" @@ -1573,7 +1573,7 @@ "field_892_h","lastQueriedChunk","h","LChunk;","Lzx;","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" "field_21113_i","curChunkX","i","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" "field_21112_j","curChunkY","j","I","I","ChunkProviderLoadOrGenerate","mv","net/minecraft/src","0" -"field_26003_a","field_26003_a","a","[B","[B","ChunkBlockMap","aig","net/minecraft/src","0" +"field_26003_a","convTable","a","[B","[B","ChunkBlockMap","aig","net/minecraft/src","0" "field_22156_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","SaveHandler","e","net/minecraft/src","0" "field_22155_b","saveDirectory","b","Ljava/io/File;","Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" "field_22158_c","playersDirectory","c","Ljava/io/File;","Ljava/io/File;","SaveHandler","e","net/minecraft/src","0" @@ -1584,7 +1584,7 @@ "field_21143_b","recipeItems","b","Ljava/util/List;","Ljava/util/List;","ShapelessRecipes","bc","net/minecraft/src","0" "field_1133_g","field_1133_g","g","[F","[F","TextureFlamesFX","agp","net/minecraft/src","0" "field_1132_h","field_1132_h","h","[F","[F","TextureFlamesFX","agp","net/minecraft/src","0" -"field_35297_a","field_35297_a","a","LBlock;","Lyy;","BlockStem","pu","net/minecraft/src","0" +"field_35297_a","fruitType","a","LBlock;","Lyy;","BlockStem","pu","net/minecraft/src","0" "field_317_a","minecartType","a","I","I","ItemMinecart","aex","net/minecraft/src","0" "field_35241_a","entityId","a","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" "field_35239_b","posX","b","I","I","Packet26EntityExpOrb","fi","net/minecraft/src","0" @@ -1877,7 +1877,7 @@ "field_287_aW","bFull3D","bP","Z","Z","Item","acy","net/minecraft/src","0" "field_21018_bf","hasSubtypes","bQ","Z","Z","Item","acy","net/minecraft/src","0" "field_20926_a","containerItem","b","LItem;","Lacy;","Item","acy","net/minecraft/src","0" -"field_39010_c","field_39010_c","bR","Ljava/lang/String;","Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"field_39010_c","potionModifier","bR","Ljava/lang/String;","Ljava/lang/String;","Item","acy","net/minecraft/src","0" "field_332_a","itemName","bS","Ljava/lang/String;","Ljava/lang/String;","Item","acy","net/minecraft/src","0" "field_27308_a","nodeBuilder","a","LJ_JsonObjectNodeBuilder;","Labq;","J_JsonObjectNodeList","nv","net/minecraft/src","0" "field_820_a","nameToClassMap","a","Ljava/util/Map;","Ljava/util/Map;","TileEntity","bq","net/minecraft/src","0" @@ -1888,7 +1888,7 @@ "field_821_h","zCoord","f","I","I","TileEntity","bq","net/minecraft/src","0" "field_31007_h","tileEntityInvalid","g","Z","Z","TileEntity","bq","net/minecraft/src","0" "field_35145_n","blockMetadata","h","I","I","TileEntity","bq","net/minecraft/src","0" -"field_35146_o","field_35146_o","i","LBlock;","Lyy;","TileEntity","bq","net/minecraft/src","0" +"field_35146_o","blockType","i","LBlock;","Lyy;","TileEntity","bq","net/minecraft/src","0" "field_460_a","numAdjacentSources","a","I","I","BlockFlowing","ahx","net/minecraft/src","0" "field_459_b","isOptimalFlowDirection","cb","[Z","[Z","BlockFlowing","ahx","net/minecraft/src","0" "field_461_c","flowCost","cc","[I","[I","BlockFlowing","ahx","net/minecraft/src","0" @@ -1976,13 +1976,13 @@ "field_20917_a","field_20917_a","a","S","S","Container","pj","net/minecraft/src","0" "field_20121_g","crafters","g","Ljava/util/List;","Ljava/util/List;","Container","pj","net/minecraft/src","0" "field_20918_b","field_20918_b","b","Ljava/util/Set;","Ljava/util/Set;","Container","pj","net/minecraft/src","0" -"field_35624_a","name","a","Ljava/lang/String;","Ljava/lang/String;","GuiSavingLevelString","ao","net/minecraft/src","0" +"field_35624_a","stringValue","a","Ljava/lang/String;","Ljava/lang/String;","GuiSavingLevelString","ao","net/minecraft/src","0" "field_35623_b","responseTime","b","I","I","GuiSavingLevelString","ao","net/minecraft/src","0" "field_27239_a","field_27239_a","a","LJ_JsonNode;","Lan;","J_JsonNumberNodeBuilder","ms","net/minecraft/src","0" "field_35311_f","inventory","g","LInventoryBasic;","Lbb;","GuiContainerCreative","aec","net/minecraft/src","0" -"field_35312_g","field_35312_g","h","F","F","GuiContainerCreative","aec","net/minecraft/src","0" -"field_35313_h","field_35313_h","j","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" -"field_35314_i","field_35314_i","k","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35312_g","currentScroll","h","F","F","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35313_h","isScrolling","j","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" +"field_35314_i","wasClicking","k","Z","Z","GuiContainerCreative","aec","net/minecraft/src","0" "field_571_a","entityID","a","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" "field_21056_b","slot","b","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" "field_570_b","itemID","c","I","I","Packet5PlayerInventory","lw","net/minecraft/src","0" @@ -2134,7 +2134,7 @@ "field_1190_c","zCoord","c","D","D","NoiseGeneratorPerlin","agk","net/minecraft/src","0" "field_25201_a","localizedName","a","LStringTranslate;","Lqp;","StatCollector","hj","net/minecraft/src","0" "field_27294_a","nodeBuilder","a","LJ_JsonArrayNodeBuilder;","Lft;","J_ArrayNodeContainer","tl","net/minecraft/src","0" -"field_27293_b","field_27293_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ArrayNodeContainer","tl","net/minecraft/src","0" +"field_27293_b","listenerToJdomAdapter","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ArrayNodeContainer","tl","net/minecraft/src","0" "field_35502_b","worldGenSeed","b","J","J","GenLayer","jx","net/minecraft/src","0" "field_35504_a","parent","a","LGenLayer;","Ljx;","GenLayer","jx","net/minecraft/src","0" "field_35503_c","chunkSeed","c","J","J","GenLayer","jx","net/minecraft/src","0" @@ -2195,15 +2195,15 @@ "field_35365_g","field_35365_g","f","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" "field_40232_h","field_40232_h","g","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" "field_22130_l","createClicked","h","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" -"field_35368_i","field_35368_i","j","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" +"field_35368_i","moreOptions","j","Z","Z","GuiCreateWorld","xh","net/minecraft/src","0" "field_35366_j","gameModeButton","k","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" "field_35367_k","moreWorldOptions","s","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" "field_35372_s","generateStructuresButton","t","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" "field_35371_t","worldTypeButton","u","LGuiButton;","Lct;","GuiCreateWorld","xh","net/minecraft/src","0" "field_35370_u","gameModeDescriptionLine1","v","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" "field_35369_v","gameModeDescriptionLine2","w","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" -"field_41048_x","field_41048_x","x","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" -"field_41047_y","field_41047_y","y","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_41048_x","seed","x","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" +"field_41047_y","localizedNewWorldText","y","Ljava/lang/String;","Ljava/lang/String;","GuiCreateWorld","xh","net/minecraft/src","0" "field_199_d","rand","a","Ljava/util/Random;","Ljava/util/Random;","RenderPainting","zv","net/minecraft/src","0" "field_31049_a","isSticky","a","Z","Z","BlockPistonBase","abr","net/minecraft/src","0" "field_31048_b","ignoreUpdates","cb","Z","Z","BlockPistonBase","abr","net/minecraft/src","0" @@ -2217,7 +2217,7 @@ "field_35054_a","field_35054_a","a","LEnumDoor;","Lmj;","ComponentStrongholdStairsStraight","so","net/minecraft/src","0" "field_40220_w","field_40220_w","w","LModelBook;","Luj;","GuiEnchantment","zw","net/minecraft/src","0" "field_40230_x","field_40230_x","x","Ljava/util/Random;","Ljava/util/Random;","GuiEnchantment","zw","net/minecraft/src","0" -"field_40228_y","field_40228_y","y","LContainerEnchantment;","Lahk;","GuiEnchantment","zw","net/minecraft/src","0" +"field_40228_y","containerEnchantment","y","LContainerEnchantment;","Lahk;","GuiEnchantment","zw","net/minecraft/src","0" "field_40227_h","field_40227_h","g","I","I","GuiEnchantment","zw","net/minecraft/src","0" "field_40229_i","field_40229_i","h","F","F","GuiEnchantment","zw","net/minecraft/src","0" "field_40225_j","field_40225_j","j","F","F","GuiEnchantment","zw","net/minecraft/src","0" @@ -2255,8 +2255,8 @@ "field_35543_n","isUnblockable","n","Z","Z","DamageSource","pm","net/minecraft/src","0" "field_35544_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","pm","net/minecraft/src","0" "field_35551_p","hungerDamage","p","F","F","DamageSource","pm","net/minecraft/src","0" -"field_40549_q","isFireDamage","q","Z","Z","DamageSource","pm","net/minecraft/src","0" -"field_40548_r","isProjectile","r","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_40549_q","fireDamage","q","Z","Z","DamageSource","pm","net/minecraft/src","0" +"field_40548_r","projectile","r","Z","Z","DamageSource","pm","net/minecraft/src","0" "field_35546_m","damageType","m","Ljava/lang/String;","Ljava/lang/String;","DamageSource","pm","net/minecraft/src","0" "field_1695_a","colorBuffer","a","Ljava/nio/FloatBuffer;","Ljava/nio/FloatBuffer;","RenderHelper","rt","net/minecraft/src","0" "field_22166_a","fileName","a","Ljava/lang/String;","Ljava/lang/String;","SaveFormatComparator","rr","net/minecraft/src","0" @@ -2286,8 +2286,8 @@ "field_21141_d","recipeItems","d","[LItemStack;","[Ldk;","ShapedRecipes","aga","net/minecraft/src","0" "field_21140_e","recipeOutput","e","LItemStack;","Ldk;","ShapedRecipes","aga","net/minecraft/src","0" "field_21139_a","recipeOutputItemID","a","I","I","ShapedRecipes","aga","net/minecraft/src","0" -"field_35523_a","worldSeed","a","J","J","WorldSettings","yw","net/minecraft/src","0" -"field_35521_b","worldType","b","I","I","WorldSettings","yw","net/minecraft/src","0" +"field_35523_a","seed","a","J","J","WorldSettings","yw","net/minecraft/src","0" +"field_35521_b","gameType","b","I","I","WorldSettings","yw","net/minecraft/src","0" "field_35522_c","mapFeaturesEnabled","c","Z","Z","WorldSettings","yw","net/minecraft/src","0" "field_40558_d","hardcoreEnabled","d","Z","Z","WorldSettings","yw","net/minecraft/src","0" "field_6463_h","rand","a","Ljava/util/Random;","Ljava/util/Random;","GuiMainMenu","eh","net/minecraft/src","0" @@ -2306,10 +2306,10 @@ "field_27028_b","lightningState","b","I","I","EntityLightningBolt","su","net/minecraft/src","0" "field_27029_a","boltVertex","a","J","J","EntityLightningBolt","su","net/minecraft/src","0" "field_27030_c","boltLivingTime","c","I","I","EntityLightningBolt","su","net/minecraft/src","0" -"field_35596_a","field_35596_a","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" -"field_35594_b","field_35594_b","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" -"field_35595_c","field_35595_c","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" -"field_35593_e","field_35593_e","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35596_a","metaId","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35594_b","minItemStack","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35595_c","maxItemStack","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" +"field_35593_e","itemWeight","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0" "field_1202_a","posX","a","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" "field_1201_b","posY","b","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" "field_1207_c","posZ","c","I","I","WorldBlockPositionType","agf","net/minecraft/src","0" @@ -2390,7 +2390,7 @@ "field_9427_K","positionsToUpdate","T","Ljava/util/Set;","Ljava/util/Set;","World","ry","net/minecraft/src","0" "field_9426_L","soundCounter","U","I","I","World","ry","net/minecraft/src","0" "field_35466_H","lightUpdateBlockList","H","[I","[I","World","ry","net/minecraft/src","0" -"field_1012_M","field_1012_M","V","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" +"field_1012_M","entitiesWithinAABBExcludingEntity","V","Ljava/util/List;","Ljava/util/List;","World","ry","net/minecraft/src","0" "field_1026_y","multiplayerWorld","I","Z","Z","World","ry","net/minecraft/src","0" "field_1346_a","signBoard","g","LModelRenderer;","Lacf;","SignModel","rb","net/minecraft/src","0" "field_1345_b","signStick","h","LModelRenderer;","Lacf;","SignModel","rb","net/minecraft/src","0" @@ -2418,11 +2418,11 @@ "field_35086_a","field_35086_a","a","I","I","ComponentVillageHouse2","ko","net/minecraft/src","0" "field_320_a","spawnID","a","I","I","ItemReed","to","net/minecraft/src","0" "field_27292_a","fieldBuilder","a","LJ_JsonFieldBuilder;","Laax;","J_FieldNodeContainer","co","net/minecraft/src","0" -"field_27291_b","field_27291_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_FieldNodeContainer","co","net/minecraft/src","0" +"field_27291_b","listenerToJdomAdapter","b","LJ_JsonListenerToJdomAdapter;","Les;","J_FieldNodeContainer","co","net/minecraft/src","0" "field_35362_a","field_35362_a","a","LGuiScreen;","Lxe;","GuiScreenAddServer","iq","net/minecraft/src","0" -"field_35360_b","field_35360_b","b","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" -"field_35361_c","field_35361_c","c","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" -"field_35359_d","field_35359_d","d","LServerNBTStorage;","Llo;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35360_b","serverAddress","b","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35361_c","serverName","c","LGuiTextField;","Ldv;","GuiScreenAddServer","iq","net/minecraft/src","0" +"field_35359_d","serverNBTStorage","d","LServerNBTStorage;","Llo;","GuiScreenAddServer","iq","net/minecraft/src","0" "field_186_a","mainFrame","a","LMinecraftApplet;","LMinecraftApplet;","MinecraftAppletImpl","nm","net/minecraft/src","0" "field_479_a","xPosition","a","I","I","Packet52MultiBlockChange","np","net/minecraft/src","0" "field_478_b","zPosition","b","I","I","Packet52MultiBlockChange","np","net/minecraft/src","0" @@ -2668,16 +2668,16 @@ "field_319_a","weaponDamage","a","I","I","ItemSword","zp","net/minecraft/src","0" "field_40439_b","field_40439_b","b","LEnumToolMaterial;","Lnu;","ItemSword","zp","net/minecraft/src","0" "field_827_a","chestContents","p","[LItemStack;","[Ldk;","TileEntityChest","tu","net/minecraft/src","0" -"field_35155_a","field_35155_a","a","Z","Z","TileEntityChest","tu","net/minecraft/src","0" -"field_35152_b","field_35152_b","b","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" -"field_35153_c","field_35153_c","j","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" -"field_35150_d","field_35150_d","k","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" -"field_35151_e","field_35151_e","l","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" -"field_35148_f","field_35148_f","m","F","F","TileEntityChest","tu","net/minecraft/src","0" -"field_35149_g","field_35149_g","n","F","F","TileEntityChest","tu","net/minecraft/src","0" -"field_35156_h","field_35156_h","o","I","I","TileEntityChest","tu","net/minecraft/src","0" -"field_35154_q","field_35154_q","q","I","I","TileEntityChest","tu","net/minecraft/src","0" -"field_35266_a","field_35266_a","a","I","I","WorldGenBigMushroom","acp","net/minecraft/src","0" +"field_35155_a","adjacentChestChecked","a","Z","Z","TileEntityChest","tu","net/minecraft/src","0" +"field_35152_b","adjacentChestZNeg","b","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35153_c","adjacentChestXPos","j","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35150_d","adjacentChestXNeg","k","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35151_e","adjacentChestZPos","l","LTileEntityChest;","Ltu;","TileEntityChest","tu","net/minecraft/src","0" +"field_35148_f","lidAngle","m","F","F","TileEntityChest","tu","net/minecraft/src","0" +"field_35149_g","prevLidAngle","n","F","F","TileEntityChest","tu","net/minecraft/src","0" +"field_35156_h","numUsingPlayers","o","I","I","TileEntityChest","tu","net/minecraft/src","0" +"field_35154_q","ticksSinceSync","q","I","I","TileEntityChest","tu","net/minecraft/src","0" +"field_35266_a","mushroomType","a","I","I","WorldGenBigMushroom","acp","net/minecraft/src","0" "field_27054_a","entityID","a","I","I","Packet71Weather","abf","net/minecraft/src","0" "field_27053_b","posX","b","I","I","Packet71Weather","abf","net/minecraft/src","0" "field_27057_c","posY","c","I","I","Packet71Weather","abf","net/minecraft/src","0" @@ -2703,7 +2703,7 @@ "NULL","NULL","g","LEnumJsonNodeType;","Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" "field_27442_h","allJsonNodeTypes","h","[LEnumJsonNodeType;","[Lpp;","EnumJsonNodeType","pp","net/minecraft/src","0" "field_27296_a","nodeBuilder","a","LJ_JsonObjectNodeBuilder;","Labq;","J_ObjectNodeContainer","lc","net/minecraft/src","0" -"field_27295_b","field_27295_b","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ObjectNodeContainer","lc","net/minecraft/src","0" +"field_27295_b","listenerToJdomAdapter","b","LJ_JsonListenerToJdomAdapter;","Les;","J_ObjectNodeContainer","lc","net/minecraft/src","0" "field_331_a","isFull","a","I","I","ItemBucket","en","net/minecraft/src","0" "field_25071_d","statId","a","I","I","StatBase","px","net/minecraft/src","0" "field_25070_e","statName","b","Ljava/lang/String;","Ljava/lang/String;","StatBase","px","net/minecraft/src","0" @@ -2847,13 +2847,13 @@ "field_4162_p","field_4162_p","q","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4161_q","gravelNoise","r","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4160_r","field_4160_r","s","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" -"field_4159_s","field_4159_s","t","LMapGenBase;","Lbz;","ChunkProviderHell","jv","net/minecraft/src","0" +"field_4159_s","netherCaveGenerator","t","LMapGenBase;","Lbz;","ChunkProviderHell","jv","net/minecraft/src","0" "field_4175_c","field_4175_c","d","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4174_d","field_4174_d","e","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4173_e","field_4173_e","f","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4172_f","field_4172_f","g","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" "field_4171_g","field_4171_g","h","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0" -"field_4201_e","field_4201_e","c","LBiomeGenBase;","Lsr;","WorldChunkManagerHell","bx","net/minecraft/src","0" +"field_4201_e","biomeGenerator","c","LBiomeGenBase;","Lsr;","WorldChunkManagerHell","bx","net/minecraft/src","0" "field_4200_f","hellTemperature","d","F","F","WorldChunkManagerHell","bx","net/minecraft/src","0" "field_4199_g","field_4199_g","e","F","F","WorldChunkManagerHell","bx","net/minecraft/src","0" "field_35437_a","field_35437_a","a","LBlock;","Lyy;","ItemMetadata","afm","net/minecraft/src","0" @@ -2988,7 +2988,7 @@ "field_455_a","signEntityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","BlockSign","mr","net/minecraft/src","0" "field_454_b","isFreestanding","cb","Z","Z","BlockSign","mr","net/minecraft/src","0" "field_27222_a","fields","a","Ljava/util/Map;","Ljava/util/Map;","J_JsonObject","g","net/minecraft/src","0" -"field_35292_a","field_35292_a","a","I","I","BlockMushroomCap","wd","net/minecraft/src","0" +"field_35292_a","mushroomType","a","I","I","BlockMushroomCap","wd","net/minecraft/src","0" "field_35061_c","field_35061_c","c","[LStructurePieceTreasure;","[Lagq;","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" "field_35062_a","field_35062_a","a","LEnumDoor;","Lmj;","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" "field_35060_b","field_35060_b","b","I","I","ComponentStrongholdRoomCrossing","jt","net/minecraft/src","0" @@ -3118,8 +3118,8 @@ "field_40535_e","field_40535_e","e","I","I","EnumRarity","ja","net/minecraft/src","0" "field_40532_f","field_40532_f","f","Ljava/lang/String;","Ljava/lang/String;","EnumRarity","ja","net/minecraft/src","0" "field_40533_g","allRarities","g","[LEnumRarity;","[Lja;","EnumRarity","ja","net/minecraft/src","0" -"field_35300_a","field_35300_a","a","I","I","BlockPane","uh","net/minecraft/src","0" -"field_40213_b","field_40213_b","cb","Z","Z","BlockPane","uh","net/minecraft/src","0" +"field_35300_a","sideTextureIndex","a","I","I","BlockPane","uh","net/minecraft/src","0" +"field_40213_b","canDropItself","cb","Z","Z","BlockPane","uh","net/minecraft/src","0" "field_1102_a","mc","a","LMinecraft;","LMinecraft;","ThreadConnectToServer","pn","net/minecraft/src","0" "field_1101_b","hostName","b","Ljava/lang/String;","Ljava/lang/String;","ThreadConnectToServer","pn","net/minecraft/src","0" "field_1104_c","port","c","I","I","ThreadConnectToServer","pn","net/minecraft/src","0" @@ -3433,13 +3433,13 @@ "field_1613_c","IDtoClassMapping","c","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" "field_1612_d","classToIDMapping","d","Ljava/util/Map;","Ljava/util/Map;","EntityList","afw","net/minecraft/src","0" "field_31053_a","field_31053_a","a","I","I","BlockPistonExtension","acu","net/minecraft/src","0" -"field_40396_i","field_40396_i","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40396_i","endRNG","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40393_j","field_40393_j","j","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40394_k","field_40394_k","k","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40391_l","field_40391_l","l","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40388_a","field_40388_a","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40386_b","field_40386_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0" -"field_40392_m","field_40392_m","m","LWorld;","Lry;","ChunkProviderEnd","a","net/minecraft/src","0" +"field_40392_m","endWorld","m","LWorld;","Lry;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40389_n","field_40389_n","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" "field_40390_o","field_40390_o","o","[LBiomeGenBase;","[Lsr;","ChunkProviderEnd","a","net/minecraft/src","0" "field_40387_c","field_40387_c","c","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0" @@ -3592,7 +3592,7 @@ "field_35129_f","difficultySetting","f","B","B","Packet1Login","nl","net/minecraft/src","1" "field_35130_g","worldHeight","g","B","B","Packet1Login","nl","net/minecraft/src","1" "field_35133_h","maxPlayers","h","B","B","Packet1Login","nl","net/minecraft/src","1" -"field_40138_s","field_40138_s","t","I","I","EntityDragonBase","ui","net/minecraft/src","1" +"field_40138_s","maxHealth","t","I","I","EntityDragonBase","ui","net/minecraft/src","1" "field_20071_a","stackResult","a","[LItemStack;","[Ljb;","InventoryCraftResult","vu","net/minecraft/src","1" "field_21008_a","xLocation","a","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" "field_21007_b","yLocation","b","I","I","Packet54PlayNoteBlock","va","net/minecraft/src","1" @@ -3614,11 +3614,11 @@ "field_35354_c","field_35354_c","c","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" "field_35351_d","field_35351_d","d","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" "field_35352_e","field_35352_e","e","Z","Z","ComponentStrongholdCrossing","up","net/minecraft/src","1" -"field_40514_a","field_40514_a","a","LThreadedFileIOBase;","Lct;","ThreadedFileIOBase","ct","net/minecraft/src","1" -"field_40512_b","field_40512_b","b","Ljava/util/List;","Ljava/util/List;","ThreadedFileIOBase","ct","net/minecraft/src","1" -"field_40513_c","field_40513_c","c","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" -"field_40510_d","field_40510_d","d","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" -"field_40511_e","field_40511_e","e","Z","Z","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40514_a","threadedIOInstance","a","LThreadedFileIOBase;","Lct;","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40512_b","threadedIOQueue","b","Ljava/util/List;","Ljava/util/List;","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40513_c","writeQueuedCounter","c","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40510_d","savedIOCounter","d","J","J","ThreadedFileIOBase","ct","net/minecraft/src","1" +"field_40511_e","isThreadWaiting","e","Z","Z","ThreadedFileIOBase","ct","net/minecraft/src","1" "UNDEFINED","UNDEFINED","a","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" "UNDEAD","UNDEAD","b","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" "ARTHROPOD","ARTHROPOD","c","LEnumCreatureAttribute;","Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" @@ -3701,7 +3701,7 @@ "field_854_d","itemDamage","e","I","I","ItemStack","jb","net/minecraft/src","1" "field_40257_a","effectCache","a","Ljava/util/HashMap;","Ljava/util/HashMap;","ItemPotion","ft","net/minecraft/src","1" "field_22106_a","field_22106_a","a","Ljava/io/File;","Ljava/io/File;","SaveFormatOld","sl","net/minecraft/src","1" -"field_35534_e","field_35534_e","e","Ljava/util/HashMap;","Ljava/util/HashMap;","MapGenStructure","qp","net/minecraft/src","1" +"field_35534_e","coordMap","e","Ljava/util/HashMap;","Ljava/util/HashMap;","MapGenStructure","qp","net/minecraft/src","1" "field_663_c","baseIndexInPNG","c","I","I","BlockLeaves","bm","net/minecraft/src","1" "field_20041_b","adjacentTreeBlocks","a","[I","[I","BlockLeaves","bm","net/minecraft/src","1" "field_35496_a","villageComponentClass","a","Ljava/lang/Class;","Ljava/lang/Class;","StructureVillagePieceWeight","ex","net/minecraft/src","1" @@ -3717,26 +3717,26 @@ "field_6042_c","motionY","c","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" "field_6041_d","motionZ","d","I","I","Packet28EntityVelocity","gu","net/minecraft/src","1" "field_35379_a","field_35379_a","a","I","I","ComponentVillagePathGen","so","net/minecraft/src","1" -"field_35537_a","field_35537_a","a","[LBiomeGenBase;","[Lkb;","MapGenStronghold","fz","net/minecraft/src","1" -"field_35535_f","field_35535_f","f","Z","Z","MapGenStronghold","fz","net/minecraft/src","1" -"field_35536_g","field_35536_g","g","[LChunkCoordIntPair;","[Lyi;","MapGenStronghold","fz","net/minecraft/src","1" +"field_35537_a","allowedBiomeGenBases","a","[LBiomeGenBase;","[Lkb;","MapGenStronghold","fz","net/minecraft/src","1" +"field_35535_f","ranBiomeCheck","f","Z","Z","MapGenStronghold","fz","net/minecraft/src","1" +"field_35536_g","structureCoords","g","[LChunkCoordIntPair;","[Lyi;","MapGenStronghold","fz","net/minecraft/src","1" "field_997_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ServerWindowAdapter","ab","net/minecraft/src","1" -"field_28055_a","field_28055_a","a","I","I","WorldGenDeadBush","kj","net/minecraft/src","1" +"field_28055_a","deadBushID","a","I","I","WorldGenDeadBush","kj","net/minecraft/src","1" "field_20020_a","xPosition","a","I","I","Packet130UpdateSign","td","net/minecraft/src","1" "field_20019_b","yPosition","b","I","I","Packet130UpdateSign","td","net/minecraft/src","1" "field_20022_c","zPosition","c","I","I","Packet130UpdateSign","td","net/minecraft/src","1" "field_20021_d","signLines","d","[Ljava/lang/String;","[Ljava/lang/String;","Packet130UpdateSign","td","net/minecraft/src","1" -"field_35291_a","field_35291_a","a","I","I","WorldGenSand","gl","net/minecraft/src","1" +"field_35291_a","sandID","a","I","I","WorldGenSand","gl","net/minecraft/src","1" "field_35290_b","field_35290_b","b","I","I","WorldGenSand","gl","net/minecraft/src","1" -"field_40619_a","field_40619_a","a","Z","Z","PacketCount","vn","net/minecraft/src","1" +"field_40619_a","allowCounting","a","Z","Z","PacketCount","vn","net/minecraft/src","1" "field_40617_b","field_40617_b","b","Ljava/util/Map;","Ljava/util/Map;","PacketCount","vn","net/minecraft/src","1" "field_40618_c","field_40618_c","c","Ljava/util/Map;","Ljava/util/Map;","PacketCount","vn","net/minecraft/src","1" -"field_40616_d","field_40616_d","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","vn","net/minecraft/src","1" +"field_40616_d","lock","d","Ljava/lang/Object;","Ljava/lang/Object;","PacketCount","vn","net/minecraft/src","1" "field_416_aj","inventory","k","LInventoryPlayer;","Lja;","EntityPlayer","gz","net/minecraft/src","1" "field_20053_ao","personalCraftingInventory","l","LContainer;","Lea;","EntityPlayer","gz","net/minecraft/src","1" "field_20052_ap","currentCraftingInventory","m","LContainer;","Lea;","EntityPlayer","gz","net/minecraft/src","1" "field_35217_m","foodStats","n","LFoodStats;","Lrd;","EntityPlayer","gz","net/minecraft/src","1" -"field_35216_n","field_35216_n","o","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35216_n","flyToggleTimer","o","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_9152_am","field_9152_am","p","B","B","EntityPlayer","gz","net/minecraft/src","1" "field_9151_an","score","q","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_9150_ao","prevCameraYaw","r","F","F","EntityPlayer","gz","net/minecraft/src","1" @@ -3745,7 +3745,7 @@ "field_9147_ar","swingProgressInt","u","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_409_aq","username","v","Ljava/lang/String;","Ljava/lang/String;","EntityPlayer","gz","net/minecraft/src","1" "field_4110_as","dimension","w","I","I","EntityPlayer","gz","net/minecraft/src","1" -"field_35218_w","field_35218_w","x","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35218_w","xpCooldown","x","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_20047_ay","field_20047_ay","y","D","D","EntityPlayer","gz","net/minecraft/src","1" "field_20046_az","field_20046_az","z","D","D","EntityPlayer","gz","net/minecraft/src","1" "field_20051_aA","field_20051_aA","A","D","D","EntityPlayer","gz","net/minecraft/src","1" @@ -3762,14 +3762,14 @@ "field_28016_C","timeUntilPortal","I","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_28015_D","inPortal","J","Z","Z","EntityPlayer","gz","net/minecraft/src","1" "field_28014_E","timeInPortal","K","F","F","EntityPlayer","gz","net/minecraft/src","1" -"field_35214_K","field_35214_K","L","LPlayerCapabilities;","Lvv;","EntityPlayer","gz","net/minecraft/src","1" +"field_35214_K","capabilities","L","LPlayerCapabilities;","Lvv;","EntityPlayer","gz","net/minecraft/src","1" "field_35211_M","experienceLevel","M","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_35212_N","experienceTotal","N","I","I","EntityPlayer","gz","net/minecraft/src","1" "field_35210_L","experience","O","F","F","EntityPlayer","gz","net/minecraft/src","1" -"field_34908_d","field_34908_d","d","LItemStack;","Ljb;","EntityPlayer","gz","net/minecraft/src","1" -"field_34909_e","field_34909_e","e","I","I","EntityPlayer","gz","net/minecraft/src","1" -"field_35213_O","field_35213_O","P","F","F","EntityPlayer","gz","net/minecraft/src","1" -"field_35215_P","field_35215_P","Q","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_34908_d","itemInUse","d","LItemStack;","Ljb;","EntityPlayer","gz","net/minecraft/src","1" +"field_34909_e","itemInUseCount","e","I","I","EntityPlayer","gz","net/minecraft/src","1" +"field_35213_O","speedOnGround","P","F","F","EntityPlayer","gz","net/minecraft/src","1" +"field_35215_P","speedInAir","Q","F","F","EntityPlayer","gz","net/minecraft/src","1" "field_6124_at","fishEntity","R","LEntityFishHook;","Llq;","EntityPlayer","gz","net/minecraft/src","1" "field_35421_a","field_35421_a","a","LBlock;","Ltl;","ItemColored","wm","net/minecraft/src","1" "field_41041_b","field_41041_b","b","[Ljava/lang/String;","[Ljava/lang/String;","ItemColored","wm","net/minecraft/src","1" @@ -3811,14 +3811,14 @@ "field_35515_A","bigTreeGenerator","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1" "field_35516_B","forestGenerator","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1" "field_35517_C","swampTreeGenerator","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1" -"field_40334_a","field_40334_a","a","LIInventory;","Llp;","ContainerEnchantment","iq","net/minecraft/src","1" -"field_40338_h","field_40338_h","h","LWorld;","Lfi;","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40334_a","tableInventory","a","LIInventory;","Llp;","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40338_h","worldPointer","h","LWorld;","Lfi;","ContainerEnchantment","iq","net/minecraft/src","1" "field_40339_i","field_40339_i","i","I","I","ContainerEnchantment","iq","net/minecraft/src","1" "field_40336_j","field_40336_j","j","I","I","ContainerEnchantment","iq","net/minecraft/src","1" "field_40337_k","field_40337_k","k","I","I","ContainerEnchantment","iq","net/minecraft/src","1" "field_40335_l","field_40335_l","l","Ljava/util/Random;","Ljava/util/Random;","ContainerEnchantment","iq","net/minecraft/src","1" -"field_40332_b","field_40332_b","b","J","J","ContainerEnchantment","iq","net/minecraft/src","1" -"field_40333_c","field_40333_c","c","[I","[I","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40332_b","nameSeed","b","J","J","ContainerEnchantment","iq","net/minecraft/src","1" +"field_40333_c","enchantLevels","c","[I","[I","ContainerEnchantment","iq","net/minecraft/src","1" "field_139_a","xPosition","a","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" "field_138_b","yPosition","b","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" "field_140_c","zPosition","c","I","I","Packet6SpawnPosition","qe","net/minecraft/src","1" @@ -3844,7 +3844,7 @@ "field_40147_c","field_40147_c","c","D","D","EntityDragon","sy","net/minecraft/src","1" "field_40144_d","field_40144_d","d","[[D","[[D","EntityDragon","sy","net/minecraft/src","1" "field_40145_e","field_40145_e","e","I","I","EntityDragon","sy","net/minecraft/src","1" -"field_40142_f","field_40142_f","f","[LDragonPart;","[Led;","EntityDragon","sy","net/minecraft/src","1" +"field_40142_f","dragonPartArray","f","[LDragonPart;","[Led;","EntityDragon","sy","net/minecraft/src","1" "field_40143_g","field_40143_g","g","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" "field_40155_h","field_40155_h","h","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" "field_40156_i","field_40156_i","i","LDragonPart;","Led;","EntityDragon","sy","net/minecraft/src","1" @@ -3871,8 +3871,8 @@ "field_40416_e","socketList","e","Ljava/util/List;","Ljava/util/List;","RConThreadBase","uu","net/minecraft/src","1" "field_40414_f","serverSocketList","f","Ljava/util/List;","Ljava/util/List;","RConThreadBase","uu","net/minecraft/src","1" "field_4249_a","liquidBlockId","a","I","I","WorldGenLiquids","wx","net/minecraft/src","1" -"field_28057_a","field_28057_a","a","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" -"field_28056_b","field_28056_b","b","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" +"field_28057_a","tallGrassID","a","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" +"field_28056_b","tallGrassMetadata","b","I","I","WorldGenTallGrass","ar","net/minecraft/src","1" "field_493_e","delay","a","I","I","TileEntityMobSpawner","de","net/minecraft/src","1" "field_492_f","mobID","d","Ljava/lang/String;","Ljava/lang/String;","TileEntityMobSpawner","de","net/minecraft/src","1" "field_491_g","yaw","b","D","D","TileEntityMobSpawner","de","net/minecraft/src","1" @@ -3919,7 +3919,7 @@ "field_27124_n","thundering","n","Z","Z","WorldInfo","eo","net/minecraft/src","1" "field_27123_o","thunderTime","o","I","I","WorldInfo","eo","net/minecraft/src","1" "field_35503_p","gameType","p","I","I","WorldInfo","eo","net/minecraft/src","1" -"field_35502_q","enableMapFeatures","q","Z","Z","WorldInfo","eo","net/minecraft/src","1" +"field_35502_q","mapFeaturesEnabled","q","Z","Z","WorldInfo","eo","net/minecraft/src","1" "field_40471_r","hardcore","r","Z","Z","WorldInfo","eo","net/minecraft/src","1" "field_39_a","packetIdToClassMap","j","LIntHashMap;","Ljw;","Packet","kf","net/minecraft/src","1" "field_38_b","packetClassToIdMap","a","Ljava/util/Map;","Ljava/util/Map;","Packet","kf","net/minecraft/src","1" @@ -4008,7 +4008,7 @@ "field_967_f","maxZ","f","D","D","AxisAlignedBB","eu","net/minecraft/src","1" "field_762_a","minableBlockId","a","I","I","WorldGenMinable","fr","net/minecraft/src","1" "field_761_b","numberOfBlocks","b","I","I","WorldGenMinable","fr","net/minecraft/src","1" -"field_35029_b","field_35029_b","b","[LBiomeGenBase;","[Lkb;","GenLayerVillageLandscape","sg","net/minecraft/src","1" +"field_35029_b","allowedBiomes","b","[LBiomeGenBase;","[Lkb;","GenLayerVillageLandscape","sg","net/minecraft/src","1" "field_485_e","signText","a","[Ljava/lang/String;","[Ljava/lang/String;","TileEntitySign","xu","net/minecraft/src","1" "field_484_f","lineBeingEdited","b","I","I","TileEntitySign","xu","net/minecraft/src","1" "field_25053_c","isEditable","c","Z","Z","TileEntitySign","xu","net/minecraft/src","1" @@ -4024,11 +4024,11 @@ "field_97_b","xPosition","b","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" "field_101_c","yPosition","c","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" "field_100_d","zPosition","d","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" -"field_28044_e","field_28044_e","e","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" -"field_28043_f","field_28043_f","f","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" -"field_28042_g","field_28042_g","g","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28044_e","speedX","e","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28043_f","speedY","f","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28042_g","speedZ","g","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" "field_99_e","type","h","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" -"field_28041_i","field_28041_i","i","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" +"field_28041_i","throwerEntityId","i","I","I","Packet23VehicleSpawn","ro","net/minecraft/src","1" "field_1016_a","xCoord","a","I","I","PathPoint","e","net/minecraft/src","1" "field_1015_b","yCoord","b","I","I","PathPoint","e","net/minecraft/src","1" "field_1014_c","zCoord","c","I","I","PathPoint","e","net/minecraft/src","1" @@ -4124,12 +4124,12 @@ "field_4125_al","ticksInAir","j","I","I","EntityFishHook","lq","net/minecraft/src","1" "field_4124_am","ticksCatchable","k","I","I","EntityFishHook","lq","net/minecraft/src","1" "field_20907_c","bobber","c","LEntity;","Lrn;","EntityFishHook","lq","net/minecraft/src","1" -"field_6149_an","field_6149_an","l","I","I","EntityFishHook","lq","net/minecraft/src","1" -"field_6148_ao","field_6148_ao","m","D","D","EntityFishHook","lq","net/minecraft/src","1" -"field_6147_ap","field_6147_ap","n","D","D","EntityFishHook","lq","net/minecraft/src","1" -"field_6146_aq","field_6146_aq","o","D","D","EntityFishHook","lq","net/minecraft/src","1" -"field_6145_ar","field_6145_ar","p","D","D","EntityFishHook","lq","net/minecraft/src","1" -"field_6144_as","field_6144_as","q","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6149_an","fishPosRotationIncrements","l","I","I","EntityFishHook","lq","net/minecraft/src","1" +"field_6148_ao","fishX","m","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6147_ap","fishY","n","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6146_aq","fishZ","o","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6145_ar","fishYaw","p","D","D","EntityFishHook","lq","net/minecraft/src","1" +"field_6144_as","fishPitch","q","D","D","EntityFishHook","lq","net/minecraft/src","1" "field_35101_n","damageSourceEntity","n","LEntity;","Lrn;","EntityDamageSource","hi","net/minecraft/src","1" "Kebab","Kebab","a","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" "Aztec","Aztec","b","LEnumArt;","Lit;","EnumArt","it","net/minecraft/src","1" @@ -4173,17 +4173,17 @@ "field_766_b","updateCounter","c","I","I","GuiStatsComponent","kp","net/minecraft/src","1" "field_768_c","displayStrings","d","[Ljava/lang/String;","[Ljava/lang/String;","GuiStatsComponent","kp","net/minecraft/src","1" "field_40572_e","field_40572_e","e","LMinecraftServer;","LMinecraftServer;","GuiStatsComponent","kp","net/minecraft/src","1" -"field_35707_a","field_35707_a","a","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_35705_b","field_35705_b","b","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_35706_c","field_35706_c","c","[LBiomeGenBase;","[Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_35703_d","field_35703_d","d","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_35704_e","field_35704_e","e","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_35701_f","field_35701_f","f","J","J","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35707_a","temperatureValues","a","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35705_b","rainfallValues","b","[F","[F","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35706_c","biomes","c","[LBiomeGenBase;","[Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35703_d","xPosition","d","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35704_e","zPosition","e","I","I","BiomeCacheBlock","tb","net/minecraft/src","1" +"field_35701_f","lastAccessTime","f","J","J","BiomeCacheBlock","tb","net/minecraft/src","1" "field_35702_g","field_35702_g","g","LBiomeCache;","Ltz;","BiomeCacheBlock","tb","net/minecraft/src","1" -"field_40330_a","field_40330_a","a","Ljava/util/List;","Ljava/util/List;","ThreadedChunkLoader","oc","net/minecraft/src","1" -"field_40328_b","field_40328_b","b","Ljava/util/Set;","Ljava/util/Set;","ThreadedChunkLoader","oc","net/minecraft/src","1" -"field_40329_c","field_40329_c","c","Ljava/lang/Object;","Ljava/lang/Object;","ThreadedChunkLoader","oc","net/minecraft/src","1" -"field_40327_d","field_40327_d","d","Ljava/io/File;","Ljava/io/File;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40330_a","pendingChunkList","a","Ljava/util/List;","Ljava/util/List;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40328_b","pendingChunkCoords","b","Ljava/util/Set;","Ljava/util/Set;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40329_c","chunkSaveLock","c","Ljava/lang/Object;","Ljava/lang/Object;","ThreadedChunkLoader","oc","net/minecraft/src","1" +"field_40327_d","chunkSaveLocation","d","Ljava/io/File;","Ljava/io/File;","ThreadedChunkLoader","oc","net/minecraft/src","1" "field_35548_c","hasMoreThanTwoComponents","c","Z","Z","StructureVillageStart","gg","net/minecraft/src","1" "field_470_ai","cargoItems","d","[LItemStack;","[Ljb;","EntityMinecart","xv","net/minecraft/src","1" "field_9165_e","fuel","e","I","I","EntityMinecart","xv","net/minecraft/src","1" @@ -4192,12 +4192,12 @@ "field_9164_f","pushX","b","D","D","EntityMinecart","xv","net/minecraft/src","1" "field_9166_aj","pushZ","c","D","D","EntityMinecart","xv","net/minecraft/src","1" "field_468_ak","field_468_ak","g","[[[I","[[[I","EntityMinecart","xv","net/minecraft/src","1" -"field_9163_an","field_9163_an","h","I","I","EntityMinecart","xv","net/minecraft/src","1" -"field_9162_ao","field_9162_ao","i","D","D","EntityMinecart","xv","net/minecraft/src","1" -"field_9161_ap","field_9161_ap","j","D","D","EntityMinecart","xv","net/minecraft/src","1" -"field_9160_aq","field_9160_aq","k","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9163_an","turnProgress","h","I","I","EntityMinecart","xv","net/minecraft/src","1" +"field_9162_ao","minecartX","i","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9161_ap","minecartY","j","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9160_aq","minecartZ","k","D","D","EntityMinecart","xv","net/minecraft/src","1" "field_9159_ar","field_9159_ar","l","D","D","EntityMinecart","xv","net/minecraft/src","1" -"field_9158_as","field_9158_as","m","D","D","EntityMinecart","xv","net/minecraft/src","1" +"field_9158_as","minecartPitch","m","D","D","EntityMinecart","xv","net/minecraft/src","1" "field_39000_a","inLove","a","I","I","EntityAnimal","bi","net/minecraft/src","1" "field_39001_b","breeding","b","I","I","EntityAnimal","bi","net/minecraft/src","1" "field_40055_d","potionDamage","d","I","I","EntityPotion","bs","net/minecraft/src","1" @@ -4234,7 +4234,7 @@ "field_652_a","wiresProvidePower","a","Z","Z","BlockRedstoneWire","rm","net/minecraft/src","1" "field_21032_b","blocksNeedingUpdate","b","Ljava/util/Set;","Ljava/util/Set;","BlockRedstoneWire","rm","net/minecraft/src","1" "field_12031_a","isFlaming","a","Z","Z","Explosion","py","net/minecraft/src","1" -"field_12024_h","ExplosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","py","net/minecraft/src","1" +"field_12024_h","explosionRNG","h","Ljava/util/Random;","Ljava/util/Random;","Explosion","py","net/minecraft/src","1" "field_4310_a","worldObj","i","LWorld;","Lfi;","Explosion","py","net/minecraft/src","1" "field_12030_b","explosionX","b","D","D","Explosion","py","net/minecraft/src","1" "field_12029_c","explosionY","c","D","D","Explosion","py","net/minecraft/src","1" @@ -4278,13 +4278,13 @@ "field_40060_b","field_40060_b","b","D","D","EntityEnderEye","ck","net/minecraft/src","1" "field_40061_c","field_40061_c","c","D","D","EntityEnderEye","ck","net/minecraft/src","1" "field_40058_d","field_40058_d","d","D","D","EntityEnderEye","ck","net/minecraft/src","1" -"field_40059_e","field_40059_e","e","I","I","EntityEnderEye","ck","net/minecraft/src","1" -"field_40057_f","field_40057_f","f","Z","Z","EntityEnderEye","ck","net/minecraft/src","1" +"field_40059_e","despawnTimer","e","I","I","EntityEnderEye","ck","net/minecraft/src","1" +"field_40057_f","shatterOrDrop","f","Z","Z","EntityEnderEye","ck","net/minecraft/src","1" "field_150_a","message","a","Ljava/lang/String;","Ljava/lang/String;","Packet3Chat","op","net/minecraft/src","1" -"field_40083_a","field_40083_a","a","[LItemStack;","[Ljb;","TileEntityBrewingStand","xx","net/minecraft/src","1" -"field_40081_b","field_40081_b","b","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" -"field_40082_c","field_40082_c","c","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" -"field_40080_d","field_40080_d","d","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40083_a","brewingItemStacks","a","[LItemStack;","[Ljb;","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40081_b","brewTime","b","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40082_c","filledSlots","c","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"field_40080_d","ingredientID","d","I","I","TileEntityBrewingStand","xx","net/minecraft/src","1" "field_40437_g","lastAuthCheckTime","g","J","J","RConThreadQuery","sv","net/minecraft/src","1" "field_40444_h","queryPort","h","I","I","RConThreadQuery","sv","net/minecraft/src","1" "field_40445_i","serverPort","i","I","I","RConThreadQuery","sv","net/minecraft/src","1" @@ -4306,8 +4306,8 @@ "field_258_bb","maxDamageArray","bS","[I","[I","ItemArmor","vf","net/minecraft/src","1" "field_257_aX","armorType","a","I","I","ItemArmor","vf","net/minecraft/src","1" "field_256_aY","damageReduceAmount","b","I","I","ItemArmor","vf","net/minecraft/src","1" -"field_40252_bR","field_40252_bR","bR","I","I","ItemArmor","vf","net/minecraft/src","1" -"field_40251_bT","field_40251_bT","bT","LEnumArmorMaterial;","Lcx;","ItemArmor","vf","net/minecraft/src","1" +"field_40252_bR","renderIndex","bR","I","I","ItemArmor","vf","net/minecraft/src","1" +"field_40251_bT","material","bT","LEnumArmorMaterial;","Lcx;","ItemArmor","vf","net/minecraft/src","1" "none","none","a","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" "eat","eat","b","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" "drink","drink","c","LEnumAction;","Ljf;","EnumAction","jf","net/minecraft/src","1" @@ -4329,7 +4329,7 @@ "field_22047_n","field_22047_n","m","I","I","ItemInWorldManager","to","net/minecraft/src","1" "field_22046_o","field_22046_o","n","I","I","ItemInWorldManager","to","net/minecraft/src","1" "field_35327_a","field_35327_a","a","Z","Z","ComponentStrongholdStairs","ig","net/minecraft/src","1" -"field_35326_b","field_35326_b","b","LEnumDoor;","Lpt;","ComponentStrongholdStairs","ig","net/minecraft/src","1" +"field_35326_b","doorType","b","LEnumDoor;","Lpt;","ComponentStrongholdStairs","ig","net/minecraft/src","1" "field_25134_a","instance","a","LAchievementMap;","Lb;","AchievementMap","b","net/minecraft/src","1" "field_25133_b","guidMap","b","Ljava/util/Map;","Ljava/util/Map;","AchievementMap","b","net/minecraft/src","1" "field_35455_a","potionTypes","a","[LPotion;","[Lir;","Potion","ir","net/minecraft/src","1" @@ -4365,13 +4365,13 @@ "field_35441_E","field_35441_E","E","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" "field_35442_F","field_35442_F","F","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" "field_35443_G","field_35443_G","G","LPotion;","Lir;","Potion","ir","net/minecraft/src","1" -"field_35447_H","potionId","H","I","I","Potion","ir","net/minecraft/src","1" -"field_35448_I","potionName","I","Ljava/lang/String;","Ljava/lang/String;","Potion","ir","net/minecraft/src","1" +"field_35447_H","id","H","I","I","Potion","ir","net/minecraft/src","1" +"field_35448_I","name","I","Ljava/lang/String;","Ljava/lang/String;","Potion","ir","net/minecraft/src","1" "field_40601_J","statusIconIndex","J","I","I","Potion","ir","net/minecraft/src","1" -"field_40602_K","field_40602_K","K","Z","Z","Potion","ir","net/minecraft/src","1" +"field_40602_K","isBadEffect","K","Z","Z","Potion","ir","net/minecraft/src","1" "field_40598_L","field_40598_L","L","D","D","Potion","ir","net/minecraft/src","1" "field_40599_M","field_40599_M","M","Z","Z","Potion","ir","net/minecraft/src","1" -"field_40600_N","field_40600_N","N","I","I","Potion","ir","net/minecraft/src","1" +"field_40600_N","liquidColor","N","I","I","Potion","ir","net/minecraft/src","1" "field_35383_a","field_35383_a","a","I","I","ComponentVillageTorch","oe","net/minecraft/src","1" "field_650_a","fallInstantly","a","Z","Z","BlockSand","gv","net/minecraft/src","1" "field_738_a","tagMap","a","Ljava/util/Map;","Ljava/util/Map;","NBTTagCompound","ng","net/minecraft/src","1" @@ -4387,8 +4387,8 @@ "field_21059_f","field_21059_f","g","F","F","EntitySquid","xc","net/minecraft/src","1" "field_21060_ak","field_21060_ak","h","F","F","EntitySquid","xc","net/minecraft/src","1" "field_21058_al","field_21058_al","i","F","F","EntitySquid","xc","net/minecraft/src","1" -"field_21057_am","field_21057_am","j","F","F","EntitySquid","xc","net/minecraft/src","1" -"field_21056_an","field_21056_an","k","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21057_am","tentacleAngle","j","F","F","EntitySquid","xc","net/minecraft/src","1" +"field_21056_an","lastTentacleAngle","k","F","F","EntitySquid","xc","net/minecraft/src","1" "field_21055_ao","randomMotionSpeed","l","F","F","EntitySquid","xc","net/minecraft/src","1" "field_21054_ap","field_21054_ap","m","F","F","EntitySquid","xc","net/minecraft/src","1" "field_21053_aq","field_21053_aq","n","F","F","EntitySquid","xc","net/minecraft/src","1" @@ -4424,13 +4424,13 @@ "field_9114_aL","scoreValue","ah","I","I","EntityLiving","lk","net/minecraft/src","1" "field_9113_aM","field_9113_aM","ai","F","F","EntityLiving","lk","net/minecraft/src","1" "field_9112_aN","isMultiplayerEntity","aj","Z","Z","EntityLiving","lk","net/minecraft/src","1" -"field_35194_aj","field_35194_aj","ak","F","F","EntityLiving","lk","net/minecraft/src","1" -"field_35193_ak","field_35193_ak","al","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_35194_aj","landMovementFactor","ak","F","F","EntityLiving","lk","net/minecraft/src","1" +"field_35193_ak","jumpMovementFactor","al","F","F","EntityLiving","lk","net/minecraft/src","1" "field_9111_aO","prevSwingProgress","am","F","F","EntityLiving","lk","net/minecraft/src","1" "field_9110_aP","swingProgress","an","F","F","EntityLiving","lk","net/minecraft/src","1" "field_9109_aQ","health","ao","I","I","EntityLiving","lk","net/minecraft/src","1" "field_9108_aR","prevHealth","ap","I","I","EntityLiving","lk","net/minecraft/src","1" -"field_40105_ap","field_40105_ap","aq","I","I","EntityLiving","lk","net/minecraft/src","1" +"field_40105_ap","carryoverDamage","aq","I","I","EntityLiving","lk","net/minecraft/src","1" "field_4099_a","livingSoundTime","a","I","I","EntityLiving","lk","net/minecraft/src","1" "field_9107_aS","hurtTime","ar","I","I","EntityLiving","lk","net/minecraft/src","1" "field_9106_aT","maxHurtTime","as","I","I","EntityLiving","lk","net/minecraft/src","1" @@ -4504,7 +4504,7 @@ "field_1033_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","ThreadServerApplication","cu","net/minecraft/src","1" "field_35400_a","field_35400_a","a","I","I","ComponentVillageField2","vc","net/minecraft/src","1" "field_732_a","stringValue","a","Ljava/lang/String;","Ljava/lang/String;","NBTTagString","wq","net/minecraft/src","1" -"field_26002_a","field_26002_a","a","[B","[B","ChunkBlockMap","uj","net/minecraft/src","1" +"field_26002_a","convTable","a","[B","[B","ChunkBlockMap","uj","net/minecraft/src","1" "field_21138_a","recipeOutput","a","LItemStack;","Ljb;","ShapelessRecipes","sp","net/minecraft/src","1" "field_21137_b","recipeItems","b","Ljava/util/List;","Ljava/util/List;","ShapelessRecipes","sp","net/minecraft/src","1" "field_35068_a","fruitType","a","LBlock;","Ltl;","BlockStem","np","net/minecraft/src","1" @@ -4514,7 +4514,7 @@ "field_35124_c","posY","c","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" "field_35121_d","posZ","d","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" "field_35122_e","xpOrbValue","e","I","I","Packet26EntityExpOrb","ot","net/minecraft/src","1" -"field_35538_a","field_35538_a","a","Ljava/util/List;","Ljava/util/List;","MapGenVillage","ao","net/minecraft/src","1" +"field_35538_a","villageSpawnBiomes","a","Ljava/util/List;","Ljava/util/List;","MapGenVillage","ao","net/minecraft/src","1" "field_35111_a","name","a","Ljava/lang/String;","Ljava/lang/String;","Packet201PlayerInfo","ef","net/minecraft/src","1" "field_35109_b","isConnected","b","Z","Z","Packet201PlayerInfo","ef","net/minecraft/src","1" "field_35110_c","ping","c","I","I","Packet201PlayerInfo","ef","net/minecraft/src","1" @@ -4564,7 +4564,7 @@ "field_27064_d","theItemStack","d","LItemStack;","Ljb;","Achievement","ni","net/minecraft/src","1" "field_27062_m","isSpecial","m","Z","Z","Achievement","ni","net/minecraft/src","1" "field_28009_a","record","a","I","I","TileEntityRecordPlayer","en","net/minecraft/src","1" -"field_35398_a","field_35398_a","a","I","I","ComponentVillageHouse1","ve","net/minecraft/src","1" +"field_35398_a","averageGroundLevel","a","I","I","ComponentVillageHouse1","ve","net/minecraft/src","1" "field_20_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","NetServerHandler","kt","net/minecraft/src","1" "field_19_b","netManager","b","LNetworkManager;","Loo;","NetServerHandler","kt","net/minecraft/src","1" "field_18_c","connectionClosed","c","Z","Z","NetServerHandler","kt","net/minecraft/src","1" @@ -4878,11 +4878,11 @@ "field_20901_a","healAmount","b","I","I","ItemFood","yf","net/minecraft/src","1" "field_35431_bu","saturationFactor","bR","F","F","ItemFood","yf","net/minecraft/src","1" "field_25011_bi","isWolfsFavoriteMeat","bS","Z","Z","ItemFood","yf","net/minecraft/src","1" -"field_35428_bw","field_35428_bw","bT","Z","Z","ItemFood","yf","net/minecraft/src","1" -"field_35430_bx","field_35430_bx","bU","I","I","ItemFood","yf","net/minecraft/src","1" -"field_35429_by","field_35429_by","bV","I","I","ItemFood","yf","net/minecraft/src","1" -"field_35425_bz","field_35425_bz","bW","I","I","ItemFood","yf","net/minecraft/src","1" -"field_35426_bA","field_35426_bA","bX","F","F","ItemFood","yf","net/minecraft/src","1" +"field_35428_bw","alwaysEdible","bT","Z","Z","ItemFood","yf","net/minecraft/src","1" +"field_35430_bx","potionId","bU","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35429_by","potionDuration","bV","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35425_bz","potionAmplifier","bW","I","I","ItemFood","yf","net/minecraft/src","1" +"field_35426_bA","potionEffectProbability","bX","F","F","ItemFood","yf","net/minecraft/src","1" "field_40047_d","xTile","d","I","I","EntityThrowable","bc","net/minecraft/src","1" "field_40048_e","yTile","e","I","I","EntityThrowable","bc","net/minecraft/src","1" "field_40045_f","zTile","f","I","I","EntityThrowable","bc","net/minecraft/src","1" @@ -4890,8 +4890,8 @@ "field_40051_a","inGround","a","Z","Z","EntityThrowable","bc","net/minecraft/src","1" "field_40049_b","throwableShake","b","I","I","EntityThrowable","bc","net/minecraft/src","1" "field_40050_c","thrower","c","LEntityLiving;","Llk;","EntityThrowable","bc","net/minecraft/src","1" -"field_40052_h","field_40052_h","h","I","I","EntityThrowable","bc","net/minecraft/src","1" -"field_40053_i","field_40053_i","i","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40052_h","ticksInGround","h","I","I","EntityThrowable","bc","net/minecraft/src","1" +"field_40053_i","ticksInAir","i","I","I","EntityThrowable","bc","net/minecraft/src","1" "field_41_a","reason","a","Ljava/lang/String;","Ljava/lang/String;","Packet255KickDisconnect","xz","net/minecraft/src","1" "field_27990_a","field_27990_a","a","I","I","StatCrafting","st","net/minecraft/src","1" "field_760_a","otherCoordPairs","a","[B","[B","WorldGenBigTree","im","net/minecraft/src","1" @@ -4978,8 +4978,8 @@ "IRON","IRON","c","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" "GOLD","GOLD","d","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" "DIAMOND","DIAMOND","e","LEnumArmorMaterial;","Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" -"field_40498_f","field_40498_f","f","I","I","EnumArmorMaterial","cx","net/minecraft/src","1" -"field_40499_g","field_40499_g","g","[I","[I","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40498_f","maxDamageFactor","f","I","I","EnumArmorMaterial","cx","net/minecraft/src","1" +"field_40499_g","damageReductionAmountArray","g","[I","[I","EnumArmorMaterial","cx","net/minecraft/src","1" "field_40505_h","enchantability","h","I","I","EnumArmorMaterial","cx","net/minecraft/src","1" "field_40506_i","allArmorMaterials","i","[LEnumArmorMaterial;","[Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" "field_35403_a","field_35403_a","a","I","I","ComponentVillageHouse4_Garden","gp","net/minecraft/src","1" @@ -5044,8 +5044,8 @@ "field_35092_n","isBlockable","n","Z","Z","DamageSource","po","net/minecraft/src","1" "field_35093_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","po","net/minecraft/src","1" "field_35100_p","hungerDamage","p","F","F","DamageSource","po","net/minecraft/src","1" -"field_40278_q","field_40278_q","q","Z","Z","DamageSource","po","net/minecraft/src","1" -"field_40277_r","field_40277_r","r","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_40278_q","fireDamage","q","Z","Z","DamageSource","po","net/minecraft/src","1" +"field_40277_r","projectile","r","Z","Z","DamageSource","po","net/minecraft/src","1" "field_35095_m","damageType","m","Ljava/lang/String;","Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" "field_78_a","xPosition","a","I","I","Packet15Place","ha","net/minecraft/src","1" "field_77_b","yPosition","b","I","I","Packet15Place","ha","net/minecraft/src","1" @@ -5063,7 +5063,7 @@ "field_21141_a","recipeOutputItemID","a","I","I","ShapedRecipes","ix","net/minecraft/src","1" "field_35043_a","seed","a","J","J","WorldSettings","hg","net/minecraft/src","1" "field_35041_b","gameType","b","I","I","WorldSettings","hg","net/minecraft/src","1" -"field_35042_c","mapFeatures","c","Z","Z","WorldSettings","hg","net/minecraft/src","1" +"field_35042_c","mapFeaturesEnabled","c","Z","Z","WorldSettings","hg","net/minecraft/src","1" "field_40280_d","hardcoreEnabled","d","Z","Z","WorldSettings","hg","net/minecraft/src","1" "OK","OK","a","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" "NOT_POSSIBLE_HERE","NOT_POSSIBLE_HERE","b","LEnumStatus;","Ldc;","EnumStatus","dc","net/minecraft/src","1" @@ -5075,10 +5075,10 @@ "field_27018_b","lightningState","b","I","I","EntityLightningBolt","d","net/minecraft/src","1" "field_27019_a","boltVertex","a","J","J","EntityLightningBolt","d","net/minecraft/src","1" "field_27020_c","boltLivingTime","c","I","I","EntityLightningBolt","d","net/minecraft/src","1" -"field_35489_a","field_35489_a","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" -"field_35487_b","field_35487_b","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" -"field_35488_c","field_35488_c","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" -"field_35486_e","field_35486_e","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35489_a","metaId","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35487_b","minItemStack","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35488_c","maxItemStack","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" +"field_35486_e","itemWeight","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1" "field_20017_a","windowId","a","I","I","Packet103SetSlot","hx","net/minecraft/src","1" "field_20016_b","itemSlot","b","I","I","Packet103SetSlot","hx","net/minecraft/src","1" "field_20018_c","myItemStack","c","LItemStack;","Ljb;","Packet103SetSlot","hx","net/minecraft/src","1" @@ -5106,7 +5106,7 @@ "field_40520_d","profilingSection","d","Ljava/lang/String;","Ljava/lang/String;","Profiler","pf","net/minecraft/src","1" "field_40521_e","profilingMap","e","Ljava/util/Map;","Ljava/util/Map;","Profiler","pf","net/minecraft/src","1" "field_35252_a","worldYBits","a","I","I","World","fi","net/minecraft/src","1" -"field_35250_b","field_35250_b","b","I","I","World","fi","net/minecraft/src","1" +"field_35250_b","xShift","b","I","I","World","fi","net/minecraft/src","1" "field_35251_c","worldYMax","c","I","I","World","fi","net/minecraft/src","1" "field_35248_d","worldYMask","d","I","I","World","fi","net/minecraft/src","1" "field_35249_e","worldOceanHeight","e","I","I","World","fi","net/minecraft/src","1" @@ -5117,7 +5117,7 @@ "field_788_B","scheduledTickSet","L","Ljava/util/Set;","Ljava/util/Set;","World","fi","net/minecraft/src","1" "field_814_b","loadedTileEntityList","h","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" "field_34901_P","addedTileEntityList","M","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" -"field_34900_Q","field_34900_Q","N","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_34900_Q","entityRemoval","N","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" "field_805_k","playerEntities","i","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" "field_27081_e","lightningEntities","j","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" "field_6159_E","cloudColour","O","J","J","World","fi","net/minecraft/src","1" @@ -5150,8 +5150,8 @@ "field_21120_L","spawnPeacefulMobs","G","Z","Z","World","fi","net/minecraft/src","1" "field_4264_K","activeChunkSet","T","Ljava/util/Set;","Ljava/util/Set;","World","fi","net/minecraft/src","1" "field_4263_L","ambientTickCountdown","U","I","I","World","fi","net/minecraft/src","1" -"field_35245_H","field_35245_H","H","[I","[I","World","fi","net/minecraft/src","1" -"field_778_L","field_778_L","V","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" +"field_35245_H","lightUpdateBlockList","H","[I","[I","World","fi","net/minecraft/src","1" +"field_778_L","entitiesWithinAABBExcludingEntity","V","Ljava/util/List;","Ljava/util/List;","World","fi","net/minecraft/src","1" "field_792_x","singleplayerWorld","I","Z","Z","World","fi","net/minecraft/src","1" "field_909_a","trackedEntity","a","LEntity;","Lrn;","EntityTrackerEntry","hy","net/minecraft/src","1" "field_9235_d","trackingDistanceThreshold","b","I","I","EntityTrackerEntry","hy","net/minecraft/src","1" @@ -5225,8 +5225,8 @@ "field_21014_f","title","f","Ljava/lang/String;","Ljava/lang/String;","Packet25EntityPainting","uy","net/minecraft/src","1" "field_74_b","id","a","I","I","Packet16BlockItemSwitch","hw","net/minecraft/src","1" "field_731_a","key","a","Ljava/lang/String;","Ljava/lang/String;","NBTBase","ik","net/minecraft/src","1" -"field_40341_a","field_40341_a","a","LTileEntityBrewingStand;","Lxx;","ContainerBrewingStand","je","net/minecraft/src","1" -"field_40340_b","field_40340_b","b","I","I","ContainerBrewingStand","je","net/minecraft/src","1" +"field_40341_a","tileBrewingStand","a","LTileEntityBrewingStand;","Lxx;","ContainerBrewingStand","je","net/minecraft/src","1" +"field_40340_b","brewTime","b","I","I","ContainerBrewingStand","je","net/minecraft/src","1" "field_21099_a","dyeColorNames","a","[Ljava/lang/String;","[Ljava/lang/String;","ItemDye","kg","net/minecraft/src","1" "field_31023_bk","dyeColors","b","[I","[I","ItemDye","kg","net/minecraft/src","1" "field_20011_a","windowId","a","I","I","Packet104WindowItems","ka","net/minecraft/src","1" @@ -5240,16 +5240,16 @@ "field_646_a","chanceToEncourageFire","a","[I","[I","BlockFire","xy","net/minecraft/src","1" "field_645_b","abilityToCatchFire","b","[I","[I","BlockFire","xy","net/minecraft/src","1" "field_35687_a","worldChunkManager","a","LWorldChunkManager;","Lxe;","BiomeCache","tz","net/minecraft/src","1" -"field_35685_b","field_35685_b","b","J","J","BiomeCache","tz","net/minecraft/src","1" -"field_35686_c","field_35686_c","c","LLongHashMap;","Lgc;","BiomeCache","tz","net/minecraft/src","1" -"field_35684_d","field_35684_d","d","Ljava/util/List;","Ljava/util/List;","BiomeCache","tz","net/minecraft/src","1" +"field_35685_b","lastCleanupTime","b","J","J","BiomeCache","tz","net/minecraft/src","1" +"field_35686_c","cacheMap","c","LLongHashMap;","Lgc;","BiomeCache","tz","net/minecraft/src","1" +"field_35684_d","cache","d","Ljava/util/List;","Ljava/util/List;","BiomeCache","tz","net/minecraft/src","1" "field_35343_a","field_35343_a","a","I","I","ComponentStrongholdCorridor","nm","net/minecraft/src","1" "field_986_a","mcServer","a","LMinecraftServer;","LMinecraftServer;","NetworkAcceptThread","qz","net/minecraft/src","1" "field_985_b","netWorkListener","b","LNetworkListenThread;","Lep;","NetworkAcceptThread","qz","net/minecraft/src","1" "field_40373_w","protectionName","w","[Ljava/lang/String;","[Ljava/lang/String;","EnchantmentDamage","kl","net/minecraft/src","1" "field_40377_x","baseEnchantability","x","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" "field_40376_y","levelEnchantability","y","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" -"field_40375_z","threesholdEnchantability","z","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" +"field_40375_z","thresholdEnchantability","z","[I","[I","EnchantmentDamage","kl","net/minecraft/src","1" "field_40374_a","damageType","a","I","I","EnchantmentDamage","kl","net/minecraft/src","1" "field_40323_L","spikeGen","L","LWorldGenerator;","Lor;","BiomeEndDecorator","lv","net/minecraft/src","1" "field_1031_a","mc","a","LMinecraftServer;","LMinecraftServer;","ThreadSleepForever","cz","net/minecraft/src","1" @@ -5315,7 +5315,7 @@ "field_22209_a","chunkFile","a","Ljava/io/File;","Ljava/io/File;","ChunkFile","ee","net/minecraft/src","1" "field_22208_b","xChunk","b","I","I","ChunkFile","ee","net/minecraft/src","1" "field_22210_c","yChunk","c","I","I","ChunkFile","ee","net/minecraft/src","1" -"field_4250_a","field_4250_a","a","I","I","WorldGenHellLava","pg","net/minecraft/src","1" +"field_4250_a","hellLavaID","a","I","I","WorldGenHellLava","pg","net/minecraft/src","1" "field_886_a","SIN_TABLE","a","[F","[F","MathHelper","in","net/minecraft/src","1" "field_404_af","attackStrength","c","I","I","EntityMob","hb","net/minecraft/src","1" "field_21081_e","dispenserContents","a","[LItemStack;","[Ljb;","TileEntityDispenser","be","net/minecraft/src","1" @@ -5325,7 +5325,7 @@ "field_694_a","isLit","a","Z","Z","Chunk","le","net/minecraft/src","1" "field_693_b","blocks","b","[B","[B","Chunk","le","net/minecraft/src","1" "field_35637_c","precipitationHeightMap","c","[I","[I","Chunk","le","net/minecraft/src","1" -"field_35636_d","field_35636_d","d","[Z","[Z","Chunk","le","net/minecraft/src","1" +"field_35636_d","updateSkylightColumns","d","[Z","[Z","Chunk","le","net/minecraft/src","1" "field_692_c","isChunkLoaded","e","Z","Z","Chunk","le","net/minecraft/src","1" "field_691_d","worldObj","f","LWorld;","Lfi;","Chunk","le","net/minecraft/src","1" "field_690_e","data","g","LNibbleArray;","Lvq;","Chunk","le","net/minecraft/src","1" @@ -5391,8 +5391,8 @@ "field_25068_c","decimalFormat","c","Ljava/text/DecimalFormat;","Ljava/text/DecimalFormat;","StatBase","uv","net/minecraft/src","1" "field_27055_j","timeStatType","j","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" "field_27054_k","distanceStatType","k","LIStatType;","Lvt;","StatBase","uv","net/minecraft/src","1" -"field_40039_a","field_40039_a","a","LEntityDragonBase;","Lui;","DragonPart","ed","net/minecraft/src","1" -"field_40038_b","field_40038_b","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","ed","net/minecraft/src","1" +"field_40039_a","entityDragonObj","a","LEntityDragonBase;","Lui;","DragonPart","ed","net/minecraft/src","1" +"field_40038_b","name","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","ed","net/minecraft/src","1" "field_974_a","logger","a","Ljava/util/logging/Logger;","Ljava/util/logging/Logger;","NetworkListenThread","ep","net/minecraft/src","1" "field_979_d","serverSocket","d","Ljava/net/ServerSocket;","Ljava/net/ServerSocket;","NetworkListenThread","ep","net/minecraft/src","1" "field_978_e","networkAcceptThread","e","Ljava/lang/Thread;","Ljava/lang/Thread;","NetworkListenThread","ep","net/minecraft/src","1" @@ -5468,14 +5468,14 @@ "field_4233_p","field_4233_p","q","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4232_q","gravelNoise","r","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4231_r","field_4231_r","s","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" -"field_4230_s","field_4230_s","t","LMapGenBase;","Lgd;","ChunkProviderHell","pp","net/minecraft/src","1" +"field_4230_s","netherCaveGenerator","t","LMapGenBase;","Lgd;","ChunkProviderHell","pp","net/minecraft/src","1" "field_4246_c","field_4246_c","d","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4245_d","field_4245_d","e","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4244_e","field_4244_e","f","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4243_f","field_4243_f","g","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4242_g","field_4242_g","h","[D","[D","ChunkProviderHell","pp","net/minecraft/src","1" "field_4262_e","biomeGenerator","b","LBiomeGenBase;","Lkb;","WorldChunkManagerHell","hj","net/minecraft/src","1" -"field_4261_f","field_4261_f","c","F","F","WorldChunkManagerHell","hj","net/minecraft/src","1" +"field_4261_f","hellTemperature","c","F","F","WorldChunkManagerHell","hj","net/minecraft/src","1" "field_4260_g","field_4260_g","d","F","F","WorldChunkManagerHell","hj","net/minecraft/src","1" "field_35420_a","field_35420_a","a","LBlock;","Ltl;","ItemMetadata","jm","net/minecraft/src","1" "field_4207_bb","blocksEffectiveAgainst","bR","[LBlock;","[Ltl;","ItemAxe","ru","net/minecraft/src","1" @@ -5507,7 +5507,7 @@ "field_40388_d","requestID","d","[B","[B","RConThreadQueryAuth","g","net/minecraft/src","1" "field_40389_e","challengeValue","e","[B","[B","RConThreadQueryAuth","g","net/minecraft/src","1" "field_40387_f","requestIDstring","f","Ljava/lang/String;","Ljava/lang/String;","RConThreadQueryAuth","g","net/minecraft/src","1" -"field_40392_a","field_40392_a","a","LRConThreadQuery;","Lsv;","RConThreadQueryAuth","g","net/minecraft/src","1" +"field_40392_a","queryThread","a","LRConThreadQuery;","Lsv;","RConThreadQueryAuth","g","net/minecraft/src","1" "field_452_ad","tickCounter1","f","I","I","EntityPainting","px","net/minecraft/src","1" "field_448_a","direction","a","I","I","EntityPainting","px","net/minecraft/src","1" "field_9188_d","xPosition","b","I","I","EntityPainting","px","net/minecraft/src","1" @@ -5624,9 +5624,9 @@ "field_35143_f","biomesToSpawnIn","g","Ljava/util/List;","Ljava/util/List;","WorldChunkManager","xe","net/minecraft/src","1" "field_40580_a","field_40580_a","a","[F","[F","WorldChunkManager","xe","net/minecraft/src","1" "field_35375_a","field_35375_a","a","I","I","ComponentVillageHall","s","net/minecraft/src","1" -"field_40647_a","field_40647_a","a","Ljava/util/Random;","Ljava/util/Random;","EnchantmentHelper","tc","net/minecraft/src","1" -"field_40645_b","field_40645_b","b","LEnchantmentModifierDamage;","Lkr;","EnchantmentHelper","tc","net/minecraft/src","1" -"field_40646_c","field_40646_c","c","LEnchantmentModifierLiving;","Lxp;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_40647_a","enchantmentRand","a","Ljava/util/Random;","Ljava/util/Random;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_40645_b","enchantmentModifierDamage","b","LEnchantmentModifierDamage;","Lkr;","EnchantmentHelper","tc","net/minecraft/src","1" +"field_40646_c","enchantmentModifierLiving","c","LEnchantmentModifierLiving;","Lxp;","EnchantmentHelper","tc","net/minecraft/src","1" "field_28047_a","sfxID","a","I","I","Packet61DoorChange","fu","net/minecraft/src","1" "field_28046_b","auxData","b","I","I","Packet61DoorChange","fu","net/minecraft/src","1" "field_28050_c","posX","c","I","I","Packet61DoorChange","fu","net/minecraft/src","1" @@ -5685,7 +5685,7 @@ "field_844_a","data","a","[B","[B","NibbleArray","vq","net/minecraft/src","1" "field_35661_b","chunkSizeYShift","b","I","I","NibbleArray","vq","net/minecraft/src","1" "field_35662_c","field_35662_c","c","I","I","NibbleArray","vq","net/minecraft/src","1" -"field_9176_d","field_9176_d","a","I","I","EntityBoat","gh","net/minecraft/src","1" +"field_9176_d","boatPosRotationIncrements","a","I","I","EntityBoat","gh","net/minecraft/src","1" "field_9174_e","boatX","b","D","D","EntityBoat","gh","net/minecraft/src","1" "field_9172_f","boatY","c","D","D","EntityBoat","gh","net/minecraft/src","1" "field_9175_aj","boatZ","d","D","D","EntityBoat","gh","net/minecraft/src","1" @@ -5911,13 +5911,13 @@ "field_851_c","IDtoClassMapping","c","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" "field_850_d","classToIDMapping","d","Ljava/util/Map;","Ljava/util/Map;","EntityList","jd","net/minecraft/src","1" "field_31046_a","field_31046_a","a","I","I","BlockPistonExtension","k","net/minecraft/src","1" -"field_40201_i","field_40201_i","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40201_i","endRNG","i","Ljava/util/Random;","Ljava/util/Random;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40198_j","field_40198_j","j","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40199_k","field_40199_k","k","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40196_l","field_40196_l","l","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40193_a","field_40193_a","a","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40191_b","field_40191_b","b","LNoiseGeneratorOctaves;","Lsw;","ChunkProviderEnd","fy","net/minecraft/src","1" -"field_40197_m","field_40197_m","m","LWorld;","Lfi;","ChunkProviderEnd","fy","net/minecraft/src","1" +"field_40197_m","endWorld","m","LWorld;","Lfi;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40194_n","field_40194_n","n","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40195_o","field_40195_o","o","[LBiomeGenBase;","[Lkb;","ChunkProviderEnd","fy","net/minecraft/src","1" "field_40192_c","field_40192_c","c","[D","[D","ChunkProviderEnd","fy","net/minecraft/src","1" @@ -5935,10 +5935,10 @@ "field_35027_b","field_35027_b","b","LGenLayer;","Lel;","GenLayerTemperatureMix","dp","net/minecraft/src","1" "field_35028_c","field_35028_c","c","I","I","GenLayerTemperatureMix","dp","net/minecraft/src","1" "field_733_a","byteArray","a","[B","[B","NBTTagByteArray","ht","net/minecraft/src","1" -"field_35392_a","field_35392_a","a","LWorldChunkManager;","Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35392_a","worldChunkMngr","a","LWorldChunkManager;","Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" "field_35390_b","field_35390_b","b","I","I","ComponentVillageStartPiece","j","net/minecraft/src","1" -"field_35391_c","field_35391_c","c","LStructureVillagePieceWeight;","Lex;","ComponentVillageStartPiece","j","net/minecraft/src","1" -"field_35388_d","field_35388_d","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35391_c","structVillagePieceWeight","c","LStructureVillagePieceWeight;","Lex;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"field_35388_d","structureVillageWeightedPieceList","d","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" "field_35389_e","field_35389_e","e","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" "field_35387_f","field_35387_f","f","Ljava/util/ArrayList;","Ljava/util/ArrayList;","ComponentVillageStartPiece","j","net/minecraft/src","1" "field_35335_b","field_35335_b","b","[LStructurePieceTreasure;","[Lib;","ComponentStrongholdLibrary","mg","net/minecraft/src","1" diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv index da50d3a2fc..81f74a707e 100644 --- a/forge/conf/methods.csv +++ b/forge/conf/methods.csv @@ -57,7 +57,7 @@ "func_40283_a","func_40283_a","a","(LEntityDragon;IF)I","(Loo;IF)I","RenderDragon","ado","net/minecraft/src","0" "func_35646_d","enableAbilities","b","(LEntityPlayer;)V","(Lvi;)V","PlayerControllerCreative","uq","net/minecraft/src","0" "func_35645_e","disableAbilities","c","(LEntityPlayer;)V","(Lvi;)V","PlayerControllerCreative","uq","net/minecraft/src","0" -"func_35644_a","func_35644_a","a","(LMinecraft;LPlayerController;IIII)V","(Lnet/minecraft/client/Minecraft;Laes;IIII)V","PlayerControllerCreative","uq","net/minecraft/src","0" +"func_35644_a","clickBlockCreative","a","(LMinecraft;LPlayerController;IIII)V","(Lnet/minecraft/client/Minecraft;Laes;IIII)V","PlayerControllerCreative","uq","net/minecraft/src","0" "func_950_f","renderStars","f","()V","()V","RenderGlobal","afv","net/minecraft/src","0" "func_946_a","changeWorld","a","(LWorld;)V","(Lry;)V","RenderGlobal","afv","net/minecraft/src","0" "func_958_a","loadRenderers","a","()V","()V","RenderGlobal","afv","net/minecraft/src","0" @@ -121,7 +121,7 @@ "func_31060_l","setImmovableMobility","n","()LMaterial;","()Lp;","Material","p","net/minecraft/src","0" "func_40029_a","func_40029_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lac;","ComponentNetherBridgeStraight","ac","net/minecraft/src","0" "func_30004_j","setNotStationary","j","(LWorld;III)V","(Lry;III)V","BlockStationary","add","net/minecraft/src","0" -"func_301_k","func_301_k","k","(LWorld;III)Z","(Lry;III)Z","BlockStationary","add","net/minecraft/src","0" +"func_301_k","isFlammable","k","(LWorld;III)Z","(Lry;III)Z","BlockStationary","add","net/minecraft/src","0" "func_900_a","setScheduledTime","a","(J)LNextTickListEntry;","(J)Lahn;","NextTickListEntry","ahn","net/minecraft/src","0" "func_899_a","comparer","a","(LNextTickListEntry;)I","(Lahn;)I","NextTickListEntry","ahn","net/minecraft/src","0" "func_27463_a","parse","a","(Ljava/io/Reader;LJ_JsonListener;)V","(Ljava/io/Reader;Lyc;)V","J_SajParser","oi","net/minecraft/src","0" @@ -214,7 +214,7 @@ "func_40711_u","func_40711_u","u","()Z","()Z","ItemStack","dk","net/minecraft/src","0" "func_40434_a_","getEffectNames","e","(LItemStack;)Ljava/util/List;","(Ldk;)Ljava/util/List;","ItemPotion","abk","net/minecraft/src","0" "func_40431_c_","getEffectNamesFromDamage","d","(I)Ljava/util/List;","(I)Ljava/util/List;","ItemPotion","abk","net/minecraft/src","0" -"func_40433_c","isSplashPotion","e","(I)Z","(I)Z","ItemPotion","abk","net/minecraft/src","0" +"func_40433_c","isSplash","e","(I)Z","(I)Z","ItemPotion","abk","net/minecraft/src","0" "func_40432_e","isEffectInstant","f","(I)Z","(I)Z","ItemPotion","abk","net/minecraft/src","0" "func_175_a","preRenderScale","a","(LEntityGiantZombie;F)V","(Labc;F)V","RenderGiantZombie","ahi","net/minecraft/src","0" "func_22179_a","deleteFiles","a","([Ljava/io/File;)V","([Ljava/io/File;)V","SaveFormatOld","w","net/minecraft/src","0" @@ -303,7 +303,7 @@ "func_173_a","getColorMultiplier","a","(LEntityLiving;FF)I","(Lnq;FF)I","RenderLiving","acq","net/minecraft/src","0" "func_22014_a","passSpecialRender","a","(LEntityLiving;DDD)V","(Lnq;DDD)V","RenderLiving","acq","net/minecraft/src","0" "func_22013_a","renderLivingLabel","a","(LEntityLiving;Ljava/lang/String;DDDI)V","(Lnq;Ljava/lang/String;DDDI)V","RenderLiving","acq","net/minecraft/src","0" -"func_40561_a","func_40561_a","a","(IJ)V","(IJ)V","PacketCount","lg","net/minecraft/src","0" +"func_40561_a","countPacket","a","(IJ)V","(IJ)V","PacketCount","lg","net/minecraft/src","0" "func_20060_w","dropCurrentItem","l_","()V","()V","EntityPlayer","vi","net/minecraft/src","0" "func_446_a","joinEntityItemWithWorld","a","(LEntityItem;)V","(Lih;)V","EntityPlayer","vi","net/minecraft/src","0" "func_457_w","swingItem","m_","()V","()V","EntityPlayer","vi","net/minecraft/src","0" @@ -367,7 +367,7 @@ "func_35197_b","canEat","b","(Z)Z","(Z)Z","EntityPlayer","vi","net/minecraft/src","0" "func_35194_au","shouldHeal","aP","()Z","()Z","EntityPlayer","vi","net/minecraft/src","0" "func_35199_b","setItemInUse","c","(LItemStack;I)V","(Ldk;I)V","EntityPlayer","vi","net/minecraft/src","0" -"func_35190_e","func_35190_e","e","(III)Z","(III)Z","EntityPlayer","vi","net/minecraft/src","0" +"func_35190_e","canPlayerEdit","e","(III)Z","(III)Z","EntityPlayer","vi","net/minecraft/src","0" "func_40182_b","func_40182_b","c","(I)V","(I)V","EntityPlayer","vi","net/minecraft/src","0" "func_41014_d","copyPlayer","d","(LEntityPlayer;)V","(Lvi;)V","EntityPlayer","vi","net/minecraft/src","0" "func_41033_a","func_41033_a","a","([Ljava/lang/String;)LItemColored;","([Ljava/lang/String;)Lhf;","ItemColored","hf","net/minecraft/src","0" @@ -384,8 +384,8 @@ "func_27078_c","getEnableSnow","b","()Z","()Z","BiomeGenBase","sr","net/minecraft/src","0" "func_27077_d","canSpawnLightningBolt","c","()Z","()Z","BiomeGenBase","sr","net/minecraft/src","0" "func_4119_a","getSpawningChance","d","()F","()F","BiomeGenBase","sr","net/minecraft/src","0" -"func_35476_e","func_35476_e","e","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" -"func_35474_f","func_35474_f","f","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" +"func_35476_e","getIntRainfall","e","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" +"func_35474_f","getIntTemperature","f","()I","()I","BiomeGenBase","sr","net/minecraft/src","0" "func_35477_a","func_35477_a","a","(LWorld;Ljava/util/Random;II)V","(Lry;Ljava/util/Random;II)V","BiomeGenBase","sr","net/minecraft/src","0" "func_40254_a","getGrassColorAtCoords","a","(LIBlockAccess;III)I","(Lkq;III)I","BiomeGenBase","sr","net/minecraft/src","0" "func_40255_b","getFoliageColorAtCoords","b","(LIBlockAccess;III)I","(Lkq;III)I","BiomeGenBase","sr","net/minecraft/src","0" @@ -421,7 +421,7 @@ "func_40597_e","func_40597_e","e","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" "func_40596_f","func_40596_f","f","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" "func_40598_g","func_40598_g","g","()I","()I","StructureBoundingBox","nl","net/minecraft/src","0" -"func_35293_c","func_35293_c","c","(LWorld;IIILjava/util/Random;)Z","(Lry;IIILjava/util/Random;)Z","BlockMushroom","js","net/minecraft/src","0" +"func_35293_c","fertilizeMushroom","c","(LWorld;IIILjava/util/Random;)Z","(Lry;IIILjava/util/Random;)Z","BlockMushroom","js","net/minecraft/src","0" "func_1137_a","createEntityPathTo","a","(LEntity;LEntity;F)LPathEntity;","(Lia;Lia;F)Ldw;","PathFinder","rw","net/minecraft/src","0" "func_1131_a","createEntityPathTo","a","(LEntity;IIIF)LPathEntity;","(Lia;IIIF)Ldw;","PathFinder","rw","net/minecraft/src","0" "func_1130_a","createEntityPathTo","a","(LEntity;DDDF)LPathEntity;","(Lia;DDDF)Ldw;","PathFinder","rw","net/minecraft/src","0" @@ -554,13 +554,13 @@ "func_25044_b","getPathOrWalkableBlock","c","(LEntity;F)V","(Lia;F)V","EntityWolf","aik","net/minecraft/src","0" "func_25035_a","showHeartsOrSmokeFX","b","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" "func_25037_z","setTailRotation","ay","()F","()F","EntityWolf","aik","net/minecraft/src","0" -"func_25045_A","getWolfOwner","aD","()Ljava/lang/String;","()Ljava/lang/String;","EntityWolf","aik","net/minecraft/src","0" +"func_25045_A","getOwner","aD","()Ljava/lang/String;","()Ljava/lang/String;","EntityWolf","aik","net/minecraft/src","0" "func_25036_a","setOwner","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityWolf","aik","net/minecraft/src","0" -"func_25034_B","isWolfSitting","aE","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25034_B","isSitting","aE","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" "func_25046_b","setIsSitting","d","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" -"func_25040_C","isWolfAngry","aF","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" -"func_25041_c","setWolfAngry","e","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" -"func_25047_D","isWolfTamed","aG","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25040_C","isAngry","aF","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" +"func_25041_c","setAngry","e","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" +"func_25047_D","isTamed","aG","()Z","()Z","EntityWolf","aik","net/minecraft/src","0" "func_25038_d","setIsTamed","f","(Z)V","(Z)V","EntityWolf","aik","net/minecraft/src","0" "func_35434_a","placeDoorBlock","a","(LWorld;IIIILBlock;)V","(Lry;IIIILyy;)V","ItemDoor","zg","net/minecraft/src","0" "func_6492_b","truncateString","b","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","TexturePackCustom","adw","net/minecraft/src","0" @@ -658,7 +658,7 @@ "func_41002_a","func_41002_a","a","(IIII)V","(IIII)V","Entity","ia","net/minecraft/src","0" "func_9279_a","updateFallState","a","(DZ)V","(DZ)V","Entity","ia","net/minecraft/src","0" "func_372_f_","getBoundingBox","A","()LAxisAlignedBB;","()Lc;","Entity","ia","net/minecraft/src","0" -"func_40047_D","func_40047_D","B","()Z","()Z","Entity","ia","net/minecraft/src","0" +"func_40047_D","isImmuneToFire","B","()Z","()Z","Entity","ia","net/minecraft/src","0" "func_27012_af","isWet","C","()Z","()Z","Entity","ia","net/minecraft/src","0" "func_27013_ag","isInWater","D","()Z","()Z","Entity","ia","net/minecraft/src","0" "func_393_a","isInsideOfMaterial","a","(LMaterial;)Z","(Lp;)Z","Entity","ia","net/minecraft/src","0" @@ -704,7 +704,7 @@ "func_35113_c","setSprinting","a","(Z)V","(Z)V","Entity","ia","net/minecraft/src","0" "func_35114_R","isEating","Y","()Z","()Z","Entity","ia","net/minecraft/src","0" "func_35116_d","setEating","c","(Z)V","(Z)V","Entity","ia","net/minecraft/src","0" -"func_21060_d","getEntityFlag","f","(I)Z","(I)Z","Entity","ia","net/minecraft/src","0" +"func_21060_d","getFlag","f","(I)Z","(I)Z","Entity","ia","net/minecraft/src","0" "func_21059_b","setFlag","a","(IZ)V","(IZ)V","Entity","ia","net/minecraft/src","0" "func_41001_Z","getAir","Z","()I","()I","Entity","ia","net/minecraft/src","0" "func_41003_g","setAir","g","(I)V","(I)V","Entity","ia","net/minecraft/src","0" @@ -730,8 +730,8 @@ "func_27315_a","aJsonArray","a","([LJ_JsonNode;)LJ_JsonRootNode;","([Lan;)Lwz;","J_JsonNodeFactories","ahf","net/minecraft/src","0" "func_27312_a","aJsonObject","a","(Ljava/util/Map;)LJ_JsonRootNode;","(Ljava/util/Map;)Lwz;","J_JsonNodeFactories","ahf","net/minecraft/src","0" "func_27297_a","func_27297_a","a","(LStatCrafting;LStatCrafting;)I","(Lyl;Lyl;)I","SorterStatsBlock","agt","net/minecraft/src","0" -"func_320_h","func_320_h","g","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" -"func_319_i","func_319_i","h","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" +"func_320_h","glow","g","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" +"func_319_i","sparkle","h","(LWorld;III)V","(Lry;III)V","BlockRedstoneOre","oc","net/minecraft/src","0" "func_35586_a","getRandomComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" "func_35587_b","getNextMineShaftComponent","b","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lnk;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" "func_35585_a","getNextComponent","a","(LStructureComponent;Ljava/util/List;Ljava/util/Random;IIIII)LStructureComponent;","(Lnk;Ljava/util/List;Ljava/util/Random;IIIII)Lnk;","StructureMineshaftPieces","aez","net/minecraft/src","0" @@ -891,7 +891,7 @@ "func_31010_a","func_31010_a","a","(FF)V","(FF)V","TileEntityPiston","agb","net/minecraft/src","0" "func_31011_l","clearPistonTileEntity","j","()V","()V","TileEntityPiston","agb","net/minecraft/src","0" "func_317_e","ejectRecord","f","(LWorld;IIII)V","(Lry;IIII)V","BlockJukeBox","abl","net/minecraft/src","0" -"func_28038_b_","func_28038_b_","g","(LWorld;III)V","(Lry;III)V","BlockJukeBox","abl","net/minecraft/src","0" +"func_28038_b_","insertDisc","g","(LWorld;III)V","(Lry;III)V","BlockJukeBox","abl","net/minecraft/src","0" "func_4042_a","calculateVelocity","a","(DDDFF)V","(DDDFF)V","EntityFishHook","ael","net/minecraft/src","0" "func_4043_i","catchFish","g","()I","()I","EntityFishHook","ael","net/minecraft/src","0" "func_27110_k","func_27110_k","e","()V","()V","GuiAchievements","qx","net/minecraft/src","0" @@ -939,7 +939,7 @@ "func_40142_a_","setDelay","b","(I)V","(I)V","EntityAnimal","fx","net/minecraft/src","0" "func_40144_b","proceate","b","(LEntityAnimal;)V","(Lfx;)V","EntityAnimal","fx","net/minecraft/src","0" "func_40143_a","isWheat","a","(LItemStack;)Z","(Ldk;)Z","EntityAnimal","fx","net/minecraft/src","0" -"func_40088_g","func_40088_g","e","()I","()I","EntityPotion","ab","net/minecraft/src","0" +"func_40088_g","getPotionDamage","e","()I","()I","EntityPotion","ab","net/minecraft/src","0" "func_27059_b","applyTo","c","(Ljava/lang/Object;)Ljava/lang/Object;","(Ljava/lang/Object;)Ljava/lang/Object;","J_Functor","gz","net/minecraft/src","0" "func_27058_a","matchesNode","b","(Ljava/lang/Object;)Z","(Ljava/lang/Object;)Z","J_Functor","gz","net/minecraft/src","0" "func_27060_a","shortForm","a","()Ljava/lang/String;","()Ljava/lang/String;","J_Functor","gz","net/minecraft/src","0" @@ -1042,8 +1042,8 @@ "func_21131_a","readWatchableObjects","a","(Ljava/io/DataInputStream;)Ljava/util/List;","(Ljava/io/DataInputStream;)Ljava/util/List;","DataWatcher","cr","net/minecraft/src","0" "func_21126_a","updateWatchedObjectsFromList","a","(Ljava/util/List;)V","(Ljava/util/List;)V","DataWatcher","cr","net/minecraft/src","0" "func_40357_a","isBitOn","a","(II)Z","(II)Z","PotionHelper","pk","net/minecraft/src","0" -"func_40349_b","func_40349_b","b","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" -"func_40353_c","func_40353_c","c","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" +"func_40349_b","isFlagSet","b","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" +"func_40353_c","isFlagUnset","c","(II)I","(II)I","PotionHelper","pk","net/minecraft/src","0" "func_40352_a","func_40352_a","a","(I)I","(I)I","PotionHelper","pk","net/minecraft/src","0" "func_40354_a","func_40354_a","a","(Ljava/util/Collection;)I","(Ljava/util/Collection;)I","PotionHelper","pk","net/minecraft/src","0" "func_40358_a","func_40358_a","a","(IZ)I","(IZ)I","PotionHelper","pk","net/minecraft/src","0" @@ -1051,7 +1051,7 @@ "func_40347_a","func_40347_a","a","(ZZZIIII)I","(ZZZIIII)I","PotionHelper","pk","net/minecraft/src","0" "func_40348_c","getOnBitCount","c","(I)I","(I)I","PotionHelper","pk","net/minecraft/src","0" "func_40355_a","func_40355_a","a","(Ljava/lang/String;III)I","(Ljava/lang/String;III)I","PotionHelper","pk","net/minecraft/src","0" -"func_40360_b","func_40360_b","b","(IZ)Ljava/util/List;","(IZ)Ljava/util/List;","PotionHelper","pk","net/minecraft/src","0" +"func_40360_b","getPotionEffects","b","(IZ)Ljava/util/List;","(IZ)Ljava/util/List;","PotionHelper","pk","net/minecraft/src","0" "func_40350_a","brewBitOperations","a","(IIZZZ)I","(IIZZZ)I","PotionHelper","pk","net/minecraft/src","0" "func_40356_a","brewPotionData","a","(ILjava/lang/String;)I","(ILjava/lang/String;)I","PotionHelper","pk","net/minecraft/src","0" "func_40351_a","func_40351_a","a","(IIIIII)I","(IIIIII)I","PotionHelper","pk","net/minecraft/src","0" @@ -1079,20 +1079,20 @@ "func_40618_a","setIconIndex","b","(II)LPotion;","(II)Labg;","Potion","abg","net/minecraft/src","0" "func_40619_a","getId","b","()I","()I","Potion","abg","net/minecraft/src","0" "func_35662_a","performEffect","a","(LEntityLiving;I)V","(Lnq;I)V","Potion","abg","net/minecraft/src","0" -"func_40613_a","func_40613_a","a","(LEntityLiving;LEntityLiving;ID)V","(Lnq;Lnq;ID)V","Potion","abg","net/minecraft/src","0" -"func_40622_b","func_40622_b","a","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_40613_a","affectEntity","a","(LEntityLiving;LEntityLiving;ID)V","(Lnq;Lnq;ID)V","Potion","abg","net/minecraft/src","0" +"func_40622_b","isInstant","a","()Z","()Z","Potion","abg","net/minecraft/src","0" "func_35660_a","isReady","a","(II)Z","(II)Z","Potion","abg","net/minecraft/src","0" "func_35661_a","setPotionName","a","(Ljava/lang/String;)LPotion;","(Ljava/lang/String;)Labg;","Potion","abg","net/minecraft/src","0" "func_40623_c","getName","c","()Ljava/lang/String;","()Ljava/lang/String;","Potion","abg","net/minecraft/src","0" "func_40617_d","hasStatusIcon","d","()Z","()Z","Potion","abg","net/minecraft/src","0" "func_40611_e","getStatusIconIndex","e","()I","()I","Potion","abg","net/minecraft/src","0" -"func_40615_f","func_40615_f","f","()Z","()Z","Potion","abg","net/minecraft/src","0" +"func_40615_f","getIsBadEffect","f","()Z","()Z","Potion","abg","net/minecraft/src","0" "func_40620_a","func_40620_a","a","(LPotionEffect;)Ljava/lang/String;","(Ls;)Ljava/lang/String;","Potion","abg","net/minecraft/src","0" "func_40614_a","func_40614_a","a","(D)LPotion;","(D)Labg;","Potion","abg","net/minecraft/src","0" "func_40610_g","func_40610_g","g","()D","()D","Potion","abg","net/minecraft/src","0" "func_40616_h","func_40616_h","h","()LPotion;","()Labg;","Potion","abg","net/minecraft/src","0" "func_40612_i","func_40612_i","i","()Z","()Z","Potion","abg","net/minecraft/src","0" -"func_40621_j","func_40621_j","j","()I","()I","Potion","abg","net/minecraft/src","0" +"func_40621_j","getLiquidColor","j","()I","()I","Potion","abg","net/minecraft/src","0" "func_35099_a","func_35099_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentVillageTorch","abj","net/minecraft/src","0" "func_315_h","tryToFall","g","(LWorld;III)V","(Lry;III)V","BlockSand","cj","net/minecraft/src","0" "func_316_a_","canFallBelow","b_","(LWorld;III)Z","(Lry;III)Z","BlockSand","cj","net/minecraft/src","0" @@ -1182,10 +1182,10 @@ "func_22049_v","isMovementBlocked","ai","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" "func_418_b_","updateEntityActionState","n","()V","()V","EntityLiving","nq","net/minecraft/src","0" "func_419_b","onDeath","a","(LDamageSource;)V","(Lpm;)V","EntityLiving","nq","net/minecraft/src","0" -"func_40116_f","subtractOne","d","(I)I","(I)I","EntityLiving","nq","net/minecraft/src","0" -"func_40128_b","func_40128_b","d","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" +"func_40116_f","func_40116_f","d","(I)I","(I)I","EntityLiving","nq","net/minecraft/src","0" +"func_40128_b","applyPotionDamageCalculations","d","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" "func_40125_g","func_40125_g","i","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" -"func_40119_ar","func_40119_ar","o_","()I","()I","EntityLiving","nq","net/minecraft/src","0" +"func_40119_ar","getTotalArmorValue","o_","()I","()I","EntityLiving","nq","net/minecraft/src","0" "func_22051_K","isPlayerSleeping","ar","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" "func_424_C","jump","ak","()V","()V","EntityLiving","nq","net/minecraft/src","0" "func_28021_c","getItemIcon","a","(LItemStack;I)I","(Ldk;I)I","EntityLiving","nq","net/minecraft/src","0" @@ -1198,7 +1198,7 @@ "func_25026_x","getVerticalFaceSpeed","am","()I","()I","EntityLiving","nq","net/minecraft/src","0" "func_6391_i","getMaxSpawnedInChunk","g_","()I","()I","EntityLiving","nq","net/minecraft/src","0" "func_421_b","getTalkInterval","p_","()I","()I","EntityLiving","nq","net/minecraft/src","0" -"func_40124_t","func_40124_t","r_","()LEnumCreatureAttribute;","()Lel;","EntityLiving","nq","net/minecraft/src","0" +"func_40124_t","getCreatureAttribute","r_","()LEnumCreatureAttribute;","()Lel;","EntityLiving","nq","net/minecraft/src","0" "func_40126_a","func_40126_a","b","(LPotionEffect;)Z","(Ls;)Z","EntityLiving","nq","net/minecraft/src","0" "func_40127_l","func_40127_l","q_","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" "func_420_c","canEntityBeSeen","i","(LEntity;)Z","(Lia;)Z","EntityLiving","nq","net/minecraft/src","0" @@ -1207,7 +1207,7 @@ "func_40114_aH","getEntityHealth","ag","()I","()I","EntityLiving","nq","net/minecraft/src","0" "func_40121_k","setEntityHealth","h","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" "func_40123_ac","getSoundPitch","ax","()F","()F","EntityLiving","nq","net/minecraft/src","0" -"func_40115_d","func_40115_d","c","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" +"func_40115_d","applyArmorCalculations","c","(LDamageSource;I)I","(Lpm;I)I","EntityLiving","nq","net/minecraft/src","0" "func_434_a","knockBack","a","(LEntity;IDD)V","(Lia;IDD)V","EntityLiving","nq","net/minecraft/src","0" "func_21067_c_","canBreatheUnderwater","h","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" "func_426_b","faceEntity","a","(LEntity;FF)V","(Lia;FF)V","EntityLiving","nq","net/minecraft/src","0" @@ -1226,13 +1226,13 @@ "func_35160_a","isPotionActive","a","(LPotion;)Z","(Labg;)Z","EntityLiving","nq","net/minecraft/src","0" "func_35167_b","getActivePotionEffect","b","(LPotion;)LPotionEffect;","(Labg;)Ls;","EntityLiving","nq","net/minecraft/src","0" "func_35165_a","addPotionEffect","a","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" -"func_40122_aP","func_40122_aP","av","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" +"func_40122_aP","isEntityUndead","av","()Z","()Z","EntityLiving","nq","net/minecraft/src","0" "func_36002_f","removePotionEffect","j","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0" "func_35164_b","onNewPotionEffect","c","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" "func_35161_c","onChangedPotionEffect","d","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" "func_35158_d","onFinishedPotionEffect","e","(LPotionEffect;)V","(Ls;)V","EntityLiving","nq","net/minecraft/src","0" -"func_35166_t_","func_35166_t_","aw","()F","()F","EntityLiving","nq","net/minecraft/src","0" -"func_40113_j","func_40113_j","i","(DDD)V","(DDD)V","EntityLiving","nq","net/minecraft/src","0" +"func_35166_t_","getSpeedModifier","aw","()F","()F","EntityLiving","nq","net/minecraft/src","0" +"func_40113_j","teleportToLocation","i","(DDD)V","(DDD)V","EntityLiving","nq","net/minecraft/src","0" "func_41005_b","func_41005_b","b","(LItemStack;)V","(Ldk;)V","EntityLiving","nq","net/minecraft/src","0" "func_20134_a","func_20134_a","a","(LInventoryBasic;)V","(Lbb;)V","IInvBasic","afq","net/minecraft/src","0" "func_1115_a","setTexturePosition","a","(FF)LPositionTextureVertex;","(FF)Lfs;","PositionTextureVertex","fs","net/minecraft/src","0" @@ -1390,7 +1390,7 @@ "func_192_a","onItemUse","a","(LItemStack;LEntityPlayer;LWorld;IIII)Z","(Ldk;Lvi;Lry;IIII)Z","Item","acy","net/minecraft/src","0" "func_4017_a","isFull3D","a","()Z","()Z","Item","acy","net/minecraft/src","0" "func_40404_a","addInformation","a","(LItemStack;Ljava/util/List;)V","(Ldk;Ljava/util/List;)V","Item","acy","net/minecraft/src","0" -"func_40398_f","func_40398_f","d","(LItemStack;)LEnumRarity;","(Ldk;)Lja;","Item","acy","net/minecraft/src","0" +"func_40398_f","getRarity","d","(LItemStack;)LEnumRarity;","(Ldk;)Lja;","Item","acy","net/minecraft/src","0" "func_35413_b","onFoodEaten","a","(LItemStack;LWorld;LEntityPlayer;)LItemStack;","(Ldk;Lry;Lvi;)Ldk;","Item","acy","net/minecraft/src","0" "func_35411_c","getMaxItemUseDuration","b","(LItemStack;)I","(Ldk;)I","Item","acy","net/minecraft/src","0" "func_35412_b","getItemUseAction","c","(LItemStack;)LEnumAction;","(Ldk;)Lps;","Item","acy","net/minecraft/src","0" @@ -1430,8 +1430,8 @@ "func_28008_a","onUpdate","a","(LItemStack;LWorld;LEntity;IZ)V","(Ldk;Lry;Lia;IZ)V","Item","acy","net/minecraft/src","0" "func_28009_b","onCreated","b","(LItemStack;LWorld;LEntityPlayer;)V","(Ldk;Lry;Lvi;)V","Item","acy","net/minecraft/src","0" "func_35414_a","onPlayerStoppedUsing","a","(LItemStack;LWorld;LEntityPlayer;I)V","(Ldk;Lry;Lvi;I)V","Item","acy","net/minecraft/src","0" -"func_40407_b","func_40407_b","b","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lacy;","Item","acy","net/minecraft/src","0" -"func_40405_m","func_40405_m","m","()Ljava/lang/String;","()Ljava/lang/String;","Item","acy","net/minecraft/src","0" +"func_40407_b","setPotionModifier","b","(Ljava/lang/String;)LItem;","(Ljava/lang/String;)Lacy;","Item","acy","net/minecraft/src","0" +"func_40405_m","getPotionModifier","m","()Ljava/lang/String;","()Ljava/lang/String;","Item","acy","net/minecraft/src","0" "func_40406_n","isValidBrewingIngredient","n","()Z","()Z","Item","acy","net/minecraft/src","0" "func_40401_i","func_40401_i","j","(LItemStack;)Z","(Ldk;)Z","Item","acy","net/minecraft/src","0" "func_40402_a","func_40402_a","a","(LWorld;LEntityPlayer;Z)LMovingObjectPosition;","(Lry;Lvi;Z)Lgv;","Item","acy","net/minecraft/src","0" @@ -1447,8 +1447,8 @@ "func_31005_i","invalidate","l","()V","()V","TileEntity","bq","net/minecraft/src","0" "func_31004_j","validate","m","()V","()V","TileEntity","bq","net/minecraft/src","0" "func_35143_b","onTileEntityPowered","b","(II)V","(II)V","TileEntity","bq","net/minecraft/src","0" -"func_35144_b","func_35144_b","n","()V","()V","TileEntity","bq","net/minecraft/src","0" -"func_30003_j","func_30003_j","j","(LWorld;III)V","(Lry;III)V","BlockFlowing","ahx","net/minecraft/src","0" +"func_35144_b","updateContainingBlockInfo","n","()V","()V","TileEntity","bq","net/minecraft/src","0" +"func_30003_j","updateFlow","j","(LWorld;III)V","(Lry;III)V","BlockFlowing","ahx","net/minecraft/src","0" "func_299_g","flowIntoBlock","g","(LWorld;IIII)V","(Lry;IIII)V","BlockFlowing","ahx","net/minecraft/src","0" "func_300_a","calculateFlowCost","c","(LWorld;IIIII)I","(Lry;IIIII)I","BlockFlowing","ahx","net/minecraft/src","0" "func_297_k","getOptimalFlowDirections","k","(LWorld;III)[Z","(Lry;III)[Z","BlockFlowing","ahx","net/minecraft/src","0" @@ -1458,7 +1458,7 @@ "func_40010_a","func_40010_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdChestCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Lys;","ComponentStrongholdChestCorridor","ys","net/minecraft/src","0" "func_494_a","getCurrentItem","a","()LItemStack;","()Ldk;","InventoryPlayer","x","net/minecraft/src","0" "func_505_f","getInventorySlotContainItem","g","(I)I","(I)I","InventoryPlayer","x","net/minecraft/src","0" -"func_41021_b","func_41021_b","b","(II)I","(II)I","InventoryPlayer","x","net/minecraft/src","0" +"func_41021_b","getInventorySlotContainItemAndDamage","b","(II)I","(II)I","InventoryPlayer","x","net/minecraft/src","0" "func_21105_c","storeItemStack","d","(LItemStack;)I","(Ldk;)I","InventoryPlayer","x","net/minecraft/src","0" "func_499_j","getFirstEmptyStack","l","()I","()I","InventoryPlayer","x","net/minecraft/src","0" "func_496_a","setCurrentItem","a","(IIZZ)V","(IIZZ)V","InventoryPlayer","x","net/minecraft/src","0" @@ -1479,7 +1479,7 @@ "func_503_g","dropAllItems","g","()V","()V","InventoryPlayer","x","net/minecraft/src","0" "func_20076_b","setItemStack","b","(LItemStack;)V","(Ldk;)V","InventoryPlayer","x","net/minecraft/src","0" "func_20075_i","getItemStack","i","()LItemStack;","()Ldk;","InventoryPlayer","x","net/minecraft/src","0" -"func_28018_c","getHasItemStack","c","(LItemStack;)Z","(Ldk;)Z","InventoryPlayer","x","net/minecraft/src","0" +"func_28018_c","hasItemStack","c","(LItemStack;)Z","(Ldk;)Z","InventoryPlayer","x","net/minecraft/src","0" "func_41022_a","copyInventory","a","(LInventoryPlayer;)V","(Lx;)V","InventoryPlayer","x","net/minecraft/src","0" "func_4105_a","isItemValid","a","(LItemStack;)Z","(Ldk;)Z","Slot","vv","net/minecraft/src","0" "func_4103_a","onPickupFromSlot","b","(LItemStack;)V","(Ldk;)V","Slot","vv","net/minecraft/src","0" @@ -1506,7 +1506,7 @@ "func_20114_a","updateCraftingResults","a","()V","()V","Container","pj","net/minecraft/src","0" "func_20112_a","updateProgressBar","a","(II)V","(II)V","Container","pj","net/minecraft/src","0" "func_1103_a","onCraftMatrixChanged","a","(LIInventory;)V","(Lde;)V","Container","pj","net/minecraft/src","0" -"func_40233_a","func_40233_a","a","(LEntityPlayer;I)Z","(Lvi;I)Z","Container","pj","net/minecraft/src","0" +"func_40233_a","enchantItem","a","(LEntityPlayer;I)Z","(Lvi;I)Z","Container","pj","net/minecraft/src","0" "func_1104_a","onCraftGuiClosed","b","(LEntityPlayer;)V","(Lvi;)V","Container","pj","net/minecraft/src","0" "func_20120_b","canInteractWith","a","(LEntityPlayer;)Z","(Lvi;)Z","Container","pj","net/minecraft/src","0" "func_27279_a","transferStackInSlot","a","(I)LItemStack;","(I)Ldk;","Container","pj","net/minecraft/src","0" @@ -1531,7 +1531,7 @@ "func_40688_a","func_40688_a","a","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Laaz;Ljava/util/List;Ljava/util/Random;IIIII)Lrh;","StructureNetherBridgePieces","rp","net/minecraft/src","0" "func_40689_a","func_40689_a","a","()[LStructureNetherBridgePieceWeight;","()[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" "func_40687_b","func_40687_b","b","()[LStructureNetherBridgePieceWeight;","()[Laaz;","StructureNetherBridgePieces","rp","net/minecraft/src","0" -"func_27366_a","Parse","a","(Ljava/io/Reader;)LJ_JsonRootNode;","(Ljava/io/Reader;)Lwz;","J_JdomParser","nx","net/minecraft/src","0" +"func_27366_a","parse","a","(Ljava/io/Reader;)LJ_JsonRootNode;","(Ljava/io/Reader;)Lwz;","J_JdomParser","nx","net/minecraft/src","0" "func_27367_a","parse","a","(Ljava/lang/String;)LJ_JsonRootNode;","(Ljava/lang/String;)Lwz;","J_JdomParser","nx","net/minecraft/src","0" "func_27002_a","doRenderLightningBolt","a","(LEntityLightningBolt;DDDFF)V","(Lsu;DDDFF)V","RenderLightningBolt","adu","net/minecraft/src","0" "func_25011_l","getHealAmount","o","()I","()I","ItemFood","agu","net/minecraft/src","0" @@ -1566,7 +1566,7 @@ "func_21008_a","func_21008_a","a","(LEntitySquid;DDDFF)V","(Lyv;DDDFF)V","RenderSquid","aic","net/minecraft/src","0" "func_21007_a","func_21007_a","a","(LEntitySquid;FFF)V","(Lyv;FFF)V","RenderSquid","aic","net/minecraft/src","0" "func_21005_a","func_21005_a","a","(LEntitySquid;F)V","(Lyv;F)V","RenderSquid","aic","net/minecraft/src","0" -"func_21006_b","func_21006_b","b","(LEntitySquid;F)F","(Lyv;F)F","RenderSquid","aic","net/minecraft/src","0" +"func_21006_b","handleRotationFloat","b","(LEntitySquid;F)F","(Lyv;F)F","RenderSquid","aic","net/minecraft/src","0" "func_25125_a","update","a","(LGuiParticle;)V","(Lvg;)V","Particle","dy","net/minecraft/src","0" "func_25127_a","preUpdate","a","()V","()V","Particle","dy","net/minecraft/src","0" "func_25126_b","setDead","b","()V","()V","Particle","dy","net/minecraft/src","0" @@ -1749,7 +1749,7 @@ "func_35530_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Laad;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" "func_35524_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" "func_40542_b","func_40542_b","b","(LEntity;LEntity;)LDamageSource;","(Lia;Lia;)Lpm;","DamageSource","pm","net/minecraft/src","0" -"func_40547_b","projectile","b","()Z","()Z","DamageSource","pm","net/minecraft/src","0" +"func_40547_b","isProjectile","b","()Z","()Z","DamageSource","pm","net/minecraft/src","0" "func_40544_c","setProjectile","c","()LDamageSource;","()Lpm;","DamageSource","pm","net/minecraft/src","0" "func_35534_b","unblockable","d","()Z","()Z","DamageSource","pm","net/minecraft/src","0" "func_35533_c","getHungerDamage","e","()F","()F","DamageSource","pm","net/minecraft/src","0" @@ -1891,7 +1891,7 @@ "func_21119_g","func_21119_g","o","()Ljava/lang/String;","()Ljava/lang/String;","World","ry","net/minecraft/src","0" "func_654_a","setBlockTileEntity","a","(IIILTileEntity;)V","(IIILbq;)V","World","ry","net/minecraft/src","0" "func_692_l","removeBlockTileEntity","o","(III)V","(III)V","World","ry","net/minecraft/src","0" -"func_35455_a","func_35455_a","a","(LTileEntity;)V","(Lbq;)V","World","ry","net/minecraft/src","0" +"func_35455_a","markEntityForDespawn","a","(LTileEntity;)V","(Lbq;)V","World","ry","net/minecraft/src","0" "func_41082_b","func_41082_b","b","(IIIZ)Z","(IIIZ)Z","World","ry","net/minecraft/src","0" "func_651_a","saveWorldIndirectly","a","(LIProgressUpdate;)V","(Lrz;)V","World","ry","net/minecraft/src","0" "func_644_f","calculateInitialSkylight","p","()V","()V","World","ry","net/minecraft/src","0" @@ -1900,8 +1900,8 @@ "func_27164_F","stopPrecipitation","I","()V","()V","World","ry","net/minecraft/src","0" "func_40471_p","func_40471_p","p","(III)Z","(III)Z","World","ry","net/minecraft/src","0" "func_40481_q","func_40481_q","q","(III)Z","(III)Z","World","ry","net/minecraft/src","0" -"func_40476_b","func_40476_b","c","(IIIZ)Z","(IIIZ)Z","World","ry","net/minecraft/src","0" -"func_40478_r","func_40478_r","r","(III)Z","(III)Z","World","ry","net/minecraft/src","0" +"func_40476_b","isBlockHydrated","c","(IIIZ)Z","(IIIZ)Z","World","ry","net/minecraft/src","0" +"func_40478_r","canSnowAt","r","(III)Z","(III)Z","World","ry","net/minecraft/src","0" "func_35463_p","updateAllLightTypes","s","(III)V","(III)V","World","ry","net/minecraft/src","0" "func_35460_a","computeSkyLightValue","a","(IIIIII)I","(IIIIII)I","World","ry","net/minecraft/src","0" "func_35458_d","computeBlockLightValue","d","(IIIIII)I","(IIIIII)I","World","ry","net/minecraft/src","0" @@ -2027,8 +2027,8 @@ "func_1153_b","init","b","()V","()V","ClippingHelperImpl","qs","net/minecraft/src","0" "func_35609_a","func_35609_a","a","(LBlock;IF)V","(Lyy;IF)V","ChestItemRenderHelper","acl","net/minecraft/src","0" "func_1040_a","compareRecipes","a","(LIRecipe;LIRecipe;)I","(Lue;Lue;)I","RecipeSorter","ga","net/minecraft/src","0" -"func_27290_a","func_27290_a","a","(LJ_JsonNodeBuilder;)V","(Lrv;)V","J_NodeContainer","ye","net/minecraft/src","0" -"func_27289_a","func_27289_a","a","(LJ_JsonFieldBuilder;)V","(Laax;)V","J_NodeContainer","ye","net/minecraft/src","0" +"func_27290_a","addNode","a","(LJ_JsonNodeBuilder;)V","(Lrv;)V","J_NodeContainer","ye","net/minecraft/src","0" +"func_27289_a","addField","a","(LJ_JsonFieldBuilder;)V","(Laax;)V","J_NodeContainer","ye","net/minecraft/src","0" "func_1260_a","createVectorHelper","a","(DDD)LVec3D;","(DDD)Lfb;","Vec3D","fb","net/minecraft/src","0" "func_28215_a","clearVectorList","a","()V","()V","Vec3D","fb","net/minecraft/src","0" "func_1259_a","initialize","b","()V","()V","Vec3D","fb","net/minecraft/src","0" @@ -2080,7 +2080,7 @@ "func_35723_d","getCachedBiomes","e","(II)[LBiomeGenBase;","(II)[Lsr;","BiomeCache","agl","net/minecraft/src","0" "func_35721_a","getWorldChunkManager","a","(LBiomeCache;)LWorldChunkManager;","(Lagl;)Lvh;","BiomeCache","agl","net/minecraft/src","0" "func_35051_a","func_35051_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentStrongholdCorridor","vn","net/minecraft/src","0" -"func_31032_h","func_31032_h","g","(LWorld;III)Z","(Lry;III)Z","BlockTorch","bg","net/minecraft/src","0" +"func_31032_h","canPlaceTorchOn","g","(LWorld;III)Z","(Lry;III)Z","BlockTorch","bg","net/minecraft/src","0" "func_271_h","dropTorchIfCantStay","h","(LWorld;III)Z","(Lry;III)Z","BlockTorch","bg","net/minecraft/src","0" "func_22386_a","func_22386_a","a","(FF)F","(FF)F","MouseFilter","ne","net/minecraft/src","0" "func_516_a","generate","a","(LWorld;Ljava/util/Random;III)Z","(Lry;Ljava/util/Random;III)Z","WorldGenerator","ig","net/minecraft/src","0" @@ -2233,22 +2233,22 @@ "func_997_a","getRandomWithSeed","a","(J)Ljava/util/Random;","(J)Ljava/util/Random;","Chunk","zx","net/minecraft/src","0" "func_21167_h","isEmpty","h","()Z","()Z","Chunk","zx","net/minecraft/src","0" "func_996_c","propagateSkylightOcclusion","d","(II)V","(II)V","Chunk","zx","net/minecraft/src","0" -"func_35839_k","func_35839_k","l","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_35839_k","updateSkylight_do","l","()V","()V","Chunk","zx","net/minecraft/src","0" "func_1020_f","checkSkylightNeighborHeight","f","(III)V","(III)V","Chunk","zx","net/minecraft/src","0" "func_35842_d","updateSkylightNeighborHeight","d","(IIII)V","(IIII)V","Chunk","zx","net/minecraft/src","0" "func_1003_g","relightBlock","g","(III)V","(III)V","Chunk","zx","net/minecraft/src","0" -"func_25124_i","func_25124_i","i","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_25124_i","removeUnknownBlocks","i","()V","()V","Chunk","zx","net/minecraft/src","0" "func_35843_a","populateChunk","a","(LIChunkProvider;LIChunkProvider;II)V","(Lej;Lej;II)V","Chunk","zx","net/minecraft/src","0" -"func_35840_c","func_35840_c","c","(II)I","(II)I","Chunk","zx","net/minecraft/src","0" -"func_35841_j","func_35841_j","j","()V","()V","Chunk","zx","net/minecraft/src","0" -"func_40740_k","func_40740_k","k","()LChunkCoordIntPair;","()Lacm;","Chunk","zx","net/minecraft/src","0" +"func_35840_c","getPrecipitationHeight","c","(II)I","(II)I","Chunk","zx","net/minecraft/src","0" +"func_35841_j","updateSkylight","j","()V","()V","Chunk","zx","net/minecraft/src","0" +"func_40740_k","getChunkCoordIntPair","k","()LChunkCoordIntPair;","()Lacm;","Chunk","zx","net/minecraft/src","0" "func_27234_b","buildNode","b","()LJ_JsonNode;","()Lan;","J_JsonNodeBuilder","rv","net/minecraft/src","0" "values","values","values","()[LEnumMobType;","()[Lxb;","EnumMobType","xb","net/minecraft/src","0" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMobType;","(Ljava/lang/String;)Lxb;","EnumMobType","xb","net/minecraft/src","0" "func_742_a","setTag","a","(LNBTBase;)V","(Lum;)V","NBTTagList","yi","net/minecraft/src","0" "func_741_a","tagAt","a","(I)LNBTBase;","(I)Lum;","NBTTagList","yi","net/minecraft/src","0" "func_740_c","tagCount","c","()I","()I","NBTTagList","yi","net/minecraft/src","0" -"func_35147_g","func_35147_g","a","()V","()V","TileEntityChest","tu","net/minecraft/src","0" +"func_35147_g","checkForAdjacentChests","a","()V","()V","TileEntityChest","tu","net/minecraft/src","0" "func_21028_c","growTree","c","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","BlockSapling","aet","net/minecraft/src","0" "func_35511_a","choose","a","(II)I","(II)I","GenLayerZoomFuzzy","gn","net/minecraft/src","0" "func_35510_b","choose","b","(IIII)I","(IIII)I","GenLayerZoomFuzzy","gn","net/minecraft/src","0" @@ -2297,9 +2297,9 @@ "func_40700_a","getDisplayColor","a","()I","()I","ProfilerResult","afx","net/minecraft/src","0" "func_35101_a","func_35101_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse3;","(Ljava/util/List;Ljava/util/Random;IIIII)Ltf;","ComponentVillageHouse3","tf","net/minecraft/src","0" "func_6473_b","func_6473_b","d","(LEntityPlayer;)V","(Lvi;)V","PlayerController","aes","net/minecraft/src","0" -"func_722_a","sendPlaceBlock","a","(LEntityPlayer;LWorld;LItemStack;IIII)Z","(Lvi;Lry;Ldk;IIII)Z","PlayerController","aes","net/minecraft/src","0" +"func_722_a","onPlayerRightClick","a","(LEntityPlayer;LWorld;LItemStack;IIII)Z","(Lvi;Lry;Ldk;IIII)Z","PlayerController","aes","net/minecraft/src","0" "func_719_a","clickBlock","b","(IIII)V","(IIII)V","PlayerController","aes","net/minecraft/src","0" -"func_6470_c","sendBlockRemoving","c","(IIII)V","(IIII)V","PlayerController","aes","net/minecraft/src","0" +"func_6470_c","onPlayerDamageBlock","c","(IIII)V","(IIII)V","PlayerController","aes","net/minecraft/src","0" "func_6468_a","resetBlockRemoving","b","()V","()V","PlayerController","aes","net/minecraft/src","0" "func_6469_d","shouldDrawHUD","a","()Z","()Z","PlayerController","aes","net/minecraft/src","0" "func_717_a","onWorldChange","a","(LWorld;)V","(Lry;)V","PlayerController","aes","net/minecraft/src","0" @@ -2308,7 +2308,7 @@ "func_35640_h","isInCreativeMode","g","()Z","()Z","PlayerController","aes","net/minecraft/src","0" "func_35636_i","extendedReach","h","()Z","()Z","PlayerController","aes","net/minecraft/src","0" "func_6476_a","flipPlayer","a","(LEntityPlayer;)V","(Lvi;)V","PlayerController","aes","net/minecraft/src","0" -"func_729_b","sendBlockRemoved","a","(IIII)Z","(IIII)Z","PlayerController","aes","net/minecraft/src","0" +"func_729_b","onPlayerDestroyBlock","a","(IIII)Z","(IIII)Z","PlayerController","aes","net/minecraft/src","0" "func_6467_a","setPartialTime","a","(F)V","(F)V","PlayerController","aes","net/minecraft/src","0" "func_4087_b","createPlayer","b","(LWorld;)LEntityPlayer;","(Lry;)Lvi;","PlayerController","aes","net/minecraft/src","0" "func_6474_c","updateController","d","()V","()V","PlayerController","aes","net/minecraft/src","0" @@ -2388,7 +2388,7 @@ "func_4057_a","func_4057_a","a","([DIIIIII)[D","([DIIIIII)[D","ChunkProviderHell","jv","net/minecraft/src","0" "func_40446_a","func_40446_a","a","(LTileEntityEndPortal;DDDF)V","(Lyg;DDDF)V","RenderEndPortal","abi","net/minecraft/src","0" "func_40447_a","func_40447_a","a","(FFFF)Ljava/nio/FloatBuffer;","(FFFF)Ljava/nio/FloatBuffer;","RenderEndPortal","abi","net/minecraft/src","0" -"func_27237_a","func_27237_a","a","(LJ_JsonFieldBuilder;)LJ_JsonObjectNodeBuilder;","(Laax;)Labq;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" +"func_27237_a","withFieldBuilder","a","(LJ_JsonFieldBuilder;)LJ_JsonObjectNodeBuilder;","(Laax;)Labq;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" "func_27235_a","func_27235_a","a","()LJ_JsonRootNode;","()Lwz;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" "func_27236_a","func_27236_a","a","(LJ_JsonObjectNodeBuilder;)Ljava/util/List;","(Labq;)Ljava/util/List;","J_JsonObjectNodeBuilder","abq","net/minecraft/src","0" "func_932_a","renderTileEntitySignAt","a","(LTileEntitySign;DDDF)V","(Lu;DDDF)V","TileEntitySignRenderer","aeu","net/minecraft/src","0" @@ -2567,7 +2567,7 @@ "func_21033_c","dispenseItem","c","(LWorld;IIILjava/util/Random;)V","(Lry;IIILjava/util/Random;)V","BlockDispenser","cu","net/minecraft/src","0" "values","values","values","()[LEnumRarity;","()[Lja;","EnumRarity","ja","net/minecraft/src","0" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumRarity;","(Ljava/lang/String;)Lja;","EnumRarity","ja","net/minecraft/src","0" -"func_35299_s","func_35299_s","j","()I","()I","BlockPane","uh","net/minecraft/src","0" +"func_35299_s","getSideTextureIndex","j","()I","()I","BlockPane","uh","net/minecraft/src","0" "func_35298_d","func_35298_d","e","(I)Z","(I)Z","BlockPane","uh","net/minecraft/src","0" "func_184_a","updateCreeperScale","a","(LEntityCreeper;F)V","(Labh;F)V","RenderCreeper","hb","net/minecraft/src","0" "func_183_a","updateCreeperColorMultiplier","a","(LEntityCreeper;FF)I","(Labh;FF)I","RenderCreeper","hb","net/minecraft/src","0" @@ -2689,8 +2689,8 @@ "func_35573_a","getHashIndex","a","(II)I","(II)I","LongHashMap","wv","net/minecraft/src","0" "func_35576_a","getNumHashElements","a","()I","()I","LongHashMap","wv","net/minecraft/src","0" "func_35578_a","getValueByKey","a","(J)Ljava/lang/Object;","(J)Ljava/lang/Object;","LongHashMap","wv","net/minecraft/src","0" -"func_35575_b","func_35575_b","b","(J)Z","(J)Z","LongHashMap","wv","net/minecraft/src","0" -"func_35569_c","func_35569_c","c","(J)LLongHashMapEntry;","(J)Lahc;","LongHashMap","wv","net/minecraft/src","0" +"func_35575_b","containsKey","b","(J)Z","(J)Z","LongHashMap","wv","net/minecraft/src","0" +"func_35569_c","getEntry","c","(J)LLongHashMapEntry;","(J)Lahc;","LongHashMap","wv","net/minecraft/src","0" "func_35577_a","add","a","(JLjava/lang/Object;)V","(JLjava/lang/Object;)V","LongHashMap","wv","net/minecraft/src","0" "func_35567_b","resizeTable","b","(I)V","(I)V","LongHashMap","wv","net/minecraft/src","0" "func_35579_a","copyHashTableTo","a","([LLongHashMapEntry;)V","([Lahc;)V","LongHashMap","wv","net/minecraft/src","0" @@ -2718,7 +2718,7 @@ "func_20161_b","translateNamedKey","b","(Ljava/lang/String;)Ljava/lang/String;","(Ljava/lang/String;)Ljava/lang/String;","StringTranslate","qp","net/minecraft/src","0" "func_20102_a","getKeyBindingDescription","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" "func_1047_d","getOptionDisplayString","b","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" -"func_41085_c","func_41085_c","c","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" +"func_41085_c","getKeyDisplayString","c","(I)Ljava/lang/String;","(I)Ljava/lang/String;","GameSettings","ki","net/minecraft/src","0" "func_1042_a","setKeyBinding","a","(II)V","(II)V","GameSettings","ki","net/minecraft/src","0" "func_1048_a","setOptionFloatValue","a","(LEnumOptions;F)V","(Llp;F)V","GameSettings","ki","net/minecraft/src","0" "func_1045_b","setOptionValue","a","(LEnumOptions;I)V","(Llp;I)V","GameSettings","ki","net/minecraft/src","0" @@ -2784,7 +2784,7 @@ "func_35027_a","func_35027_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lnl;","ComponentMineshaftStairs","ra","net/minecraft/src","0" "func_27070_a","func_27070_a","a","(LJ_JsonNode;)Z","(Lan;)Z","J_JsonObjectNodeSelector","agz","net/minecraft/src","0" "func_27071_b","func_27071_b","b","(LJ_JsonNode;)Ljava/util/Map;","(Lan;)Ljava/util/Map;","J_JsonObjectNodeSelector","agz","net/minecraft/src","0" -"func_28182_a","getWaterBiomeColorizer","a","([I)V","([I)V","ColorizerWater","ya","net/minecraft/src","0" +"func_28182_a","setWaterBiomeColorizer","a","([I)V","([I)V","ColorizerWater","ya","net/minecraft/src","0" "func_35105_a","getWorldChunkMngr","d","()LWorldChunkManager;","()Lvh;","ComponentVillageStartPiece","yp","net/minecraft/src","0" "func_35055_a","func_35055_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLibrary;","(Ljava/util/List;Ljava/util/Random;IIIII)Lzc;","ComponentStrongholdLibrary","zc","net/minecraft/src","0" "func_4060_a","generateTerrain","a","(II[B)V","(II[B)V","ChunkProviderGenerate","xj","net/minecraft/src","0" @@ -2867,7 +2867,7 @@ "func_35368_a","func_35368_a","a","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentVillage","sr","net/minecraft/src","1" "func_35369_b","func_35369_b","b","(LComponentVillageStartPiece;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lj;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentVillage","sr","net/minecraft/src","1" "func_35367_b","getFoundationLevel","b","(LWorld;LStructureBoundingBox;)I","(Lfi;Lvb;)I","ComponentVillage","sr","net/minecraft/src","1" -"func_35366_a","func_35366_a","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentVillage","sr","net/minecraft/src","1" +"func_35366_a","canVillageGoDeeper","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentVillage","sr","net/minecraft/src","1" "func_40309_a","func_40309_a","a","(LWorld;LStructureBoundingBox;IIII)V","(Lfi;Lvb;IIII)V","ComponentVillage","sr","net/minecraft/src","1" "func_40310_a","func_40310_a","a","(I)I","(I)I","ComponentVillage","sr","net/minecraft/src","1" "func_438_a","displaySavingString","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","IProgressUpdate","xk","net/minecraft/src","1" @@ -2880,21 +2880,21 @@ "func_446_b","getBlockMetadata","c","(III)I","(III)I","IBlockAccess","wy","net/minecraft/src","1" "func_443_c","getBlockMaterial","d","(III)LMaterial;","(III)Llg;","IBlockAccess","wy","net/minecraft/src","1" "func_445_d","isBlockNormalCube","e","(III)Z","(III)Z","IBlockAccess","wy","net/minecraft/src","1" -"func_35232_c","func_35232_c","c","(LEntityPlayer;)Z","(Lgz;)Z","EntityEnderman","mb","net/minecraft/src","1" -"func_35227_w","func_35227_w","u_","()Z","()Z","EntityEnderman","mb","net/minecraft/src","1" -"func_35230_e","func_35230_e","f","(LEntity;)Z","(Lrn;)Z","EntityEnderman","mb","net/minecraft/src","1" -"func_35228_a","func_35228_a","b","(DDD)Z","(DDD)Z","EntityEnderman","mb","net/minecraft/src","1" -"func_35226_b","func_35226_b","b","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" +"func_35232_c","shouldAttackPlayer","c","(LEntityPlayer;)Z","(Lgz;)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35227_w","teleportRandomly","u_","()Z","()Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35230_e","teleportToEntity","f","(LEntity;)Z","(Lrn;)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35228_a","teleportTo","b","(DDD)Z","(DDD)Z","EntityEnderman","mb","net/minecraft/src","1" +"func_35226_b","setCarried","b","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" "func_35225_x","getCarried","A","()I","()I","EntityEnderman","mb","net/minecraft/src","1" -"func_35229_d","func_35229_d","c","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" +"func_35229_d","setCarryingData","c","(I)V","(I)V","EntityEnderman","mb","net/minecraft/src","1" "func_35231_y","getCarryingData","B","()I","()I","EntityEnderman","mb","net/minecraft/src","1" "func_726_a","writePlayerData","a","(LEntityPlayer;)V","(Lgz;)V","IPlayerFileData","ii","net/minecraft/src","1" "func_725_b","readPlayerData","b","(LEntityPlayer;)V","(Lgz;)V","IPlayerFileData","ii","net/minecraft/src","1" "func_22012_g","ignoreTick","f","(LWorld;IIII)Z","(Lfi;IIII)Z","BlockRedstoneRepeater","wa","net/minecraft/src","1" "func_35350_a","func_35350_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Lup;","ComponentStrongholdCrossing","up","net/minecraft/src","1" "func_40509_b","func_40509_b","b","()V","()V","ThreadedFileIOBase","ct","net/minecraft/src","1" -"func_40507_a","func_40507_a","a","(LIThreadedFileIO;)V","(Lgm;)V","ThreadedFileIOBase","ct","net/minecraft/src","1" -"func_40508_a","func_40508_a","a","()V","()V","ThreadedFileIOBase","ct","net/minecraft/src","1" +"func_40507_a","queueIO","a","(LIThreadedFileIO;)V","(Lgm;)V","ThreadedFileIOBase","ct","net/minecraft/src","1" +"func_40508_a","waitForFinish","a","()V","()V","ThreadedFileIOBase","ct","net/minecraft/src","1" "values","values","values","()[LEnumCreatureAttribute;","()[Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumCreatureAttribute;","(Ljava/lang/String;)Lbq;","EnumCreatureAttribute","bq","net/minecraft/src","1" "func_216_a","isSolid","a","()Z","()Z","Material","lg","net/minecraft/src","1" @@ -2913,7 +2913,7 @@ "func_31059_k","setNoPushMobility","m","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" "func_31057_l","setImmovableMobility","n","()LMaterial;","()Llg;","Material","lg","net/minecraft/src","1" "func_40289_a","func_40289_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Ldu;","ComponentNetherBridgeStraight","du","net/minecraft/src","1" -"func_30005_i","func_30005_i","i","(LWorld;III)V","(Lfi;III)V","BlockStationary","nh","net/minecraft/src","1" +"func_30005_i","setNotStationary","i","(LWorld;III)V","(Lfi;III)V","BlockStationary","nh","net/minecraft/src","1" "func_4033_j","isFlammable","j","(LWorld;III)Z","(Lfi;III)Z","BlockStationary","nh","net/minecraft/src","1" "func_733_a","setScheduledTime","a","(J)LNextTickListEntry;","(J)Lqa;","NextTickListEntry","qa","net/minecraft/src","1" "func_734_a","comparer","a","(LNextTickListEntry;)I","(Lqa;)I","NextTickListEntry","qa","net/minecraft/src","1" @@ -2925,7 +2925,7 @@ "func_572_a","useItem","a","(LEntityPlayer;LWorld;IIII)Z","(Lgz;Lfi;IIII)Z","ItemStack","jb","net/minecraft/src","1" "func_574_a","getStrVsBlock","a","(LBlock;)F","(Ltl;)F","ItemStack","jb","net/minecraft/src","1" "func_6168_a","useItemRightClick","a","(LWorld;LEntityPlayer;)LItemStack;","(Lfi;Lgz;)Ljb;","ItemStack","jb","net/minecraft/src","1" -"func_35617_b","func_35617_b","b","(LWorld;LEntityPlayer;)LItemStack;","(Lfi;Lgz;)Ljb;","ItemStack","jb","net/minecraft/src","1" +"func_35617_b","onFoodEaten","b","(LWorld;LEntityPlayer;)LItemStack;","(Lfi;Lgz;)Ljb;","ItemStack","jb","net/minecraft/src","1" "func_570_a","writeToNBT","b","(LNBTTagCompound;)LNBTTagCompound;","(Lng;)Lng;","ItemStack","jb","net/minecraft/src","1" "func_575_b","readFromNBT","c","(LNBTTagCompound;)V","(Lng;)V","ItemStack","jb","net/minecraft/src","1" "func_576_b","getMaxStackSize","b","()I","()I","ItemStack","jb","net/minecraft/src","1" @@ -2953,29 +2953,29 @@ "func_28143_a","updateAnimation","a","(LWorld;LEntity;IZ)V","(Lfi;Lrn;IZ)V","ItemStack","jb","net/minecraft/src","1" "func_28142_b","onCrafting","c","(LWorld;LEntityPlayer;)V","(Lfi;Lgz;)V","ItemStack","jb","net/minecraft/src","1" "func_28144_c","isStackEqual","c","(LItemStack;)Z","(Ljb;)Z","ItemStack","jb","net/minecraft/src","1" -"func_35614_l","func_35614_l","l","()I","()I","ItemStack","jb","net/minecraft/src","1" -"func_35615_m","func_35615_m","m","()LEnumAction;","()Ljf;","ItemStack","jb","net/minecraft/src","1" -"func_35613_a","func_35613_a","a","(LWorld;LEntityPlayer;I)V","(Lfi;Lgz;I)V","ItemStack","jb","net/minecraft/src","1" -"func_40608_n","func_40608_n","n","()Z","()Z","ItemStack","jb","net/minecraft/src","1" -"func_40607_o","func_40607_o","o","()LNBTTagCompound;","()Lng;","ItemStack","jb","net/minecraft/src","1" -"func_40609_p","func_40609_p","p","()LNBTTagList;","()Lrp;","ItemStack","jb","net/minecraft/src","1" +"func_35614_l","getMaxItemUseDuration","l","()I","()I","ItemStack","jb","net/minecraft/src","1" +"func_35615_m","getItemUseAction","m","()LEnumAction;","()Ljf;","ItemStack","jb","net/minecraft/src","1" +"func_35613_a","onPlayerStoppedUsing","a","(LWorld;LEntityPlayer;I)V","(Lfi;Lgz;I)V","ItemStack","jb","net/minecraft/src","1" +"func_40608_n","hasTagCompound","n","()Z","()Z","ItemStack","jb","net/minecraft/src","1" +"func_40607_o","getTagCompound","o","()LNBTTagCompound;","()Lng;","ItemStack","jb","net/minecraft/src","1" +"func_40609_p","getEnchantmentTagList","p","()LNBTTagList;","()Lrp;","ItemStack","jb","net/minecraft/src","1" "func_40604_d","setNBTData","d","(LNBTTagCompound;)V","(Lng;)V","ItemStack","jb","net/minecraft/src","1" "func_40606_q","func_40606_q","q","()Z","()Z","ItemStack","jb","net/minecraft/src","1" -"func_40605_a","func_40605_a","a","(LEnchantment;I)V","(Lmq;I)V","ItemStack","jb","net/minecraft/src","1" +"func_40605_a","addEnchantment","a","(LEnchantment;I)V","(Lmq;I)V","ItemStack","jb","net/minecraft/src","1" "func_40610_r","func_40610_r","r","()Z","()Z","ItemStack","jb","net/minecraft/src","1" "func_40256_b","getPotionEffectsForItemStack","b","(LItemStack;)Ljava/util/List;","(Ljb;)Ljava/util/List;","ItemPotion","ft","net/minecraft/src","1" "func_40255_b","getPotionEffectsForDamage","b","(I)Ljava/util/List;","(I)Ljava/util/List;","ItemPotion","ft","net/minecraft/src","1" -"func_40254_c","func_40254_c","c","(I)Z","(I)Z","ItemPotion","ft","net/minecraft/src","1" +"func_40254_c","isSplash","c","(I)Z","(I)Z","ItemPotion","ft","net/minecraft/src","1" "func_22103_b","getWorldInfo","b","(Ljava/lang/String;)LWorldInfo;","(Ljava/lang/String;)Leo;","SaveFormatOld","sl","net/minecraft/src","1" -"func_22104_a","func_22104_a","a","([Ljava/io/File;)V","([Ljava/io/File;)V","SaveFormatOld","sl","net/minecraft/src","1" +"func_22104_a","deleteFiles","a","([Ljava/io/File;)V","([Ljava/io/File;)V","SaveFormatOld","sl","net/minecraft/src","1" "func_22105_a","getSaveLoader","a","(Ljava/lang/String;Z)LISaveHandler;","(Ljava/lang/String;Z)Lwg;","SaveFormatOld","sl","net/minecraft/src","1" "func_40177_b","canConnectFenceTo","b","(LIBlockAccess;III)Z","(Lwy;III)Z","BlockFence","jv","net/minecraft/src","1" -"func_35532_a","func_35532_a","a","(LWorld;Ljava/util/Random;II)Z","(Lfi;Ljava/util/Random;II)Z","MapGenStructure","qp","net/minecraft/src","1" +"func_35532_a","generateStructuresInChunk","a","(LWorld;Ljava/util/Random;II)Z","(Lfi;Ljava/util/Random;II)Z","MapGenStructure","qp","net/minecraft/src","1" "func_40204_a","func_40204_a","a","(III)Z","(III)Z","MapGenStructure","qp","net/minecraft/src","1" "func_40202_a","func_40202_a","a","(LWorld;III)LChunkPosition;","(Lfi;III)Lvo;","MapGenStructure","qp","net/minecraft/src","1" "func_40203_a","func_40203_a","a","()Ljava/util/List;","()Ljava/util/List;","MapGenStructure","qp","net/minecraft/src","1" -"func_35531_a","func_35531_a","a","(II)Z","(II)Z","MapGenStructure","qp","net/minecraft/src","1" -"func_35533_b","func_35533_b","b","(II)LStructureStart;","(II)Ltr;","MapGenStructure","qp","net/minecraft/src","1" +"func_35531_a","canSpawnStructureAtCoords","a","(II)Z","(II)Z","MapGenStructure","qp","net/minecraft/src","1" +"func_35533_b","getStructureStart","b","(II)LStructureStart;","(II)Ltr;","MapGenStructure","qp","net/minecraft/src","1" "func_6091_h","removeLeaves","g","(LWorld;III)V","(Lfi;III)V","BlockLeaves","bm","net/minecraft/src","1" "func_35491_a","canSpawnMoreVillagePiecesOfType","a","(I)Z","(I)Z","StructureVillagePieceWeight","ex","net/minecraft/src","1" "func_35492_a","canSpawnMoreVillagePieces","a","()Z","()Z","StructureVillagePieceWeight","ex","net/minecraft/src","1" @@ -2990,15 +2990,15 @@ "func_22094_a","saveWorldInfo","a","(LWorldInfo;)V","(Leo;)V","ISaveHandler","wg","net/minecraft/src","1" "func_22090_d","getPlayerNBTManager","d","()LIPlayerFileData;","()Lii;","ISaveHandler","wg","net/minecraft/src","1" "func_28111_b","getMapFileFromName","b","(Ljava/lang/String;)Ljava/io/File;","(Ljava/lang/String;)Ljava/io/File;","ISaveHandler","wg","net/minecraft/src","1" -"func_35070_c","func_35070_c","d","(I)Z","(I)Z","BlockFenceGate","tt","net/minecraft/src","1" +"func_35070_c","isFenceGateOpen","d","(I)Z","(I)Z","BlockFenceGate","tt","net/minecraft/src","1" "func_35071_d","func_35071_d","e","(I)I","(I)I","BlockFenceGate","tt","net/minecraft/src","1" "func_40292_a","func_40292_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing3;","(Ljava/util/List;Ljava/util/Random;IIIII)Lpm;","ComponentNetherBridgeCrossing3","pm","net/minecraft/src","1" "func_434_a","pickCheckLootItem","a","(Ljava/util/Random;)LItemStack;","(Ljava/util/Random;)Ljb;","WorldGenDungeons","ev","net/minecraft/src","1" "func_433_b","pickMobSpawner","b","(Ljava/util/Random;)Ljava/lang/String;","(Ljava/util/Random;)Ljava/lang/String;","WorldGenDungeons","ev","net/minecraft/src","1" -"func_40615_a","func_40615_a","a","(IJ)V","(IJ)V","PacketCount","vn","net/minecraft/src","1" -"func_35209_o_","func_35209_o_","H","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" -"func_35196_E","func_35196_E","I","()V","()V","EntityPlayer","gz","net/minecraft/src","1" -"func_35205_F","func_35205_F","J","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_40615_a","countPacket","a","(IJ)V","(IJ)V","PacketCount","vn","net/minecraft/src","1" +"func_35209_o_","isUsingItem","H","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" +"func_35196_E","stopUsingItem","I","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_35205_F","clearItemInUse","J","()V","()V","EntityPlayer","gz","net/minecraft/src","1" "func_35208_b","func_35208_b","b","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1" "func_35199_C","func_35199_C","G","()V","()V","EntityPlayer","gz","net/minecraft/src","1" "func_20043_I","usePersonalCraftingInventory","B","()V","()V","EntityPlayer","gz","net/minecraft/src","1" @@ -3011,7 +3011,7 @@ "func_165_a","getCurrentPlayerStrVsBlock","a","(LBlock;)F","(Ltl;)F","EntityPlayer","gz","net/minecraft/src","1" "func_167_b","canHarvestBlock","b","(LBlock;)Z","(Ltl;)Z","EntityPlayer","gz","net/minecraft/src","1" "func_166_a","displayGUIChest","a","(LIInventory;)V","(Llp;)V","EntityPlayer","gz","net/minecraft/src","1" -"func_40106_c","func_40106_c","c","(III)V","(III)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40106_c","displayGUIEnchantment","c","(III)V","(III)V","EntityPlayer","gz","net/minecraft/src","1" "func_174_A","displayWorkbenchGUI","b","(III)V","(III)V","EntityPlayer","gz","net/minecraft/src","1" "func_163_c","onItemPickup","a","(LEntity;I)V","(Lrn;I)V","EntityPlayer","gz","net/minecraft/src","1" "func_22064_l_","resetHeight","w","()V","()V","EntityPlayer","gz","net/minecraft/src","1" @@ -3020,13 +3020,13 @@ "func_170_a","displayGUIFurnace","a","(LTileEntityFurnace;)V","(Lrj;)V","EntityPlayer","gz","net/minecraft/src","1" "func_21072_a","displayGUIDispenser","a","(LTileEntityDispenser;)V","(Lbe;)V","EntityPlayer","gz","net/minecraft/src","1" "func_4048_a","displayGUIEditSign","a","(LTileEntitySign;)V","(Lxu;)V","EntityPlayer","gz","net/minecraft/src","1" -"func_40110_a","func_40110_a","a","(LTileEntityBrewingStand;)V","(Lxx;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_40110_a","displayGUIBrewingStand","a","(LTileEntityBrewingStand;)V","(Lxx;)V","EntityPlayer","gz","net/minecraft/src","1" "func_9145_g","useCurrentItemOnEntity","e","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" "func_172_B","getCurrentEquippedItem","P","()LItemStack;","()Ljb;","EntityPlayer","gz","net/minecraft/src","1" "func_164_C","destroyCurrentEquippedItem","Q","()V","()V","EntityPlayer","gz","net/minecraft/src","1" "func_168_z","swingItem","r_","()V","()V","EntityPlayer","gz","net/minecraft/src","1" "func_9146_h","attackTargetEntityWithCurrentItem","f","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" -"func_35202_e","func_35202_e","c","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35202_e","onCriticalHit","c","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" "func_40109_c","func_40109_c","d","(LEntity;)V","(Lrn;)V","EntityPlayer","gz","net/minecraft/src","1" "func_20045_a","onItemStackChanged","a","(LItemStack;)V","(Ljb;)V","EntityPlayer","gz","net/minecraft/src","1" "func_22060_a","sleepInBedAt","a","(III)LEnumStatus;","(III)Ldc;","EntityPlayer","gz","net/minecraft/src","1" @@ -3045,15 +3045,15 @@ "func_35195_d","addExperience","h","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" "func_40108_b","removeExperience","b","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" "func_35203_U","func_35203_U","Z","()I","()I","EntityPlayer","gz","net/minecraft/src","1" -"func_36001_y","func_36001_y","D","()V","()V","EntityPlayer","gz","net/minecraft/src","1" +"func_36001_y","increaseLevel","D","()V","()V","EntityPlayer","gz","net/minecraft/src","1" "func_35198_b","addExhaustion","c","(F)V","(F)V","EntityPlayer","gz","net/minecraft/src","1" -"func_35207_V","func_35207_V","aa","()LFoodStats;","()Lrd;","EntityPlayer","gz","net/minecraft/src","1" -"func_35197_c","func_35197_c","b","(Z)Z","(Z)Z","EntityPlayer","gz","net/minecraft/src","1" +"func_35207_V","getFoodStats","aa","()LFoodStats;","()Lrd;","EntityPlayer","gz","net/minecraft/src","1" +"func_35197_c","canEat","b","(Z)Z","(Z)Z","EntityPlayer","gz","net/minecraft/src","1" "func_35206_W","mustHeal","ab","()Z","()Z","EntityPlayer","gz","net/minecraft/src","1" -"func_35201_a","func_35201_a","a","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1" +"func_35201_a","setItemInUse","a","(LItemStack;I)V","(Ljb;I)V","EntityPlayer","gz","net/minecraft/src","1" "func_35200_c","func_35200_c","d","(III)Z","(III)Z","EntityPlayer","gz","net/minecraft/src","1" "func_40107_e","func_40107_e","e","(I)V","(I)V","EntityPlayer","gz","net/minecraft/src","1" -"func_41031_d","func_41031_d","c","(LEntityPlayer;)V","(Lgz;)V","EntityPlayer","gz","net/minecraft/src","1" +"func_41031_d","copyPlayer","c","(LEntityPlayer;)V","(Lgz;)V","EntityPlayer","gz","net/minecraft/src","1" "func_41040_a","func_41040_a","a","([Ljava/lang/String;)LItemColored;","([Ljava/lang/String;)Lwm;","ItemColored","wm","net/minecraft/src","1" "func_35514_a","createBiomeDecorator","a","()LBiomeDecorator;","()Lgo;","BiomeGenBase","kb","net/minecraft/src","1" "func_35512_a","setTemperatureRainfall","a","(FF)LBiomeGenBase;","(FF)Lkb;","BiomeGenBase","kb","net/minecraft/src","1" @@ -3067,8 +3067,8 @@ "func_27049_c","getEnableSnow","b","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1" "func_27048_d","canSpawnLightningBolt","c","()Z","()Z","BiomeGenBase","kb","net/minecraft/src","1" "func_4078_a","getBiome","d","()F","()F","BiomeGenBase","kb","net/minecraft/src","1" -"func_35510_e","func_35510_e","e","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" -"func_35509_f","func_35509_f","f","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" +"func_35510_e","getIntRainfall","e","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" +"func_35509_f","getIntTemperature","f","()I","()I","BiomeGenBase","kb","net/minecraft/src","1" "func_35513_a","func_35513_a","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","BiomeGenBase","kb","net/minecraft/src","1" "func_22108_a","func_22108_a","a","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","(Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V","SaveConverterMcRegion","ho","net/minecraft/src","1" "func_22107_a","func_22107_a","a","(Ljava/io/File;Ljava/util/ArrayList;IILIProgressUpdate;)V","(Ljava/io/File;Ljava/util/ArrayList;IILxk;)V","SaveConverterMcRegion","ho","net/minecraft/src","1" @@ -3085,8 +3085,8 @@ "func_35153_j_","getXpValue","g","()I","()I","EntityXPOrb","cn","net/minecraft/src","1" "func_35152_b","getMore","b","(I)I","(I)I","EntityXPOrb","cn","net/minecraft/src","1" "func_40315_a","func_40315_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdPortalRoom;","(Ljava/util/List;Ljava/util/Random;IIIII)Llf;","ComponentStrongholdPortalRoom","lf","net/minecraft/src","1" -"func_35672_a","func_35672_a","a","()LStructureBoundingBox;","()Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" -"func_35663_a","func_35663_a","a","(IIIIIIIIII)LStructureBoundingBox;","(IIIIIIIIII)Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35672_a","getNewBoundingBox","a","()LStructureBoundingBox;","()Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" +"func_35663_a","getComponentToAddBoundingBox","a","(IIIIIIIIII)LStructureBoundingBox;","(IIIIIIIIII)Lvb;","StructureBoundingBox","vb","net/minecraft/src","1" "func_35664_a","canFitInside","a","(LStructureBoundingBox;)Z","(Lvb;)Z","StructureBoundingBox","vb","net/minecraft/src","1" "func_35671_a","isInBbArea","a","(IIII)Z","(IIII)Z","StructureBoundingBox","vb","net/minecraft/src","1" "func_35666_b","expandTo","b","(LStructureBoundingBox;)V","(Lvb;)V","StructureBoundingBox","vb","net/minecraft/src","1" @@ -3098,7 +3098,7 @@ "func_40623_e","func_40623_e","e","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" "func_40622_f","func_40622_f","f","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" "func_40624_g","func_40624_g","g","()I","()I","StructureBoundingBox","vb","net/minecraft/src","1" -"func_35065_b","fertilizeMushrom","b","(LWorld;IIILjava/util/Random;)Z","(Lfi;IIILjava/util/Random;)Z","BlockMushroom","sf","net/minecraft/src","1" +"func_35065_b","fertilizeMushroom","b","(LWorld;IIILjava/util/Random;)Z","(Lfi;IIILjava/util/Random;)Z","BlockMushroom","sf","net/minecraft/src","1" "func_657_a","createEntityPathTo","a","(LEntity;LEntity;F)LPathEntity;","(Lrn;Lrn;F)Ldk;","PathFinder","ge","net/minecraft/src","1" "func_651_a","createEntityPathTo","a","(LEntity;IIIF)LPathEntity;","(Lrn;IIIF)Ldk;","PathFinder","ge","net/minecraft/src","1" "func_652_a","createEntityPathTo","a","(LEntity;DDDF)LPathEntity;","(Lrn;DDDF)Ldk;","PathFinder","ge","net/minecraft/src","1" @@ -3146,13 +3146,13 @@ "func_25033_a","isNowTamed","a","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" "func_25034_v","getOwner","y","()Ljava/lang/String;","()Ljava/lang/String;","EntityWolf","gs","net/minecraft/src","1" "func_25029_a","setOwner","a","(Ljava/lang/String;)V","(Ljava/lang/String;)V","EntityWolf","gs","net/minecraft/src","1" -"func_25036_w","getIsSitting","t_","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" +"func_25036_w","isSitting","t_","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" "func_25031_b","setIsSitting","b","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" -"func_25028_x","isWolfAngry","A","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" -"func_25037_c","setIsAngry","c","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" +"func_25028_x","isAngry","A","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" +"func_25037_c","setAngry","c","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" "func_25030_y","isTamed","B","()Z","()Z","EntityWolf","gs","net/minecraft/src","1" "func_25032_d","setIsTamed","d","(Z)V","(Z)V","EntityWolf","gs","net/minecraft/src","1" -"func_35418_a","func_35418_a","a","(LWorld;IIIILBlock;)V","(Lfi;IIIILtl;)V","ItemDoor","ia","net/minecraft/src","1" +"func_35418_a","placeDoorBlock","a","(LWorld;IIIILBlock;)V","(Lfi;IIIILtl;)V","ItemDoor","ia","net/minecraft/src","1" "func_22185_a","getNBTTagCompound","a","()LNBTTagCompound;","()Lng;","WorldInfo","eo","net/minecraft/src","1" "func_22183_a","storeLevelDataToNBT","a","(Ljava/util/List;)LNBTTagCompound;","(Ljava/util/List;)Lng;","WorldInfo","eo","net/minecraft/src","1" "func_22176_a","saveNBTTag","a","(LNBTTagCompound;LNBTTagCompound;)V","(Lng;Lng;)V","WorldInfo","eo","net/minecraft/src","1" @@ -3178,7 +3178,7 @@ "func_27120_m","getRainTime","m","()I","()I","WorldInfo","eo","net/minecraft/src","1" "func_27118_c","setRainTime","c","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" "func_35501_n","getGameType","n","()I","()I","WorldInfo","eo","net/minecraft/src","1" -"func_35499_o","getMapFeaturesEnabled","o","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" +"func_35499_o","isMapFeaturesEnabled","o","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" "func_35500_d","setGameType","d","(I)V","(I)V","WorldInfo","eo","net/minecraft/src","1" "func_40470_p","isHardcoreModeEnabled","p","()Z","()Z","WorldInfo","eo","net/minecraft/src","1" "func_70_a","readPacketData","a","(Ljava/io/DataInputStream;)V","(Ljava/io/DataInputStream;)V","Packet","kf","net/minecraft/src","1" @@ -3218,7 +3218,7 @@ "func_119_o","handleWaterMovement","i_","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_125_b","dealFireDamage","a","(I)V","(I)V","Entity","rn","net/minecraft/src","1" "func_6093_b","onCollideWithPlayer","a_","(LEntityPlayer;)V","(Lgz;)V","Entity","rn","net/minecraft/src","1" -"func_40037_aF","func_40037_aF","aG","()[LEntity;","()[Lrn;","Entity","rn","net/minecraft/src","1" +"func_40037_aF","getParts","aG","()[LEntity;","()[Lrn;","Entity","rn","net/minecraft/src","1" "func_6092_a","interact","b","(LEntityPlayer;)Z","(Lgz;)Z","Entity","rn","net/minecraft/src","1" "func_21039_p","getDataWatcher","au","()LDataWatcher;","()Lsu;","Entity","rn","net/minecraft/src","1" "func_113_a","setSize","b","(FF)V","(FF)V","Entity","rn","net/minecraft/src","1" @@ -3226,15 +3226,15 @@ "func_86_a","setPosition","c","(DDD)V","(DDD)V","Entity","rn","net/minecraft/src","1" "func_84_k","onEntityUpdate","af","()V","()V","Entity","rn","net/minecraft/src","1" "func_4040_n","setOnFireFromLava","av","()V","()V","Entity","rn","net/minecraft/src","1" -"func_40034_j","func_40034_j","j","(I)V","(I)V","Entity","rn","net/minecraft/src","1" -"func_40036_aw","func_40036_aw","aw","()V","()V","Entity","rn","net/minecraft/src","1" +"func_40034_j","setFire","j","(I)V","(I)V","Entity","rn","net/minecraft/src","1" +"func_40036_aw","extinguish","aw","()V","()V","Entity","rn","net/minecraft/src","1" "func_4043_o","kill","ao","()V","()V","Entity","rn","net/minecraft/src","1" "func_133_b","isOffsetPositionInLiquid","d","(DDD)Z","(DDD)Z","Entity","rn","net/minecraft/src","1" "func_88_c","moveEntity","a","(DDD)V","(DDD)V","Entity","rn","net/minecraft/src","1" "func_41011_a","func_41011_a","a","(IIII)V","(IIII)V","Entity","rn","net/minecraft/src","1" "func_122_m","updateFallState","a","(DZ)V","(DZ)V","Entity","rn","net/minecraft/src","1" "func_93_n","getBoundingBox","h_","()LAxisAlignedBB;","()Leu;","Entity","rn","net/minecraft/src","1" -"func_40033_ax","func_40033_ax","ax","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_40033_ax","isImmuneToFire","ax","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_27008_Y","isWet","ay","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_27011_Z","isInWater","az","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_110_a","isInsideOfMaterial","a","(LMaterial;)Z","(Llg;)Z","Entity","rn","net/minecraft/src","1" @@ -3265,15 +3265,15 @@ "func_127_w","updateRiderPosition","i","()V","()V","Entity","rn","net/minecraft/src","1" "func_130_h","getMountedYOffset","q","()D","()D","Entity","rn","net/minecraft/src","1" "func_6094_e","mountEntity","b","(LEntity;)V","(Lrn;)V","Entity","rn","net/minecraft/src","1" -"func_41010_j_","func_41010_j_","j_","()F","()F","Entity","rn","net/minecraft/src","1" +"func_41010_j_","getCollisionBorderSize","j_","()F","()F","Entity","rn","net/minecraft/src","1" "func_4039_B","getLookVec","ap","()LVec3D;","()Lbx;","Entity","rn","net/minecraft/src","1" "func_20042_E","getInventory","v","()[LItemStack;","()[Ljb;","Entity","rn","net/minecraft/src","1" -"func_40035_z","func_40035_z","z","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_40035_z","isBurning","z","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_9059_p","isSneaking","aD","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_21043_b","setSneaking","e","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" -"func_35149_at","getSprinting","aE","()Z","()Z","Entity","rn","net/minecraft/src","1" +"func_35149_at","isSprinting","aE","()Z","()Z","Entity","rn","net/minecraft/src","1" "func_35146_g","setSprinting","f","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" -"func_35148_h","func_35148_h","g","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" +"func_35148_h","setEating","g","(Z)V","(Z)V","Entity","rn","net/minecraft/src","1" "func_21042_c","getFlag","k","(I)Z","(I)Z","Entity","rn","net/minecraft/src","1" "func_21041_a","setFlag","a","(IZ)V","(IZ)V","Entity","rn","net/minecraft/src","1" "func_41009_al","getAir","aF","()I","()I","Entity","rn","net/minecraft/src","1" @@ -3281,7 +3281,7 @@ "func_27009_a","onStruckByLightning","a","(LEntityLightningBolt;)V","(Ld;)V","Entity","rn","net/minecraft/src","1" "func_28005_g","pushOutOfBlocks","g","(DDD)Z","(DDD)Z","Entity","rn","net/minecraft/src","1" "func_35147_q","setInWeb","s","()V","()V","Entity","rn","net/minecraft/src","1" -"func_41012_c_","func_41012_c_","a","(LEntity;)Z","(Lrn;)Z","Entity","rn","net/minecraft/src","1" +"func_41012_c_","isEntityEqual","a","(LEntity;)Z","(Lrn;)Z","Entity","rn","net/minecraft/src","1" "func_40649_a","func_40649_a","a","(I)Z","(I)Z","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" "func_40650_a","func_40650_a","a","()Z","()Z","StructureNetherBridgePieceWeight","rr","net/minecraft/src","1" "func_659_a","loadChunk","a","(LWorld;II)LChunk;","(Lfi;II)Lle;","IChunkLoader","bh","net/minecraft/src","1" @@ -3392,20 +3392,20 @@ "func_771_a","writeTo","a","(LNBTTagCompound;Ljava/io/DataOutput;)V","(Lng;Ljava/io/DataOutput;)V","CompressedStreamTools","ax","net/minecraft/src","1" "func_35700_a","func_35700_a","a","(II)LBiomeGenBase;","(II)Lkb;","BiomeCacheBlock","tb","net/minecraft/src","1" "func_40626_b","func_40626_b","b","(II)F","(II)F","BiomeCacheBlock","tb","net/minecraft/src","1" -"func_40326_a","func_40326_a","a","(LChunkCoordIntPair;LNBTTagCompound;)V","(Lyi;Lng;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" -"func_40325_a","func_40325_a","a","(LThreadedChunkLoaderPending;)V","(Lxq;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" +"func_40326_a","queueChunkMap","a","(LChunkCoordIntPair;LNBTTagCompound;)V","(Lyi;Lng;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" +"func_40325_a","writeChunk","a","(LThreadedChunkLoaderPending;)V","(Lxq;)V","ThreadedChunkLoader","oc","net/minecraft/src","1" "func_40124_p_","func_40124_p_","o_","()Z","()Z","EntitySpider","cq","net/minecraft/src","1" "func_40125_a","func_40125_a","a","(Z)V","(Z)V","EntitySpider","cq","net/minecraft/src","1" "func_182_g","func_182_g","h","(DDD)LVec3D;","(DDD)Lbx;","EntityMinecart","xv","net/minecraft/src","1" -"func_41015_m","func_41015_m","j","()Z","()Z","EntityMinecart","xv","net/minecraft/src","1" -"func_41017_a","func_41017_a","a","(Z)V","(Z)V","EntityMinecart","xv","net/minecraft/src","1" +"func_41015_m","isMinecartPowered","j","()Z","()Z","EntityMinecart","xv","net/minecraft/src","1" +"func_41017_a","setMinecartPowered","a","(Z)V","(Z)V","EntityMinecart","xv","net/minecraft/src","1" "func_41018_e_","func_41018_e_","b","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" "func_41020_o","func_41020_o","k","()I","()I","EntityMinecart","xv","net/minecraft/src","1" "func_41014_b","func_41014_b","c","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" "func_41019_p","func_41019_p","l","()I","()I","EntityMinecart","xv","net/minecraft/src","1" "func_41016_d","func_41016_d","d","(I)V","(I)V","EntityMinecart","xv","net/minecraft/src","1" "func_41021_q","func_41021_q","m","()I","()I","EntityMinecart","xv","net/minecraft/src","1" -"func_40133_a","func_40133_a","a","(LEntityAnimal;)LEntityAnimal;","(Lbi;)Lbi;","EntityAnimal","bi","net/minecraft/src","1" +"func_40133_a","spawnBabyAnimal","a","(LEntityAnimal;)LEntityAnimal;","(Lbi;)Lbi;","EntityAnimal","bi","net/minecraft/src","1" "func_40135_j","getDelay","j","()I","()I","EntityAnimal","bi","net/minecraft/src","1" "func_40132_b_","setDelay","b_","(I)V","(I)V","EntityAnimal","bi","net/minecraft/src","1" "func_40131_b","proceate","b","(LEntityAnimal;)V","(Lbi;)V","EntityAnimal","bi","net/minecraft/src","1" @@ -3492,11 +3492,11 @@ "func_40548_a","handleBitFromIngredient","a","(IIZZZ)I","(IIZZZ)I","PotionHelper","km","net/minecraft/src","1" "func_40555_a","applyIngredient","a","(ILjava/lang/String;)I","(ILjava/lang/String;)I","PotionHelper","km","net/minecraft/src","1" "func_40056_a","func_40056_a","a","(DID)V","(DID)V","EntityEnderEye","ck","net/minecraft/src","1" -"func_40077_h","func_40077_h","h","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" -"func_40075_o","func_40075_o","o","()Z","()Z","TileEntityBrewingStand","xx","net/minecraft/src","1" -"func_40076_p","func_40076_p","p","()V","()V","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40077_h","getBrewTime","h","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40075_o","canBrew","o","()Z","()Z","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40076_p","brewPotions","p","()V","()V","TileEntityBrewingStand","xx","net/minecraft/src","1" "func_40078_b","applyPotionIngredient","b","(ILItemStack;)I","(ILjb;)I","TileEntityBrewingStand","xx","net/minecraft/src","1" -"func_40079_n","func_40079_n","n","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" +"func_40079_n","getFilledSlots","n","()I","()I","TileEntityBrewingStand","xx","net/minecraft/src","1" "func_40428_a","sendResponsePacket","a","([BLjava/net/DatagramPacket;)V","([BLjava/net/DatagramPacket;)V","RConThreadQuery","sv","net/minecraft/src","1" "func_40430_a","parseIncomingPacket","a","(Ljava/net/DatagramPacket;)Z","(Ljava/net/DatagramPacket;)Z","RConThreadQuery","sv","net/minecraft/src","1" "func_40434_b","createQueryResponse","b","(Ljava/net/DatagramPacket;)[B","(Ljava/net/DatagramPacket;)[B","RConThreadQuery","sv","net/minecraft/src","1" @@ -3506,7 +3506,7 @@ "func_40432_e","cleanQueryClientsMap","e","()V","()V","RConThreadQuery","sv","net/minecraft/src","1" "func_40433_a","stopWithException","a","(Ljava/lang/Exception;)V","(Ljava/lang/Exception;)V","RConThreadQuery","sv","net/minecraft/src","1" "func_40429_f","initQuerySystem","f","()Z","()Z","RConThreadQuery","sv","net/minecraft/src","1" -"func_40250_n","func_40250_n","n","()[I","()[I","ItemArmor","vf","net/minecraft/src","1" +"func_40250_n","getMaxDamageArray","n","()[I","()[I","ItemArmor","vf","net/minecraft/src","1" "values","values","values","()[LEnumAction;","()[Ljf;","EnumAction","jf","net/minecraft/src","1" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumAction;","(Ljava/lang/String;)Ljf;","EnumAction","jf","net/minecraft/src","1" "func_35696_a","toggleGameType","a","(I)V","(I)V","ItemInWorldManager","to","net/minecraft/src","1" @@ -3524,18 +3524,18 @@ "func_35325_a","getStrongholdStairsComponent","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStairs;","(Ljava/util/List;Ljava/util/Random;IIIII)Lig;","ComponentStrongholdStairs","ig","net/minecraft/src","1" "func_25132_a","getGuid","a","(I)Ljava/lang/String;","(I)Ljava/lang/String;","AchievementMap","b","net/minecraft/src","1" "func_40589_a","setIconIndex","a","(II)LPotion;","(II)Lir;","Potion","ir","net/minecraft/src","1" -"func_40594_a","getPotionId","a","()I","()I","Potion","ir","net/minecraft/src","1" -"func_35438_a","func_35438_a","a","(LEntityLiving;I)V","(Llk;I)V","Potion","ir","net/minecraft/src","1" +"func_40594_a","getId","a","()I","()I","Potion","ir","net/minecraft/src","1" +"func_35438_a","performEffect","a","(LEntityLiving;I)V","(Llk;I)V","Potion","ir","net/minecraft/src","1" "func_40588_a","affectEntity","a","(LEntityLiving;LEntityLiving;ID)V","(Llk;Llk;ID)V","Potion","ir","net/minecraft/src","1" "func_40595_b","isInstant","b","()Z","()Z","Potion","ir","net/minecraft/src","1" "func_35437_a","isReady","b","(II)Z","(II)Z","Potion","ir","net/minecraft/src","1" "func_35439_a","setPotionName","a","(Ljava/lang/String;)LPotion;","(Ljava/lang/String;)Lir;","Potion","ir","net/minecraft/src","1" -"func_40596_c","getPotionName","c","()Ljava/lang/String;","()Ljava/lang/String;","Potion","ir","net/minecraft/src","1" +"func_40596_c","getName","c","()Ljava/lang/String;","()Ljava/lang/String;","Potion","ir","net/minecraft/src","1" "func_40591_a","func_40591_a","a","(D)LPotion;","(D)Lir;","Potion","ir","net/minecraft/src","1" "func_40592_d","func_40592_d","d","()D","()D","Potion","ir","net/minecraft/src","1" "func_40590_e","func_40590_e","e","()LPotion;","()Lir;","Potion","ir","net/minecraft/src","1" "func_40593_f","func_40593_f","f","()Z","()Z","Potion","ir","net/minecraft/src","1" -"func_40597_g","func_40597_g","g","()I","()I","Potion","ir","net/minecraft/src","1" +"func_40597_g","getLiquidColor","g","()I","()I","Potion","ir","net/minecraft/src","1" "func_35382_a","func_35382_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentVillageTorch","oe","net/minecraft/src","1" "func_284_h","tryToFall","h","(LWorld;III)V","(Lfi;III)V","BlockSand","gv","net/minecraft/src","1" "func_285_g","canFallBelow","g","(LWorld;III)Z","(Lfi;III)Z","BlockSand","gv","net/minecraft/src","1" @@ -3551,7 +3551,7 @@ "func_391_a","setByteArray","a","(Ljava/lang/String;[B)V","(Ljava/lang/String;[B)V","NBTTagCompound","ng","net/minecraft/src","1" "func_392_a","setCompoundTag","a","(Ljava/lang/String;LNBTTagCompound;)V","(Ljava/lang/String;Lng;)V","NBTTagCompound","ng","net/minecraft/src","1" "func_393_a","setBoolean","a","(Ljava/lang/String;Z)V","(Ljava/lang/String;Z)V","NBTTagCompound","ng","net/minecraft/src","1" -"func_40469_b","func_40469_b","b","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lik;","NBTTagCompound","ng","net/minecraft/src","1" +"func_40469_b","getTag","b","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lik;","NBTTagCompound","ng","net/minecraft/src","1" "func_410_a","hasKey","c","(Ljava/lang/String;)Z","(Ljava/lang/String;)Z","NBTTagCompound","ng","net/minecraft/src","1" "func_408_b","getByte","d","(Ljava/lang/String;)B","(Ljava/lang/String;)B","NBTTagCompound","ng","net/minecraft/src","1" "func_406_c","getShort","e","(Ljava/lang/String;)S","(Ljava/lang/String;)S","NBTTagCompound","ng","net/minecraft/src","1" @@ -3577,7 +3577,7 @@ "func_35648_a","onUpdate","a","(LEntityLiving;)Z","(Llk;)Z","PotionEffect","ww","net/minecraft/src","1" "func_35647_d","deincrementDuration","e","()I","()I","PotionEffect","ww","net/minecraft/src","1" "func_35651_b","performEffect","b","(LEntityLiving;)V","(Llk;)V","PotionEffect","ww","net/minecraft/src","1" -"func_40614_d","func_40614_d","d","()Ljava/lang/String;","()Ljava/lang/String;","PotionEffect","ww","net/minecraft/src","1" +"func_40614_d","getEffectName","d","()Ljava/lang/String;","()Ljava/lang/String;","PotionEffect","ww","net/minecraft/src","1" "func_35338_a","func_35338_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdStraight;","(Ljava/util/List;Ljava/util/Random;IIIII)Lnu;","ComponentStrongholdStraight","nu","net/minecraft/src","1" "func_40282_a","func_40282_a","a","(Ljava/util/List;)I","(Ljava/util/List;)I","ComponentNetherBridgePiece","jh","net/minecraft/src","1" "func_40284_a","func_40284_a","a","(LComponentNetherBridgeStartPiece;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lpk;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","ComponentNetherBridgePiece","jh","net/minecraft/src","1" @@ -3605,9 +3605,9 @@ "func_152_d_","updateEntityActionState","m_","()V","()V","EntityLiving","lk","net/minecraft/src","1" "func_142_f","onDeath","a","(LDamageSource;)V","(Lpo;)V","EntityLiving","lk","net/minecraft/src","1" "func_40094_f","func_40094_f","f","(I)I","(I)I","EntityLiving","lk","net/minecraft/src","1" -"func_40099_b","func_40099_b","b","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" +"func_40099_b","applyPotionDamageCalculations","b","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" "func_40101_g","func_40101_g","g","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" -"func_40092_O","func_40092_O","O","()I","()I","EntityLiving","lk","net/minecraft/src","1" +"func_40092_O","getTotalArmorValue","O","()I","()I","EntityLiving","lk","net/minecraft/src","1" "func_6099_c","damageEntity","c","(LDamageSource;I)V","(Lpo;I)V","EntityLiving","lk","net/minecraft/src","1" "func_22057_E","isPlayerSleeping","U","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" "func_154_F","jump","X","()V","()V","EntityLiving","lk","net/minecraft/src","1" @@ -3620,7 +3620,7 @@ "func_25018_n_","getVerticalFaceSpeed","q_","()I","()I","EntityLiving","lk","net/minecraft/src","1" "func_4045_i","getMaxSpawnedInChunk","p","()I","()I","EntityLiving","lk","net/minecraft/src","1" "func_146_b","getTalkInterval","h","()I","()I","EntityLiving","lk","net/minecraft/src","1" -"func_40093_t","func_40093_t","t","()LEnumCreatureAttribute;","()Lbq;","EntityLiving","lk","net/minecraft/src","1" +"func_40093_t","getCreatureAttribute","t","()LEnumCreatureAttribute;","()Lbq;","EntityLiving","lk","net/minecraft/src","1" "func_40096_a","func_40096_a","a","(LPotionEffect;)Z","(Lww;)Z","EntityLiving","lk","net/minecraft/src","1" "func_40104_l","func_40104_l","l","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" "func_145_g","canEntityBeSeen","g","(LEntity;)Z","(Lrn;)Z","EntityLiving","lk","net/minecraft/src","1" @@ -3629,8 +3629,8 @@ "func_137_a","heal","d","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" "func_40097_ai","getEntityHealth","ai","()I","()I","EntityLiving","lk","net/minecraft/src","1" "func_40103_i","setEntityHealth","i","(I)V","(I)V","EntityLiving","lk","net/minecraft/src","1" -"func_40090_w","func_40090_w","w","()F","()F","EntityLiving","lk","net/minecraft/src","1" -"func_40091_d","func_40091_d","d","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" +"func_40090_w","getSoundPitch","w","()F","()F","EntityLiving","lk","net/minecraft/src","1" +"func_40091_d","applyArmorCalculations","d","(LDamageSource;I)I","(Lpo;I)I","EntityLiving","lk","net/minecraft/src","1" "func_143_a","knockBack","a","(LEntity;IDD)V","(Lrn;IDD)V","EntityLiving","lk","net/minecraft/src","1" "func_21046_d_","canBreatheUnderwater","f","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" "func_147_b","faceEntity","a","(LEntity;FF)V","(Lrn;FF)V","EntityLiving","lk","net/minecraft/src","1" @@ -3639,18 +3639,18 @@ "func_140_b","updateRotation","b","(FFF)F","(FFF)F","EntityLiving","lk","net/minecraft/src","1" "func_6101_K","onEntityDeath","an","()V","()V","EntityLiving","lk","net/minecraft/src","1" "func_141_d","getLook","d","(F)LVec3D;","(F)Lbx;","EntityLiving","lk","net/minecraft/src","1" -"func_35186_aj","func_35186_aj","aq","()V","()V","EntityLiving","lk","net/minecraft/src","1" +"func_35186_aj","updatePotionEffects","aq","()V","()V","EntityLiving","lk","net/minecraft/src","1" "func_40089_ar","func_40089_ar","ar","()V","()V","EntityLiving","lk","net/minecraft/src","1" "func_35183_ak","func_35183_ak","as","()Ljava/util/Collection;","()Ljava/util/Collection;","EntityLiving","lk","net/minecraft/src","1" -"func_35184_a","func_35184_a","a","(LPotion;)Z","(Lir;)Z","EntityLiving","lk","net/minecraft/src","1" +"func_35184_a","isPotionActive","a","(LPotion;)Z","(Lir;)Z","EntityLiving","lk","net/minecraft/src","1" "func_35187_b","getActivePotionEffect","b","(LPotion;)LPotionEffect;","(Lir;)Lww;","EntityLiving","lk","net/minecraft/src","1" "func_35182_d","addPotionEffect","e","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" "func_40100_at","isEntityUndead","at","()Z","()Z","EntityLiving","lk","net/minecraft/src","1" -"func_35181_a","func_35181_a","b","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" -"func_35179_b","func_35179_b","c","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" -"func_35185_c","func_35185_c","d","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" -"func_35178_D","func_35178_D","F","()F","()F","EntityLiving","lk","net/minecraft/src","1" -"func_40098_a_","func_40098_a_","a_","(DDD)V","(DDD)V","EntityLiving","lk","net/minecraft/src","1" +"func_35181_a","onNewPotionEffect","b","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35179_b","onChangedPotionEffect","c","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35185_c","onFinishedPotionEffect","d","(LPotionEffect;)V","(Lww;)V","EntityLiving","lk","net/minecraft/src","1" +"func_35178_D","getPotionSpeedMultiplier","F","()F","()F","EntityLiving","lk","net/minecraft/src","1" +"func_40098_a_","setPositionAndUpdate","a_","(DDD)V","(DDD)V","EntityLiving","lk","net/minecraft/src","1" "func_41030_c","func_41030_c","c","(LItemStack;)V","(Ljb;)V","EntityLiving","lk","net/minecraft/src","1" "func_618_a","setPlayerManager","a","([LWorldServer;)V","([Lfp;)V","ServerConfigurationManager","hv","net/minecraft/src","1" "func_28172_a","joinNewPlayerManager","a","(LEntityPlayerMP;)V","(Lfl;)V","ServerConfigurationManager","hv","net/minecraft/src","1" @@ -3769,7 +3769,7 @@ "func_22112_a","tryParse","a","(Ljava/lang/String;I)I","(Ljava/lang/String;I)I","ConsoleCommandHandler","sc","net/minecraft/src","1" "func_40648_a","func_40648_a","a","([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;","ConsoleCommandHandler","sc","net/minecraft/src","1" "func_31030_a","getTileEntity","a","(IIIZZ)LTileEntity;","(IIIZZ)Loh;","BlockPistonMoving","tk","net/minecraft/src","1" -"func_31032_a","func_31032_a","b","(LWorld;IIIIFI)LAxisAlignedBB;","(Lfi;IIIIFI)Leu;","BlockPistonMoving","tk","net/minecraft/src","1" +"func_31032_a","getAxisAlignedBB","b","(LWorld;IIIIFI)LAxisAlignedBB;","(Lfi;IIIIFI)Leu;","BlockPistonMoving","tk","net/minecraft/src","1" "func_31031_b","getTileEntityAtLocation","b","(LIBlockAccess;III)LTileEntityPiston;","(Lwy;III)Ltf;","BlockPistonMoving","tk","net/minecraft/src","1" "func_413_a","addPoint","a","(LPathPoint;)LPathPoint;","(Le;)Le;","Path","kv","net/minecraft/src","1" "func_417_a","clearPath","a","()V","()V","Path","kv","net/minecraft/src","1" @@ -3829,7 +3829,7 @@ "func_31004_g","isInvalid","l","()Z","()Z","TileEntity","oh","net/minecraft/src","1" "func_31003_h","invalidate","i","()V","()V","TileEntity","oh","net/minecraft/src","1" "func_31002_j","validate","m","()V","()V","TileEntity","oh","net/minecraft/src","1" -"func_35163_b","func_35163_b","b","(II)V","(II)V","TileEntity","oh","net/minecraft/src","1" +"func_35163_b","onTileEntityPowered","b","(II)V","(II)V","TileEntity","oh","net/minecraft/src","1" "func_35164_g","func_35164_g","d","()V","()V","TileEntity","oh","net/minecraft/src","1" "func_30004_i","updateFlow","i","(LWorld;III)V","(Lfi;III)V","BlockFlowing","nx","net/minecraft/src","1" "func_311_f","flowIntoBlock","g","(LWorld;IIII)V","(Lfi;IIII)V","BlockFlowing","nx","net/minecraft/src","1" @@ -3860,7 +3860,7 @@ "func_20073_b","setItemStack","b","(LItemStack;)V","(Ljb;)V","InventoryPlayer","ja","net/minecraft/src","1" "func_20072_i","getItemStack","l","()LItemStack;","()Ljb;","InventoryPlayer","ja","net/minecraft/src","1" "func_28010_c","hasItemStack","c","(LItemStack;)Z","(Ljb;)Z","InventoryPlayer","ja","net/minecraft/src","1" -"func_41013_a","func_41013_a","a","(LInventoryPlayer;)V","(Lja;)V","InventoryPlayer","ja","net/minecraft/src","1" +"func_41013_a","copyInventory","a","(LInventoryPlayer;)V","(Lja;)V","InventoryPlayer","ja","net/minecraft/src","1" "func_20095_a","isItemValid","a","(LItemStack;)Z","(Ljb;)Z","Slot","gy","net/minecraft/src","1" "func_20091_b","onPickupFromSlot","b","(LItemStack;)V","(Ljb;)V","Slot","gy","net/minecraft/src","1" "func_20093_a","getSlotStackLimit","a","()I","()I","Slot","gy","net/minecraft/src","1" @@ -3877,7 +3877,7 @@ "func_20128_a","onCraftGuiOpened","a","(LICrafting;)V","(Lej;)V","Container","ea","net/minecraft/src","1" "func_20125_a","updateCraftingResults","a","()V","()V","Container","ea","net/minecraft/src","1" "func_20121_a","onCraftMatrixChanged","a","(LIInventory;)V","(Llp;)V","Container","ea","net/minecraft/src","1" -"func_40331_a","func_40331_a","a","(LEntityPlayer;I)Z","(Lgz;I)Z","Container","ea","net/minecraft/src","1" +"func_40331_a","enchantItem","a","(LEntityPlayer;I)Z","(Lgz;I)Z","Container","ea","net/minecraft/src","1" "func_20130_a","onCraftGuiClosed","a","(LEntityPlayer;)V","(Lgz;)V","Container","ea","net/minecraft/src","1" "func_20126_b","canInteractWith","b","(LEntityPlayer;)Z","(Lgz;)Z","Container","ea","net/minecraft/src","1" "func_27086_a","transferStackInSlot","a","(I)LItemStack;","(I)Ljb;","Container","ea","net/minecraft/src","1" @@ -3895,7 +3895,7 @@ "func_21064_a","setSaddled","a","(Z)V","(Z)V","EntityPig","vr","net/minecraft/src","1" "func_648_a","generateNoiseOctaves","a","([DIIIIIIDDD)[D","([DIIIIIIDDD)[D","NoiseGeneratorOctaves","sw","net/minecraft/src","1" "func_4103_a","func_4103_a","a","([DIIIIDDD)[D","([DIIIIDDD)[D","NoiseGeneratorOctaves","sw","net/minecraft/src","1" -"func_35419_a","func_35419_a","a","()I","()I","ItemBlock","cl","net/minecraft/src","1" +"func_35419_a","getBlockID","a","()I","()I","ItemBlock","cl","net/minecraft/src","1" "func_40537_b","func_40537_b","b","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lrr;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","StructureNetherBridgePieces","lu","net/minecraft/src","1" "func_40538_a","func_40538_a","a","(LStructureNetherBridgePieceWeight;Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgePiece;","(Lrr;Ljava/util/List;Ljava/util/Random;IIIII)Ljh;","StructureNetherBridgePieces","lu","net/minecraft/src","1" "func_40536_a","func_40536_a","a","()[LStructureNetherBridgePieceWeight;","()[Lrr;","StructureNetherBridgePieces","lu","net/minecraft/src","1" @@ -3904,12 +3904,12 @@ "func_35424_l","getSaturationFactor","o","()F","()F","ItemFood","yf","net/minecraft/src","1" "func_25010_k","getIsWolfsFavoriteMeat","p","()Z","()Z","ItemFood","yf","net/minecraft/src","1" "func_35422_a","setPotionEffect","a","(IIIF)LItemFood;","(IIIF)Lyf;","ItemFood","yf","net/minecraft/src","1" -"func_35423_n","func_35423_n","q","()LItemFood;","()Lyf;","ItemFood","yf","net/minecraft/src","1" +"func_35423_n","setAlwaysEdible","q","()LItemFood;","()Lyf;","ItemFood","yf","net/minecraft/src","1" "func_40041_a","onImpact","a","(LMovingObjectPosition;)V","(Luc;)V","EntityThrowable","bc","net/minecraft/src","1" "func_40042_e","func_40042_e","e","()F","()F","EntityThrowable","bc","net/minecraft/src","1" "func_40044_c","func_40044_c","c","()F","()F","EntityThrowable","bc","net/minecraft/src","1" "func_40040_d","func_40040_d","d","()F","()F","EntityThrowable","bc","net/minecraft/src","1" -"func_40043_a","func_40043_a","a","(DDDFF)V","(DDDFF)V","EntityThrowable","bc","net/minecraft/src","1" +"func_40043_a","setThrowableHeading","a","(DDDFF)V","(DDDFF)V","EntityThrowable","bc","net/minecraft/src","1" "func_424_a","generateLeafNodeList","a","()V","()V","WorldGenBigTree","im","net/minecraft/src","1" "func_426_a","func_426_a","a","(IIIFBI)V","(IIIFBI)V","WorldGenBigTree","im","net/minecraft/src","1" "func_431_a","func_431_a","a","(I)F","(I)F","WorldGenBigTree","im","net/minecraft/src","1" @@ -4001,7 +4001,7 @@ "values","values","values","()[LEnumArmorMaterial;","()[Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumArmorMaterial;","(Ljava/lang/String;)Lcx;","EnumArmorMaterial","cx","net/minecraft/src","1" "func_40497_a","func_40497_a","a","(I)I","(I)I","EnumArmorMaterial","cx","net/minecraft/src","1" -"func_40495_b","func_40495_b","b","(I)I","(I)I","EnumArmorMaterial","cx","net/minecraft/src","1" +"func_40495_b","getDamageReductionAmount","b","(I)I","(I)I","EnumArmorMaterial","cx","net/minecraft/src","1" "func_40496_a","getEnchantability","a","()I","()I","EnumArmorMaterial","cx","net/minecraft/src","1" "func_35401_a","func_35401_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHouse4_Garden;","(Ljava/util/List;Ljava/util/Random;IIIII)Lgp;","ComponentVillageHouse4_Garden","gp","net/minecraft/src","1" "func_40300_a","func_40300_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor5;","(Ljava/util/List;Ljava/util/Random;IIIII)Lne;","ComponentNetherBridgeCorridor5","ne","net/minecraft/src","1" @@ -4041,22 +4041,22 @@ "func_35305_c","func_35305_c","c","()I","()I","StructureComponent","jx","net/minecraft/src","1" "func_35312_a","canFitInside","a","(Ljava/util/List;LStructureBoundingBox;)LStructureComponent;","(Ljava/util/List;Lvb;)Ljx;","StructureComponent","jx","net/minecraft/src","1" "func_35295_a","isLiquidInStructureBoundingBox","a","(LWorld;LStructureBoundingBox;)Z","(Lfi;Lvb;)Z","StructureComponent","jx","net/minecraft/src","1" -"func_35306_a","func_35306_a","a","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" -"func_35300_a","func_35300_a","b","(I)I","(I)I","StructureComponent","jx","net/minecraft/src","1" -"func_35296_b","func_35296_b","b","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" +"func_35306_a","getXWithOffset","a","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" +"func_35300_a","getYWithOffset","b","(I)I","(I)I","StructureComponent","jx","net/minecraft/src","1" +"func_35296_b","getZWithOffset","b","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" "func_35301_c","func_35301_c","c","(II)I","(II)I","StructureComponent","jx","net/minecraft/src","1" -"func_35309_a","func_35309_a","a","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35309_a","placeBlockAtCurrentPosition","a","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" "func_35297_a","func_35297_a","a","(LWorld;IIILStructureBoundingBox;)I","(Lfi;IIILvb;)I","StructureComponent","jx","net/minecraft/src","1" "func_35294_a","fillWithBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIIIZ)V","(Lfi;Lvb;IIIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" -"func_35307_a","func_35307_a","a","(LWorld;LStructureBoundingBox;IIIIIIZLjava/util/Random;LStructurePieceBlockSelector;)V","(Lfi;Lvb;IIIIIIZLjava/util/Random;Lcb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35307_a","fillWithRandomizedBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIZLjava/util/Random;LStructurePieceBlockSelector;)V","(Lfi;Lvb;IIIIIIZLjava/util/Random;Lcb;)V","StructureComponent","jx","net/minecraft/src","1" "func_35315_a","randomlyFillWithBlocks","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIIIIIIZ)V","(Lfi;Lvb;Ljava/util/Random;FIIIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" "func_35302_a","randomlyPlaceBlock","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;FIIIII)V","(Lfi;Lvb;Ljava/util/Random;FIIIII)V","StructureComponent","jx","net/minecraft/src","1" -"func_35304_a","func_35304_a","a","(LWorld;LStructureBoundingBox;IIIIIIIZ)V","(Lfi;Lvb;IIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" -"func_35314_b","func_35314_b","b","(LWorld;IIILStructureBoundingBox;)V","(Lfi;IIILvb;)V","StructureComponent","jx","net/minecraft/src","1" -"func_35303_b","func_35303_b","b","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" -"func_35299_a","func_35299_a","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;III[LStructurePieceTreasure;I)V","(Lfi;Lvb;Ljava/util/Random;III[Lib;I)V","StructureComponent","jx","net/minecraft/src","1" -"func_35311_a","func_35311_a","a","(Ljava/util/Random;[LStructurePieceTreasure;LTileEntityChest;I)V","(Ljava/util/Random;[Lib;Ljs;I)V","StructureComponent","jx","net/minecraft/src","1" -"func_35298_a","func_35298_a","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;IIII)V","(Lfi;Lvb;Ljava/util/Random;IIII)V","StructureComponent","jx","net/minecraft/src","1" +"func_35304_a","randomlyRareFillWithBlocks","a","(LWorld;LStructureBoundingBox;IIIIIIIZ)V","(Lfi;Lvb;IIIIIIIZ)V","StructureComponent","jx","net/minecraft/src","1" +"func_35314_b","clearCurrentPositionBlocksUpwards","b","(LWorld;IIILStructureBoundingBox;)V","(Lfi;IIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35303_b","fillCurrentPositionBlocksDownwards","b","(LWorld;IIIIILStructureBoundingBox;)V","(Lfi;IIIIILvb;)V","StructureComponent","jx","net/minecraft/src","1" +"func_35299_a","createTreasureChestAtCurrentPosition","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;III[LStructurePieceTreasure;I)V","(Lfi;Lvb;Ljava/util/Random;III[Lib;I)V","StructureComponent","jx","net/minecraft/src","1" +"func_35311_a","fillTreasureChestWithLoot","a","(Ljava/util/Random;[LStructurePieceTreasure;LTileEntityChest;I)V","(Ljava/util/Random;[Lib;Ljs;I)V","StructureComponent","jx","net/minecraft/src","1" +"func_35298_a","placeDoorAtCurrentPosition","a","(LWorld;LStructureBoundingBox;Ljava/util/Random;IIII)V","(Lfi;Lvb;Ljava/util/Random;IIII)V","StructureComponent","jx","net/minecraft/src","1" "func_20057_k","func_20057_k","u","()V","()V","EntityPlayerMP","fl","net/minecraft/src","1" "func_21073_a","getEquipmentInSlot","c","(I)LItemStack;","(I)Ljb;","EntityPlayerMP","fl","net/minecraft/src","1" "func_22070_a","onUpdateEntity","a","(Z)V","(Z)V","EntityPlayerMP","fl","net/minecraft/src","1" @@ -4086,17 +4086,17 @@ "func_35082_a","causeFireballDamage","a","(LEntityFireball;LEntity;)LDamageSource;","(Lch;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" "func_35081_a","causeThrownDamage","a","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" "func_40271_b","func_40271_b","b","(LEntity;LEntity;)LDamageSource;","(Lrn;Lrn;)Lpo;","DamageSource","po","net/minecraft/src","1" -"func_40275_b","func_40275_b","b","()Z","()Z","DamageSource","po","net/minecraft/src","1" -"func_40273_c","func_40273_c","c","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40275_b","isProjectile","b","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_40273_c","setProjectile","c","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" "func_35083_b","unblockable","d","()Z","()Z","DamageSource","po","net/minecraft/src","1" "func_35074_c","getHungerDamage","e","()F","()F","DamageSource","po","net/minecraft/src","1" "func_35077_d","canHarmInCreative","f","()Z","()Z","DamageSource","po","net/minecraft/src","1" "func_35079_e","getSourceOfDamage","g","()LEntity;","()Lrn;","DamageSource","po","net/minecraft/src","1" "func_35078_f","setDamageBypassesArmor","h","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" "func_35084_g","setDamageAllowedInCreativeMode","i","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" -"func_40276_j","func_40276_j","j","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" -"func_40272_k","func_40272_k","k","()Z","()Z","DamageSource","po","net/minecraft/src","1" -"func_40274_l","func_40274_l","l","()Ljava/lang/String;","()Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" +"func_40276_j","setFireDamage","j","()LDamageSource;","()Lpo;","DamageSource","po","net/minecraft/src","1" +"func_40272_k","fireDamage","k","()Z","()Z","DamageSource","po","net/minecraft/src","1" +"func_40274_l","getDamageType","l","()Ljava/lang/String;","()Ljava/lang/String;","DamageSource","po","net/minecraft/src","1" "func_40297_a","func_40297_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCorridor;","(Ljava/util/List;Ljava/util/Random;IIIII)Llo;","ComponentNetherBridgeCorridor","lo","net/minecraft/src","1" "func_20115_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesCrafting","jy","net/minecraft/src","1" "func_21075_a","changePitch","c","()V","()V","TileEntityNote","si","net/minecraft/src","1" @@ -4105,7 +4105,7 @@ "func_35038_a","getSeed","a","()J","()J","WorldSettings","hg","net/minecraft/src","1" "func_35039_b","getGameType","b","()I","()I","WorldSettings","hg","net/minecraft/src","1" "func_40279_c","getHardcoreEnabled","c","()Z","()Z","WorldSettings","hg","net/minecraft/src","1" -"func_35040_c","getMapFeaturesEnabled","d","()Z","()Z","WorldSettings","hg","net/minecraft/src","1" +"func_35040_c","isMapFeaturesEnabled","d","()Z","()Z","WorldSettings","hg","net/minecraft/src","1" "func_35037_a","validGameType","a","(I)I","(I)I","WorldSettings","hg","net/minecraft/src","1" "values","values","values","()[LEnumStatus;","()[Ldc;","EnumStatus","dc","net/minecraft/src","1" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumStatus;","(Ljava/lang/String;)Ldc;","EnumStatus","dc","net/minecraft/src","1" @@ -4113,7 +4113,7 @@ "func_282_g","isCropsNearby","g","(LWorld;III)Z","(Lfi;III)Z","BlockFarmland","um","net/minecraft/src","1" "func_283_h","isWaterNearby","h","(LWorld;III)Z","(Lfi;III)Z","BlockFarmland","um","net/minecraft/src","1" "func_21165_a","addRecipes","a","(LCraftingManager;)V","(Lhq;)V","RecipesDyes","mo","net/minecraft/src","1" -"func_40324_c","func_40324_c","c","()Z","()Z","IThreadedFileIO","gm","net/minecraft/src","1" +"func_40324_c","writeNextIO","c","()Z","()Z","IThreadedFileIO","gm","net/minecraft/src","1" "close","close","close","()V","()V","GuiLogOutputHandler","dt","net/minecraft/src","1" "flush","flush","flush","()V","()V","GuiLogOutputHandler","dt","net/minecraft/src","1" "publish","publish","publish","(Ljava/util/logging/LogRecord;)V","(Ljava/util/logging/LogRecord;)V","GuiLogOutputHandler","dt","net/minecraft/src","1" @@ -4182,7 +4182,7 @@ "func_520_e","updateEntity","g","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1" "func_4074_a","updateEntityWithOptionalForce","a","(LEntity;Z)V","(Lrn;Z)V","World","fi","net/minecraft/src","1" "func_522_a","checkIfAABBIsClear","a","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" -"func_27069_b","func_27069_b","b","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" +"func_27069_b","isAABBEmpty","b","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" "func_469_b","getIsAnyLiquid","c","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" "func_523_c","isBoundingBoxBurning","d","(LAxisAlignedBB;)Z","(Leu;)Z","World","fi","net/minecraft/src","1" "func_490_a","handleMaterialAcceleration","a","(LAxisAlignedBB;LMaterial;LEntity;)Z","(Leu;Llg;Lrn;)Z","World","fi","net/minecraft/src","1" @@ -4194,26 +4194,26 @@ "func_28096_a","onBlockHit","a","(LEntityPlayer;IIII)V","(Lgz;IIII)V","World","fi","net/minecraft/src","1" "func_473_a","setBlockTileEntity","a","(IIILTileEntity;)V","(IIILoh;)V","World","fi","net/minecraft/src","1" "func_513_l","removeBlockTileEntity","n","(III)V","(III)V","World","fi","net/minecraft/src","1" -"func_35239_a","func_35239_a","a","(LTileEntity;)V","(Loh;)V","World","fi","net/minecraft/src","1" +"func_35239_a","markEntityForDespawn","a","(LTileEntity;)V","(Loh;)V","World","fi","net/minecraft/src","1" "func_28095_p","isBlockOpaqueCube","o","(III)Z","(III)Z","World","fi","net/minecraft/src","1" "func_41047_b","func_41047_b","b","(IIIZ)Z","(IIIZ)Z","World","fi","net/minecraft/src","1" "func_465_d","calculateInitialSkylight","g","()V","()V","World","fi","net/minecraft/src","1" "func_21116_a","setAllowedSpawnTypes","a","(ZZ)V","(ZZ)V","World","fi","net/minecraft/src","1" "func_22077_g","tick","h","()V","()V","World","fi","net/minecraft/src","1" -"func_27070_x","func_27070_x","z","()V","()V","World","fi","net/minecraft/src","1" +"func_27070_x","updateRainAndThunder","z","()V","()V","World","fi","net/minecraft/src","1" "func_27066_i","updateWeather","i","()V","()V","World","fi","net/minecraft/src","1" "func_27071_y","clearWeather","A","()V","()V","World","fi","net/minecraft/src","1" "func_40218_j","commandToggleDownfall","j","()V","()V","World","fi","net/minecraft/src","1" "func_4073_g","doRandomUpdateTicks","k","()V","()V","World","fi","net/minecraft/src","1" "func_40210_p","func_40210_p","p","(III)Z","(III)Z","World","fi","net/minecraft/src","1" "func_40217_q","func_40217_q","q","(III)Z","(III)Z","World","fi","net/minecraft/src","1" -"func_40213_b","func_40213_b","c","(IIIZ)Z","(IIIZ)Z","World","fi","net/minecraft/src","1" -"func_40215_r","func_40215_r","r","(III)Z","(III)Z","World","fi","net/minecraft/src","1" +"func_40213_b","isBlockHydrated","c","(IIIZ)Z","(IIIZ)Z","World","fi","net/minecraft/src","1" +"func_40215_r","canSnowAt","r","(III)Z","(III)Z","World","fi","net/minecraft/src","1" "func_35242_p","updateAllLightTypes","s","(III)V","(III)V","World","fi","net/minecraft/src","1" -"func_35240_d","func_35240_d","d","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" -"func_35241_e","func_35241_e","e","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" +"func_35240_d","computeSkyLightValue","d","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" +"func_35241_e","computeBlockLightValue","e","(IIIIII)I","(IIIIII)I","World","fi","net/minecraft/src","1" "func_35243_b","updateLightByType","b","(LEnumSkyBlock;III)V","(Lei;III)V","World","fi","net/minecraft/src","1" -"func_518_a","TickUpdates","a","(Z)Z","(Z)Z","World","fi","net/minecraft/src","1" +"func_518_a","tickUpdates","a","(Z)Z","(Z)Z","World","fi","net/minecraft/src","1" "func_41046_a","func_41046_a","a","(LChunk;Z)Ljava/util/List;","(Lle;Z)Ljava/util/List;","World","fi","net/minecraft/src","1" "func_450_b","getEntitiesWithinAABBExcludingEntity","b","(LEntity;LAxisAlignedBB;)Ljava/util/List;","(Lrn;Leu;)Ljava/util/List;","World","fi","net/minecraft/src","1" "func_457_a","getEntitiesWithinAABB","a","(Ljava/lang/Class;LAxisAlignedBB;)Ljava/util/List;","(Ljava/lang/Class;Leu;)Ljava/util/List;","World","fi","net/minecraft/src","1" @@ -4259,7 +4259,7 @@ "func_28104_b","getUniqueDataId","b","(Ljava/lang/String;)I","(Ljava/lang/String;)I","World","fi","net/minecraft/src","1" "func_28097_e","playAuxSFX","f","(IIIII)V","(IIIII)V","World","fi","net/minecraft/src","1" "func_28101_a","playAuxSFXAtEntity","a","(LEntityPlayer;IIIII)V","(Lgz;IIIII)V","World","fi","net/minecraft/src","1" -"func_35238_t","func_35238_t","w","(III)Ljava/util/Random;","(III)Ljava/util/Random;","World","fi","net/minecraft/src","1" +"func_35238_t","setRandomSeed","w","(III)Ljava/util/Random;","(III)Ljava/util/Random;","World","fi","net/minecraft/src","1" "func_6156_d","updatingLighting","x","()Z","()Z","World","fi","net/minecraft/src","1" "func_483_a","scheduleLightingUpdate","a","(LEnumSkyBlock;IIIIII)V","(Lei;IIIIII)V","World","fi","net/minecraft/src","1" "func_40216_a","func_40216_a","a","(LEnumCreatureType;III)LSpawnListEntry;","(Lla;III)Lbl;","World","fi","net/minecraft/src","1" @@ -4305,7 +4305,7 @@ "func_35324_a","func_35324_a","a","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" "func_35321_b","func_35321_b","b","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" "func_35320_c","func_35320_c","c","(LComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)LStructureComponent;","(Lw;Ljava/util/List;Ljava/util/Random;II)Ljx;","ComponentStronghold","hc","net/minecraft/src","1" -"func_35319_a","func_35319_a","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentStronghold","hc","net/minecraft/src","1" +"func_35319_a","canStrongholdGoDeeper","a","(LStructureBoundingBox;)Z","(Lvb;)Z","ComponentStronghold","hc","net/minecraft/src","1" "func_20107_a","compareRecipes","a","(LIRecipe;LIRecipe;)I","(Ldz;Ldz;)I","RecipeSorter","kn","net/minecraft/src","1" "compare","compare","compare","(Ljava/lang/Object;Ljava/lang/Object;)I","(Ljava/lang/Object;Ljava/lang/Object;)I","RecipeSorter","kn","net/minecraft/src","1" "func_760_a","createVectorHelper","a","(DDD)LVec3D;","(DDD)Lbx;","Vec3D","bx","net/minecraft/src","1" @@ -4327,7 +4327,7 @@ "func_381_a","writeTagContents","a","(Ljava/io/DataOutput;)V","(Ljava/io/DataOutput;)V","NBTBase","ik","net/minecraft/src","1" "func_382_a","readTagContents","a","(Ljava/io/DataInput;)V","(Ljava/io/DataInput;)V","NBTBase","ik","net/minecraft/src","1" "func_379_a","getType","a","()B","()B","NBTBase","ik","net/minecraft/src","1" -"func_40468_b","func_40468_b","b","()LNBTBase;","()Lik;","NBTBase","ik","net/minecraft/src","1" +"func_40468_b","cloneTag","b","()LNBTBase;","()Lik;","NBTBase","ik","net/minecraft/src","1" "func_385_m","setKey","a","(Ljava/lang/String;)LNBTBase;","(Ljava/lang/String;)Lik;","NBTBase","ik","net/minecraft/src","1" "func_384_c","getKey","c","()Ljava/lang/String;","()Ljava/lang/String;","NBTBase","ik","net/minecraft/src","1" "func_383_b","readTag","b","(Ljava/io/DataInput;)LNBTBase;","(Ljava/io/DataInput;)Lik;","NBTBase","ik","net/minecraft/src","1" @@ -4346,8 +4346,8 @@ "func_35680_c","getBiomeCacheBlock","a","(II)LBiomeCacheBlock;","(II)Ltb;","BiomeCache","tz","net/minecraft/src","1" "func_35683_a","func_35683_a","b","(II)LBiomeGenBase;","(II)Lkb;","BiomeCache","tz","net/minecraft/src","1" "func_40625_c","func_40625_c","c","(II)F","(II)F","BiomeCache","tz","net/minecraft/src","1" -"func_35681_a","func_35681_a","a","()V","()V","BiomeCache","tz","net/minecraft/src","1" -"func_35682_b","func_35682_b","d","(II)[LBiomeGenBase;","(II)[Lkb;","BiomeCache","tz","net/minecraft/src","1" +"func_35681_a","cleanupCache","a","()V","()V","BiomeCache","tz","net/minecraft/src","1" +"func_35682_b","getCachedBiomes","d","(II)[LBiomeGenBase;","(II)[Lkb;","BiomeCache","tz","net/minecraft/src","1" "func_35679_a","getChunkManager","a","(LBiomeCache;)LWorldChunkManager;","(Ltz;)Lxe;","BiomeCache","tz","net/minecraft/src","1" "func_35342_a","func_35342_a","a","(Ljava/util/List;Ljava/util/Random;IIII)LStructureBoundingBox;","(Ljava/util/List;Ljava/util/Random;IIII)Lvb;","ComponentStrongholdCorridor","nm","net/minecraft/src","1" "func_31028_g","canPlaceTorchOn","g","(LWorld;III)Z","(Lfi;III)Z","BlockTorch","un","net/minecraft/src","1" @@ -4448,7 +4448,7 @@ "func_35475_a","getUnsigned","a","(I)I","(I)I","MathHelper","in","net/minecraft/src","1" "func_41051_a","func_41051_a","a","(III)I","(III)I","MathHelper","in","net/minecraft/src","1" "func_581_a","abs_max","a","(DD)D","(DD)D","MathHelper","in","net/minecraft/src","1" -"func_35476_a","func_35476_a","a","(Ljava/util/Random;II)I","(Ljava/util/Random;II)I","MathHelper","in","net/minecraft/src","1" +"func_35476_a","getRandomIntegerInRange","a","(Ljava/util/Random;II)I","(Ljava/util/Random;II)I","MathHelper","in","net/minecraft/src","1" "func_35224_c","attackEntityAsMob","d","(LEntity;)Z","(Lrn;)Z","EntityMob","hb","net/minecraft/src","1" "func_40123_y","func_40123_y","y","()Z","()Z","EntityMob","hb","net/minecraft/src","1" "func_21079_e","getRandomStackFromInventory","k_","()LItemStack;","()Ljb;","TileEntityDispenser","be","net/minecraft/src","1" @@ -4485,15 +4485,15 @@ "func_334_a","getRandomWithSeed","a","(J)Ljava/util/Random;","(J)Ljava/util/Random;","Chunk","le","net/minecraft/src","1" "func_41049_g","isEmpty","g","()Z","()Z","Chunk","le","net/minecraft/src","1" "func_333_c","propagateSkylightOcclusion","d","(II)V","(II)V","Chunk","le","net/minecraft/src","1" -"func_35633_i","func_35633_i","k","()V","()V","Chunk","le","net/minecraft/src","1" +"func_35633_i","updateSkylight_do","k","()V","()V","Chunk","le","net/minecraft/src","1" "func_355_f","checkSkylightNeighborHeight","f","(III)V","(III)V","Chunk","le","net/minecraft/src","1" -"func_35634_d","func_35634_d","d","(IIII)V","(IIII)V","Chunk","le","net/minecraft/src","1" +"func_35634_d","updateSkylightNeighborHeight","d","(IIII)V","(IIII)V","Chunk","le","net/minecraft/src","1" "func_339_g","relightBlock","g","(III)V","(III)V","Chunk","le","net/minecraft/src","1" -"func_25083_h","func_25083_h","h","()V","()V","Chunk","le","net/minecraft/src","1" +"func_25083_h","removeUnknownBlocks","h","()V","()V","Chunk","le","net/minecraft/src","1" "func_35632_a","populateChunk","a","(LIChunkProvider;LIChunkProvider;II)V","(Lco;Lco;II)V","Chunk","le","net/minecraft/src","1" -"func_35631_c","func_35631_c","c","(II)I","(II)I","Chunk","le","net/minecraft/src","1" -"func_35635_h","func_35635_h","i","()V","()V","Chunk","le","net/minecraft/src","1" -"func_40543_i","func_40543_i","j","()LChunkCoordIntPair;","()Lyi;","Chunk","le","net/minecraft/src","1" +"func_35631_c","getPrecipitationHeight","c","(II)I","(II)I","Chunk","le","net/minecraft/src","1" +"func_35635_h","updateSkylight","i","()V","()V","Chunk","le","net/minecraft/src","1" +"func_40543_i","getChunkCoordIntPair","j","()LChunkCoordIntPair;","()Lyi;","Chunk","le","net/minecraft/src","1" "values","values","values","()[LEnumMobType;","()[Lqu;","EnumMobType","qu","net/minecraft/src","1" "valueOf","valueOf","valueOf","(Ljava/lang/String;)LEnumMobType;","(Ljava/lang/String;)Lqu;","EnumMobType","qu","net/minecraft/src","1" "func_386_a","setTag","a","(LNBTBase;)V","(Lik;)V","NBTTagList","rp","net/minecraft/src","1" @@ -4502,8 +4502,8 @@ "func_641_a","init","a","()V","()V","ConsoleLogManager","hm","net/minecraft/src","1" "func_35167_h","func_35167_h","h","()V","()V","TileEntityChest","js","net/minecraft/src","1" "func_21027_b","growTree","b","(LWorld;IIILjava/util/Random;)V","(Lfi;IIILjava/util/Random;)V","BlockSapling","hk","net/minecraft/src","1" -"func_35032_a","func_35032_a","a","(II)I","(II)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" -"func_35031_b","func_35031_b","b","(IIII)I","(IIII)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" +"func_35032_a","choose","a","(II)I","(II)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" +"func_35031_b","choose","b","(IIII)I","(IIII)I","GenLayerZoomFuzzy","we","net/minecraft/src","1" "func_83_a","getSizeInventory","c","()I","()I","IInventory","lp","net/minecraft/src","1" "func_82_a","getStackInSlot","c_","(I)LItemStack;","(I)Ljb;","IInventory","lp","net/minecraft/src","1" "func_20068_b","getInvName","e","()Ljava/lang/String;","()Ljava/lang/String;","IInventory","lp","net/minecraft/src","1" @@ -4519,7 +4519,7 @@ "func_40208_c","func_40208_c","c","()Ljava/util/LinkedList;","()Ljava/util/LinkedList;","StructureStart","tr","net/minecraft/src","1" "func_35541_a","generateStructure","a","(LWorld;Ljava/util/Random;LStructureBoundingBox;)V","(Lfi;Ljava/util/Random;Lvb;)V","StructureStart","tr","net/minecraft/src","1" "func_35544_c","updateBoundingBox","d","()V","()V","StructureStart","tr","net/minecraft/src","1" -"func_35545_a","func_35545_a","a","(LWorld;Ljava/util/Random;I)V","(Lfi;Ljava/util/Random;I)V","StructureStart","tr","net/minecraft/src","1" +"func_35545_a","markAvailableHeight","a","(LWorld;Ljava/util/Random;I)V","(Lfi;Ljava/util/Random;I)V","StructureStart","tr","net/minecraft/src","1" "func_40209_a","func_40209_a","a","(LWorld;Ljava/util/Random;II)V","(Lfi;Ljava/util/Random;II)V","StructureStart","tr","net/minecraft/src","1" "func_27053_d","registerStat","d","()LStatBase;","()Luv;","StatBase","uv","net/minecraft/src","1" "func_27052_e","initIndependentStat","e","()LStatBase;","()Luv;","StatBase","uv","net/minecraft/src","1" @@ -4539,8 +4539,8 @@ "compareTo","compareTo","compareTo","(Ljava/lang/Object;)I","(Ljava/lang/Object;)I","ChunkCoordinates","bu","net/minecraft/src","1" "func_22215_a","compareChunkCoordinate","a","(LChunkCoordinates;)I","(Lbu;)I","ChunkCoordinates","bu","net/minecraft/src","1" "func_27127_a","getSqDistanceTo","a","(III)D","(III)D","ChunkCoordinates","bu","net/minecraft/src","1" -"func_35058_c","func_35058_c","d","(I)Z","(I)Z","BlockVine","nw","net/minecraft/src","1" -"func_35059_g","func_35059_g","g","(LWorld;III)Z","(Lfi;III)Z","BlockVine","nw","net/minecraft/src","1" +"func_35058_c","canBePlacedOn","d","(I)Z","(I)Z","BlockVine","nw","net/minecraft/src","1" +"func_35059_g","canVineStay","g","(LWorld;III)Z","(Lfi;III)Z","BlockVine","nw","net/minecraft/src","1" "accept","accept","accept","(Ljava/io/File;)Z","(Ljava/io/File;)Z","ChunkFolderPattern","cm","net/minecraft/src","1" "func_27097_a","func_27097_a","a","()V","()V","AchievementList","et","net/minecraft/src","1" "func_25077_b","getRecipeOutput","b","()LItemStack;","()Ljb;","IRecipe","dz","net/minecraft/src","1" @@ -4579,11 +4579,11 @@ "func_4089_a","calculateCelestialAngle","a","(JF)F","(JF)F","WorldProvider","wn","net/minecraft/src","1" "func_28108_d","canRespawnHere","c","()Z","()Z","WorldProvider","wn","net/minecraft/src","1" "func_4092_a","canCoordinateBeSpawn","a","(II)Z","(II)Z","WorldProvider","wn","net/minecraft/src","1" -"func_40545_d","func_40545_d","d","()LChunkCoordinates;","()Lbu;","WorldProvider","wn","net/minecraft/src","1" +"func_40545_d","getEntrancePortalLocation","d","()LChunkCoordinates;","()Lbu;","WorldProvider","wn","net/minecraft/src","1" "func_4088_b","generateLightBrightnessTable","e","()V","()V","WorldProvider","wn","net/minecraft/src","1" "func_4093_a","registerWorld","a","(LWorld;)V","(Lfi;)V","WorldProvider","wn","net/minecraft/src","1" "func_4091_a","getProviderForDimension","a","(I)LWorldProvider;","(I)Lwn;","WorldProvider","wn","net/minecraft/src","1" -"func_275_g","reduntantonNeighborBlockChange","g","(LWorld;III)Z","(Lfi;III)Z","BlockSnow","jr","net/minecraft/src","1" +"func_275_g","redundantOnNeighborBlockChange","g","(LWorld;III)Z","(Lfi;III)Z","BlockSnow","jr","net/minecraft/src","1" "func_40179_c","func_40179_c","d","(I)Z","(I)Z","BlockEndPortalFrame","yc","net/minecraft/src","1" "func_274_g","checkIfAttachedToBlock","g","(LWorld;III)Z","(Lfi;III)Z","BlockLever","xa","net/minecraft/src","1" "func_40306_a","func_40306_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentNetherBridgeCrossing;","(Ljava/util/List;Ljava/util/Random;IIIII)Luw;","ComponentNetherBridgeCrossing","uw","net/minecraft/src","1" @@ -4609,7 +4609,7 @@ "func_21167_a","canCreatureTypeSpawnAtLocation","a","(LEnumCreatureType;LWorld;III)Z","(Lla;Lfi;III)Z","SpawnerAnimals","cs","net/minecraft/src","1" "func_21166_a","creatureSpecificInit","a","(LEntityLiving;LWorld;FFF)V","(Llk;Lfi;FFF)V","SpawnerAnimals","cs","net/minecraft/src","1" "func_35573_a","func_35573_a","a","(LWorld;LBiomeGenBase;IIIILjava/util/Random;)V","(Lfi;Lkb;IIIILjava/util/Random;)V","SpawnerAnimals","cs","net/minecraft/src","1" -"func_35060_c","func_35060_c","d","(I)Z","(I)Z","BlockSilverfish","pu","net/minecraft/src","1" +"func_35060_c","getPosingIdByMetadata","d","(I)Z","(I)Z","BlockSilverfish","pu","net/minecraft/src","1" "func_35061_d","func_35061_d","e","(I)I","(I)I","BlockSilverfish","pu","net/minecraft/src","1" "func_754_a","setNetHandler","a","(LNetHandler;)V","(Lsd;)V","NetworkManager","oo","net/minecraft/src","1" "func_745_a","addToSendQueue","a","(LPacket;)V","(Lkf;)V","NetworkManager","oo","net/minecraft/src","1" @@ -4645,35 +4645,35 @@ "func_4067_a","getBiomeGenAt","a","(II)LBiomeGenBase;","(II)Lkb;","WorldChunkManager","xe","net/minecraft/src","1" "func_4068_a","getTemperatures","a","([FIIII)[F","([FIIII)[F","WorldChunkManager","xe","net/minecraft/src","1" "func_40578_a","func_40578_a","a","(IIII)[F","(IIII)[F","WorldChunkManager","xe","net/minecraft/src","1" -"func_4065_a","func_4065_a","b","([FIIII)[F","([FIIII)[F","WorldChunkManager","xe","net/minecraft/src","1" +"func_4065_a","getRainfall","b","([FIIII)[F","([FIIII)[F","WorldChunkManager","xe","net/minecraft/src","1" "func_4064_a","loadBlockGeneratorData","a","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lkb;IIII)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" "func_35140_a","func_35140_a","a","([LBiomeGenBase;IIIIZ)[LBiomeGenBase;","([Lkb;IIIIZ)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" "func_35139_a","func_35139_a","a","(IIILjava/util/List;Ljava/util/Random;)LChunkPosition;","(IIILjava/util/List;Ljava/util/Random;)Lvo;","WorldChunkManager","xe","net/minecraft/src","1" -"func_35141_a","func_35141_a","a","(IIILjava/util/List;)Z","(IIILjava/util/List;)Z","WorldChunkManager","xe","net/minecraft/src","1" -"func_35137_a","func_35137_a","a","()Ljava/util/List;","()Ljava/util/List;","WorldChunkManager","xe","net/minecraft/src","1" +"func_35141_a","areBiomesViable","a","(IIILjava/util/List;)Z","(IIILjava/util/List;)Z","WorldChunkManager","xe","net/minecraft/src","1" +"func_35137_a","getBiomesToSpawnIn","a","()Ljava/util/List;","()Ljava/util/List;","WorldChunkManager","xe","net/minecraft/src","1" "func_40579_a","func_40579_a","a","(III)F","(III)F","WorldChunkManager","xe","net/minecraft/src","1" "func_40577_a","func_40577_a","a","(FI)F","(FI)F","WorldChunkManager","xe","net/minecraft/src","1" "func_35142_b","func_35142_b","b","([LBiomeGenBase;IIII)[LBiomeGenBase;","([Lkb;IIII)[Lkb;","WorldChunkManager","xe","net/minecraft/src","1" "func_35138_b","func_35138_b","b","()V","()V","WorldChunkManager","xe","net/minecraft/src","1" "func_35374_a","func_35374_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentVillageHall;","(Ljava/util/List;Ljava/util/Random;IIIII)Ls;","ComponentVillageHall","s","net/minecraft/src","1" -"func_40638_b","func_40638_b","b","(ILItemStack;)I","(ILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40639_a","func_40639_a","a","(I[LItemStack;)I","(I[Ljb;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40627_a","func_40627_a","a","(LIEnchantmentModifier;LItemStack;)V","(Ly;Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40640_a","func_40640_a","a","(LIEnchantmentModifier;[LItemStack;)V","(Ly;[Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40634_a","func_40634_a","a","(LInventoryPlayer;LDamageSource;)I","(Lja;Lpo;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40641_a","func_40641_a","a","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40637_b","func_40637_b","b","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40636_c","func_40636_c","c","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40628_a","func_40628_a","a","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40638_b","getEnchantmentLevel","b","(ILItemStack;)I","(ILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40639_a","getMaxEnchantmentLevel","a","(I[LItemStack;)I","(I[Ljb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40627_a","applyEnchantmentModifier","a","(LIEnchantmentModifier;LItemStack;)V","(Ly;Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40640_a","applyEnchantmentModifierArray","a","(LIEnchantmentModifier;[LItemStack;)V","(Ly;[Ljb;)V","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40634_a","getEnchantmentModifierDamage","a","(LInventoryPlayer;LDamageSource;)I","(Lja;Lpo;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40641_a","getEnchantmentModifierLiving","a","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40637_b","getKnockbackModifier","b","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40636_c","getFireAspectModifier","c","(LInventoryPlayer;LEntityLiving;)I","(Lja;Llk;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40628_a","getRespiration","a","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" "func_40630_b","getEfficiencyModifier","b","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40643_c","func_40643_c","c","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40644_d","func_40644_d","d","(LInventoryPlayer;)Z","(Lja;)Z","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40643_c","getUnbreakingModifier","c","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40644_d","getSilkTouchModifier","d","(LInventoryPlayer;)Z","(Lja;)Z","EnchantmentHelper","tc","net/minecraft/src","1" "func_40635_e","getFortuneModifier","e","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40633_f","func_40633_f","f","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40633_f","getLootingModifier","f","(LInventoryPlayer;)I","(Lja;)I","EnchantmentHelper","tc","net/minecraft/src","1" "func_40632_g","getAquaAffinityModifier","g","(LInventoryPlayer;)Z","(Lja;)Z","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40642_a","func_40642_a","a","(Ljava/util/Random;IILItemStack;)I","(Ljava/util/Random;IILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40629_a","func_40629_a","a","(Ljava/util/Random;LItemStack;I)Ljava/util/List;","(Ljava/util/Random;Ljb;I)Ljava/util/List;","EnchantmentHelper","tc","net/minecraft/src","1" -"func_40631_a","func_40631_a","a","(ILItemStack;)Ljava/util/Map;","(ILjb;)Ljava/util/Map;","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40642_a","calcItemStackEnchantability","a","(Ljava/util/Random;IILItemStack;)I","(Ljava/util/Random;IILjb;)I","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40629_a","buildEnchantmentList","a","(Ljava/util/Random;LItemStack;I)Ljava/util/List;","(Ljava/util/Random;Ljb;I)Ljava/util/List;","EnchantmentHelper","tc","net/minecraft/src","1" +"func_40631_a","mapEnchantmentData","a","(ILItemStack;)Ljava/util/Map;","(ILjb;)Ljava/util/Map;","EnchantmentHelper","tc","net/minecraft/src","1" "func_40345_a","getMinEnchantability","a","(I)I","(I)I","Enchantment","mq","net/minecraft/src","1" "func_40342_b","getMaxEnchantability","b","(I)I","(I)I","Enchantment","mq","net/minecraft/src","1" "func_40344_a","getMaxLevel","a","()I","()I","Enchantment","mq","net/minecraft/src","1" @@ -4709,12 +4709,12 @@ "func_562_a","getNibble","a","(III)I","(III)I","NibbleArray","vq","net/minecraft/src","1" "func_561_a","setNibble","a","(IIII)V","(IIII)V","NibbleArray","vq","net/minecraft/src","1" "func_560_a","isValid","a","()Z","()Z","NibbleArray","vq","net/minecraft/src","1" -"func_41024_b","func_41024_b","b","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" -"func_41025_i","func_41025_i","j","()I","()I","EntityBoat","gh","net/minecraft/src","1" -"func_41027_c","func_41027_c","c","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" -"func_41028_k","func_41028_k","k","()I","()I","EntityBoat","gh","net/minecraft/src","1" -"func_41026_d","func_41026_d","d","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" -"func_41029_m","func_41029_m","l","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_41024_b","setDamageTaken","b","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41025_i","getDamageTaken","j","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_41027_c","setTimeSinceHit","c","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41028_k","getTimeSinceHit","k","()I","()I","EntityBoat","gh","net/minecraft/src","1" +"func_41026_d","setForwardDirection","d","(I)V","(I)V","EntityBoat","gh","net/minecraft/src","1" +"func_41029_m","getForwardDirection","l","()I","()I","EntityBoat","gh","net/minecraft/src","1" "func_28025_b","isACube","b","()Z","()Z","Block","tl","net/minecraft/src","1" "func_259_a","canPlaceBlockAt","c","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1" "func_220_f","canBlockStay","f","(LWorld;III)Z","(Lfi;III)Z","Block","tl","net/minecraft/src","1" @@ -4743,11 +4743,11 @@ "func_242_b","onBlockRemoval","d","(LWorld;III)V","(Lfi;III)V","Block","tl","net/minecraft/src","1" "func_21025_b","damageDropped","c","(I)I","(I)I","Block","tl","net/minecraft/src","1" "func_249_b","onEntityWalking","b","(LWorld;IIILEntity;)V","(Lfi;IIILrn;)V","Block","tl","net/minecraft/src","1" -"func_21024_a","playBlock","a","(LWorld;IIIII)V","(Lfi;IIIII)V","Block","tl","net/minecraft/src","1" +"func_21024_a","powerBlock","a","(LWorld;IIIII)V","(Lfi;IIIII)V","Block","tl","net/minecraft/src","1" "func_263_a","onEntityCollidedWithBlock","a","(LWorld;IIILEntity;)V","(Lfi;IIILrn;)V","Block","tl","net/minecraft/src","1" "func_31025_e","getMobilityFlag","g","()I","()I","Block","tl","net/minecraft/src","1" "func_4028_b","tickRate","d","()I","()I","Block","tl","net/minecraft/src","1" -"func_40163_f","func_40163_f","f","()V","()V","Block","tl","net/minecraft/src","1" +"func_40163_f","setBlockBoundsForItemRender","f","()V","()V","Block","tl","net/minecraft/src","1" "func_243_a","canCollideCheck","a","(IZ)Z","(IZ)Z","Block","tl","net/minecraft/src","1" "func_253_a","shouldSideBeRendered","b","(LIBlockAccess;IIII)Z","(Lwy;IIII)Z","Block","tl","net/minecraft/src","1" "func_230_a","velocityToAddToEntity","a","(LWorld;IIILEntity;LVec3D;)V","(Lfi;IIILrn;Lbx;)V","Block","tl","net/minecraft/src","1" @@ -4831,8 +4831,8 @@ "func_35583_a","addExhaustion","a","(F)V","(F)V","FoodStats","rd","net/minecraft/src","1" "func_35586_c","getSaturationLevel","c","()F","()F","FoodStats","rd","net/minecraft/src","1" "func_35565_a","selectBlocks","a","(Ljava/util/Random;IIIZ)V","(Ljava/util/Random;IIIZ)V","StructurePieceBlockSelector","cb","net/minecraft/src","1" -"func_35566_a","func_35566_a","a","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" -"func_35567_b","func_35567_b","b","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"func_35566_a","getSelectedBlockId","a","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" +"func_35567_b","getSelectedBlockMetaData","b","()I","()I","StructurePieceBlockSelector","cb","net/minecraft/src","1" "func_669_a","generateLargeCaveNode","a","(JII[BDDD)V","(JII[BDDD)V","MapGenCaves","rq","net/minecraft/src","1" "func_668_a","generateCaveNode","a","(JII[BDDDFFFIID)V","(JII[BDDDFFFIID)V","MapGenCaves","rq","net/minecraft/src","1" "func_374_c","func_374_c","d","(II)V","(II)V","ChunkProviderServer","kw","net/minecraft/src","1" @@ -4854,7 +4854,7 @@ "func_6158_a","func_6158_a","a","(I)LEntity;","(I)Lrn;","WorldServer","fp","net/minecraft/src","1" "func_30006_w","func_30006_w","y","()V","()V","WorldServer","fp","net/minecraft/src","1" "focusGained","focusGained","focusGained","(Ljava/awt/event/FocusEvent;)V","(Ljava/awt/event/FocusEvent;)V","ServerGuiFocusAdapter","ae","net/minecraft/src","1" -"func_35386_a","func_35386_a","a","()LWorldChunkManager;","()Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" +"func_35386_a","getWorldChunkMngr","a","()LWorldChunkManager;","()Lxe;","ComponentVillageStartPiece","j","net/minecraft/src","1" "func_35334_a","func_35334_a","a","(Ljava/util/List;Ljava/util/Random;IIIII)LComponentStrongholdLibrary;","(Ljava/util/List;Ljava/util/Random;IIIII)Lmg;","ComponentStrongholdLibrary","mg","net/minecraft/src","1" "func_4057_a","generateTerrain","a","(II[B)V","(II[B)V","ChunkProviderGenerate","xo","net/minecraft/src","1" "func_4056_a","replaceBlocksForBiome","a","(II[B[LBiomeGenBase;)V","(II[B[Lkb;)V","ChunkProviderGenerate","xo","net/minecraft/src","1" diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index b481a8bf52..10f3d3449f 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -2,7 +2,7 @@ +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 @@ -41,7 +41,7 @@ - private boolean func_31032_h(World world, int i, int j, int k) + private boolean canPlaceTorchOn(World world, int i, int j, int k) { - if(world.func_41082_b(i, j, k, true)) + if(world.isBlockSolidOnSide(i, j, k, 1)) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 613f252572..6e5666b863 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -17,8 +17,8 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -398,14 +399,6 @@ - tileentity.func_35144_b(); +@@ -398,15 +399,7 @@ + tileentity.updateContainingBlockInfo(); } } - } else @@ -27,11 +27,13 @@ - TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); - if(tileentity1 != null) - { -- tileentity1.func_35144_b(); +- tileentity1.updateContainingBlockInfo(); - } - } +- } ++ } isModified = true; return true; + } @@ -430,7 +423,11 @@ blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff); if(k1 != 0) @@ -55,7 +57,7 @@ } if(tileentity != null) @@ -466,14 +463,6 @@ - tileentity.func_35144_b(); + tileentity.updateContainingBlockInfo(); } } - } else @@ -64,7 +66,7 @@ - TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k); - if(tileentity1 != null) - { -- tileentity1.func_35144_b(); +- tileentity1.updateContainingBlockInfo(); - } } isModified = true; @@ -138,7 +140,7 @@ + Iterator iterator = chunkTileEntityMap.values().iterator(); + while (iterator.hasNext()){ + te = (TileEntity)iterator.next(); -+ te.func_35144_b(); ++ te.updateContainingBlockInfo(); + te.getBlockMetadata(); + te.getBlockType(); + } @@ -146,17 +148,18 @@ for(int l1 = i; l1 < l; l1++) { for(int l2 = k; l2 < j1; l2++) -@@ -859,12 +869,25 @@ +@@ -859,12 +869,29 @@ } - TileEntity tileentity; -- for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b()) +- for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.updateContainingBlockInfo()) - { - tileentity = (TileEntity)iterator.next(); + List invalidList=new ArrayList(); + iterator = chunkTileEntityMap.values().iterator(); -+ while(iterator.hasNext()) { ++ while(iterator.hasNext()) ++ { + te = (TileEntity)iterator.next(); + if ((te.xCoord & 15) >= i && (te.xCoord & 15) <= l && + (te.yCoord >= j) && (te.yCoord <= i1) && @@ -171,9 +174,11 @@ + invalidList.add(te); + } } -- + + for(TileEntity te2 : invalidList) ++ { + te2.invalidate(); ++ } return k1; } diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 440b06e87c..98a2982bbc 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -9,7 +9,7 @@ import java.util.Random; @@ -177,6 +178,9 @@ - private String field_39010_c; + private String potionModifier; private String itemName; + // FORGE: To disable repair recipes. diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 6d7d6c8c43..5a9ef12d07 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -10,27 +10,32 @@ import java.util.Random; // Referenced classes of package net.minecraft.src: -@@ -45,13 +47,18 @@ +@@ -45,13 +47,23 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { -- if(!entityplayer.func_35190_e(i, j, k)) -+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k)) +- if(!entityplayer.canPlayerEdit(i, j, k)) ++ if(entityplayer != null && !entityplayer.canPlayerEdit(i, j, k)) { return false; } if(itemstack.getItemDamage() == 15) { int i1 = world.getBlockId(i, j, k); -+ if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) { -+ if(!world.multiplayerWorld) -+ itemstack.stackSize--; -+ return true; -+ } ++ ++ if (ForgeHooks.onUseBonemeal(world, i1, i, j, k)) ++ { ++ if (!world.multiplayerWorld) ++ { ++ itemstack.stackSize--; ++ } ++ return true; ++ } ++ if(i1 == Block.sapling.blockID) { if(!world.multiplayerWorld) -@@ -118,13 +125,7 @@ +@@ -118,13 +130,7 @@ world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1); continue; } @@ -45,7 +50,7 @@ } } -@@ -147,5 +148,17 @@ +@@ -147,5 +153,17 @@ } } } diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index aa53cf7395..7eb087a9a4 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -10,43 +10,46 @@ import net.minecraft.client.Minecraft; // Referenced classes of package net.minecraft.src: -@@ -68,13 +71,16 @@ +@@ -68,13 +71,19 @@ - public boolean sendBlockRemoved(int i, int j, int k, int l) + public boolean onPlayerDestroyBlock(int i, int j, int k, int l) { -+ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); -+ if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack, -+ i,j,k,mc.thePlayer)) -+ return false; ++ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); ++ if (itemstack != null && itemstack.getItem().onBlockStartBreak(itemstack, i, j, k, mc.thePlayer)) ++ { ++ return false; ++ } ++ if(creativeMode) { - return super.sendBlockRemoved(i, j, k, l); + return super.onPlayerDestroyBlock(i, j, k, l); } int i1 = mc.theWorld.getBlockId(i, j, k); - boolean flag = super.sendBlockRemoved(i, j, k, l); + boolean flag = super.onPlayerDestroyBlock(i, j, k, l); - ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); ++ if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -103,7 +109,7 @@ +@@ -103,7 +112,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } - if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) + if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) { - sendBlockRemoved(i, j, k, l); + onPlayerDestroyBlock(i, j, k, l); } else -@@ -149,7 +155,7 @@ +@@ -149,7 +158,7 @@ return; } Block block = Block.blocksList[i1]; - 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(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); -@@ -216,6 +222,13 @@ +@@ -216,6 +225,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); @@ -60,7 +63,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -235,7 +248,11 @@ +@@ -235,7 +251,11 @@ return flag; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 0414252dae..c5d3891f8f 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -9,44 +9,47 @@ import net.minecraft.client.Minecraft; -@@ -46,11 +48,14 @@ +@@ -46,11 +48,17 @@ - public boolean sendBlockRemoved(int i, int j, int k, int l) + public boolean onPlayerDestroyBlock(int i, int j, int k, int l) { -+ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); -+ if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack, -+ i,j,k,mc.thePlayer)) -+ return false; ++ ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); ++ if (itemstack != null && itemstack.getItem().onBlockStartBreak(itemstack, i, j, k, mc.thePlayer)) ++ { ++ return false; ++ } ++ int i1 = mc.theWorld.getBlockId(i, j, k); int j1 = mc.theWorld.getBlockMetadata(i, j, k); - boolean flag = super.sendBlockRemoved(i, j, k, l); + boolean flag = super.onPlayerDestroyBlock(i, j, k, l); - ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); - boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]); -+ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1); ++ ++ boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer, j1); if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -79,7 +84,7 @@ +@@ -79,7 +87,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } - if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F) + if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F) { - sendBlockRemoved(i, j, k, l); + onPlayerDestroyBlock(i, j, k, l); } -@@ -110,7 +115,7 @@ +@@ -110,7 +118,7 @@ return; } Block block = Block.blocksList[i1]; - curBlockDamage += block.blockStrength(mc.thePlayer); -+ curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k); - if(field_1069_h % 4F == 0.0F && block != null) ++ curBlockDamage += block.blockStrength(mc.theWorld, mc.thePlayer, i, j, k); + if(blockDestroySoundCounter % 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); -@@ -173,6 +178,12 @@ +@@ -173,6 +181,12 @@ - public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { + if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { + IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); @@ -57,7 +60,7 @@ int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -183,7 +194,11 @@ +@@ -183,7 +197,11 @@ return false; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index a7f04659b8..af1d1e4383 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -145,7 +145,7 @@ + } } - public void func_35455_a(TileEntity tileentity) + public void markEntityForDespawn(TileEntity tileentity) @@ -2106,13 +2092,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index 24433f82fd..7112527c1c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -9,16 +9,27 @@ } public void onBlockRemoval(World world, int i, int j, int k) -@@ -37,6 +37,12 @@ +@@ -36,7 +36,7 @@ + } public abstract TileEntity getBlockEntity(); - -+ /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression. -+ */ -+ public TileEntity getBlockEntity(int md) { -+ return getBlockEntity(); -+ } -+ - public void playBlock(World world, int i, int j, int k, int l, int i1) +- ++ + public void powerBlock(World world, int i, int j, int k, int l, int i1) { - super.playBlock(world, i, j, k, l, i1); + super.powerBlock(world, i, j, k, l, i1); +@@ -46,4 +46,14 @@ + tileentity.onTileEntityPowered(l, i1); + } + } ++ ++ /** ++ * Metatdata sensitive version of getBlockEntity ++ * @param metadata The Metatdata for the current block ++ * @return A instance of the TileEntity class associated with this block ++ */ ++ public TileEntity getBlockEntity(int metadata) ++ { ++ return getBlockEntity(); ++ } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 6d7110c8be..ce56573e91 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -8,15 +8,7 @@ import java.io.PrintStream; import java.util.*; -@@ -325,6 +326,7 @@ - } - int i2 = xPosition * 16 + i; - int j2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff); - if(l1 != 0) - { -@@ -367,7 +369,7 @@ +@@ -367,7 +368,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -25,7 +17,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -375,14 +377,6 @@ +@@ -375,14 +376,6 @@ tileentity.func_35164_g(); } } @@ -40,22 +32,19 @@ } isModified = true; return true; -@@ -404,10 +398,13 @@ - } - int l1 = xPosition * 16 + i; - int i2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff); +@@ -408,6 +401,11 @@ if(k1 != 0) { -- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if (!worldObj.singleplayerWorld) -+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ worldObj.removeBlockTileEntity(l1, j, i2); + Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ if (!worldObj.singleplayerWorld) ++ { ++ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ } ++ worldObj.removeBlockTileEntity(l1, j, i2); } data.setNibble(i, j, k, 0); if(Block.lightOpacity[byte0 & 0xff] != 0) -@@ -435,7 +432,7 @@ +@@ -435,7 +433,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -64,7 +53,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -443,14 +440,6 @@ +@@ -443,14 +441,6 @@ tileentity.func_35164_g(); } } @@ -79,7 +68,7 @@ } isModified = true; return true; -@@ -586,6 +575,11 @@ +@@ -586,6 +576,11 @@ { ChunkPosition chunkposition = new ChunkPosition(i, j, k); TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition); @@ -91,7 +80,7 @@ if(tileentity == null) { int l = getBlockID(i, j, k); -@@ -595,18 +589,23 @@ +@@ -595,18 +590,23 @@ } if(tileentity == null) { @@ -122,7 +111,7 @@ } } -@@ -618,7 +617,7 @@ +@@ -618,7 +618,7 @@ setChunkBlockTileEntity(i, j, k, tileentity); if(isChunkLoaded) { @@ -131,7 +120,7 @@ } } -@@ -634,6 +633,8 @@ +@@ -634,6 +634,8 @@ return; } else { diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 0876c65252..65619dad62 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -41,12 +41,12 @@ + f += i * i + 1; + } + -+ if(func_35184_a(Potion.digSpeed)) ++ if(isPotionActive(Potion.digSpeed)) + { + f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } + -+ if(func_35184_a(Potion.digSlowdown)) ++ if(isPotionActive(Potion.digSlowdown)) + { + f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch index 1d215eb741..9406147bec 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch @@ -17,7 +17,7 @@ + implements IInventory, ISidedInventory { - private ItemStack field_40083_a[]; + private ItemStack brewingItemStacks[]; @@ -274,5 +276,15 @@ } diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 8dfd2463e9..b2ccbedd72 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -144,7 +144,7 @@ + } } - public void func_35239_a(TileEntity tileentity) + public void markEntityForDespawn(TileEntity tileentity) @@ -1762,13 +1751,18 @@ public boolean isBlockNormalCube(int i, int j, int k) { @@ -173,7 +173,7 @@ public boolean func_41047_b(int i, int j, int k, boolean flag) @@ -2179,7 +2173,7 @@ - private int func_35241_e(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 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); From c2f165f211f2e3f30a05dad8e7e31b847f8dc96b Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 20 Dec 2011 07:00:43 +0000 Subject: [PATCH 159/169] Commit of a hook for adding items into world dungeon generation. Uses a weighted random selection scheme. Also a hook for adding custom mobs to the dungeon generation list. --- .../net/minecraft/src/forge/DungeonLoot.java | 51 ++++ .../minecraft/src/forge/MinecraftForge.java | 242 ++++++++++++++++++ .../net/minecraft/src/forge/ObjectPair.java | 40 +++ .../minecraft/src/WorldGenDungeons.java.patch | 34 +++ .../minecraft/src/WorldGenDungeons.java.patch | 34 +++ 5 files changed, 401 insertions(+) create mode 100644 forge/forge_common/net/minecraft/src/forge/DungeonLoot.java create mode 100644 forge/forge_common/net/minecraft/src/forge/ObjectPair.java create mode 100644 forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch diff --git a/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java b/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java new file mode 100644 index 0000000000..cf9c767c93 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java @@ -0,0 +1,51 @@ +package net.minecraft.src.forge; + +import java.util.Random; +import net.minecraft.src.ItemStack; + +/** + * + * Used to hold a list of all items that can be spawned in a world dungeon + * + */ +public class DungeonLoot +{ + private ItemStack item; + private int minCount = 1; + private int maxCount = 1; + + /** + * @param item A item stack + * @param min Minimum stack size when randomly generating + * @param max Maximum stack size when randomly generating + */ + public DungeonLoot(ItemStack item, int min, int max) + { + this.item = item; + minCount = min; + maxCount = max; + } + + /** + * Grabs a ItemStack ready to be added to the dungeon chest, + * the stack size will be between minCount and maxCount + * @param rand World gen random number generator + * @return The ItemStack to be added to the chest + */ + public ItemStack generateStack(Random rand) + { + ItemStack ret = this.item.copy(); + ret.stackSize = minCount + (rand.nextInt(maxCount - minCount + 1)); + return ret; + } + + public boolean equals(ItemStack item, int min, int max) + { + return (min == minCount && max == maxCount && item.isItemEqual(this.item)); + } + + public boolean equals(ItemStack item) + { + return item.isItemEqual(this.item); + } +} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 89c049dde3..cb2fa45de2 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -365,4 +365,246 @@ public class MinecraftForge { } } + private static int dungeonLootAttempts = 8; + private static ArrayList> dungeonMobs = new ArrayList>(); + private static ArrayList> dungeonLoot = new ArrayList>(); + /** + * Set the number of item stacks that will be attempted to be added to each Dungeon chest. + * Note: Due to random number generation, you will not always get this amount per chest. + * @param number The maximum number of item stacks to add to a chest. + */ + public static void setDungeonLootTries(int number) + { + dungeonLootAttempts = number; + } + + /** + * @return The max number of item stacks found in each dungeon chest. + */ + public static int getDungeonLootTries() + { + return dungeonLootAttempts; + } + + /** + * Adds a mob to the possible list of creatures the spawner will create. + * If the mob is already in the spawn list, the rarity will be added to the existing one, + * causing the mob to be more common. + * + * @param name The name of the monster, use the same name used when registering the entity. + * @param rarity The rarity of selecting this mob over others. Must be greater then 0. + * Vanilla Minecraft has the following mobs: + * Spider 1 + * Skeleton 1 + * Zombie 2 + * Meaning, Zombies are twice as common as spiders or skeletons. + * @return The new rarity of the monster, + */ + public static float addDungeonMob(String name, float rarity) + { + if (rarity <= 0) + { + throw new IllegalArgumentException("Rarity must be greater then zero"); + } + + for(ObjectPair mob : dungeonMobs) + { + if (name.equals(mob.getValue2())) + { + mob.setValue1(mob.getValue1() + rarity); + return mob.getValue1(); + } + } + + dungeonMobs.add(new ObjectPair(rarity, name)); + return rarity; + } + + /** + * Will completely remove a Mob from the dungeon spawn list. + * + * @param name The name of the mob to remove + * @return The rarity of the removed mob, prior to being removed. + */ + public static float removeDungeonMob(String name) + { + for (ObjectPair mob : dungeonMobs) + { + if (name.equals(name)) + { + dungeonMobs.remove(mob); + return mob.getValue1(); + } + } + return 0; + } + + /** + * Gets a random mob name from the list. + * @param rand World generation random number generator + * @return The mob name + */ + public static String getRandomDungeonMob(Random rand) + { + float maxRarity = 0f; + for (ObjectPair mob : dungeonMobs) + { + maxRarity += mob.getValue1(); + } + + float targetRarity = rand.nextFloat() * maxRarity; + for (ObjectPair mob : dungeonMobs) + { + if (targetRarity < mob.getValue1()) + { + return mob.getValue2(); + } + targetRarity -= mob.getValue1(); + } + + return ""; + } + + /** + * Adds a item stack to the dungeon loot list with a stack size + * of 1. + * + * @param item The ItemStack to be added to the loot list + * @param rarity The relative chance that this item will spawn, Vanilla has + * most of its items set to 1. Like the saddle, bread, silk, wheat, etc.. + * Rarer items are set to lower values, EXA: Golden Apple 0.01 + */ + public static void addDungeonLoot(ItemStack item, float rarity) + { + addDungeonLoot(item, rarity, 1, 1); + } + + /** + * Adds a item stack, with a range of sizes, to the dungeon loot list. + * If a stack matching the same item, and size range, is already in the list + * the rarities will be added together making the item more common. + * + * @param item The ItemStack to be added to the loot list + * @param rarity The relative chance that this item will spawn, Vanilla has + * most of its items set to 1. Like the saddle, bread, silk, wheat, etc.. + * Rarer items are set to lower values, EXA: Golden Apple 0.01 + * @param minCount When this item does generate, the minimum number that is in the stack + * @param maxCount When this item does generate, the maximum number that can bein the stack + * @return The new rarity of the loot. + */ + public static float addDungeonLoot(ItemStack item, float rarity, int minCount, int maxCount) + { + for (ObjectPair loot : dungeonLoot) + { + if (loot.getValue2().equals(item, minCount, maxCount)) + { + loot.setValue1(loot.getValue1() + rarity); + return loot.getValue1(); + } + } + + dungeonLoot.add(new ObjectPair(rarity, new DungeonLoot(item, minCount, maxCount))); + return rarity; + } + /** + * Removes a item stack from the dungeon loot list, this will remove all items + * as long as the item stack matches, it will not care about matching the stack + * size ranges perfectly. + * + * @param item The item stack to remove + * @return The total rarity of all items removed + */ + public static float removeDungeonLoot(ItemStack item) + { + return removeDungeonLoot(item, -1, 0); + } + + /** + * Removes a item stack from the dungeon loot list. If 'minCount' parameter + * is greater then 0, it will only remove loot items that have the same exact + * stack size range as passed in by parameters. + * + * @param item The item stack to remove + * @param minCount The minimum count for the match check, if less then 0, + * the size check is skipped + * @param maxCount The max count used in match check when 'minCount' is >= 0 + * @return The total rarity of all items removed + */ + public static float removeDungeonLoot(ItemStack item, int minCount, int maxCount) + { + float rarity = 0; + ArrayList> lootTmp = (ArrayList>)dungeonLoot.clone(); + if (minCount < 0) + { + for (ObjectPair loot : lootTmp) + { + if (loot.getValue2().equals(item)) + { + dungeonLoot.remove(loot); + rarity += loot.getValue1(); + } + } + } + else + { + for (ObjectPair loot : lootTmp) + { + if (loot.getValue2().equals(item, minCount, maxCount)) + { + dungeonLoot.remove(loot); + rarity += loot.getValue1(); + } + } + } + + return rarity; + } + + + /** + * Gets a random item stack to place in a dungeon chest during world generation + * @param rand World generation random number generator + * @return The item stack + */ + public static ItemStack getRandomDungeonLoot(Random rand) + { + float maxRarity = 0f; + for (ObjectPair loot : dungeonLoot) + { + maxRarity += loot.getValue1(); + } + + float targetRarity = rand.nextFloat() * maxRarity; + for (ObjectPair loot : dungeonLoot) + { + if (targetRarity < loot.getValue1()) + { + return loot.getValue2().generateStack(rand); + } + targetRarity -= loot.getValue1(); + } + + return null; + } + + static + { + addDungeonMob("Skeleton", 1.0f); + addDungeonMob("Zombie", 2.0f); + addDungeonMob("Spider", 1.0f); + + addDungeonLoot(new ItemStack(Item.saddle), 1.00f ); + addDungeonLoot(new ItemStack(Item.ingotIron), 1.00f, 1, 4); + addDungeonLoot(new ItemStack(Item.bread), 1.00f ); + addDungeonLoot(new ItemStack(Item.wheat), 1.00f, 1, 4); + addDungeonLoot(new ItemStack(Item.gunpowder), 1.00f, 1, 4); + addDungeonLoot(new ItemStack(Item.silk), 1.00f, 1, 4); + addDungeonLoot(new ItemStack(Item.bucketEmpty), 1.00f ); + addDungeonLoot(new ItemStack(Item.appleGold), 0.01f ); + addDungeonLoot(new ItemStack(Item.redstone), 0.50f, 1, 4); + addDungeonLoot(new ItemStack(Item.record13), 0.05f ); + addDungeonLoot(new ItemStack(Item.recordCat), 0.05f ); + addDungeonLoot(new ItemStack(Item.dyePowder, 1, 3), 1.00f ); + } + } diff --git a/forge/forge_common/net/minecraft/src/forge/ObjectPair.java b/forge/forge_common/net/minecraft/src/forge/ObjectPair.java new file mode 100644 index 0000000000..ec5f03a9a9 --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/ObjectPair.java @@ -0,0 +1,40 @@ +package net.minecraft.src.forge; + +/** + * A class that holds two generic values, can be used as a Key/Value pair, + * but is used in forge as a frequency/object pair. + * + * @param The type of the first value + * @param The Type of the second value + */ +public class ObjectPair +{ + private T1 object1; + private T2 object2; + + public ObjectPair(T1 obj1, T2 obj2) + { + this.object1 = obj1; + this.object2 = obj2; + } + + public T1 getValue1() + { + return this.object1; + } + + public T2 getValue2() + { + return this.object2; + } + + public void setValue1(T1 value) + { + object1 = value; + } + + public void setValue2(T2 value) + { + object2 = value; + } +} diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch new file mode 100644 index 0000000000..be5b7b7eda --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch @@ -0,0 +1,34 @@ +--- ../src_base/minecraft/net/minecraft/src/WorldGenDungeons.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/WorldGenDungeons.java 0000-00-00 00:00:00.000000000 -0000 +@@ -7,6 +7,8 @@ + import java.io.PrintStream; + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // WorldGenerator, World, Material, Block, + // TileEntityChest, TileEntityMobSpawner, ItemStack, Item +@@ -129,11 +131,11 @@ + int k4 = 0; + do + { +- if(k4 >= 8) ++ if(k4 >= MinecraftForge.getDungeonLootTries()) + { + break label0; + } +- ItemStack itemstack = pickCheckLootItem(random); ++ ItemStack itemstack = MinecraftForge.getRandomDungeonLoot(random); + if(itemstack != null) + { + tileentitychest.setInventorySlotContents(random.nextInt(tileentitychest.getSizeInventory()), itemstack); +@@ -148,7 +150,7 @@ + TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(i, j, k); + if(tileentitymobspawner != null) + { +- tileentitymobspawner.setMobID(pickMobSpawner(random)); ++ tileentitymobspawner.setMobID(MinecraftForge.getRandomDungeonMob(random)); + } else + { + System.err.println((new StringBuilder()).append("Failed to fetch mob spawner entity at (").append(i).append(", ").append(j).append(", ").append(k).append(")").toString()); diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch new file mode 100644 index 0000000000..c1b177f279 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch @@ -0,0 +1,34 @@ +--- ../src_base/minecraft_server/net/minecraft/src/WorldGenDungeons.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldGenDungeons.java 0000-00-00 00:00:00.000000000 -0000 +@@ -7,6 +7,8 @@ + import java.io.PrintStream; + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // WorldGenerator, World, Material, Block, + // TileEntityChest, TileEntityMobSpawner, ItemStack, Item +@@ -129,11 +131,11 @@ + int k4 = 0; + do + { +- if(k4 >= 8) ++ if(k4 >= MinecraftForge.getDungeonLootTries()) + { + break label0; + } +- ItemStack itemstack = pickCheckLootItem(random); ++ ItemStack itemstack = MinecraftForge.getRandomDungeonLoot(random); + if(itemstack != null) + { + tileentitychest.setInventorySlotContents(random.nextInt(tileentitychest.getSizeInventory()), itemstack); +@@ -148,7 +150,7 @@ + TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(i, j, k); + if(tileentitymobspawner != null) + { +- tileentitymobspawner.setMobID(pickMobSpawner(random)); ++ tileentitymobspawner.setMobID(MinecraftForge.getRandomDungeonMob(random)); + } else + { + System.err.println((new StringBuilder()).append("Failed to fetch mob spawner entity at (").append(i).append(", ").append(j).append(", ").append(k).append(")").toString()); From 52de732b8e77a52890ab0a9d85274866c6327658 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 20 Dec 2011 21:39:53 +0000 Subject: [PATCH 160/169] Fixed a minor crop fortune bug. --- forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch | 2 +- .../minecraft_server/net/minecraft/src/BlockCrops.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 4c7af8d45a..2092f97031 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -27,7 +27,7 @@ - int j1 = 3 + i1; - for(int k1 = 0; k1 < j1; k1++) + -+ for(int n = 0; n < 3; n++) ++ for(int n = 0; n < 3+fortune; n++) { - if(world.rand.nextInt(15) <= l) + if (world.rand.nextInt(15) <= md) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 91ca055c20..81efe2b35b 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -24,7 +24,7 @@ + tr.add(new ItemStack(Item.wheat)); + } + -+ for(int n = 0; n < 3; n++) ++ for(int n = 0; n < 3+fortune; n++) { - return; - } From 2936697302fb16c1011631e4604a7ba6fb16be55 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 21 Dec 2011 00:44:53 +0000 Subject: [PATCH 161/169] Replaced dropBlockAsItemWithChance in BlockNetherStalk with getBlockDropped. --- .../minecraft/src/BlockNetherStalk.java.patch | 56 ++++++++++++++++++ .../minecraft/src/BlockNetherStalk.java.patch | 59 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch new file mode 100644 index 0000000000..028e3ddb0f --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch @@ -0,0 +1,56 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockNetherStalk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockNetherStalk.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import java.util.ArrayList; + import java.util.Random; + + // Referenced classes of package net.minecraft.src: +@@ -65,26 +66,26 @@ + return 6; + } + +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1) ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) + { +- if(world.multiplayerWorld) +- { +- return; +- } +- int j1 = 1; +- if(l >= 3) +- { +- j1 = 2 + world.rand.nextInt(3); +- if(i1 > 0) +- { +- j1 += world.rand.nextInt(i1 + 1); +- } +- } +- for(int k1 = 0; k1 < j1; k1++) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(Item.netherStalkSeeds)); +- } +- ++ ArrayList ret = new ArrayList(); ++ ++ int count = 1; ++ if (md >= 3) ++ { ++ count = 2 + world.rand.nextInt(3); ++ if (fortune > 0) ++ { ++ count += world.rand.nextInt(fortune + 1); ++ } ++ } ++ for (int n = 0; n < count; n++) ++ { ++ ret.add(new ItemStack(Item.netherStalkSeeds)); ++ } ++ return ret; ++ + } + + public int idDropped(int i, Random random, int j) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch new file mode 100644 index 0000000000..b2b74f5c79 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch @@ -0,0 +1,59 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockNetherStalk.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockNetherStalk.java 0000-00-00 00:00:00.000000000 -0000 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import java.util.ArrayList; + import java.util.Random; + + // Referenced classes of package net.minecraft.src: +@@ -64,27 +65,27 @@ + { + return 6; + } +- +- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1) +- { +- if(world.singleplayerWorld) +- { +- return; +- } +- int j1 = 1; +- if(l >= 3) +- { +- j1 = 2 + world.rand.nextInt(3); +- if(i1 > 0) +- { +- j1 += world.rand.nextInt(i1 + 1); +- } +- } +- for(int k1 = 0; k1 < j1; k1++) +- { +- dropBlockAsItem_do(world, i, j, k, new ItemStack(Item.netherStalkSeeds)); +- } +- ++ ++ @Override ++ public ArrayList getBlockDropped(World world, int i, int j, int k, int md, int fortune) ++ { ++ ArrayList ret = new ArrayList(); ++ ++ int count = 1; ++ if (md >= 3) ++ { ++ count = 2 + world.rand.nextInt(3); ++ if (fortune > 0) ++ { ++ count += world.rand.nextInt(fortune + 1); ++ } ++ } ++ for (int n = 0; n < count; n++) ++ { ++ ret.add(new ItemStack(Item.netherStalkSeeds)); ++ } ++ return ret; ++ + } + + public int idDropped(int i, Random random, int j) From a38c8bd427363fa3d4861b1d309ce56d5429464e Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 21 Dec 2011 04:30:53 +0000 Subject: [PATCH 162/169] Added hooks to BlockFire for setting block flame interaction properties. --- .../net/minecraft/src/Block.java.patch | 95 ++++++- .../net/minecraft/src/BlockFire.java.patch | 257 ++++++++++++++++++ .../net/minecraft/src/RenderBlocks.java.patch | 54 ++++ .../net/minecraft/src/Block.java.patch | 94 ++++++- .../net/minecraft/src/BlockFire.java.patch | 204 ++++++++++++++ 5 files changed, 702 insertions(+), 2 deletions(-) create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index b991e0a439..04cda65444 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -130,7 +130,7 @@ } } -@@ -805,6 +848,107 @@ +@@ -805,6 +848,200 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } @@ -234,6 +234,99 @@ + public void addCreativeItems(ArrayList itemList) + { + } ++ ++ private static int blockFireSpreadSpeed[] = new int[256]; ++ private static int blockFlammability[] = new int[256]; ++ ++ /** ++ * Chance that fire will spread and consume this block. ++ * 300 being a 100% chance, 0, being a 0% chance. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return A number ranging from 0 to 300 relating used to determine if the block will be consumed by fire ++ */ ++ public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, int face) ++ { ++ return blockFlammability[blockID]; ++ } ++ ++ /** ++ * Called when fire is updating, checks if a block face can catch fire. ++ * ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return True if the face can be on fire, false otherwise. ++ */ ++ public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, int face) ++ { ++ return getFlammability(world, x, y, z, metadata, face) > 0; ++ } ++ ++ /** ++ * Called when fire is updating on a neighbor block. ++ * The higher the number returned, the faster fire will spread around this block. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return A number that is used to determine the speed of fire growth around the block ++ */ ++ public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, int face) ++ { ++ return blockFireSpreadSpeed[blockID]; ++ } ++ ++ /** ++ * Currently only called by fire when it is on top of this block. ++ * Returning true will prevent the fire from naturally dying during updating. ++ * Also prevents firing from dying from rain. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return ++ */ ++ public boolean isFireSource(World world, int x, int y, int z, int metadata, int face) ++ { ++ if (blockID == Block.netherrack.blockID && face == 0) ++ { ++ return true; ++ } ++ if ((world.worldProvider instanceof WorldProviderEnd) && blockID == Block.bedrock.blockID && face == 0) ++ { ++ return true; ++ } ++ return false; ++ } ++ ++ /** ++ * Called by BlockFire to setup the burn values of vanilla blocks. ++ * @param id The block id ++ * @param encouragement How much the block encourages fire to spread ++ * @param flammability how easy a block is to catch fire ++ */ ++ protected static void setBurnRate(int id, int encouragement, int flammability) ++ { ++ blockFireSpreadSpeed[id] = encouragement; ++ blockFlammability[id] = flammability; ++ } ++ + static Class _mthclass$(String s) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch new file mode 100644 index 0000000000..b61c786a55 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch @@ -0,0 +1,257 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockFire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockFire.java 0000-00-00 00:00:00.000000000 -0000 +@@ -14,14 +14,9 @@ + public class BlockFire extends Block + { + +- private int chanceToEncourageFire[]; +- private int abilityToCatchFire[]; +- + protected BlockFire(int i, int j) + { + super(i, j, Material.fire); +- chanceToEncourageFire = new int[256]; +- abilityToCatchFire = new int[256]; + setTickOnLoad(true); + } + +@@ -39,12 +34,6 @@ + setBurnRate(Block.vine.blockID, 15, 100); + } + +- private void setBurnRate(int i, int j, int k) +- { +- chanceToEncourageFire[i] = j; +- abilityToCatchFire[i] = k; +- } +- + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k) + { + return null; +@@ -77,11 +66,9 @@ + + public void updateTick(World world, int i, int j, int k, Random random) + { +- boolean flag = world.getBlockId(i, j - 1, k) == Block.netherrack.blockID; +- if((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID) +- { +- flag = true; +- } ++ Block base = Block.blocksList[world.getBlockId(i, j - 1, k)]; ++ boolean flag = (base != null && base.isFireSource(world, i, j - 1, k, world.getBlockMetadata(i, j - 1, k), 0)); ++ + if(!canPlaceBlockAt(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); +@@ -99,23 +86,23 @@ + world.scheduleBlockUpdate(i, j, k, blockID, tickRate()); + if(!flag && !func_263_h(world, i, j, k)) + { +- if(!world.isBlockNormalCube(i, j - 1, k) || l > 3) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) || l > 3) + { + world.setBlockWithNotify(i, j, k, 0); + } + return; + } +- if(!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0) ++ if(!flag && !canBlockCatchFire(world, i, j - 1, k, 0) && l == 15 && random.nextInt(4) == 0) + { + world.setBlockWithNotify(i, j, k, 0); + return; + } +- tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l); +- tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l); +- tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l); +- tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l); +- tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l); +- tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l); ++ tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4); ++ tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5); ++ tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0); ++ tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1); ++ tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3); ++ tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2); + for(int i1 = i - 1; i1 <= i + 1; i1++) + { + for(int j1 = k - 1; j1 <= k + 1; j1++) +@@ -155,9 +142,14 @@ + + } + +- private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1) ++ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face) + { +- int j1 = abilityToCatchFire[world.getBlockId(i, j, k)]; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ int j1 = 0; ++ if (block != null) ++ { ++ j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } + if(random.nextInt(l) < j1) + { + boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID; +@@ -182,27 +174,27 @@ + + private boolean func_263_h(World world, int i, int j, int k) + { +- if(canBlockCatchFire(world, i + 1, j, k)) ++ if(canBlockCatchFire(world, i + 1, j, k, 4)) + { + return true; + } +- if(canBlockCatchFire(world, i - 1, j, k)) ++ if(canBlockCatchFire(world, i - 1, j, k, 5)) + { + return true; + } +- if(canBlockCatchFire(world, i, j - 1, k)) ++ if(canBlockCatchFire(world, i, j - 1, k, 0)) + { + return true; + } +- if(canBlockCatchFire(world, i, j + 1, k)) ++ if(canBlockCatchFire(world, i, j + 1, k, 1)) + { + return true; + } +- if(canBlockCatchFire(world, i, j, k - 1)) ++ if(canBlockCatchFire(world, i, j, k - 1, 3)) + { + return true; + } +- return canBlockCatchFire(world, i, j, k + 1); ++ return canBlockCatchFire(world, i, j, k + 1, 2); + } + + private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k) +@@ -213,12 +205,12 @@ + return 0; + } else + { +- l = getChanceToEncourageFire(world, i + 1, j, k, l); +- l = getChanceToEncourageFire(world, i - 1, j, k, l); +- l = getChanceToEncourageFire(world, i, j - 1, k, l); +- l = getChanceToEncourageFire(world, i, j + 1, k, l); +- l = getChanceToEncourageFire(world, i, j, k - 1, l); +- l = getChanceToEncourageFire(world, i, j, k + 1, l); ++ l = getChanceToEncourageFire(world, i + 1, j, k, l, 5); ++ l = getChanceToEncourageFire(world, i - 1, j, k, l, 4); ++ l = getChanceToEncourageFire(world, i, j - 1, k, l, 0); ++ l = getChanceToEncourageFire(world, i, j + 1, k, l, 1); ++ l = getChanceToEncourageFire(world, i, j, k - 1, l, 3); ++ l = getChanceToEncourageFire(world, i, j, k + 1, l, 2); + return l; + } + } +@@ -228,14 +220,25 @@ + return false; + } + +- public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k) +- { +- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0; +- } + +- public int getChanceToEncourageFire(World world, int i, int j, int k, int l) ++ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face) + { +- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)]; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ if (block != null) ++ { ++ return block.isFlammable(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } ++ return false; ++ } ++ ++ public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face) ++ { ++ int i1 = 0; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ if (block != null) ++ { ++ i1 = block.getFireSpreadSpeed(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } + if(i1 > l) + { + return i1; +@@ -247,12 +250,12 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k) || func_263_h(world, i, j, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 0) || func_263_h(world, i, j, k); + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { +- if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); + return; +@@ -268,7 +271,7 @@ + { + return; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); + return; +@@ -285,7 +288,7 @@ + { + world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F); + } +- if(world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k)) ++ if(world.isBlockSolidOnSide(i, j - 1, k, 0) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 0)) + { + for(int l = 0; l < 3; l++) + { +@@ -297,7 +300,7 @@ + + } else + { +- if(Block.fire.canBlockCatchFire(world, i - 1, j, k)) ++ if(Block.fire.canBlockCatchFire(world, i - 1, j, k, 4)) + { + for(int i1 = 0; i1 < 2; i1++) + { +@@ -308,7 +311,7 @@ + } + + } +- if(Block.fire.canBlockCatchFire(world, i + 1, j, k)) ++ if(Block.fire.canBlockCatchFire(world, i + 1, j, k, 5)) + { + for(int j1 = 0; j1 < 2; j1++) + { +@@ -319,7 +322,7 @@ + } + + } +- if(Block.fire.canBlockCatchFire(world, i, j, k - 1)) ++ if(Block.fire.canBlockCatchFire(world, i, j, k - 1, 3)) + { + for(int k1 = 0; k1 < 2; k1++) + { +@@ -330,7 +333,7 @@ + } + + } +- if(Block.fire.canBlockCatchFire(world, i, j, k + 1)) ++ if(Block.fire.canBlockCatchFire(world, i, j, k + 1, 2)) + { + for(int l1 = 0; l1 < 2; l1++) + { +@@ -341,7 +344,7 @@ + } + + } +- if(Block.fire.canBlockCatchFire(world, i, j + 1, k)) ++ if(Block.fire.canBlockCatchFire(world, i, j + 1, k, 1)) + { + for(int i2 = 0; i2 < 2; i2++) + { diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index 01495bb6d5..0225ac40fe 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,5 +1,59 @@ --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +@@ -1332,7 +1332,7 @@ + double d2 = (float)j1 / 256F; + double d3 = ((float)j1 + 15.99F) / 256F; + float f = 1.4F; +- if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k)) ++ if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k, 0)) + { + float f1 = 0.2F; + float f2 = 0.0625F; +@@ -1349,7 +1349,7 @@ + d1 = d; + d = d4; + } +- if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k)) ++ if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k, 4)) + { + tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2); + tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3); +@@ -1360,7 +1360,7 @@ + tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3); + tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2); + } +- if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k)) ++ if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k, 5)) + { + tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2); + tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3); +@@ -1371,7 +1371,7 @@ + tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3); + tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2); + } +- if(Block.fire.canBlockCatchFire(blockAccess, i, j, k - 1)) ++ if(Block.fire.canBlockCatchFire(blockAccess, i, j, k - 1, 3)) + { + tessellator.addVertexWithUV(i + 0, (float)j + f + f2, (float)k + f1, d1, d2); + tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 0, d1, d3); +@@ -1382,7 +1382,7 @@ + tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 0, d1, d3); + tessellator.addVertexWithUV(i + 0, (float)j + f + f2, (float)k + f1, d1, d2); + } +- if(Block.fire.canBlockCatchFire(blockAccess, i, j, k + 1)) ++ if(Block.fire.canBlockCatchFire(blockAccess, i, j, k + 1, 2)) + { + tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2); + tessellator.addVertexWithUV(i + 1, (float)(j + 0) + f2, (k + 1) - 0, d, d3); +@@ -1393,7 +1393,7 @@ + tessellator.addVertexWithUV(i + 1, (float)(j + 0) + f2, (k + 1) - 0, d, d3); + tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2); + } +- if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k)) ++ if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k, 1)) + { + double d5 = (double)i + 0.5D + 0.5D; + double d7 = ((double)i + 0.5D) - 0.5D; @@ -3301,7 +3301,7 @@ colorBlueTopRight *= f27; int k2 = block.getBlockTexture(blockAccess, i, j, k, 2); diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 3db91cbc66..dd3b4612a0 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -115,7 +115,7 @@ } } -@@ -725,6 +767,99 @@ +@@ -725,6 +767,191 @@ return blockMaterial.getMaterialMobility(); } @@ -211,6 +211,98 @@ + int i, int j, int k) { + return world.setBlockWithNotify(i, j, k, 0); + } ++ ++ private static int chanceToEncourageFire[] = new int[256]; ++ private static int blockFlammability[] = new int[256]; ++ ++ /** ++ * Chance that fire will spread and consume this block. ++ * 300 being a 100% chance, 0, being a 0% chance. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return A number ranging from 0 to 300 relating used to determine if the block will be consumed by fire ++ */ ++ public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, int face) ++ { ++ return blockFlammability[blockID]; ++ } ++ ++ /** ++ * Called when fire is updating, checks if a block face can catch fire. ++ * ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return True if the face can be on fire, false otherwise. ++ */ ++ public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, int face) ++ { ++ return getFlammability(world, x, y, z, metadata, face) > 0; ++ } ++ ++ /** ++ * Called when fire is updating on a neighbor block. ++ * The higher the number returned, the faster fire will spread around this block. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return A number that is used to determine the speed of fire growth around the block ++ */ ++ public int chanceToEncourageFire(World world, int x, int y, int z, int metadata, int face) ++ { ++ return chanceToEncourageFire[blockID]; ++ } ++ ++ /** ++ * Currently only called by fire when it is on top of this block. ++ * Returning true will prevent the fire from naturally dieing during updating. ++ * Also prevents firing from dieing from rain. ++ * ++ * @param world The current world ++ * @param x The blocks X position ++ * @param y The blocks Y position ++ * @param z The blocks Z position ++ * @param metadata The blocks current metadata ++ * @param face The face that the fire is coming from ++ * @return ++ */ ++ public boolean isFireSource(World world, int x, int y, int z, int metadata, int face) ++ { ++ if (blockID == Block.netherrack.blockID && face == 0) ++ { ++ return true; ++ } ++ if ((world.worldProvider instanceof WorldProviderEnd) && blockID == Block.bedrock.blockID && face == 0) ++ { ++ return true; ++ } ++ return false; ++ } ++ ++ /** ++ * Called by BlockFire to setup the burn values of vanilla blocks. ++ * @param id The block id ++ * @param encouragement How much the block encourages fire to spread ++ * @param flammability how easy a block is to catch fire ++ */ ++ protected static void setBurnRate(int id, int encouragement, int flammability) ++ { ++ chanceToEncourageFire[id] = encouragement; ++ blockFlammability[id] = flammability; ++ } + static Class _mthclass$(String s) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch new file mode 100644 index 0000000000..e2555d5a53 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch @@ -0,0 +1,204 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockFire.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockFire.java 0000-00-00 00:00:00.000000000 -0000 +@@ -13,15 +13,9 @@ + + public class BlockFire extends Block + { +- +- private int chanceToEncourageFire[]; +- private int abilityToCatchFire[]; +- + protected BlockFire(int i, int j) + { + super(i, j, Material.fire); +- chanceToEncourageFire = new int[256]; +- abilityToCatchFire = new int[256]; + setTickOnLoad(true); + } + +@@ -39,12 +33,6 @@ + setBurnRate(Block.vine.blockID, 15, 100); + } + +- private void setBurnRate(int i, int j, int k) +- { +- chanceToEncourageFire[i] = j; +- abilityToCatchFire[i] = k; +- } +- + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k) + { + return null; +@@ -77,11 +65,9 @@ + + public void updateTick(World world, int i, int j, int k, Random random) + { +- boolean flag = world.getBlockId(i, j - 1, k) == Block.netherrack.blockID; +- if((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID) +- { +- flag = true; +- } ++ Block base = Block.blocksList[world.getBlockId(i, j - 1, k)]; ++ boolean flag = (base != null && base.isFireSource(world, i, j - 1, k, world.getBlockMetadata(i, j - 1, k), 0)); ++ + if(!canPlaceBlockAt(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); +@@ -99,23 +85,23 @@ + world.scheduleBlockUpdate(i, j, k, blockID, tickRate()); + if(!flag && !func_268_g(world, i, j, k)) + { +- if(!world.isBlockNormalCube(i, j - 1, k) || l > 3) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) || l > 3) + { + world.setBlockWithNotify(i, j, k, 0); + } + return; + } +- if(!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0) ++ if(!flag && !canBlockCatchFire(world, i, j - 1, k, 0) && l == 15 && random.nextInt(4) == 0) + { + world.setBlockWithNotify(i, j, k, 0); + return; + } +- tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l); +- tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l); +- tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l); +- tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l); +- tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l); +- tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l); ++ tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4); ++ tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5); ++ tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0); ++ tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1); ++ tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3); ++ tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2); + for(int i1 = i - 1; i1 <= i + 1; i1++) + { + for(int j1 = k - 1; j1 <= k + 1; j1++) +@@ -155,9 +141,14 @@ + + } + +- private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1) ++ private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face) + { +- int j1 = abilityToCatchFire[world.getBlockId(i, j, k)]; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ int j1 = 0; ++ if (block != null) ++ { ++ j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } + if(random.nextInt(l) < j1) + { + boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID; +@@ -182,27 +173,27 @@ + + private boolean func_268_g(World world, int i, int j, int k) + { +- if(canBlockCatchFire(world, i + 1, j, k)) ++ if(canBlockCatchFire(world, i + 1, j, k, 4)) + { + return true; + } +- if(canBlockCatchFire(world, i - 1, j, k)) ++ if(canBlockCatchFire(world, i - 1, j, k, 5)) + { + return true; + } +- if(canBlockCatchFire(world, i, j - 1, k)) ++ if(canBlockCatchFire(world, i, j - 1, k, 0)) + { + return true; + } +- if(canBlockCatchFire(world, i, j + 1, k)) ++ if(canBlockCatchFire(world, i, j + 1, k, 1)) + { + return true; + } +- if(canBlockCatchFire(world, i, j, k - 1)) ++ if(canBlockCatchFire(world, i, j, k - 1, 3)) + { + return true; + } +- return canBlockCatchFire(world, i, j, k + 1); ++ return canBlockCatchFire(world, i, j, k + 1, 2); + } + + private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k) +@@ -213,12 +204,12 @@ + return 0; + } else + { +- l = getChanceToEncourageFire(world, i + 1, j, k, l); +- l = getChanceToEncourageFire(world, i - 1, j, k, l); +- l = getChanceToEncourageFire(world, i, j - 1, k, l); +- l = getChanceToEncourageFire(world, i, j + 1, k, l); +- l = getChanceToEncourageFire(world, i, j, k - 1, l); +- l = getChanceToEncourageFire(world, i, j, k + 1, l); ++ l = getChanceToEncourageFire(world, i + 1, j, k, l, 5); ++ l = getChanceToEncourageFire(world, i - 1, j, k, l, 4); ++ l = getChanceToEncourageFire(world, i, j - 1, k, l, 0); ++ l = getChanceToEncourageFire(world, i, j + 1, k, l, 1); ++ l = getChanceToEncourageFire(world, i, j, k - 1, l, 3); ++ l = getChanceToEncourageFire(world, i, j, k + 1, l, 2); + return l; + } + } +@@ -228,14 +219,24 @@ + return false; + } + +- public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k) +- { +- return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0; +- } +- +- public int getChanceToEncourageFire(World world, int i, int j, int k, int l) ++ public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face) + { +- int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)]; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ if (block != null) ++ { ++ return block.isFlammable(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } ++ return false; ++ } ++ ++ public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face) ++ { ++ int i1 = 0; ++ Block block = Block.blocksList[world.getBlockId(i, j, k)]; ++ if (block != null) ++ { ++ i1 = block.chanceToEncourageFire(world, i, j, k, world.getBlockMetadata(i, j, k), face); ++ } + if(i1 > l) + { + return i1; +@@ -247,12 +248,12 @@ + + public boolean canPlaceBlockAt(World world, int i, int j, int k) + { +- return world.isBlockNormalCube(i, j - 1, k) || func_268_g(world, i, j, k); ++ return world.isBlockSolidOnSide(i, j - 1, k, 0) || func_268_g(world, i, j, k); + } + + public void onNeighborBlockChange(World world, int i, int j, int k, int l) + { +- if(!world.isBlockNormalCube(i, j - 1, k) && !func_268_g(world, i, j, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_268_g(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); + return; +@@ -268,7 +269,7 @@ + { + return; + } +- if(!world.isBlockNormalCube(i, j - 1, k) && !func_268_g(world, i, j, k)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_268_g(world, i, j, k)) + { + world.setBlockWithNotify(i, j, k, 0); + return; From b91eb1ceacbf099751921f453fa51829a8822cb2 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 21 Dec 2011 04:38:59 +0000 Subject: [PATCH 163/169] Added server side prototypes for addCreativeItems()s They are unused, but declared for compiling compatibility. --- .../net/minecraft/src/Block.java.patch | 8 +++++- .../net/minecraft/src/Item.java.patch | 27 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index dd3b4612a0..ce80187300 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -115,7 +115,7 @@ } } -@@ -725,6 +767,191 @@ +@@ -725,6 +767,197 @@ return blockMaterial.getMaterialMobility(); } @@ -211,6 +211,12 @@ + int i, int j, int k) { + return world.setBlockWithNotify(i, j, k, 0); + } ++ ++ /* FORGE: This is not called by the server, but declared here for compatibility ++ */ ++ public void addCreativeItems(ArrayList itemList) ++ { ++ } + + private static int chanceToEncourageFire[] = new int[256]; + private static int blockFlammability[] = new int[256]; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 8c426a6f49..9b3f17c142 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -@@ -175,6 +175,9 @@ +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.io.PrintStream; ++import java.util.ArrayList; + import java.util.Random; + + // Referenced classes of package net.minecraft.src: +@@ -175,6 +176,9 @@ private String potionInfo; private String itemName; @@ -10,7 +18,7 @@ protected Item(int i) { maxStackSize = 64; -@@ -219,6 +222,13 @@ +@@ -219,6 +223,13 @@ return 1.0F; } @@ -24,7 +32,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -266,6 +276,29 @@ +@@ -266,6 +277,29 @@ return maxDamage > 0 && !hasSubtypes; } @@ -54,3 +62,16 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; +@@ -414,6 +448,12 @@ + return 0; + } + ++ /* FORGE: This is not called by the server, but declared here for compatibility ++ */ ++ public void addCreativeItems(ArrayList itemList) ++ { ++ } ++ + static + { + shovelSteel = (new ItemSpade(0, EnumToolMaterial.IRON)).setIconCoord(2, 5).setItemName("shovelIron"); From 6e1442e8e616c7264f73d6ec7191662336a7f224 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Dec 2011 06:34:57 +0000 Subject: [PATCH 164/169] Deprecated IUseItemFirst, and made onUseItemFirst work in Creative. --- .../minecraft/src/forge/IUseItemFirst.java | 3 +++ .../net/minecraft/src/Item.java.patch | 21 ++++++++++++--- .../src/PlayerControllerMP.java.patch | 23 ++++++++-------- .../src/PlayerControllerSP.java.patch | 23 ++++++++-------- .../net/minecraft/src/Item.java.patch | 21 ++++++++++++--- .../src/ItemInWorldManager.java.patch | 26 +++++++++---------- 6 files changed, 74 insertions(+), 43 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java index 7d020aa28b..7584f215c5 100644 --- a/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java +++ b/forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java @@ -14,6 +14,9 @@ import net.minecraft.src.World; * This interface is to be implemented by item classes. It will allow an item * to perform a use before the block is activated. * + * @deprecated This interface is no longer used, the function has been moved to + * Item. The functionality remains, it simply does not require this interface + * any further. * @see Item */ public interface IUseItemFirst { diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 98a2982bbc..fe293965a2 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -18,7 +18,22 @@ protected Item(int i) { maxStackSize = 64; -@@ -231,6 +235,13 @@ +@@ -221,6 +225,14 @@ + return getIconFromDamage(itemstack.getItemDamage()); + } + ++ /* FORGE: This is called when the item is used, before the block is ++ * activated. Return true to prevent any further processing. ++ */ ++ public boolean onItemUseFirst(ItemStack ist, EntityPlayer player, ++ World world, int i, int j, int k, int l) { ++ return false; ++ } ++ + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { + return false; +@@ -231,6 +243,13 @@ return 1.0F; } @@ -32,7 +47,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -278,6 +289,29 @@ +@@ -278,6 +297,29 @@ return maxDamage > 0 && !hasSubtypes; } @@ -62,7 +77,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -473,6 +507,18 @@ +@@ -473,6 +515,18 @@ { return 0; } diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index 7eb087a9a4..2654ef9b27 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -1,16 +1,15 @@ --- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 -@@ -4,6 +4,9 @@ +@@ -4,6 +4,8 @@ package net.minecraft.src; -+import net.minecraft.src.forge.IUseItemFirst; +import net.minecraft.src.forge.ForgeHooks; + import net.minecraft.client.Minecraft; // Referenced classes of package net.minecraft.src: -@@ -68,13 +71,19 @@ +@@ -68,13 +70,19 @@ public boolean onPlayerDestroyBlock(int i, int j, int k, int l) { @@ -31,7 +30,7 @@ if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -103,7 +112,7 @@ +@@ -103,7 +111,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -40,7 +39,7 @@ { onPlayerDestroyBlock(i, j, k, l); } else -@@ -149,7 +158,7 @@ +@@ -149,7 +157,7 @@ return; } Block block = Block.blocksList[i1]; @@ -49,21 +48,21 @@ 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); -@@ -216,6 +225,13 @@ +@@ -216,6 +224,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); + -+ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); -+ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { -+ return true; -+ } ++ if (itemstack != null) { ++ Item it=itemstack.getItem(); ++ if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } + } int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -235,7 +251,11 @@ +@@ -235,7 +250,11 @@ return flag; } else { diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index c5d3891f8f..8db4198b10 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,15 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,8 @@ +@@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; -+import net.minecraft.src.forge.IUseItemFirst; +import net.minecraft.src.forge.ForgeHooks; import net.minecraft.client.Minecraft; -@@ -46,11 +48,17 @@ +@@ -46,11 +47,17 @@ public boolean onPlayerDestroyBlock(int i, int j, int k, int l) { @@ -29,7 +28,7 @@ if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -79,7 +87,7 @@ +@@ -79,7 +86,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -38,7 +37,7 @@ { onPlayerDestroyBlock(i, j, k, l); } -@@ -110,7 +118,7 @@ +@@ -110,7 +117,7 @@ return; } Block block = Block.blocksList[i1]; @@ -47,20 +46,20 @@ if(blockDestroySoundCounter % 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); -@@ -173,6 +181,12 @@ +@@ -173,6 +180,12 @@ public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { -+ if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem(); -+ if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { -+ return true; -+ } ++ if (itemstack != null) { ++ Item it=itemstack.getItem(); ++ if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } + } int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -183,7 +197,11 @@ +@@ -183,7 +196,11 @@ return false; } else { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 9b3f17c142..9d03b02040 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -18,7 +18,22 @@ protected Item(int i) { maxStackSize = 64; -@@ -219,6 +223,13 @@ +@@ -209,6 +213,14 @@ + return this; + } + ++ /* FORGE: This is called when the item is used, before the block is ++ * activated. Return true to prevent any further processing. ++ */ ++ public boolean onItemUseFirst(ItemStack ist, EntityPlayer player, ++ World world, int i, int j, int k, int l) { ++ return false; ++ } ++ + public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) + { + return false; +@@ -219,6 +231,13 @@ return 1.0F; } @@ -32,7 +47,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; -@@ -266,6 +277,29 @@ +@@ -266,6 +285,29 @@ return maxDamage > 0 && !hasSubtypes; } @@ -62,7 +77,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -414,6 +448,12 @@ +@@ -414,6 +456,12 @@ return 0; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index f6a6b2be26..c53a2c645a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,16 +1,15 @@ --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,7 +3,8 @@ +@@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode fieldsfirst package net.minecraft.src; - +import net.minecraft.src.forge.ForgeHooks; -+import net.minecraft.src.forge.IUseItemFirst; // Referenced classes of package net.minecraft.src: // EntityPlayer, PlayerCapabilities, World, Block, -@@ -81,7 +82,8 @@ +@@ -81,7 +81,8 @@ if(j != 0) { Block block = Block.blocksList[j]; @@ -20,7 +19,7 @@ if(f >= 1.0F) { field_22050_k = false; -@@ -108,7 +110,7 @@ +@@ -108,7 +109,7 @@ { Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); } @@ -29,7 +28,7 @@ { blockHarvessted(i, j, k); } else -@@ -128,7 +130,7 @@ +@@ -128,7 +129,7 @@ if(i1 != 0) { Block block = Block.blocksList[i1]; @@ -38,7 +37,7 @@ if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -150,16 +152,19 @@ +@@ -150,16 +151,19 @@ { Block block = Block.blocksList[thisWorld.getBlockId(i, j, k)]; int l = thisWorld.getBlockMetadata(i, j, k); @@ -63,7 +62,7 @@ int l = thisWorld.getBlockId(i, j, k); int i1 = thisWorld.getBlockMetadata(i, j, k); thisWorld.playAuxSFXAtEntity(thisPlayer, 2001, i, j, k, l + thisWorld.getBlockMetadata(i, j, k) * 256); -@@ -169,8 +174,7 @@ +@@ -169,8 +173,7 @@ ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld)); } else { @@ -73,7 +72,7 @@ if(itemstack != null) { itemstack.onDestroyBlock(l, i, j, k, thisPlayer); -@@ -204,6 +208,7 @@ +@@ -204,6 +207,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -81,15 +80,16 @@ } return true; } else -@@ -214,6 +219,11 @@ +@@ -214,6 +218,12 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { -+ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { -+ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); -+ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) ++ if (itemstack != null) { ++ Item it=itemstack.getItem(); ++ if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { + return true; -+ } ++ } ++ } int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { From 348a6fe03c369e6767e2222f9dfe357ecc37f132 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 21 Dec 2011 07:44:01 +0000 Subject: [PATCH 165/169] Added Item.onDroppedByPlayer hook --- .../net/minecraft/src/EntityPlayer.java.patch | 28 +++++++++++++++---- .../net/minecraft/src/Item.java.patch | 16 ++++++++++- .../net/minecraft/src/EntityPlayer.java.patch | 28 +++++++++++++++---- .../net/minecraft/src/Item.java.patch | 16 ++++++++++- 4 files changed, 76 insertions(+), 12 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 3e10b58ebe..c79b15d3d5 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -11,7 +11,25 @@ import java.util.*; // Referenced classes of package net.minecraft.src: -@@ -548,6 +552,8 @@ +@@ -502,7 +506,16 @@ + + public void dropCurrentItem() + { +- dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false); ++ ItemStack stack = inventory.getCurrentItem(); ++ if (stack == null) ++ { ++ return; ++ } ++ ++ if (stack.getItem().onDroppedByPlayer(stack, this)) ++ { ++ dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false); ++ } + } + + public void dropPlayerItem(ItemStack itemstack) +@@ -548,6 +561,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -20,7 +38,7 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -576,6 +582,45 @@ +@@ -576,6 +591,45 @@ return f1; } @@ -66,7 +84,7 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -774,6 +819,25 @@ +@@ -774,6 +828,25 @@ protected void damageEntity(DamageSource damagesource, int i) { @@ -92,7 +110,7 @@ if(!damagesource.unblockable() && func_35162_ad()) { i = 1 + i >> 1; -@@ -825,7 +889,9 @@ +@@ -825,7 +898,9 @@ public void destroyCurrentEquippedItem() { @@ -102,7 +120,7 @@ } public double getYOffset() -@@ -957,6 +1023,10 @@ +@@ -957,6 +1032,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index fe293965a2..2277b4b8f6 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -77,7 +77,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -473,6 +515,18 @@ +@@ -473,6 +515,32 @@ { return 0; } @@ -92,6 +92,20 @@ + { + itemList.add(new ItemStack(this, 1)); + } ++ } ++ ++ /** ++ * Called when a player drops the item into the world, ++ * returning false from this will prevent the item from ++ * being removed from the players inventory and spawning ++ * in the world ++ * ++ * @param player The player that dropped the item ++ * @param item The item stack, before the item is removed. ++ */ ++ public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player) ++ { ++ return true; + } static diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 65619dad62..55399e4b0d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -11,7 +11,25 @@ // Referenced classes of package net.minecraft.src: // EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, // ContainerPlayer, World, ChunkCoordinates, DataWatcher, -@@ -493,6 +497,8 @@ +@@ -447,7 +451,16 @@ + + public void dropCurrentItem() + { +- dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false); ++ ItemStack stack = inventory.getCurrentItem(); ++ if (stack == null) ++ { ++ return; ++ } ++ ++ if (stack.getItem().onDroppedByPlayer(stack, this)) ++ { ++ dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false); ++ } + } + + public void dropPlayerItem(ItemStack itemstack) +@@ -493,6 +506,8 @@ worldObj.entityJoinedWorld(entityitem); } @@ -20,7 +38,7 @@ public float getCurrentPlayerStrVsBlock(Block block) { float f = inventory.getStrVsBlock(block); -@@ -521,6 +527,45 @@ +@@ -521,6 +536,45 @@ return f1; } @@ -66,7 +84,7 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -718,7 +763,26 @@ +@@ -718,7 +772,26 @@ } protected void damageEntity(DamageSource damagesource, int i) @@ -94,7 +112,7 @@ if(!damagesource.unblockable() && func_35180_G()) { i = 1 + i >> 1; -@@ -770,7 +834,9 @@ +@@ -770,7 +843,9 @@ public void destroyCurrentEquippedItem() { @@ -104,7 +122,7 @@ } public double getYOffset() -@@ -896,6 +962,10 @@ +@@ -896,6 +971,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 9d03b02040..937d440b86 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -77,7 +77,7 @@ public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { return false; -@@ -414,6 +456,12 @@ +@@ -414,6 +456,26 @@ return 0; } @@ -86,6 +86,20 @@ + public void addCreativeItems(ArrayList itemList) + { + } ++ ++ /** ++ * Called when a player drops the item into the world, ++ * returning false from this will prevent the item from ++ * being removed from the players inventory and spawning ++ * in the world ++ * ++ * @param player The player that dropped the item ++ * @param item The item stack, before the item is removed. ++ */ ++ public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player) ++ { ++ return true; ++ } + static { From dbb5a37449315abc83b55e1f3d0e848d9ed274e7 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Dec 2011 09:01:45 +0000 Subject: [PATCH 166/169] Major rework of the rendering core. Added support for custom render context handling. --- .../minecraft/src/forge/ForgeHooksClient.java | 82 +++++++++++++------ .../src/forge/IRenderContextHandler.java | 16 ++++ .../src/forge/MinecraftForgeClient.java | 14 ++++ 3 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index e3c892e8b8..7531d6af93 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -41,25 +41,54 @@ public class ForgeHooksClient { return false; } - static HashMap tessellators=new HashMap(); - static HashMap textures=new HashMap(); + private static class TesKey implements Comparable { + public TesKey(int t, int s) { tex=t; sub=s; } + public int compareTo(TesKey key) { + if(sub==key.sub) return tex-key.tex; + return sub-key.sub; + } + public boolean equals(Object obj) { + return compareTo((TesKey)obj)==0; + } + public int hashCode() { + int c1=Integer.valueOf(tex).hashCode(); + int c2=Integer.valueOf(sub).hashCode(); + return c1+31*c2; + } + public int tex, sub; + } + + static HashMap tessellators= + new HashMap(); + static HashMap textures=new HashMap(); static boolean inWorld=false; - static HashSet renderTextureTest=new HashSet(); - static ArrayList renderTextureList=new ArrayList(); + static TreeSet renderTextures=new TreeSet(); static Tessellator defaultTessellator=null; + static HashMap renderHandlers=new + HashMap(); + + protected static void registerRenderContextHandler(String tex, int sub, + IRenderContextHandler handler) { + Integer n; + n=textures.get(tex); + if(n==null) { + n=ModLoader.getMinecraftInstance().renderEngine + .getTexture(tex); + textures.put(tex,n); + } + renderHandlers.put(new TesKey(n,sub),handler); + } protected static void bindTessellator(int tex, int sub) { - List key=Arrays.asList(tex,sub); + TesKey key=new TesKey(tex,sub); Tessellator t; - if(!tessellators.containsKey(key)) { + t=tessellators.get(key); + if(t==null) { t=new Tessellator(); tessellators.put(key,t); - } else { - t=(Tessellator)tessellators.get(key); } - if(inWorld && !renderTextureTest.contains(key)) { - renderTextureTest.add(key); - renderTextureList.add(key); + if(inWorld && !renderTextures.contains(key)) { + renderTextures.add(key); t.startDrawingQuads(); t.setTranslationD(defaultTessellator.xOffset, defaultTessellator.yOffset, @@ -69,13 +98,12 @@ public class ForgeHooksClient { } protected static void bindTexture(String name, int sub) { - int n; - if(!textures.containsKey(name)) { + Integer n; + n=textures.get(name); + if(n==null) { n=ModLoader.getMinecraftInstance().renderEngine .getTexture(name); textures.put(name,n); - } else { - n=(Integer)textures.get(name); } if(!inWorld) { if(Tessellator.instance.isDrawing) { @@ -113,25 +141,31 @@ public class ForgeHooksClient { GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); - renderTextureTest.clear(); - renderTextureList.clear(); + renderTextures.clear(); inWorld=true; } public static void afterRenderPass(int pass) { renderPass=-1; inWorld=false; - for(List l : renderTextureList) { - // TODO: call appropriate client hooks - Integer[] tn=(Integer[])l.toArray(); - GL11.glBindTexture(GL11.GL_TEXTURE_2D,tn[0]); - Tessellator t=(Tessellator)tessellators.get(l); - t.draw(); + for(TesKey tk : renderTextures) { + IRenderContextHandler irch=renderHandlers.get(tk); + GL11.glBindTexture(GL11.GL_TEXTURE_2D,tk.tex); + Tessellator t=tessellators.get(tk); + if(irch==null) { + t.draw(); + } else { + Tessellator.instance=t; + irch.beforeRenderContext(); + t.draw(); + irch.afterRenderContext(); + } } GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); Tessellator.renderingWorldRenderer=false; + Tessellator.instance=defaultTessellator; } public static void beforeBlockRender(Block block, @@ -171,7 +205,7 @@ public class ForgeHooksClient { return def; } } - + public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) { Tessellator tessellator = Tessellator.instance; if (renderBlocks.useInventoryTint) { diff --git a/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java b/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java new file mode 100644 index 0000000000..4eb1ee05d9 --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java @@ -0,0 +1,16 @@ +/* + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +public interface IRenderContextHandler { + /** Run before the specified rendering context. + */ + public void beforeRenderContext(); + + /** Run after the specified rendering context. + */ + public void afterRenderContext(); +} + diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 4163783968..8c5d270e9c 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -18,6 +18,20 @@ public class MinecraftForgeClient { ForgeHooksClient.highlightHandlers.add(handler); } + /** Register a new render context handler. A render context is a block + * of rendering performed with similar OpenGL modes, for example, + * texture name. + * @param tex The name of the texture for this render context. + * @param sub The subid of this render context. 0 is the default pass + * for normal rendering, higher subids render later. All subids of 0 + * will render before all subids of 1, etc. + * @param handler The handler to register. + */ + public static void registerRenderContextHandler(String tex, int sub, + IRenderContextHandler handler) { + ForgeHooksClient.registerRenderContextHandler(tex,sub,handler); + } + /** Bind a texture. This is used to bind a texture file when * performing your own rendering, rather than using ITextureProvider. * From f4eec04ebac7695779c54a96e08a332bc0ce7b5d Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Dec 2011 09:57:10 +0000 Subject: [PATCH 167/169] A minimalistic hook for rendering world effect overlays or other 3D overlay data. --- .../minecraft/src/forge/ForgeHooksClient.java | 11 ++++++++++- .../src/forge/IRenderWorldLastHandler.java | 17 +++++++++++++++++ .../net/minecraft/src/EntityRenderer.java.patch | 9 +++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 7531d6af93..69970116fd 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -30,7 +30,16 @@ public class ForgeHooksClient { return false; } - static LinkedList highlightHandlers = new LinkedList(); + public static void onRenderWorldLast(RenderGlobal rg, float f) { + for (IRenderWorldLastHandler handler : renderWorldLastHandlers) { + handler.onRenderWorldLast(rg,f); + } + } + + static LinkedList highlightHandlers = + new LinkedList(); + static LinkedList renderWorldLastHandlers = + new LinkedList(); public static boolean canRenderInPass(Block block, int pass) { if(block instanceof IMultipassRender) { diff --git a/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java b/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java new file mode 100644 index 0000000000..53160895f3 --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java @@ -0,0 +1,17 @@ +/* + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ +package net.minecraft.src.forge; + +import net.minecraft.src.RenderGlobal; + +public interface IRenderWorldLastHandler { + /** Called after rendering all the 3D data of the world. This is + * called before the user's tool is rendered, but otherwise after all + * 3D content. It is called twice in anaglyph mode. This is intended + * for rendering visual effect overlays into the world. + */ + void onRenderWorldLast(RenderGlobal rg, float f); +} + diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index c72429ad2b..d330267270 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -34,3 +34,12 @@ GL11.glEnable(3008 /*GL_ALPHA_TEST*/); } Profiler.endStartSection("weather"); +@@ -988,6 +993,8 @@ + setupFog(1, f); + GL11.glPopMatrix(); + } ++ Profiler.endStartSection("fhooks"); ++ ForgeHooksClient.onRenderWorldLast(renderglobal,f); + Profiler.endStartSection("hand"); + if(cameraZoom == 1.0D) + { From 90a4744130364ebf25082dd2801b9635063212dc Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Dec 2011 10:15:38 +0000 Subject: [PATCH 168/169] Fixed some strange behavior in snow blocks. Fixed a missing patch checkin. --- .../net/minecraft/src/BlockSnow.java.patch | 29 +++++++++++++++++++ .../src/PlayerControllerCreative.java.patch | 15 ++++++++++ .../net/minecraft/src/BlockSnow.java.patch | 28 ++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch new file mode 100644 index 0000000000..39b16e4b93 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch @@ -0,0 +1,29 @@ +--- ../src_base/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -82,15 +82,8 @@ + + public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) + { +- int i1 = Item.snowball.shiftedIndex; +- float f = 0.7F; +- double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- world.setBlockWithNotify(i, j, k, 0); ++ ++ dropBlockAsItem(world,i,j,k,l,0); + entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1); + } + +@@ -101,7 +94,7 @@ + + public int quantityDropped(Random random) + { +- return 0; ++ return 1; + } + + public void updateTick(World world, int i, int j, int k, Random random) diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch new file mode 100644 index 0000000000..ff735effa5 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch @@ -0,0 +1,15 @@ +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerCreative.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerCreative.java 0000-00-00 00:00:00.000000000 -0000 +@@ -58,6 +58,12 @@ + + public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) + { ++ if (itemstack != null) { ++ Item it=itemstack.getItem(); ++ if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) { ++ return true; ++ } ++ } + int i1 = world.getBlockId(i, j, k); + if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch new file mode 100644 index 0000000000..f167a91cf1 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch @@ -0,0 +1,28 @@ +--- ../src_base/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -82,15 +82,7 @@ + + public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) + { +- int i1 = Item.snowball.shiftedIndex; +- float f = 0.7F; +- double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; +- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0)); +- entityitem.delayBeforeCanPickup = 10; +- world.entityJoinedWorld(entityitem); +- world.setBlockWithNotify(i, j, k, 0); ++ dropBlockAsItem(world,i,j,k,l,0); + entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1); + } + +@@ -101,7 +93,7 @@ + + public int quantityDropped(Random random) + { +- return 0; ++ return 1; + } + + public void updateTick(World world, int i, int j, int k, Random random) From a4475c9e9a1e7c914930b43d55bcf10282d5e08e Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 21 Dec 2011 10:22:37 +0000 Subject: [PATCH 169/169] Bumping the version number. --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 9f2f2b2d7b..7668b13381 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -269,7 +269,7 @@ public class ForgeHooks { public static final int majorVersion=1; public static final int minorVersion=2; - public static final int revisionVersion=2; + public static final int revisionVersion=3; static { System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion); }