Cleanup the codebase (#3311)

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

23 files changed, 173 insertions, 224 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 9f82936035..5dc2c4c7da 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -8,6 +8,7 @@ import static gtPlusPlus.core.util.Utils.getTcAspectStack;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
@@ -410,9 +411,9 @@ public enum GregtechOrePrefixes {
          * at a location where it shouldn't happen.
          * <p/>
          * Mainly for preventing NullPointer Exceptions and providing Default Values.
-         *
+         * <p>
          * Unknown Material Components. Dead End Section.
-         *
+         * <p>
          * Alkalus Range 730-799 & 970-998 (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality,
          * aTypes, R, G, B, Alpha, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp,
          * aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor
@@ -420,7 +421,7 @@ public enum GregtechOrePrefixes {
          *
          */
         _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1,
-            Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TCAspects.VACUOS.name(), 1))),
+            Dyes._NULL, Element._NULL, Collections.singletonList(getTcAspectStack(TCAspects.VACUOS.name(), 1))),
 
         // Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false,
         // 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new
@@ -459,7 +460,7 @@ public enum GregtechOrePrefixes {
             Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8), getTcAspectStack(TCAspects.MACHINA, 8))),
 
         Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false,
-            false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8))),
+            false, 1, 1, 1, Dyes.dyeGreen, Collections.singletonList(getTcAspectStack(TCAspects.ELECTRUM, 8))),
 
         Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0,
             0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2,
@@ -924,11 +925,12 @@ public enum GregtechOrePrefixes {
                 aColor);
             this.mExtraData = aExtraData;
             this.mMaterialList.addAll(aMaterialList);
-            this.mChemicalFormula = "";
+            final StringBuilder sb = new StringBuilder();
             for (final MaterialStack tMaterial : this.mMaterialList) {
-                this.mChemicalFormula += tMaterial.toString();
+                sb.append(tMaterial.toString());
             }
-            this.mChemicalFormula = this.mChemicalFormula.replaceAll("_", "-");
+            this.mChemicalFormula = sb.toString()
+                .replaceAll("_", "-");
 
             int tAmountOfComponents = 0, tMeltingPoint = 0;
             for (final MaterialStack tMaterial : this.mMaterialList) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
index 0a116b1b9f..7dd8b429d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
@@ -5,5 +5,5 @@ public enum GregtechToolDictNames {
     craftingToolAngleGrinder,
     craftingToolElectricSnips,
     craftingToolElectricLighter,
-    craftingToolElectricButcherKnife;
+    craftingToolElectricButcherKnife
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
index 1bc2050eee..743f10aae6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
@@ -35,6 +35,6 @@ public class ElectricSlotWidget extends SlotWidget {
             return false;
         }
         return (Info.itemEnergy.getEnergyValue(stack) > 0.0D)
-            || (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), 4, true, true, true) > 0.0D);
+            || (ElectricItem.manager.discharge(stack, Double.NaN, 4, true, true, true) > 0.0D);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java
index ea9ab3602a..f8537b1125 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java
@@ -6,35 +6,35 @@ import net.minecraft.item.ItemStack;
 
 public interface IGregtechItemContainer {
 
-    public Item getItem();
+    Item getItem();
 
-    public Block getBlock();
+    Block getBlock();
 
-    public boolean isStackEqual(Object aStack);
+    boolean isStackEqual(Object aStack);
 
-    public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT);
+    boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT);
 
-    public ItemStack get(long aAmount, Object... aReplacements);
+    ItemStack get(long aAmount, Object... aReplacements);
 
-    public ItemStack getWildcard(long aAmount, Object... aReplacements);
+    ItemStack getWildcard(long aAmount, Object... aReplacements);
 
-    public ItemStack getUndamaged(long aAmount, Object... aReplacements);
+    ItemStack getUndamaged(long aAmount, Object... aReplacements);
 
-    public ItemStack getAlmostBroken(long aAmount, Object... aReplacements);
+    ItemStack getAlmostBroken(long aAmount, Object... aReplacements);
 
-    public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
+    ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
 
-    public IGregtechItemContainer set(Item aItem);
+    IGregtechItemContainer set(Item aItem);
 
-    public IGregtechItemContainer set(ItemStack aStack);
+    IGregtechItemContainer set(ItemStack aStack);
 
-    public IGregtechItemContainer registerOre(Object... aOreNames);
+    IGregtechItemContainer registerOre(Object... aOreNames);
 
-    public IGregtechItemContainer registerWildcardAsOre(Object... aOreNames);
+    IGregtechItemContainer registerWildcardAsOre(Object... aOreNames);
 
-    public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements);
+    ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements);
 
-    public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements);
+    ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements);
 
-    public boolean hasBeenSet();
+    boolean hasBeenSet();
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java
index a68efc4fb8..5f7e4527cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java
@@ -16,31 +16,31 @@ import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemBase;
 
 public interface IItemBehaviour<E extends Item> {
 
-    public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
+    boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
 
-    public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ);
+    boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide,
+        float hitX, float hitY, float hitZ);
 
-    public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+    boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
         int aSide, float hitX, float hitY, float hitZ);
 
-    public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
+    ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
 
-    public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
+    List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
 
-    public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
+    void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
 
-    public boolean isItemStackUsable(E aItem, ItemStack aStack);
+    boolean isItemStackUsable(E aItem, ItemStack aStack);
 
-    public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+    boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+    ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack);
+    boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX,
-        double aY, double aZ);
+    EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY,
+        double aZ);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        EntityLivingBase aEntity, float aSpeed);
+    EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity,
+        float aSpeed);
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java
index 4c8b1c2391..93b61dc7f0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java
@@ -16,9 +16,9 @@ public interface IOreRecipeRegistrator {
      * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
      * @param aStack    always != null
      */
-    public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
+    void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack);
 
-    public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
+    void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack copyAmount);
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java
index 98b446869c..1a61814f55 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java
@@ -26,126 +26,126 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats {
      * Called when aPlayer crafts this Tool
      */
     @Override
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
+    void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Called when this gets added to a Tool Item
      */
-    public void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID);
+    void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID);
 
     /**
      * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU).
      */
     @Override
-    public int getToolDamagePerBlockBreak();
+    int getToolDamagePerBlockBreak();
 
     /**
      * @return Damage the Tool receives when converting the drops of a Block. 100 is one Damage Point (or 100 EU).
      */
     @Override
-    public int getToolDamagePerDropConversion();
+    int getToolDamagePerDropConversion();
 
     /**
      * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times
      *         more than normal.
      */
     @Override
-    public int getToolDamagePerContainerCraft();
+    int getToolDamagePerContainerCraft();
 
     /**
      * @return Damage the Tool receives when being used as Weapon, 200 is the normal Value, 100 for actual Weapons.
      */
     @Override
-    public int getToolDamagePerEntityAttack();
+    int getToolDamagePerEntityAttack();
 
     /**
      * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools
      *         of this Type. Decreasing is also possible.
      */
     @Override
-    public int getBaseQuality();
+    int getBaseQuality();
 
     /**
      * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is normal punch.
      */
     @Override
-    public float getBaseDamage();
+    float getBaseDamage();
 
     /**
      * @return This gets the Hurt Resistance time for Entities getting hit. (always does 1 as minimum)
      */
     @Override
-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity);
+    int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity);
 
     /**
      * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed.
      */
     @Override
-    public float getSpeedMultiplier();
+    float getSpeedMultiplier();
 
     /**
      * @return This is a multiplier for the Tool Speed. 1.0F = no special Durability.
      */
     @Override
-    public float getMaxDurabilityMultiplier();
+    float getMaxDurabilityMultiplier();
 
     @Override
-    public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
+    DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
 
     @Override
-    public String getMiningSound();
+    String getMiningSound();
 
     @Override
-    public String getCraftingSound();
+    String getCraftingSound();
 
     @Override
-    public String getEntityHitSound();
+    String getEntityHitSound();
 
     @Override
-    public String getBreakingSound();
+    String getBreakingSound();
 
     @Override
-    public Enchantment[] getEnchantments(ItemStack aStack);
+    Enchantment[] getEnchantments(ItemStack aStack);
 
     @Override
-    public int[] getEnchantmentLevels(ItemStack aStack);
+    int[] getEnchantmentLevels(ItemStack aStack);
 
     /**
      * @return If this Tool can be used for blocking Damage like a Sword.
      */
     @Override
-    public boolean canBlock();
+    boolean canBlock();
 
     /**
      * @return If this Tool can be used as an RC Crowbar.
      */
     @Override
-    public boolean isCrowbar();
+    boolean isCrowbar();
 
     /**
      * @return If this Tool can be used as an BC Wrench.
      */
     @Override
-    public boolean isWrench();
+    boolean isWrench();
 
     /**
      * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
      */
     @Override
-    public boolean isWeapon();
+    boolean isWeapon();
 
     /**
      * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your
      *         Bow/Gun or something
      */
     @Override
-    public boolean isRangedWeapon();
+    boolean isRangedWeapon();
 
     /**
      * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
      */
     @Override
-    public boolean isMiningTool();
+    boolean isMiningTool();
 
     /**
      * aBlock.getHarvestTool(aMetaData) can return the following Values for example. "axe", "pickaxe", "sword",
@@ -156,7 +156,7 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats {
      *         check.
      */
     @Override
-    public boolean isMinableBlock(Block aBlock, byte aMetaData);
+    boolean isMinableBlock(Block aBlock, byte aMetaData);
 
     /**
      * This lets you modify the Drop List, when this type of Tool has been used.
@@ -164,38 +164,36 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats {
      * @return the Amount of modified Items.
      */
     @Override
-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
-        int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
+    int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY,
+        int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
 
     /**
      * @return Returns a broken Version of the Item.
      */
     @Override
-    public ItemStack getBrokenItem(ItemStack aStack);
+    ItemStack getBrokenItem(ItemStack aStack);
 
     /**
      * @return the Damage actually done to the Mob.
      */
     @Override
-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
-        EntityPlayer aPlayer);
+    float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * @return the Damage actually done to the Mob.
      */
     @Override
-    public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
-        EntityPlayer aPlayer);
+    float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
 
     @Override
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
+    IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
 
     @Override
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
+    short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
 
     /**
      * Called when this gets added to a Tool Item
      */
     @Override
-    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID);
+    void onStatsAddedToTool(MetaGeneratedTool aItem, int aID);
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
index c98023bad7..befca0975f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
@@ -106,7 +106,6 @@ public abstract class GTMetaItem extends GTMetaItemBase {
                     }
                     if (tRandomData == SubTag.NO_UNIFICATION) {
                         GTOreDictUnificator.addToBlacklist(rStack);
-                        continue;
                     }
                 }
             }
@@ -140,7 +139,6 @@ public abstract class GTMetaItem extends GTMetaItemBase {
                     }
                     if (tUseOreDict) {
                         GTOreDictUnificator.registerOre(tRandomData, rStack);
-                        continue;
                     }
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
index 3e7fcf1486..09c6d4467a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
@@ -64,11 +64,8 @@ public abstract class GTMetaItemBase extends GTGenericItem
         if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) {
             return this;
         }
-        ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue);
-        if (tList == null) {
-            tList = new ArrayList<>(1);
-            this.mItemBehaviors.put((short) aMetaValue, tList);
-        }
+        ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors
+            .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1));
         tList.add(aBehavior);
         return this;
     }
@@ -278,8 +275,7 @@ public abstract class GTMetaItemBase extends GTGenericItem
                         EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY);
                 } else {
                     aList.add(
-                        EnumChatFormatting.AQUA + ""
-                            + GTUtility.formatNumbers(tCharge)
+                        EnumChatFormatting.AQUA + GTUtility.formatNumbers(tCharge)
                             + " / "
                             + GTUtility.formatNumbers(Math.abs(tStats[0]))
                             + " EU - Voltage: "
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
index 31cdac4770..102a3cc0b7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
@@ -101,7 +101,7 @@ public abstract class GTMetaItemX32 extends GTMetaItem {
         // You have to check for at least these Conditions in every Case! So add a super Call like the following for
         // this before executing your Code:
         // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false;
-        return (aPrefix != null) && (aMaterial != null) && aPrefix.doGenerateItem(aMaterial);
+        return aPrefix != null && aPrefix.doGenerateItem(aMaterial);
     }
 
     /* ---------- OVERRIDEABLE FUNCTIONS ---------- */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
index e475037c63..6786fabc31 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
@@ -101,27 +101,27 @@ public class METHatchAirIntake extends MTEHatchFluidGenerator {
 
         aWorld.spawnParticle(
             name,
-            (double) (xPos + ran1 * 0.5f),
-            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) xSpd,
-            (double) -ySpd,
-            (double) zSpd);
+            xPos + ran1 * 0.5f,
+            yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            xSpd,
+            -ySpd,
+            zSpd);
         aWorld.spawnParticle(
             name,
-            (double) (xPos + ran2 * 0.5f),
-            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) xSpd,
-            (double) -ySpd,
-            (double) zSpd);
+            xPos + ran2 * 0.5f,
+            yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            xSpd,
+            -ySpd,
+            zSpd);
         aWorld.spawnParticle(
             name,
-            (double) (xPos + ran3 * 0.5f),
-            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
-            (double) xSpd,
-            (double) -ySpd,
-            (double) zSpd);
+            xPos + ran3 * 0.5f,
+            yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f,
+            xSpd,
+            -ySpd,
+            zSpd);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java
index 0043819b23..68396fee78 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java
@@ -125,22 +125,16 @@ public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigu
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         Logger.INFO("Checking if we can pull " + aStack.getDisplayName() + " from slot " + aIndex);
-        if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
-            && side == getBaseMetaTileEntity().getFrontFacing()) {
-            return true;
-        }
-        return false;
+        return aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
+            && side == getBaseMetaTileEntity().getFrontFacing();
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         Logger.INFO("Checking if we can put " + aStack.getDisplayName() + " into slot " + aIndex);
-        if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
-            && side == getBaseMetaTileEntity().getFrontFacing()) {
-            return true;
-        }
-        return false;
+        return aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
+            && side == getBaseMetaTileEntity().getFrontFacing();
     }
 
     public ArrayList<ItemStack> getInventory() {
@@ -154,7 +148,7 @@ public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigu
 
     public ItemStack getOrbByCircuit() {
         ItemStack aCirc = getBaseMetaTileEntity().getStackInSlot(getCircuitSlot());
-        if (aCirc != null && ItemUtils.isControlCircuit(aCirc)) {
+        if (ItemUtils.isControlCircuit(aCirc)) {
             int slot = aCirc.getItemDamage() - 1; // slots are 0 indexed but there's no 0 circuit
             if (slot < getBaseMetaTileEntity().getSizeInventory() - 1) {
                 return getBaseMetaTileEntity().getStackInSlot(slot);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java
index 3a5640cd88..9eafd09a10 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java
@@ -9,7 +9,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -58,14 +57,12 @@ public abstract class MTEHatchFluidGenerator extends MTEHatchInput {