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

first batch of documentation + minor reformatings

Browse source
This commit is contained in:
Space Toad 2011-07-30 06:42:15 +00:00
parent 58f3084074
commit 5975944963
10 changed files with 202 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
forge/forge_common/net/minecraft/src/forge/Configuration.java
View file

@ -287,7 +287,6 @@ public class Configuration {
fileoutputstream.close(); fileoutputstream.close();
} }
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }

5
forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java
View file

@ -11,7 +11,10 @@ import net.minecraft.src.World;
public interface IBiomePopulator { 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); public void populate(World world, BiomeGenBase biomegenbase, int x, int z);

8
forge/forge_common/net/minecraft/src/forge/IBucketHandler.java
View file

@ -10,6 +10,14 @@ import net.minecraft.src.World;
public interface IBucketHandler { 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); public ItemStack fillCustomBucket(World w, int i, int j, int k);
} }

25
forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java
View file

@ -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 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);
} }

10
forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java
View file

@ -9,5 +9,15 @@ import net.minecraft.src.Block;
import net.minecraft.src.ItemTool; import net.minecraft.src.ItemTool;
public interface IHarvestHandler { 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); public boolean canHarvestBlock(ItemTool item, Block block);
} }

6
forge/forge_common/net/minecraft/src/forge/IMultipassRender.java
View file

@ -1,5 +1,9 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge; package net.minecraft.src.forge;
import net.minecraft.src.*;
public interface IMultipassRender { public interface IMultipassRender {
public boolean canRenderInPass(int n); public boolean canRenderInPass(int n);

27
forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java
View file

@ -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 { 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); public boolean canReplaceBlock(World world, int i, int j, int k, int bid);
/**
* Return the status of the actual replacement.
*/
public boolean getReplacedSuccess(); public boolean getReplacedSuccess();
} }

23
forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java
View file

@ -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 { 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, public float getSpecialExplosionResistance(World world, int i, int j, int k,
double src_x, double src_y, double src_z, Entity exploder); double src_x, double src_y, double src_z, Entity exploder);
} }

24
forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java
View file

@ -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 { 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, public boolean onItemUseFirst(ItemStack ist,
EntityPlayer player, World world, EntityPlayer player, World world,
int i, int j, int k, int l); int i, int j, int k, int l);

164
forge/minecraft.patch
View file

@ -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 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_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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:23:20.966701700 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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; return false;
} }
+ if(Block.blocksList[i1] instanceof IConnectRedstone) { + if (Block.blocksList[i1] instanceof IConnectRedstone) {
+ IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1]; + IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1];
+ return icr.canConnectRedstone(iblockaccess,i,j,k,l); + return icr.canConnectRedstone(iblockaccess, i, j, k, l);
+ } + }
if(Block.blocksList[i1].canProvidePower()) if(Block.blocksList[i1].canProvidePower())
{ {
return true; return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-07-29 16:35:26.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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-07-30 08:28:53.466719600 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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 l1 = xPosition * 16 + i;
int i2 = zPosition * 16 + k; int i2 = zPosition * 16 + k;
+ +
+ if(Block.blocksList[k1] instanceof IOverrideReplace) { + if (Block.blocksList[k1] instanceof IOverrideReplace) {
+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1]; + IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1];
+ if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l)) + if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l))
+ return iovr.getReplacedSuccess(); + return iovr.getReplacedSuccess();
+ } + }
+ +
blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
if(k1 != 0 && !worldObj.multiplayerWorld) 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 k1 = xPosition * 16 + i;
int l1 = zPosition * 16 + k; int l1 = zPosition * 16 + k;
+ +
+ if(Block.blocksList[j1] instanceof IOverrideReplace) { + if (Block.blocksList[j1] instanceof IOverrideReplace) {
+ IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1]; + IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[j1];
+ if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l)) + if (!iovr.canReplaceBlock(worldObj, k1, j, l1, l))
+ return iovr.getReplacedSuccess(); + return iovr.getReplacedSuccess();
+ } + }
+ +
blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
if(j1 != 0) 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.684144300 +0200
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; 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); generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-30 08:15:01.696145000 +0200
@@ -7,6 +7,9 @@ @@ -7,6 +7,9 @@
import java.util.*; import java.util.*;
import org.lwjgl.opengl.GL11; 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; 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 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_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-29 17:56:22.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-07-30 08:35:55.747872700 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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.*; import java.util.*;
@@ -65,7 +66,16 @@ @@ -65,7 +66,17 @@
int i5 = worldObj.getBlockId(j4, k4, l4); int i5 = worldObj.getBlockId(j4, k4, l4);
if(i5 > 0) if(i5 > 0)
{ {
- f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; - f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
+ if(Block.blocksList[i5] instanceof ISpecialResistance) { + if (Block.blocksList[i5] instanceof ISpecialResistance) {
+ ISpecialResistance isr=(ISpecialResistance) + ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5];
+ Block.blocksList[i5]; + f1 -= (isr.getSpecialExplosionResistance(
+ f1-=(isr.getSpecialExplosionResistance( + worldObj, j4, k4, l4, explosionX,
+ worldObj,j4,k4,l4, + explosionY, explosionZ, exploder) + 0.3F)
+ explosionX,explosionY,explosionZ, + * f2;
+ exploder) + 0.3F) * f2; + } else {
+ } else { + f1 -= (Block.blocksList[i5]
+ f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2; + .getExplosionResistance(exploder) + 0.3F)
+ } + * f2;
+ }
} }
if(f1 > 0.0F) if(f1 > 0.0F)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:27.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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.709145800 +0200
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; 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); 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.718146300 +0200
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -303,8 +304,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka
{ {
return true; return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-29 16:35:27.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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-30 08:15:01.733147100 +0200
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
package net.minecraft.src; 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; Tessellator tessellator = Tessellator.instance;
int i = entityliving.getItemIcon(itemstack); int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-07-29 16:35:27.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-29 17:06:13.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.737147400 +0200
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package net.minecraft.src; 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 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_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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-07-30 08:41:23.244604400 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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; 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) public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
{ {
+ if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) { + if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) {
+ IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem(); + IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem();
+ if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l)) + if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
+ return true; + return true;
+ } + }
+ }
int i1 = world.getBlockId(i, j, k); int i1 = world.getBlockId(i, j, k);
if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-30 08:15:01.745147800 +0200
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
package net.minecraft.src; 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); int k1 = Item.itemsList[i].getColorFromDamage(j);
float f = (float)(k1 >> 16 & 0xff) / 255F; float f = (float)(k1 >> 16 & 0xff) / 255F;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-29 16:35:27.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-29 16:58:43.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-30 08:28:15.329538300 +0200
@@ -3,8 +3,12 @@ @@ -3,8 +3,12 @@
// Decompiler options: packimports(3) braces deadcode // 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; import org.lwjgl.opengl.GL11;
// Referenced classes of package net.minecraft.src: // Referenced classes of package net.minecraft.src:
@@ -138,14 +142,23 @@ @@ -138,14 +142,27 @@
} }
Block block = Block.blocksList[i3]; Block block = Block.blocksList[i3];
int j3 = block.getRenderBlockPass(); int j3 = block.getRenderBlockPass();
+ +
+ if(block instanceof IMultipassRender) { + if (block instanceof IMultipassRender) {
+ if(j3 != i2) flag = true; + if (j3 != i2) {
+ IMultipassRender impr=(IMultipassRender)block; + flag = true;
+ if(impr.canRenderInPass(i2)) j3=i2; + }
+ } + IMultipassRender impr = (IMultipassRender) block;
+ if (impr.canRenderInPass(i2)) {
+ j3 = i2;
+ }
+ }
+ +
if(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 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_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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-07-30 08:15:01.754148300 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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; 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 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_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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-07-30 08:15:01.770149300 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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) 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.786150200 +0200
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; 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); generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
for(int j19 = k + 8; j19 < k + 8 + 16; j19++) 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 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_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-29 17:56:53.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-07-30 08:15:01.806151300 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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) if(f1 > 0.0F)
{ {
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-29 16:35:28.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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-30 08:15:01.811151600 +0200
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
import java.util.Random; 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); world.setBlockWithNotify(i, j, k, 0);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-29 16:35:28.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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-07-30 08:15:01.830152700 +0200
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode // 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)) 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java 2011-07-30 08:15:01.834152900 +0200
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; package net.minecraft.src;
@ -666,8 +672,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{ {
return true; 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 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_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-29 16:41:55.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-07-30 08:15:01.838153200 +0200
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; 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 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_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-29 16:57:37.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-07-30 08:15:01.842153400 +0200
@@ -169,12 +169,11 @@ @@ -169,12 +169,11 @@
sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
for(int k = 0; k < numBlocksToUpdate; k++) for(int k = 0; k < numBlocksToUpdate; k++)