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

Merge branch 'pull/5483' into 1.13.x

Browse source
This commit is contained in:
cpw 2019-02-16 17:19:27 -05:00
commit 869964cb2f
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,16 @@
--- a/net/minecraft/item/Item.java
+++ b/net/minecraft/item/Item.java
@@ -48,7 +48,7 @@
@@ -48,8 +48,8 @@
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
-public class Item implements IItemProvider {
- public static final Map<Block, Item> field_179220_a = Maps.newHashMap();
+public class Item extends net.minecraftforge.registries.ForgeRegistryEntry<Item> implements IItemProvider, net.minecraftforge.common.extensions.IForgeItem {
public static final Map<Block, Item> field_179220_a = Maps.newHashMap();
+ public static final Map<Block, Item> field_179220_a = net.minecraftforge.registries.GameData.getBlockItemMap();
private static final IItemPropertyGetter field_185046_b = (p_210306_0_, p_210306_1_, p_210306_2_) -> {
return p_210306_0_.func_77951_h() ? 1.0F : 0.0F;
};
@@ -96,6 +96,10 @@
this.field_77700_c = p_i48487_1_.field_200922_c;
this.field_77699_b = p_i48487_1_.field_200921_b;