From 99646e86563a39e889b57c82253fc7ad79e19b42 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 12 May 2016 01:56:40 -0700 Subject: [PATCH] Fix crash with BoP integration --- src/main/java/forestry/core/utils/ItemStackUtil.java | 10 +++++++++- .../forestry/plugins/compat/PluginBiomesOPlenty.java | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java index 5f9b5e805..7026031c1 100644 --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -76,8 +76,13 @@ public abstract class ItemStackUtil { * * @return The registry name of the item as {@link String} */ + @Nullable public static String getItemNameFromRegistryAsString(Item item) { - return getItemNameFromRegistry(item).toString(); + ResourceLocation itemNameFromRegistry = getItemNameFromRegistry(item); + if (itemNameFromRegistry == null) { + return null; + } + return itemNameFromRegistry.toString(); } @Nullable @@ -92,6 +97,9 @@ public abstract class ItemStackUtil { } String itemStackString = getItemNameFromRegistryAsString(item); + if (itemStackString == null) { + return null; + } int meta = itemStack.getItemDamage(); if (meta != OreDictionary.WILDCARD_VALUE) { diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 00c8d6ab6..994e80104 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -105,7 +105,9 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(BoP, key); String saplingName = ItemStackUtil.getItemNameFromRegistryAsString(saplingItem); - FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + if (saplingName != null) { + FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + } } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && saplings != null && persimmon != null) {