diff options
| author | miozune <miozune@gmail.com> | 2023-02-22 18:03:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 10:03:21 +0100 |
| commit | 4a02268131df212c616c3a6db139b3fea7cbdd21 (patch) | |
| tree | 890929980c70d91f9a59d4deb87e2e59a73fd5e1 | |
| parent | ee43c385c68edc281f3a22b08b68cb6aaf2f0c7d (diff) | |
| download | GT5-Unofficial-4a02268131df212c616c3a6db139b3fea7cbdd21.tar.gz GT5-Unofficial-4a02268131df212c616c3a6db139b3fea7cbdd21.tar.bz2 GT5-Unofficial-4a02268131df212c616c3a6db139b3fea7cbdd21.zip | |
Fix two NPEs with recipe registrations (#551)
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 0f48b69e66..15964c6e45 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.280:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.289:dev') api("com.github.GTNewHorizons:bartworks:0.5.155:dev") api("com.github.GTNewHorizons:TecTech:5.0.88:dev") 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); } |