From b04d6bbefab303582cfb2e612e4cfb528cc845d0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Jan 2017 14:29:16 -0600 Subject: [PATCH] A couple more nulls --- .../vazkii/botania/api/item/IManaProficiencyArmor.java | 6 +++--- .../java/vazkii/botania/api/lexicon/LexiconEntry.java | 10 +++------- .../java/vazkii/botania/api/lexicon/LexiconPage.java | 5 +++-- .../botania/api/lexicon/LexiconRecipeMappings.java | 2 +- .../vazkii/botania/api/mana/ManaDiscountEvent.java | 6 +++--- .../vazkii/botania/api/subtile/SubTileGenerating.java | 2 +- .../botania/client/core/handler/BoundTileRenderer.java | 5 ++--- .../vazkii/botania/common/entity/EntityManaBurst.java | 2 +- 8 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index b89c6ca6b..9e413b11f 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -33,7 +33,7 @@ public interface IManaProficiencyArmor { return false; } - default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, @Nullable ItemStack rod) { + default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, ItemStack rod) { return shouldGiveProficiency(armorStack, slot, player); } @@ -41,10 +41,10 @@ public interface IManaProficiencyArmor { @Deprecated public static boolean hasProficiency(EntityPlayer player) { - return hasProficiency(player, null); + return hasProficiency(player, ItemStack.EMPTY); } - public static boolean hasProficiency(EntityPlayer player, @Nullable ItemStack rod) { + public static boolean hasProficiency(EntityPlayer player, ItemStack rod) { boolean proficient = false; for(EntityEquipmentSlot e: EntityEquipmentSlot.values()) { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 8daf3f16c..f007584cc 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -130,13 +130,10 @@ public class LexiconEntry implements Comparable { public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); for(LexiconPage page : pages) { - List l = page.getDisplayedRecipes(); + ArrayList itemsAddedThisPage = new ArrayList<>(); - if(l != null) { - ArrayList itemsAddedThisPage = new ArrayList<>(); - - for(ItemStack s : l) { - addItem: { + for(ItemStack s : page.getDisplayedRecipes()) { + addItem: { for(ItemStack s1 : itemsAddedThisPage) if(s1.getItem() == s.getItem()) break addItem; @@ -147,7 +144,6 @@ public class LexiconEntry implements Comparable { itemsAddedThisPage.add(s); list.add(s); } - } } } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 199a9babc..3311e3264 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -84,10 +85,10 @@ public abstract class LexiconPage { /** * Shows the list of recipes present in this page for display in the category - * page. Can return null for an entry with no recipes. + * page. */ public List getDisplayedRecipes() { - return null; + return ImmutableList.of(); } public String getUnlocalizedName() { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index a700bfff2..0174d2abb 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -35,7 +35,7 @@ public final class LexiconRecipeMappings { if(force || !mappings.containsKey(str)) mappings.put(str, data); - if(entry.getIcon() == null) + if(entry.getIcon().isEmpty()) entry.setIcon(stack.copy()); } diff --git a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java index 27cb28664..ed7e42f9d 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -22,7 +22,7 @@ public class ManaDiscountEvent extends Event { private float discount; private ItemStack tool; - public ManaDiscountEvent(EntityPlayer entityPlayer, float discount, @Nullable ItemStack tool) { + public ManaDiscountEvent(EntityPlayer entityPlayer, float discount, ItemStack tool) { this.entityPlayer = entityPlayer; this.discount = discount; this.tool = tool; @@ -30,10 +30,10 @@ public class ManaDiscountEvent extends Event { @Deprecated public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) { - this(entityPlayer, discount, null); + this(entityPlayer, discount, ItemStack.EMPTY); } - @Nullable + public ItemStack getTool() { return tool; } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 349b04a3d..15002ddb8 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -197,7 +197,7 @@ public class SubTileGenerating extends SubTileEntity { public void populateDropStackNBTs(List drops) { if(isPassiveFlower() && ticksExisted > 0 && BotaniaAPI.internalHandler.getPassiveFlowerDecay() > 0) { ItemStack drop = drops.get(0); - if(drop != null) { + if(!drop.isEmpty()) { if(!drop.hasTagCompound()) drop.setTagCompound(new NBTTagCompound()); NBTTagCompound cmp = drop.getTagCompound(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 8896e93e6..2aaf8544d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -75,9 +75,8 @@ public final class BoundTileRenderer { if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); List coordsList = provider.getWireframesToDraw(player, stackInSlot); - if(coordsList != null) - for(BlockPos coords : coordsList) - renderBlockOutlineAt(coords, color); + for(BlockPos coords : coordsList) + renderBlockOutlineAt(coords, color); BlockPos coords = provider.getSourceWireframe(player, stackInSlot); if(coords != null && coords.getY() > -1) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 24da15086..feefd0c94 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -734,7 +734,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private ILensEffect getLensInstance() { ItemStack lens = getSourceLens(); - if(lens != null && lens.getItem() instanceof ILensEffect) + if(!lens.isEmpty() && lens.getItem() instanceof ILensEffect) return (ILensEffect) lens.getItem(); return null;