upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-14 01:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from chochem/add-null-check

Browse Source 
Add a couple of null checks
This commit is contained in:
chochem authored and GitHub committed 2024-09-11 18:27:58 +01:00
2 parents c2cafd4a98 3ff6e91053
commit 6429eea5d6
2 files changed
+15 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/main/utils/CraftingManager.java
+10 -8
View File
@@ -426,14 +426,16 @@ public class CraftingManager {
GameRegistry.addRecipe(
new ShapedOreRecipe(new ItemStack(Items.emerald), "xxx", "xxx", "xxx", 'x', "nuggetEmerald"));
GameRegistry.addRecipe(
new ShapedOreRecipe(
ItemInterface.getItemStack("apatite"),
"xxx",
"xxx",
"xxx",
'x',
Config.nuggets.getStackForType(NuggetType.APATITE)));
if (ItemInterface.getItemStack("apatite") != null) {
GameRegistry.addRecipe(
new ShapedOreRecipe(
ItemInterface.getItemStack("apatite"),
"xxx",
"xxx",
"xxx",
'x',
Config.nuggets.getStackForType(NuggetType.APATITE)));
}
output = Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY);
GameRegistry.addRecipe(
src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
+5 -3
View File
@@ -638,9 +638,11 @@ public class ThaumcraftHelper implements IModHelper {
new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()),
list.copy());
item = ItemInterface.getItemStack(ForestryHelper.Name, "apatite");
ThaumcraftApi.registerObjectTag(
new ItemStack(item.getItem(), 1, item.getItemDamage()),
list.copy().add(Aspect.CRYSTAL, 2));
if (item != null) {
ThaumcraftApi.registerObjectTag(
new ItemStack(item.getItem(), 1, item.getItemDamage()),
list.copy().add(Aspect.CRYSTAL, 2));
}
list = new AspectList().add(Aspect.MOTION, 2).add(Aspect.FLIGHT, 1);
item = ItemInterface.getItemStack("beeDroneGE");