diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 6db95d0ff..7fa8ef768 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -694,7 +694,7 @@ public final class BotaniaAPI { } private static String getMagnetKey(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return ""; return "i_" + stack.getItem().getUnlocalizedName() + "@" + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index a9cc8fc37..31d2b7d12 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -142,7 +142,7 @@ public final class CorporeaHelper { * Bridge for requestItem() using an ItemStack. */ public static List requestItem(ItemStack stack, ICorporeaSpark spark, boolean checkNBT, boolean doit) { - return requestItem(stack, stack.stackSize, spark, checkNBT, doit); + return requestItem(stack, stack.getCount(), spark, checkNBT, doit); } /** @@ -232,14 +232,14 @@ public final class CorporeaHelper { * Gets if two stacks match. */ public static boolean stacksMatch(ItemStack stack1, ItemStack stack2, boolean checkNBT) { - return stack1 != null && stack2 != null && stack1.isItemEqual(stack2) && (!checkNBT || ItemStack.areItemStackTagsEqual(stack1, stack2)); + return !stack1.isEmpty() && !stack2.isEmpty() && stack1.isItemEqual(stack2) && (!checkNBT || ItemStack.areItemStackTagsEqual(stack1, stack2)); } /** * Gets if the name of a stack matches the string passed in. */ public static boolean stacksMatch(ItemStack stack, String s) { - if(stack == null) + if(stack.isEmpty()) return false; boolean contains = false; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index b51ce62cd..944ab8896 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -84,12 +84,12 @@ public class Multiblock { } private void addStack(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return; for(ItemStack oStack : materials) if(oStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(oStack, stack)) { - oStack.stackSize += stack.stackSize; + oStack.grow(stack.getCount()); return; } diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index e22673ed8..492e7e39e 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -44,7 +44,7 @@ public final class ManaItemHandler { for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = mainInv.getStackInSlot(slot); - if(stackInSlot != null && stackInSlot.getItem() instanceof IManaItem) { + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { toReturn.add(stackInSlot); } } @@ -74,7 +74,7 @@ public final class ManaItemHandler { for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = baublesInv.getStackInSlot(slot); - if(stackInSlot != null && stackInSlot.getItem() instanceof IManaItem) { + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { toReturn.put(slot, stackInSlot); } } @@ -328,11 +328,11 @@ public final class ManaItemHandler { * Gets the sum of all the discounts on IManaDiscountArmor items equipped * on the player passed in. This discount can vary based on what the passed tool is. */ - public static float getFullDiscountForTools(EntityPlayer player, @Nullable ItemStack tool) { + public static float getFullDiscountForTools(EntityPlayer player, ItemStack tool) { float discount = 0F; - for(int i = 0; i < player.inventory.armorInventory.length; i++) { - ItemStack armor = player.inventory.armorInventory[i]; - if(armor != null && armor.getItem() instanceof IManaDiscountArmor) + for(int i = 0; i < player.inventory.armorInventory.size(); i++) { + ItemStack armor = player.inventory.armorInventory.get(i); + if(!armor.isEmpty() && armor.getItem() instanceof IManaDiscountArmor) discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player, tool); } diff --git a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java index 0600c7b98..17ff005aa 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java @@ -10,10 +10,6 @@ */ package vazkii.botania.api.mana; -import java.util.List; - -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; @@ -24,7 +20,7 @@ public class ManaProficiencyEvent extends Event { private ItemStack rod; private boolean proficient; - public ManaProficiencyEvent(EntityPlayer entityPlayer, @Nullable ItemStack rod, boolean proficient) { + public ManaProficiencyEvent(EntityPlayer entityPlayer, ItemStack rod, boolean proficient) { this.entityPlayer = entityPlayer; this.rod = rod; this.proficient = proficient; @@ -34,7 +30,6 @@ public class ManaProficiencyEvent extends Event { return entityPlayer; } - @Nullable public ItemStack getRod() { return rod; } diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 81354baf9..a2153e5d2 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "85", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "86", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index f56f0175b..44b124e6d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -45,7 +45,7 @@ public class RecipeBrew { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; if(stack.getItem() instanceof IBrewContainer) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 56beaa12c..ec1c3f0eb 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -31,7 +31,7 @@ public class RecipeElvenTrade { List stacksToRemove = new ArrayList<>(); for(ItemStack stack : stacks) { - if(stack == null) { + if(stack.isEmpty()) { continue; } if(inputsMissing.isEmpty()) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 1a65d9b60..af1285b7d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -42,7 +42,7 @@ public class RecipePetals { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; int stackIndex = -1, oredictIndex = -1; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 530741a26..1460c3ef4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -59,7 +59,7 @@ public class RecipePureDaisy { } private boolean isOreDict(ItemStack stack, String entry) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return false; List ores; diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 65574df64..3055153d3 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -53,10 +53,10 @@ public class SimpleWikiProvider implements IWikiProvider { ItemStack stack = state.getBlock().getPickBlock(state, pos, world, bPos, player); - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state)); - if(stack.getItem() == null) + if(stack.isEmpty()) return null; String name = stack.getDisplayName();