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

[1.11] Fix initCapabilities for ItemStacks (#3379)

Browse source
This commit is contained in:
mezz 2016-11-16 14:15:02 -08:00 committed by LexManos
parent cc48280a8b
commit e498dc7532
3 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
patches/minecraft/net/minecraft/item/Item.java.patch
View file

@ -60,7 +60,7 @@
return p_77621_1_.func_147447_a(vec3d, vec3d1, p_77621_3_, !p_77621_3_, false); return p_77621_1_.func_147447_a(vec3d, vec3d1, p_77621_3_, !p_77621_3_, false);
} }
@@ -433,11 +440,604 @@ @@ -433,11 +440,605 @@
return false; return false;
} }
@ -638,7 +638,8 @@
+ * @param nbt NBT of this item serialized, or null. + * @param nbt NBT of this item serialized, or null.
+ * @return A holder instance associated with this ItemStack where you can hold capabilities for the life of this item. + * @return A holder instance associated with this ItemStack where you can hold capabilities for the life of this item.
+ */ + */
+ public net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + @Nullable
+ public net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt)
+ { + {
+ return null; + return null;
+ } + }
@ -665,7 +666,7 @@
public static void func_150900_l() public static void func_150900_l()
{ {
func_179214_a(Blocks.field_150350_a, new ItemAir(Blocks.field_150350_a)); func_179214_a(Blocks.field_150350_a, new ItemAir(Blocks.field_150350_a));
@@ -972,6 +1572,10 @@ @@ -972,6 +1573,10 @@
private final float field_78011_i; private final float field_78011_i;
private final int field_78008_j; private final int field_78008_j;
@ -676,7 +677,7 @@
private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_) private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_)
{ {
this.field_78001_f = p_i1874_3_; this.field_78001_f = p_i1874_3_;
@@ -1006,9 +1610,36 @@ @@ -1006,9 +1611,36 @@
return this.field_78008_j; return this.field_78008_j;
} }

64
patches/minecraft/net/minecraft/item/ItemStack.java.patch
View file

@ -26,26 +26,37 @@
- public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_) - public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_)
+ public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_){ this(p_i1881_1_, p_i1881_2_, p_i1881_3_, null); } + public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_){ this(p_i1881_1_, p_i1881_2_, p_i1881_3_, null); }
+ public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_, NBTTagCompound capNBT) + public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_, @Nullable NBTTagCompound capNBT)
{ {
+ this.capNBT = capNBT; + this.capNBT = capNBT;
this.field_151002_e = p_i1881_1_; this.field_151002_e = p_i1881_1_;
this.field_77991_e = p_i1881_3_; this.field_77991_e = p_i1881_3_;
this.field_77994_a = p_i1881_2_; this.field_77994_a = p_i1881_2_;
@@ -105,10 +111,12 @@ @@ -100,6 +106,7 @@
private void func_190923_F()
{
this.field_190928_g = this.func_190926_b();
+ this.delegate = this.field_151002_e != null ? this.field_151002_e.delegate : null;
} }
this.func_190923_F();
+ this.forgeInit();
}
private void func_190923_F()
@@ -109,6 +116,7 @@
public ItemStack(NBTTagCompound p_i47263_1_) public ItemStack(NBTTagCompound p_i47263_1_)
{ {
+ this.capNBT = p_i47263_1_.func_74764_b("ForgeCaps") ? p_i47263_1_.func_74775_l("ForgeCaps") : null; + this.capNBT = p_i47263_1_.func_74764_b("ForgeCaps") ? p_i47263_1_.func_74775_l("ForgeCaps") : null;
this.field_151002_e = Item.func_111206_d(p_i47263_1_.func_74779_i("id")); this.field_151002_e = Item.func_111206_d(p_i47263_1_.func_74779_i("id"));
this.field_77994_a = p_i47263_1_.func_74771_c("Count"); this.field_77994_a = p_i47263_1_.func_74771_c("Count");
this.field_77991_e = Math.max(0, p_i47263_1_.func_74765_d("Damage")); this.field_77991_e = Math.max(0, p_i47263_1_.func_74765_d("Damage"));
@@ -148,11 +156,12 @@ @@ -124,6 +132,7 @@
}
this.func_190923_F();
+ this.forgeInit();
}
public boolean func_190926_b()
@@ -148,11 +157,12 @@
public Item func_77973_b() public Item func_77973_b()
{ {
@ -59,7 +70,7 @@
EnumActionResult enumactionresult = this.func_77973_b().func_180614_a(p_179546_1_, p_179546_2_, p_179546_3_, p_179546_4_, p_179546_5_, p_179546_6_, p_179546_7_, p_179546_8_); EnumActionResult enumactionresult = this.func_77973_b().func_180614_a(p_179546_1_, p_179546_2_, p_179546_3_, p_179546_4_, p_179546_5_, p_179546_6_, p_179546_7_, p_179546_8_);
if (enumactionresult == EnumActionResult.SUCCESS) if (enumactionresult == EnumActionResult.SUCCESS)
@@ -163,6 +172,19 @@ @@ -163,6 +173,19 @@
return enumactionresult; return enumactionresult;
} }
@ -79,7 +90,7 @@
public float func_150997_a(IBlockState p_150997_1_) public float func_150997_a(IBlockState p_150997_1_)
{ {
return this.func_77973_b().func_150893_a(this, p_150997_1_); return this.func_77973_b().func_150893_a(this, p_150997_1_);
@@ -190,12 +212,18 @@ @@ -190,12 +213,18 @@
p_77955_1_.func_74782_a("tag", this.field_77990_d); p_77955_1_.func_74782_a("tag", this.field_77990_d);
} }
@ -99,7 +110,7 @@
} }
public boolean func_77985_e() public boolean func_77985_e()
@@ -205,7 +233,7 @@ @@ -205,7 +234,7 @@
public boolean func_77984_f() public boolean func_77984_f()
{ {
@ -108,7 +119,7 @@
} }
public boolean func_77981_g() public boolean func_77981_g()
@@ -215,32 +243,27 @@ @@ -215,32 +244,27 @@
public boolean func_77951_h() public boolean func_77951_h()
{ {
@ -146,7 +157,7 @@
} }
public boolean func_96631_a(int p_96631_1_, Random p_96631_2_) public boolean func_96631_a(int p_96631_1_, Random p_96631_2_)
@@ -272,8 +295,8 @@ @@ -272,8 +296,8 @@
} }
} }
@ -157,7 +168,7 @@
} }
} }
@@ -322,7 +345,7 @@ @@ -322,7 +346,7 @@
public boolean func_150998_b(IBlockState p_150998_1_) public boolean func_150998_b(IBlockState p_150998_1_)
{ {
@ -166,7 +177,7 @@
} }
public boolean func_111282_a(EntityPlayer p_111282_1_, EntityLivingBase p_111282_2_, EnumHand p_111282_3_) public boolean func_111282_a(EntityPlayer p_111282_1_, EntityLivingBase p_111282_2_, EnumHand p_111282_3_)
@@ -332,7 +355,7 @@ @@ -332,7 +356,7 @@
public ItemStack func_77946_l() public ItemStack func_77946_l()
{ {
@ -175,7 +186,7 @@
if (this.field_77990_d != null) if (this.field_77990_d != null)
{ {
@@ -758,6 +781,7 @@ @@ -758,6 +782,7 @@
} }
} }
@ -183,7 +194,7 @@
return list; return list;
} }
@@ -869,7 +893,7 @@ @@ -869,7 +894,7 @@
} }
else else
{ {
@ -192,7 +203,7 @@
} }
return multimap; return multimap;
@@ -982,6 +1006,50 @@ @@ -982,6 +1007,50 @@
} }
} }
@ -243,3 +254,22 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public int func_190921_D() public int func_190921_D()
{ {
@@ -1013,4 +1082,18 @@
{
this.func_190917_f(-p_190918_1_);
}
+
+ /**
+ * Set up forge's ItemStack additions.
+ */
+ private void forgeInit()
+ {
+ if (this.field_151002_e != null)
+ {
+ this.delegate = this.field_151002_e.delegate;
+ net.minecraftforge.common.capabilities.ICapabilityProvider provider = this.field_151002_e.initCapabilities(this, this.capNBT);
+ this.capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this.field_151002_e, this, provider);
+ if (this.capNBT != null && this.capabilities != null) this.capabilities.deserializeNBT(this.capNBT);
+ }
+ }
}

2
src/main/java/net/minecraftforge/fml/common/asm/transformers/ItemStackTransformer.java
View file

@ -81,7 +81,7 @@ public class ItemStackTransformer implements IClassTransformer {
for (MethodNode m: classNode.methods) for (MethodNode m: classNode.methods)
{ {
if (m.name.equals("func_190923_F") || m.name.equals("func_190926_b")) continue; if (m.name.equals("forgeInit") || m.name.equals("func_190926_b")) continue;
for (ListIterator<AbstractInsnNode> it = m.instructions.iterator(); it.hasNext(); ) for (ListIterator<AbstractInsnNode> it = m.instructions.iterator(); it.hasNext(); )
{ {
AbstractInsnNode insnNode = it.next(); AbstractInsnNode insnNode = it.next();