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

Added server side prototypes for addCreativeItems()s They are unused, but declared for compiling compatibility.

Browse source
This commit is contained in:
LexManos 2011-12-21 04:38:59 +00:00
parent a38c8bd427
commit b91eb1ceac
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
View file

@ -115,7 +115,7 @@
} }
} }
@@ -725,6 +767,191 @@ @@ -725,6 +767,197 @@
return blockMaterial.getMaterialMobility(); return blockMaterial.getMaterialMobility();
} }
@ -212,6 +212,12 @@
+ return world.setBlockWithNotify(i, j, k, 0); + 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 chanceToEncourageFire[] = new int[256];
+ private static int blockFlammability[] = new int[256]; + private static int blockFlammability[] = new int[256];
+ +

27
forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
View file

@ -1,6 +1,14 @@
--- ../src_base/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 -0000
+++ ../src_work/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 potionInfo;
private String itemName; private String itemName;
@ -10,7 +18,7 @@
protected Item(int i) protected Item(int i)
{ {
maxStackSize = 64; maxStackSize = 64;
@@ -219,6 +222,13 @@ @@ -219,6 +223,13 @@
return 1.0F; return 1.0F;
} }
@ -24,7 +32,7 @@
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
{ {
return itemstack; return itemstack;
@@ -266,6 +276,29 @@ @@ -266,6 +277,29 @@
return maxDamage > 0 && !hasSubtypes; return maxDamage > 0 && !hasSubtypes;
} }
@ -54,3 +62,16 @@
public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
{ {
return false; 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");