From 4a02268131df212c616c3a6db139b3fea7cbdd21 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 22 Feb 2023 18:03:21 +0900 Subject: Fix two NPEs with recipe registrations (#551) --- src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java | 4 ++-- src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index 294fea996e..5e7c96a0c3 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -614,8 +614,8 @@ public class RecipeUtils { GameRegistry.addRecipe(mRecipe); } else { Logger.RECIPE( - "[Fix] Invalid shapped recipe outputting " + mOutput != null ? mOutput.getDisplayName() - : "Bad Output Item"); + "[Fix] Invalid shapped recipe outputting " + + (mOutput != null ? mOutput.getDisplayName() : "Bad Output Item")); } } diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java index 650ecfa55e..b816489418 100644 --- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java @@ -21,6 +21,8 @@ public class BW_Utils { } public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) { + Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get(werkstoffID); + if (werkstoff == null) return null; return WerkstoffLoader .getCorrespondingItemStackUnsafe(orePrefixes, Werkstoff.werkstoffHashMap.get(werkstoffID), amount); } -- cgit