diff --git a/gradle.properties b/gradle.properties index 57efee39f..2f1469c66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 -forgeversion=10.13.4.1448-1.7.10 +forgeversion=10.13.4.1541-1.7.10 version_major=4 version_minor=1 version_patch=0 diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 1cebbf00e..d4261963b 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -33,7 +33,7 @@ public class ItemFruit extends ItemForestryFood { CHERRY("cropCherry"), WALNUT("cropWalnut"), CHESTNUT("cropChestnut"), LEMON("cropLemon"), PLUM("cropPlum"), DATES("cropDate"), PAPAYA("cropPapaya");//, COCONUT("cropCoconut"); public static final EnumFruit[] VALUES = values(); - final String oreDict; + private final String oreDict; EnumFruit(String oreDict) { this.oreDict = oreDict; @@ -59,19 +59,16 @@ public class ItemFruit extends ItemForestryFood { public ItemStack getStack(int qty) { return ForestryItem.fruits.getItemStack(qty, ordinal()); } + + public String getOreDict() { + return oreDict; + } } public ItemFruit() { super(1, 0.2f); setMaxDamage(0); setHasSubtypes(true); - registerOreDictionary(); - } - - private void registerOreDictionary() { - for (EnumFruit def : EnumFruit.values()) { - OreDictionary.registerOre(def.oreDict, new ItemStack(this, 1, def.ordinal())); - } } @Override diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 8c12660a2..2965a5bef 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -282,6 +282,9 @@ public class PluginCore extends ForestryPlugin { // FRUITS ForestryItem.fruits.registerItem(new ItemFruit(), "fruits"); + for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.values()) { + OreDictionary.registerOre(def.getOreDict(), def.getStack()); + } } @Override