Cleanup the codebase (#3311)

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

27 files changed, 101 insertions, 151 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
index 6988d2f43b..438fe6a536 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
@@ -68,14 +68,14 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
             "Making sure you don't live in Gwalior - Uses 2A",
             3,
             0,
-            new ITexture[] { new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
-                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB));
         mPollutionEnabled = GTMod.gregtechproxy.mPollution;
     }
 
@@ -264,8 +264,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
                                     Logger.INFO("mOptimalAirFlow[1]:" + mOptimalAirFlow);
 
                                     // Calculate The Voltage we are running
-                                    long tVoltage = drainEU;
-                                    byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage));
+                                    byte tTier = (byte) Math.max(1, GTUtility.getTier(drainEU));
 
                                     // Check Sides for Air,
                                     // More air means more pollution processing.
@@ -295,15 +294,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
 
                                         Logger.INFO("mCurrentPollution[4]:" + mCurrentPollution);
                                         Logger.INFO("mCurrentPollution[5]:" + reduction);
-                                        if (reduction <= mCurrentPollution) {
-                                            // Clean some Air.
-                                            toRemove = reduction;
-                                        } else {
-                                            // Makes sure we don't get negative pollution.
-                                            toRemove = mCurrentPollution;
-                                        }
-
-                                        toRemove = toRemove / 2;
+
+                                        toRemove = Math.min(reduction, mCurrentPollution) / 2;
                                         Logger.INFO("mCurrentPollution[6]:" + toRemove);
 
                                         // We are good to clean
@@ -391,21 +383,13 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
                 mCurrentChunkPollution += getPollutionInChunk(r);
             }
         }
-        if (mCurrentChunkPollution > 0) {
-            mHasPollution = true;
-        } else {
-            mHasPollution = false;
-        }
+        mHasPollution = mCurrentChunkPollution > 0;
         return mCurrentChunkPollution;
     }
 
     public int getPollutionInChunk(Chunk aChunk) {
         int mCurrentChunkPollution = PollutionUtils.getPollution(aChunk);
-        if (mCurrentChunkPollution > 0) {
-            mHasPollution = true;
-        } else {
-            mHasPollution = false;
-        }
+        mHasPollution = mCurrentChunkPollution > 0;
         return mCurrentChunkPollution;
     }
 
@@ -573,9 +557,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
 
     public boolean removePollution(int toRemove) {
 
-        if (this == null || this.getBaseMetaTileEntity() == null
-            || this.getBaseMetaTileEntity()
-                .getWorld() == null) {
+        if (this.getBaseMetaTileEntity() == null || this.getBaseMetaTileEntity()
+            .getWorld() == null) {
             return false;
         }
 
@@ -740,10 +723,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
                 if (aStack.getItem() instanceof ItemBasicScrubberTurbine) {
                     return true;
                 }
-                if (aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170
-                    && aStack.getItemDamage() <= 179) {
-                    return true;
-                }
+                return aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170
+                    && aStack.getItemDamage() <= 179;
             }
         }
         return false;
@@ -765,8 +746,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
 
     @Override
     public String[] getInfoData() {
-        ArrayList<String> aTooltipSuper = new ArrayList<>();
-        aTooltipSuper.addAll(Arrays.asList(super.getInfoData()));
+        ArrayList<String> aTooltipSuper = new ArrayList<>(Arrays.asList(super.getInfoData()));
         int mAirSides = getFreeSpaces();
         int reduction = 0;
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java
index 6cdc97130b..b4f69323f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java
@@ -40,14 +40,14 @@ public class MTEAutoChisel extends MTEBasicMachine {
             "Chisels things, Gregtech style",
             1,
             1,
-            new ITexture[] { new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
-                new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
-                new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
-                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
-                new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
+            new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+            new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
+            new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
+            new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+            new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+            new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB));
     }
 
     public MTEAutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
@@ -90,8 +90,8 @@ public class MTEAutoChisel extends MTEBasicMachine {
     @Override
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        return hasValidCache(aStack, this.getSpecialSlot(), false) ? true
-            : super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) && hasChiselResults(aStack);
+        return hasValidCache(aStack, this.getSpecialSlot(), false)
+            || super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) && hasChiselResults(aStack);
     }
 
     // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target
@@ -108,7 +108,7 @@ public class MTEAutoChisel extends MTEBasicMachine {
     // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target
     private static boolean hasChiselResults(ItemStack from) {
         List<ItemStack> results = getItemsForChiseling(from);
-        return results.size() > 0;
+        return !results.isEmpty();
     }
 
     private static List<ItemStack> getItemsForChiseling(ItemStack aStack) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java
index 9788abcf0c..f1f129606f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java
@@ -164,7 +164,7 @@ public class MTECropHarvestor extends MTEBasicTank {
         };
     }
 
-    private HashSet<ICropTile> mCropCache = new HashSet<>();
+    private final HashSet<ICropTile> mCropCache = new HashSet<>();
     private boolean mInvalidCache = false;
 
     public boolean doesInventoryHaveSpace() {
@@ -213,7 +213,7 @@ public class MTECropHarvestor extends MTEBasicTank {
                 for (int x = (-aSide); x <= aSide; x++) {
                     for (int z = (-aSide); z <= aSide; z++) {
                         TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z);
-                        if (tTileEntity != null && tTileEntity instanceof ICropTile tCrop) {
+                        if (tTileEntity instanceof ICropTile tCrop) {
                             this.mCropCache.add(tCrop);
                         }
                     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java
index 2521fb703f..0226214c44 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java
@@ -22,10 +22,10 @@ public class MTEPollutionCreator extends GTPPMetaTileEntity {
 
     int mCurrentPollution;
     int mAveragePollution;
-    int mAveragePollutionArray[] = new int[10];
+    int[] mAveragePollutionArray = new int[10];
     private int mArrayPos = 0;
     private int mTickTimer = 0;
-    private int mSecondTimer = 0;
+    private final int mSecondTimer = 0;
 
     public MTEPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java
index 747663f4cb..87e18931b5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java
@@ -24,10 +24,10 @@ public class MTEPollutionDetector extends GTPPMetaTileEntity {
 
     int mCurrentPollution;
     int mAveragePollution;
-    int mAveragePollutionArray[] = new int[10];
+    int[] mAveragePollutionArray = new int[10];
     private int mArrayPos = 0;
     private int mTickTimer = 0;
-    private int mSecondTimer = 0;
+    private final int mSecondTimer = 0;
     private long mRedstoneLevel = 0;
 
     public MTEPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java
index 1535140115..739a098331 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java
@@ -323,9 +323,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity {
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isClientSide()) {
-            return true;
-        }
+        aBaseMetaTileEntity.isClientSide();
         return true;
     }
 
@@ -449,18 +447,14 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity {
         super.onFirstTick(aBaseMetaTileEntity);
     }
 
-    private Map<String, UUID> mWirelessChargingMap = new HashMap<>();
-    private Map<String, UUID> mLocalChargingMap = new HashMap<>();
+    private final Map<String, UUID> mWirelessChargingMap = new HashMap<>();
+    private final Map<String, UUID> mLocalChargingMap = new HashMap<>();
 
     private boolean isValidPlayer(EntityPlayer aPlayer) {
         BaseMetaTileEntity aTile = (BaseMetaTileEntity) this.getBaseMetaTileEntity();
         if (mLocked || (aTile != null && aTile.privateAccess())) {
-            if (aPlayer.getUniqueID()
-                .equals(getBaseMetaTileEntity().getOwnerUuid())) {
-                return true;
-            } else {
-                return false;
-            }
+            return aPlayer.getUniqueID()
+                .equals(getBaseMetaTileEntity().getOwnerUuid());
         }
         return true;
     }
@@ -579,11 +573,10 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity {
         int[] objectArray1 = new int[] { objectA.xPos, objectA.yPos, objectA.zPos };
         int[] objectArray2 = new int[] { objectB.xPos, objectB.yPos, objectB.zPos };
 
-        final double distance = Math.sqrt(
+        return Math.sqrt(
             (objectArray2[0] - objectArray1[0]) * (objectArray2[0] - objectArray1[0])
                 + (objectArray2[1] - objectArray1[1]) * (objectArray2[1] - objectArray1[1])
                 + (objectArray2[2] - objectArray1[2]) * (objectArray2[2] - objectArray1[2]));
-        return distance;
     }
 
     @Override
@@ -636,7 +629,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity {
             PlayerUtils.messagePlayer(aPlayer, "Players with access:");
             for (String name : this.getLocalMap()
                 .keySet()) {
-                PlayerUtils.messagePlayer(aPlayer, "" + name);
+                PlayerUtils.messagePlayer(aPlayer, name);
             }
 
         } else {
@@ -644,7 +637,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity {
             PlayerUtils.messagePlayer(aPlayer, "Players with access:");
             for (String name : this.getLongRangeMap()
                 .keySet()) {
-                PlayerUtils.messagePlayer(aPlayer, "" + name);
+                PlayerUtils.messagePlayer(aPlayer, name);
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
index 40a497fa06..d68fe3f8c7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
@@ -195,7 +195,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel>
     // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target
     private static boolean hasChiselResults(ItemStack from) {
         List<ItemStack> results = getItemsForChiseling(from);
-        return results.size() > 0;
+        return !results.isEmpty();
     }
 
     private static List<ItemStack> getItemsForChiseling(ItemStack aStack) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
index eb7e6baa9c..8b63f34edb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
@@ -62,7 +62,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh
     implements ISurvivalConstructable {
 
     private static int CASING_TEXTURE_ID;
-    private static String mCasingName = "Vacuum Casing";
+    private static final String mCasingName = "Vacuum Casing";
     private HeatingCoilLevel mHeatingCapacity;
     private boolean mDehydratorMode = false;
     private int mCasing;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
index 8d543b7bcc..563b844574 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
@@ -72,7 +72,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return (IMetaTileEntity) new MTEIndustrialVacuumFreezer(this.mName);
+        return new MTEIndustrialVacuumFreezer(this.mName);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
index 0df9417f32..5634b5f1d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
@@ -256,9 +256,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi
         if (!aEntities.isEmpty()) {
             for (EntityLivingBase aFoundEntity : aEntities) {
                 if (aFoundEntity instanceof EntityPlayer aPlayer) {
-                    if (PlayerUtils.isCreative(aPlayer) || !PlayerUtils.canTakeDamage(aPlayer)) {
-                        continue;
-                    } else {
+                    if (!PlayerUtils.isCreative(aPlayer) && PlayerUtils.canTakeDamage(aPlayer)) {
                         if (aFoundEntity.getHealth() > 0) {
                             EntityUtils.doDamage(aFoundEntity, mIsaMillDamageSource, getPlayerDamageValue(aPlayer, 10));
                             if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
index 4c313a3be3..6952dd5c24 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
@@ -264,7 +264,7 @@ public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements IS
 
     @Override
     public boolean onRunningTick(ItemStack aStack) {
-        if (this.mOutputBusses.size() > 0) {
+        if (!this.mOutputBusses.isEmpty()) {
             for (MTEHatchOutputBus g : this.mOutputBusses) {
                 if (g != null) {
                     for (ItemStack s : g.mInventory) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
index a241238e42..32ea79cc55 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
@@ -152,7 +152,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli
                                 .build(),
                             buildHatchAdder(MTEElementalDuplicator.class)
                                 .hatchClass(MTEHatchElementalDataOrbHolder.class)
-                                .shouldReject(x -> x.mReplicatorDataOrbHatches.size() >= 1)
+                                .shouldReject(x -> !x.mReplicatorDataOrbHatches.isEmpty())
                                 .adder(MTEElementalDuplicator::addDataOrbHatch)
                                 .casingIndex(getCasingTextureIndex())
                                 .dot(1)
@@ -172,7 +172,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli
     public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
         mCasing = 0;
         boolean aDidBuild = checkPiece(STRUCTURE_PIECE_MAIN, 4, 4, 0);
-        if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && this.mOutputHatches.size() != 0)
+        if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && !this.mOutputHatches.isEmpty())
             || this.mEnergyHatches.size() != 1
             || this.mReplicatorDataOrbHatches.size() != 1) {
             return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
index f4e9bac434..bbcbfc1322 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
@@ -276,7 +276,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC
 
     @Override
     public boolean isRecipeLockingEnabled() {
-        return lockedMaterialName != null && !lockedMaterialName.equals("");
+        return lockedMaterialName != null && !lockedMaterialName.isEmpty();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
index c3bf843fd3..ee62f45ef8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
@@ -144,7 +144,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo
         boolean aCheckPiece = checkPiece(mName, 1, 3, 0);
         boolean aCasingCount = mCasing >= 9;
         boolean aCheckHatch = checkHatch();
-        log("" + aCheckPiece + ", " + aCasingCount + ", " + aCheckHatch);
+        log(aCheckPiece + ", " + aCasingCount + ", " + aCheckHatch);
         return aCheckPiece && aCasingCount && aCheckHatch;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
index f2ddecb687..b9e1d7858c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
@@ -132,8 +132,8 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
 
     @Override
     public IStructureDefinition<MTELargeRocketEngine> getStructureDefinition() {
-        if (this.STRUCTURE_DEFINITION == null) {
-            this.STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder()
+        if (STRUCTURE_DEFINITION == null) {
+            STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder()
                 .addShape(
                     this.mName,
                     transpose(
@@ -161,7 +161,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
                 .addElement('M', Muffler.newAny(getCasingTextureIndex(), 3))
                 .build();
         }
-        return this.STRUCTURE_DEFINITION;
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
@@ -182,7 +182,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
         this.mAllDynamoHatches.clear();