Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

33 files changed, 151 insertions, 244 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index a7fe8ced30..49a22bc8a8 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -582,7 +582,7 @@ public final class ModItems {
         // LFTR Control Circuit
         itemCircuitLFTR = new CoreItem(
             "itemCircuitLFTR",
-            "" + EnumChatFormatting.GREEN + "Control Circuit",
+            EnumChatFormatting.GREEN + "Control Circuit",
             AddToCreativeTab.tabMisc,
             1,
             0,
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index 3ce461ffab..f79b20ccb9 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -16,7 +16,7 @@ public class BaseItemBurnable extends CoreItem {
         super(unlocalizedName, creativeTab, stackSize, maxDmg, description);
         this.itemName = displayName;
         this.meta = meta;
-        if (oredictName != null && !oredictName.equals("")) {
+        if (oredictName != null && !oredictName.isEmpty()) {
             registerOrdictionary(oredictName);
         }
         registerFuel(burnTime);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 07744c5c2e..ba98bb25b7 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -231,9 +231,7 @@ public class BaseItemComponent extends Item {
                 }
             }
 
-            if ((this.materialName != null) && (this.materialName != "")
-                && !this.materialName.equals("")
-                && (this.componentMaterial != null)) {
+            if (this.materialName != null && !this.materialName.isEmpty() && (this.componentMaterial != null)) {
 
                 if (this.componentMaterial != null) {
                     if (!this.componentMaterial.vChemicalFormula.contains("?")) {
@@ -255,10 +253,8 @@ public class BaseItemComponent extends Item {
                     }
 
                     if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) {
-                        if ((this.materialName != null) && (this.materialName != "")
-                            && !this.materialName.equals("")
-                            && this.unlocalName.toLowerCase()
-                                .contains("hot")) {
+                        if (this.unlocalName.toLowerCase()
+                            .contains("hot")) {
                             list.add(
                                 EnumChatFormatting.GRAY + "Warning: "
                                     + EnumChatFormatting.RED
@@ -269,7 +265,7 @@ public class BaseItemComponent extends Item {
                     }
                 } else {
                     String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
-                    if (aChemicalFormula != null && aChemicalFormula.length() > 0) {
+                    if (aChemicalFormula != null && !aChemicalFormula.isEmpty()) {
                         list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula));
                     }
                 }
@@ -300,7 +296,6 @@ public class BaseItemComponent extends Item {
         super.addInformation(stack, aPlayer, list, bool);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
         final boolean p_77663_5_) {
@@ -325,10 +320,9 @@ public class BaseItemComponent extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        return (Configuration.visual.useGregtechTextures ? true : false);
+        return Configuration.visual.useGregtechTextures;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
 
@@ -402,7 +396,7 @@ public class BaseItemComponent extends Item {
         }
     }
 
-    public static enum ComponentTypes {
+    public enum ComponentTypes {
 
         DUST("Dust", "@ Dust", "dust", OrePrefixes.dust),
         DUSTSMALL("DustSmall", "Small Pile of @ Dust", "dustSmall", OrePrefixes.dustSmall),
@@ -434,7 +428,7 @@ public class BaseItemComponent extends Item {
         private final String OREDICT_NAME;
         private final OrePrefixes a_GT_EQUAL;
 
-        private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName,
+        ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName,
             final OrePrefixes aPrefix) {
             this.COMPONENT_NAME = LocalName;
             this.DISPLAY_NAME = DisplayName;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
index 9a4109a1de..fb24fbf2f1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
@@ -86,7 +86,7 @@ public class BaseItemDamageable extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        if ((this.itemName == null) || this.itemName.equals("")) {
+        if ((this.itemName == null) || this.itemName.isEmpty()) {
             return super.getItemStackDisplayName(tItem);
         }
         return this.itemName;
@@ -101,7 +101,7 @@ public class BaseItemDamageable extends Item {
         return true;
     }
 
-    public static final long getItemDamage(final ItemStack aStack) {
+    public static long getItemDamage(final ItemStack aStack) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("Damage");
@@ -114,7 +114,7 @@ public class BaseItemDamageable extends Item {
         return 0L;
     }
 
-    public static final boolean setItemDamage(final ItemStack aStack, final long aDamage) {
+    public static boolean setItemDamage(final ItemStack aStack, final long aDamage) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("Damage");
@@ -142,11 +142,7 @@ public class BaseItemDamageable extends Item {
     @Override
     public boolean showDurabilityBar(ItemStack stack) {
         int dmg = (int) getItemDamage(stack);
-        if (dmg <= 20) {
-            return false;
-        } else {
-            return true;
-        }
+        return dmg > 20;
     }
 
     public static ItemStack damageItem(ItemStack item) {
@@ -154,10 +150,8 @@ public class BaseItemDamageable extends Item {
             long currentUse = BaseItemDamageable.getItemDamage(item);
             if (currentUse >= 0 && currentUse <= 250) {
                 BaseItemDamageable.setItemDamage(item, currentUse + 1);
-                return item;
-            } else {
-                return item;
             }
+            return item;
         }
         return null;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 8417eba3d1..8c2473aafe 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -285,8 +285,7 @@ public class BaseItemTickable extends CoreItem {
             return 0;
         }
         double currentDamage = getTicks(null, stack);
-        double durabilitypercent = currentDamage / getMaxTicks(stack);
-        return durabilitypercent;
+        return currentDamage / getMaxTicks(stack);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
index b564d60424..0d7710e651 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
@@ -10,7 +10,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IEntityLivingData;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemMonsterPlacer;
@@ -58,7 +57,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
 
     /**
      * Callback for item usage. If the item does something special on right clicking,
-     *
+     * <p>
      * he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS
      */
     @Override
@@ -94,7 +93,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
 
     /**
      * Called whenever this item is equipped and the right mouse button is pressed.
-     *
+     * <p>
      * Args: itemStack, world, entityPlayer
      */
     @Override
@@ -143,7 +142,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
 
     /**
      * Spawns the creature specified by the egg's type in the location specified by
-     *
+     * <p>
      * the last three parameters. Parameters: world, entityID, x, y, z.
      */
     public Entity spawnEntity(final World parWorld, final double parX, final double parY, final double parZ) {
@@ -162,7 +161,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
                     0.0F);
 
                 parWorld.spawnEntityInWorld(this.entityToSpawn);
-                this.entityToSpawn.onSpawnWithEgg((IEntityLivingData) null);
+                this.entityToSpawn.onSpawnWithEgg(null);
                 this.entityToSpawn.playLivingSound();
             } else {
                 // DEBUG
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index 451a5b1290..e9f1d87ede 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -23,7 +23,7 @@ public class BaseItemCell extends BaseItemComponent {
 
     public BaseItemCell(final Material material) {
         super(material, BaseItemComponent.ComponentTypes.CELL);
-        this.fluidColour = (short[]) material.getRGBA();
+        this.fluidColour = material.getRGBA();
     }
 
     public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
index 151f3f3860..5d61f36ce3 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
@@ -26,7 +26,7 @@ public class BaseItemPlasmaCell extends BaseItemComponent {
 
     public BaseItemPlasmaCell(final Material material) {
         super(material, ComponentTypes.PLASMACELL);
-        this.fluidColour = (short[]) material.getRGBA();
+        this.fluidColour = material.getRGBA();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index fd52fe78c4..d230115129 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material;
 
 public class BaseItemDust extends BaseItemComponent {
 
-    private BaseItemComponent[] mSizedDusts = new BaseItemComponent[2];
+    private final BaseItemComponent[] mSizedDusts = new BaseItemComponent[2];
 
     public BaseItemDust(Material aMat) {
         this(aMat, true);
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index bcb56795bc..7b3c8cbd28 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -44,7 +44,7 @@ public class BaseItemDustUnique extends Item {
         this.setCreativeTab(tabMisc);
         this.colour = colour;
         this.materialName = materialName;
-        if (mChemicalFormula == null || mChemicalFormula.equals("") || mChemicalFormula.equals("NullFormula")) {
+        if (mChemicalFormula == null || mChemicalFormula.isEmpty() || mChemicalFormula.equals("NullFormula")) {
             this.chemicalNotation = StringUtils.subscript(materialName);
         } else {
             this.chemicalNotation = StringUtils.subscript(mChemicalFormula);
@@ -84,7 +84,7 @@ public class BaseItemDustUnique extends Item {
             temp = temp.replace("itemD", "d");
             Logger.WARNING("Generating OreDict Name: " + temp);
         }
-        if ((temp != null) && !temp.equals("")) {
+        if ((temp != null) && !temp.isEmpty()) {
             GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
         }
         registerComponent();
@@ -144,7 +144,7 @@ public class BaseItemDustUnique extends Item {
         if (this.sRadiation > 0) {
             list.add(GTPPCore.GT_Tooltip_Radioactive.get());
         }
-        if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("")
+        if (!this.chemicalNotation.isEmpty() && !chemicalNotation.isEmpty()
             && !chemicalNotation.equals("NullFormula")) {
             list.add(this.chemicalNotation);
         }
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index cb227a9423..c9377cba27 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -26,7 +26,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 public class BaseItemIngotHot extends BaseItemIngot {
 
     private final ItemStack outputIngot;
-    private int tickCounter = 0;
+    private final int tickCounter = 0;
     private final int tickCounterMax = 200;
     private final int mTier;
 
@@ -66,7 +66,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
         final boolean p_77663_5_) {
         if (this.componentMaterial != null) {
-            if (entityHolding != null && entityHolding instanceof EntityPlayer) {
+            if (entityHolding instanceof EntityPlayer) {
                 if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
                     EntityUtils.applyHeatDamageToEntity(1, world, entityHolding);
                 }
@@ -78,11 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        if (Configuration.visual.useGregtechTextures) {
-            return true;
-        } else {
-            return false;
-        }
+        return Configuration.visual.useGregtechTextures;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java
index 28407a4557..827adb9bc3 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java
@@ -41,7 +41,7 @@ public class BaseItemIngotOld extends Item {
         } else if (this.unlocalName.contains("itemHotIngot")) {
             temp = this.unlocalName.replace("itemHotIngot", "ingotHot");
         }
-        if ((temp != null) && !temp.equals("")) {
+        if ((temp != null) && !temp.isEmpty()) {
             GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
         }
         // this.generateCompressorRecipe();
@@ -80,7 +80,7 @@ public class BaseItemIngotOld extends Item {
             }
             temp = temp.replace("itemIngot", "block");
             Logger.WARNING("Generating OreDict Name: " + temp);
-            if ((temp != null) && !temp.equals("")) {
+            if ((temp != null) && !temp.isEmpty()) {
                 tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
                 if (tempOutput != null) {
                     GTValues.RA.stdBuilder()
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index 240c0851e1..41f3a2bf73 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -13,21 +13,20 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
 
 public class ItemBlockMeta extends ItemBlockWithMetadata {
 
     private final Block mBlock;
-    private HashMap<Integer, ArrayList<String>> aTooltips = new LinkedHashMap<>();
+    private final HashMap<Integer, ArrayList<String>> aTooltips = new LinkedHashMap<>();
 
     public ItemBlockMeta(final Block aBlock) {
         super(aBlock, aBlock);
         this.mBlock = aBlock;
         this.setMaxDamage(0);
         this.setHasSubtypes(true);
-        if (aBlock instanceof ITileTooltip aTooltip) {
-            // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap());
-        }
+        // if (aBlock instanceof ITileTooltip aTooltip) {
+        // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap());
+        // }
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index 6c8e0ce81a..7f6f57223d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -119,7 +119,7 @@ public class BaseItemMisc extends Item {
         // Nothing Fancy here yet.
     }
 
-    public static enum MiscTypes {
+    public enum MiscTypes {
 
         POTION("Potion", " Potion", "potion"),
         KEY("Key", " Key", "key"),
@@ -133,7 +133,7 @@ public class BaseItemMisc extends Item {
         private final String DISPLAY_NAME_SUFFIX;
         private final String OREDICT_PREFIX;
 
-        private MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) {
+        MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) {
             this.TYPE = LocalName;
             this.DISPLAY_NAME_SUFFIX = DisplayNameSuffix;
             this.OREDICT_PREFIX = OreDictPrefix;
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 45ba089f15..01294556f7 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -112,7 +112,7 @@ public class BaseOreComponent extends Item {
     @Override
     public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
         final boolean bool) {
-        if (this.materialName != null && !this.materialName.equals("")) {
+        if (this.materialName != null && !this.materialName.isEmpty()) {
             if (this.componentMaterial != null) {
                 if (!this.componentMaterial.vChemicalFormula.contains("?")) {
                     list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
@@ -133,7 +133,7 @@ public class BaseOreComponent extends Item {
                 }
             } else {
                 String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
-                if (aChemicalFormula != null && aChemicalFormula.length() > 0) {
+                if (aChemicalFormula != null && !aChemicalFormula.isEmpty()) {
                     list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula));
                 }
             }
@@ -166,10 +166,7 @@ public class BaseOreComponent extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        if (this.componentType.hasOverlay()) {
-            return true;
-        }
-        return false;
+        return this.componentType.hasOverlay();
     }
 
     @Override
@@ -209,7 +206,6 @@ public class BaseOreComponent extends Item {
             if (renderPass == 1) {
                 return Utils.rgbtoHexValue(230, 230, 230);
             }
-            return this.componentColour;
         } else {
             if (renderPass == 0 && !Configuration.visual.useGregtechTextures) {
                 return this.componentColour;
@@ -217,8 +213,8 @@ public class BaseOreComponent extends Item {
             if (renderPass == 1 && Configuration.visual.useGregtechTextures) {
                 return Utils.rgbtoHexValue(230, 230, 230);
             }
-            return this.componentColour;
         }
+        return this.componentColour;
     }
 
     @Override
@@ -229,7 +225,7 @@ public class BaseOreComponent extends Item {
         return this.overlay;
     }
 
-    public static enum ComponentTypes {
+    public enum ComponentTypes {
 
         DUST("dust", "", " Dust", true),
         DUSTIMPURE("dustImpure", "Impure ", " Dust", true),
@@ -245,8 +241,7 @@ public class BaseOreComponent extends Item {
         private final String DISPLAY_NAME;
         private final boolean HAS_OVERLAY;
 
-        private ComponentTypes(final String LocalName, final String prefix, final String DisplayName,
-            final boolean overlay) {
+        ComponentTypes(final String LocalName, final String prefix, final String DisplayName, final boolean overlay) {
             this.COMPONENT_NAME = LocalName;
             this.PREFIX = prefix;
             this.DISPLAY_NAME = DisplayName;
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
index 0279a396de..d36207c1d1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
@@ -42,7 +42,7 @@ public class BaseItemPlate_OLD extends Item {
         this.setMaxStackSize(64);
         this.colour = colour;
         this.materialName = materialName;
-        if (mChemicalFormula.equals("") || mChemicalFormula.equals("NullFormula")) {
+        if (mChemicalFormula.isEmpty() || mChemicalFormula.equals("NullFormula")) {
             this.chemicalNotation = StringUtils.subscript(materialName);
         } else {
             this.chemicalNotation = StringUtils.subscript(mChemicalFormula);
@@ -53,7 +53,7 @@ public class BaseItemPlate_OLD extends Item {
         if (this.unlocalName.toLowerCase()
             .contains("itemplate")) {
             temp = this.unlocalName.replace("itemP", "p");
-            if ((temp != null) && !temp.equals("")) {
+            if ((temp != null) && !temp.isEmpty()) {
                 GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
index f1184fb5bb..658ce1a535 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
@@ -29,9 +29,9 @@ public class BaseBauble extends Item implements IBauble {
     /**
      * Implementation suggestions taken from Botania.
      */
-    private BaubleType mThisBauble;
+    private final BaubleType mThisBauble;
 
-    private List<String> damageNegations = new ArrayList<>();
+    private final List<String> damageNegations = new ArrayList<>();
     Multimap<String, AttributeModifier> attributes = HashMultimap.create();
 
     public BaseBauble(BaubleType type) {
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index 01cd0ec0c1..efe18ed70c 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -135,7 +135,7 @@ public class BatteryPackBaseBauble extend