aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry/bees/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees/items')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
index ab2353cc37..7ded5cc171 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
@@ -2,7 +2,7 @@
* Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
* available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
* at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
+ * <p>
* Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
* MysteriousAges
******************************************************************************/
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
index b196598f43..54b003386e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
@@ -45,7 +45,7 @@ public class MBItemFrame extends Item implements IHiveFrame {
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- if ((this.toolTip != "") || !this.toolTip.equals("")) {
+ if (!this.toolTip.isEmpty()) {
list.add(EnumChatFormatting.GRAY + this.toolTip);
}
super.addInformation(stack, aPlayer, list, bool);
@@ -79,10 +79,7 @@ public class MBItemFrame extends Item implements IHiveFrame {
@Override
public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
- if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)) {
- return false;
- }
- return true;
+ return this.rarity_value != EnumRarity.uncommon && this.rarity_value != EnumRarity.common;
}
@Override