MTE Inventory updates (#1496)

* MTE Inventory updates
* Separate Input/Output inventory
* Use a LinkedHashMap to ensure inventory orders are deterministic
* Input/Output work on either Input/Output inventories

* MTE Inventory

* Add GT_Packet_MultiTileEntity
* More dyanmic packet with packetFeatures
* Add IMTE_HasModes for MultiBlockPart

* Help with MTE Inventory (#1613)

* convert inventory to use ItemStackHandler
* Update MUI
* inventories
* move Iteminventory to its own method

Co-authored-by: miozune <miozune@gmail.com>

* Update MUI

* Update MUI

* Add IMultiBlockPart

* Mte fluid inventory (#1639)

* first work on fluid inventory
* make gui work with numbers not dividable by 4
* use math.min
* add outputfluids saving
* actually working
* Update MUI

Co-authored-by: miozune <miozune@gmail.com>

* Ticking Covers!
* Parts now register covers with the controller
* Controllers now tick covers on parts
* Break cover ticking out into `tickCoverAtSide`

Fix some inventory methods on MultiBlockController

* Filter on tickable covers

* Improve GUIs for MTEs (#1650)

* working controller GUI
* locked inventory selection work
* input and output locking of inventories

Co-authored-by: miozune <miozune@gmail.com>

* spotless

* CoverInfo refactor (#1654)

* Add `CoverInfo` and deprecate the old fields to hold cover information

* Disable MTE registration

* Fix NPE - Return EMPTY_INFO for SIDE_UNKNOWN

Temporarily add back old NBT saving in case of a revert so covers aren't lost.

* Actually save the old NBT data, instead of empty

Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>

4 files changed, 102 insertions, 110 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index ed0ca51231..2014138b71 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -129,13 +129,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
 
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (!getBaseMetaTileEntity()
-                .getCoverBehaviorAtSideNew(aSide)
-                .isGUIClickable(
-                        aSide,
-                        getBaseMetaTileEntity().getCoverIDAtSide(aSide),
-                        getBaseMetaTileEntity().getComplexCoverDataAtSide(aSide),
-                        getBaseMetaTileEntity())) return;
+        if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return;
         infiniteCache = !infiniteCache;
         GT_Utility.sendChatToPlayer(
                 aPlayer, StatCollector.translateToLocal("GT5U.hatch.infiniteCache." + infiniteCache));
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
index 940497ede3..bdb1ebbbb4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
@@ -151,13 +151,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         // Don't allow to lock fluid in me fluid hatch
-        if (!getBaseMetaTileEntity()
-                .getCoverBehaviorAtSideNew(aSide)
-                .isGUIClickable(
-                        aSide,
-                        getBaseMetaTileEntity().getCoverIDAtSide(aSide),
-                        getBaseMetaTileEntity().getComplexCoverDataAtSide(aSide),
-                        getBaseMetaTileEntity())) return;
+        if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return;
         infiniteCache = !infiniteCache;
         GT_Utility.sendChatToPlayer(
                 aPlayer, StatCollector.translateToLocal("GT5U.hatch.infiniteCacheFluid." + infiniteCache));
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
index 557b01fbb0..516d2dda66 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
+import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
 import static gregtech.api.enums.GT_Values.AuthorKuba;
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.Textures.BlockIcons.*;
@@ -179,8 +180,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             openGUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
-        for (byte i = 0; i < 6; i++) {
-            if (aBaseMetaTileEntity.getAirAtSide(i)) {
+        for (byte tSide : ALL_VALID_SIDES) {
+            if (aBaseMetaTileEntity.getAirAtSide(tSide)) {
                 openGUI(aBaseMetaTileEntity, aPlayer);
                 return true;
             }
@@ -230,38 +231,38 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
         updateModifiers();
         if (canWork()) {
 
-            ItemStack queen = getQueen();
+            final ItemStack queen = getQueen();
             usedQueen = queen.copy();
             if (beeRoot.getType(queen) == EnumBeeType.QUEEN) {
-                IBee bee = beeRoot.getMember(queen);
+                final IBee bee = beeRoot.getMember(queen);
                 usedQueenBee = bee;
 
                 // LIFE CYCLES
 
                 float mod = this.getLifespanModifier(null, null, 1.f);
-                IBeekeepingMode mode = beeRoot.getBeekeepingMode(this.getWorld());
-                IBeeModifier beemodifier = mode.getBeeModifier();
+                final IBeekeepingMode mode = beeRoot.getBeekeepingMode(this.getWorld());
+                final IBeeModifier beemodifier = mode.getBeeModifier();
                 mod *= beemodifier.getLifespanModifier(null, null, 1.f);
-                int h = bee.getHealth();
+                final int h = bee.getHealth();
                 mod = 1.f / mod;
-                float cycles = h / mod;
+                final float cycles = h / mod;
 
                 // PRODUCTS
 
-                HashMap<GT_Utility.ItemId, ItemStack> pollen = new HashMap<>();
+                final HashMap<GT_Utility.ItemId, ItemStack> pollen = new HashMap<>();
 
                 if (isRetrievingPollen && floweringMod > 0f) {
-                    int icycles =
+                    final int icycles =
                             (int) cycles + (getWorld().rand.nextFloat() < (cycles - (float) ((int) cycles)) ? 1 : 0);
                     for (int z = 0; z < icycles; z++) {
-                        IIndividual p = bee.retrievePollen(this);
+                        final IIndividual p = bee.retrievePollen(this);
                         if (p != null) {
-                            ItemStack s =
+                            final ItemStack s =
                                     p.getGenome().getSpeciesRoot().getMemberStack(p, EnumGermlingType.POLLEN.ordinal());
                             if (s != null) {
-                                GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(s);
+                                final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(s);
                                 pollen.computeIfAbsent(id, k -> {
-                                    ItemStack ns = s.copy();
+                                    final ItemStack ns = s.copy();
                                     ns.stackSize = 0;
                                     return ns;
                                 });
@@ -274,19 +275,19 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 retrievedpollen = null;
                 retrievingPollenInThisOperation = isRetrievingPollen;
 
-                IBeeGenome genome = bee.getGenome();
-                IAlleleBeeSpecies primary = genome.getPrimary();
-                IAlleleBeeSpecies secondary = genome.getSecondary();
+                final IBeeGenome genome = bee.getGenome();
+                final IAlleleBeeSpecies primary = genome.getPrimary();
+                final IAlleleBeeSpecies secondary = genome.getSecondary();
 
-                float speed = genome.getSpeed();
-                float prodMod = getProductionModifier(null, 1f) * beemodifier.getProductionModifier(null, 1.f);
+                final float speed = genome.getSpeed();
+                final float prodMod = getProductionModifier(null, 1f) * beemodifier.getProductionModifier(null, 1.f);
 
-                HashMap<GT_Utility.ItemId, Float> drops = new HashMap<>();
-                HashMap<GT_Utility.ItemId, ItemStack> dropstacks = new HashMap<>();
+                final HashMap<GT_Utility.ItemId, Float> drops = new HashMap<>();
+                final HashMap<GT_Utility.ItemId, ItemStack> dropstacks = new HashMap<>();
 
                 for (Map.Entry<ItemStack, Float> entry :
                         primary.getProductChances().entrySet()) {
-                    GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                    final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
                     drops.merge(
                             id,
                             Bee.getFinalChance(entry.getValue(), speed, prodMod, 8f)
@@ -297,7 +298,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 }
                 for (Map.Entry<ItemStack, Float> entry :
                         secondary.getProductChances().entrySet()) {
-                    GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                    final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
                     drops.merge(
                             id,
                             Bee.getFinalChance(entry.getValue() / 2f, speed, prodMod, 8f)
@@ -309,7 +310,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 if (primary.isJubilant(genome, this) && secondary.isJubilant(genome, this))
                     for (Map.Entry<ItemStack, Float> entry :
                             primary.getSpecialtyChances().entrySet()) {
-                        GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                        final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
                         drops.merge(
                                 id,
                                 Bee.getFinalChance(entry.getValue(), speed, prodMod, 8f)
@@ -320,30 +321,30 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     }
 
                 int i = 0;
-                int imax = mOutputItems.length;
+                final int imax = mOutputItems.length;
 
-                IApiaristTracker breedingTracker = beeRoot.getBreedingTracker(getWorld(), getOwner());
+                final IApiaristTracker breedingTracker = beeRoot.getBreedingTracker(getWorld(), getOwner());
 
                 if (!bee.canSpawn()) {
-                    ItemStack convert = new ItemStack(PluginApiculture.items.beePrincessGE);
-                    NBTTagCompound nbttagcompound = new NBTTagCompound();
+                    final ItemStack convert = new ItemStack(PluginApiculture.items.beePrincessGE);
+                    final NBTTagCompound nbttagcompound = new NBTTagCompound();
                     queen.writeToNBT(nbttagcompound);
                     convert.setTagCompound(nbttagcompound);
                     this.mOutputItems[i++] = convert;
                 } else {
-                    IBee b = bee.spawnPrincess(this);
+                    final IBee b = bee.spawnPrincess(this);
                     if (b != null) {
-                        ItemStack princess = beeRoot.getMemberStack(b, EnumBeeType.PRINCESS.ordinal());
+                        final ItemStack princess = beeRoot.getMemberStack(b, EnumBeeType.PRINCESS.ordinal());
                         breedingTracker.registerPrincess(b);
                         this.mOutputItems[i++] = princess;
                     }
-                    IBee[] d = bee.spawnDrones(this);
+                    final IBee[] d = bee.spawnDrones(this);
                     if (d != null && d.length > 0) {
-                        HashMap<GT_Utility.ItemId, ItemStack> drones = new HashMap<>(d.length);
+                        final HashMap<GT_Utility.ItemId, ItemStack> drones = new HashMap<>(d.length);
                         for (IBee dr : d) {
-                            ItemStack drone = beeRoot.getMemberStack(dr, EnumBeeType.DRONE.ordinal());
+                            final ItemStack drone = beeRoot.getMemberStack(dr, EnumBeeType.DRONE.ordinal());
                             breedingTracker.registerDrone(dr);
-                            GT_Utility.ItemId drid = GT_Utility.ItemId.createNoCopy(drone);
+                            final GT_Utility.ItemId drid = GT_Utility.ItemId.createNoCopy(drone);
                             if (drones.containsKey(drid)) drones.get(drid).stackSize += drone.stackSize;
                             else {
                                 this.mOutputItems[i++] = drone;
@@ -353,12 +354,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     }
                 }
 
-                int imin = i;
+                final int imin = i;
 
                 setQueen(null);
 
                 for (Map.Entry<GT_Utility.ItemId, Float> entry : drops.entrySet()) {
-                    ItemStack s = dropstacks.get(entry.getKey()).copy();
+                    final ItemStack s = dropstacks.get(entry.getKey()).copy();
                     s.stackSize = entry.getValue().intValue()
                             + (getWorld().rand.nextFloat()
                                             < (entry.getValue()
@@ -383,8 +384,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
                 usedBeeLife = cycles * (float) beeCycleLength;
                 this.mMaxProgresstime = (int) usedBeeLife;
-                int timemaxdivider = this.mMaxProgresstime / 100;
-                int useddivider = 1 << this.mSpeed;
+                final int timemaxdivider = this.mMaxProgresstime / 100;
+                final int useddivider = 1 << this.mSpeed;
                 int actualdivider = useddivider;
                 this.mMaxProgresstime /= Math.min(actualdivider, timemaxdivider);
                 actualdivider /= Math.min(actualdivider, timemaxdivider);
@@ -403,17 +404,17 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
                 this.mMaxProgresstime = 100;
                 this.mProgresstime = 0;
-                int useddivider = Math.min(100, 1 << this.mSpeed);
+                final int useddivider = Math.min(100, 1 << this.mSpeed);
                 this.mMaxProgresstime /= useddivider;
                 this.mEUt = (int) ((float) baseEUtUsage * this.energyMod * useddivider);
                 if (useddivider == 2) this.mEUt += 32;
                 else if (useddivider > 2) this.mEUt += (32 * (useddivider << (this.mSpeed - 2)));
 
-                IBee princess = beeRoot.getMember(getQueen());
+                final IBee princess = beeRoot.getMember(getQueen());
                 usedQueenBee = princess;
-                IBee drone = beeRoot.getMember(getDrone());
+                final IBee drone = beeRoot.getMember(getDrone());
                 princess.mate(drone);
-                NBTTagCompound nbttagcompound = new NBTTagCompound();
+                final NBTTagCompound nbttagcompound = new NBTTagCompound();
                 princess.writeToNBT(nbttagcompound);
                 this.mOutputItems[0] = new ItemStack(PluginApiculture.items.beeQueenGE);
                 this.mOutputItems[0].setTagCompound(nbttagcompound);
@@ -446,8 +447,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     }
 
     private void doEffect() {
-        IBeeGenome genome = usedQueenBee.getGenome();
-        IAlleleBeeEffect effect = genome.getEffect();
+        final IBeeGenome genome = usedQueenBee.getGenome();
+        final IAlleleBeeEffect effect = genome.getEffect();
         if (!(effect instanceof IAlleleBeeAcceleratableEffect)) {
             effectData[0] = effect.validateStorage(effectData[0]);
             effect.doEffect(genome, effectData[0], this);
@@ -455,7 +456,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
         if (!effect.isCombinable()) return;
 
-        IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT);
+        final IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT);
         if (!secondary.isCombinable()) return;
 
         if (!(secondary instanceof IAlleleBeeAcceleratableEffect)) {
@@ -465,8 +466,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     }
 
     private void doAcceleratedEffects() {
-        IBeeGenome genome = usedQueenBee.getGenome();
-        IAlleleBeeEffect effect = genome.getEffect();
+        final IBeeGenome genome = usedQueenBee.getGenome();
+        final IAlleleBeeEffect effect = genome.getEffect();
         try {
             if (AlleleBeeEffectThrottledField == null) {
                 AlleleBeeEffectThrottledField = AlleleEffectThrottled.class.getDeclaredField("throttle");
@@ -487,7 +488,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
             if (!effect.isCombinable()) return;
 
-            IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT);
+            final IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT);
             if (!secondary.isCombinable()) return;
 
             if (secondary instanceof IAlleleBeeAcceleratableEffect) {
@@ -521,7 +522,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 if (usedQueen != null) {
                     if (aTick % 2 == 0) {
                         // FX on client, effect on server
-                        IBee bee = beeRoot.getMember(usedQueen);
+                        final IBee bee = beeRoot.getMember(usedQueen);
                         effectData = bee.doFX(effectData, this);
                     }
                 }
@@ -540,7 +541,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                                 || aTick % 600 == 0
                                 || aBaseMetaTileEntity.hasWorkJustBeenEnabled())
                         && hasEnoughEnergyToCheckRecipe()) {
-                    int check = checkRecipe();
+                    final int check = checkRecipe();
                     if (check == FOUND_AND_SUCCESSFULLY_USED_RECIPE) {
                         aBaseMetaTileEntity.setActive(true);
                     }
@@ -615,9 +616,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     aBaseMetaTileEntity.setActive(false);
 
                     if (doesAutoOutput() && !isOutputEmpty() && aBaseMetaTileEntity.getFrontFacing() != mMainFacing) {
-                        TileEntity tTileEntity2 =
+                        final TileEntity tTileEntity2 =
                                 aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing());
-                        long tStoredEnergy = aBaseMetaTileEntity.getUniversalEnergyStored();
+                        final long tStoredEnergy = aBaseMetaTileEntity.getUniversalEnergyStored();
                         int tMaxStacks = (int) (tStoredEnergy / 64L);
                         if (tMaxStacks > mOutputItems.length) tMaxStacks = mOutputItems.length;
 
@@ -670,7 +671,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             if (!GT_ApiaryUpgrade.isUpgrade(aStack)) return false;
             for (int i = drone + 1; i < drone + 1 + 4; i++) {
                 if (aIndex == i) continue;
-                ItemStack s = getStackInSlot(i);
+                final ItemStack s = getStackInSlot(i);
                 if (s == null) continue;
                 if (GT_Utility.areStacksEqual(getStackInSlot(i), aStack)) return false;
                 if (GT_ApiaryUpgrade.isUpgrade(aStack)) {
@@ -860,7 +861,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     private int flowerBlockMeta;
 
     private boolean checkFlower(IBee bee) {
-        String flowerType = bee.getGenome().getFlowerProvider().getFlowerType();
+        final String flowerType = bee.getGenome().getFlowerProvider().getFlowerType();
         if (!this.flowerType.equals(flowerType)) flowercoords = null;
         if (flowercoords != null) {
             if (getWorld().getBlock(flowercoords.posX, flowercoords.posY, flowercoords.posZ) != flowerBlock
@@ -890,7 +891,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
         clearErrors();
         if (queen == null) return true; // Reloaded the chunk ?
         if (beeRoot.isMember(queen, EnumBeeType.PRINCESS.ordinal())) return true;
-        IBee bee = beeRoot.getMember(queen);
+        final IBee bee = beeRoot.getMember(queen);
         for (IErrorState err : bee.getCanWork(this)) setCondition(true, err);
         setCondition(!checkFlower(bee), EnumErrorCode.NO_FLOWER);
         return !hasErrors();
@@ -898,13 +899,13 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
     private boolean canWork() {
         clearErrors();
-        EnumBeeType beeType = beeRoot.getType(getQueen());
+        final EnumBeeType beeType = beeRoot.getType(getQueen());
         if (beeType == EnumBeeType.PRINCESS) {
             setCondition(!beeRoot.isDrone(getDrone()), EnumErrorCode.NO_DRONE);
             return !hasErrors();
         }
         if (beeType == EnumBeeType.QUEEN) {
-            IBee bee = beeRoot.getMember(getQueen());
+            final IBee bee = beeRoot.getMember(getQueen());
             for (IErrorState err : bee.getCanWork(this)) setCondition(true, err);
             setCondition(!checkFlower(bee), EnumErrorCode.NO_FLOWER);
             return !hasErrors();
@@ -936,12 +937,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     private int maxspeed = 0;
 
     public void updateModifiers() {
-        GT_ApiaryModifier mods = new GT_ApiaryModifier();
+        final GT_ApiaryModifier mods = new GT_ApiaryModifier();
         for (int i = 2; i < 2 + 4; i++) {
-            ItemStack s = getInputAt(i);
+            final ItemStack s = getInputAt(i);
             if (s == null) continue;
             if (GT_ApiaryUpgrade.isUpgrade(s)) {
-                GT_ApiaryUpgrade upgrade = GT_ApiaryUpgrade.getUpgrade(s);
+                final GT_ApiaryUpgrade upgrade = GT_ApiaryUpgrade.getUpgrade(s);
                 upgrade.applyModifiers(mods, s);
             }
         }
@@ -1124,25 +1125,26 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 .widget(new DrawableWidget()
                         .setDrawable(GT_UITextures.PICTURE_INFORMATION)
                         .setGTTooltip(() -> {
-                            String energyreq = GT_Utility.formatNumbers(
+                            final String energyreq = GT_Utility.formatNumbers(
                                     (int) ((float) GT_MetaTileEntity_IndustrialApiary.baseEUtUsage
                                                     * getEnergyModifier()
                                                     * getAcceleration())
                                             + getAdditionalEnergyUsage());
-                            String Temp = StatCollector.translateToLocal(
+                            final String Temp = StatCollector.translateToLocal(
                                     getTemperature().getName());
-                            String Hum =
+                            final String Hum =
                                     StatCollector.translateToLocal(getHumidity().getName());
                             if (getUsedQueen() != null
                                     && BeeManager.beeRoot.isMember(getUsedQueen(), EnumBeeType.QUEEN.ordinal())) {
-                                IBee bee = BeeManager.beeRoot.getMember(getUsedQueen());
+                                final IBee bee = BeeManager.beeRoot.getMember(getUsedQueen());
                                 if (bee.isAnalyzed()) {
-                                    IBeeGenome genome = bee.getGenome();
-                                    IBeeModifier mod = BeeManager.beeRoot
+                                    final IBeeGenome genome = bee.getGenome();
+                                    final IBeeModifier mod = BeeManager.beeRoot
                                             .getBeekeepingMode(getWorld())
                                             .getBeeModifier();
-                                    float tmod = getTerritoryModifier(null, 1f) * mod.getTerritoryModifier(null, 1f);
-                                    int[] t = Arrays.stream(genome.getTerritory())
+                                    final float tmod =
+                                            getTerritoryModifier(null, 1f) * mod.getTerritoryModifier(null, 1f);
+                                    final int[] t = Arrays.stream(genome.getTerritory())
                                             .map(i -> (int) ((float) i * tmod))
                                             .toArray();
                                     return mTooltipCache.getUncachedTooltipData(
@@ -1279,7 +1281,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     }
 
     private int getAdditionalEnergyUsage() {
-        int accelerated = getAcceleration();
+        final int accelerated = getAcceleration();
         int energyusage = 0;
         if (accelerated == 2) energyusage = 32;
         else if (accelerated > 2) energyusage = 32 * accelerated << (mSpeed - 2);
@@ -1322,10 +1324,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             if (aShifthold == 5) return null;
             if (aShifthold != 0) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
             if (aMouseclick > 1) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
-            ItemStack s = aPlayer.inventory.getItemStack();
+            final ItemStack s = aPlayer.inventory.getItemStack();
             if (s == null) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
-            Slot slot = getSlot(aSlotNumber);
-            ItemStack slotStack = slot.getStack();
+            final Slot slot = getSlot(aSlotNumber);
+            final ItemStack slotStack = slot.getStack();
             if (slotStack != null && !GT_Utility.areStacksEqual(slotStack, s)) return null; // super would replace item
             if (slotStack == null && !slot.isItemValid(s))
                 return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
@@ -1336,23 +1338,23 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             if (max == 0) return null;
             if (aMouseclick == 1) max = 1;
             if (max == s.stackSize) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
-            ItemStack newStack = s.splitStack(s.stackSize - max);
-            ItemStack result = super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
+            final ItemStack newStack = s.splitStack(s.stackSize - max);
+            final ItemStack result = super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
             aPlayer.inventory.setItemStack(newStack);
             return result;
         }
 
         @Override
         public ItemStack transferStackInSlot(EntityPlayer aPlayer, int aSlotIndex) {
-            Slot s = getSlot(aSlotIndex);
+            final Slot s = getSlot(aSlotIndex);
             if (s == null) return super.transferStackInSlot(aPlayer, aSlotIndex);
             if (aSlotIndex >= playerInventorySlot) return super.transferStackInSlot(aPlayer, aSlotIndex);
-            ItemStack aStack = s.getStack();
+            final ItemStack aStack = s.getStack();
             if (aStack == null) return super.transferStackInSlot(aPlayer, aSlotIndex);
             if (!GT_ApiaryUpgrade.isUpgrade(aStack)) return super.transferStackInSlot(aPlayer, aSlotIndex);
             for (int i = playerInventorySlot + 2; i < playerInventorySlot + 2 + 4; i++) {
-                Slot iSlot = getSlot(i);
-                ItemStack iStack = iSlot.getStack();
+                final Slot iSlot = getSlot(i);
+                final ItemStack iStack = iSlot.getStack();
                 if (iStack == null) {
                     if (!iSlot.isItemValid(aStack)) continue;
                 } else {
@@ -1361,7 +1363,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 int max = GT_ApiaryUpgrade.getUpgrade(aStack).getMaxNumber();
                 if (iStack == null) {
                     max = Math.min(max, aStack.stackSize);
-                    ItemStack newstack = aStack.splitStack(max);
+                    final ItemStack newstack = aStack.splitStack(max);
                     iSlot.putStack(newstack);
                 } else {
                     max = Math.max(0, max - iStack.stackSize);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 0006c8b7d5..5e6651cdad 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
+import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
 import static gregtech.api.enums.GT_Values.debugCleanroom;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 
@@ -45,6 +46,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         return new GT_MetaTileEntity_Cleanroom(mName);
     }
 
+    @Override
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Cleanroom")
@@ -104,7 +106,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         int mDoorCount = 0;
         int mHullCount = 0;
         int mPlascreteCount = 0;
-        HashMap<String, Integer> otherBlocks = new HashMap<>();
+        final HashMap<String, Integer> otherBlocks = new HashMap<>();
         boolean doorState = false;
         this.mUpdate = 100;
 
@@ -112,8 +114,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             GT_Log.out.println("Cleanroom: Checking machine");
         }
         for (int i = 1; i < 8; i++) {
-            Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, 0, 0);
-            int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0);
+            final Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, 0, 0);
+            final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0);
             if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) {
                 if (tBlock == GregTech_API.sBlockReinforced || tMeta == 2) {
                     x = i;
@@ -127,8 +129,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             }
         }
         for (int i = 1; i < 8; i++) {
-            Block tBlock = aBaseMetaTileEntity.getBlockOffset(0, 0, i);
-            int tMeta = aBaseMetaTileEntity.getMetaIDOffset(0, 0, i);
+            final Block tBlock = aBaseMetaTileEntity.getBlockOffset(0, 0, i);
+            final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(0, 0, i);
             if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) {
                 if (tBlock == GregTech_API.sBlockReinforced || tMeta == 2) {
                     z = i;
@@ -145,8 +147,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         for (int i = -x + 1; i < x; i++) {
             for (int j = -z + 1; j < z; j++) {
                 if (i == 0 && j == 0) continue;
-                Block tBlock = aBaseMetaTileEntity.getBlockOffset(j, 0, i);
-                int tMeta = aBaseMetaTileEntity.getMetaIDOffset(j, 0, i);
+                final Block tBlock = aBaseMetaTileEntity.getBlockOffset(j, 0, i);
+                final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(j, 0, i);
                 if (tBlock != GregTech_API.sBlockCasings3 && tMeta != 11) {
                     return false;
                 }
@@ -154,8 +156,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         }
 
         for (int i = -1; i > -16; i--) {
-            Block tBlock = aBaseMetaTileEntity.getBlockOffset(x, i, z);
-            int tMeta = aBaseMetaTileEntity.getMetaIDOffset(x, i, z);
+            final Block tBlock = aBaseMetaTileEntity.getBlockOffset(x, i, z);
+            final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(x, i, z);
             if (tBlock != GregTech_API.sBlockReinforced || tMeta != 2) {
                 y = i + 1;
                 break;
@@ -193,7 +195,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                         } else if (tBlock == GregTech_API.sBlockReinforced && tMeta == 2) {
                             mPlascreteCount++;
                         } else {
-                            IGregTechTileEntity tTileEntity =
+                            final IGregTechTileEntity tTileEntity =
                                     aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ);
                             if ((!this.addMaintenanceToMachineList(tTileEntity, 210))
                                     && (!this.addEnergyInputToMachineList(tTileEntity, 210))) {
@@ -209,7 +211,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                                     mDoorCount++;
                                 } else {
                                     if (tTileEntity != null) {
-                                        IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity();
+                                        final IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity();
                                         if (aMetaTileEntity == null) {
                                             if (debugCleanroom) {
                                                 GT_Log.out.println("Cleanroom: Missing block? Not a aMetaTileEntity");
@@ -255,9 +257,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             return false;
         }
         if (mPlascreteCount < 20) return false;
-        float ratio = (((float) mPlascreteCount) / 100f);
+        final float ratio = (((float) mPlascreteCount) / 100f);
         for (Map.Entry<String, Integer> e : otherBlocks.entrySet()) {
-            ConfigEntry ce = config.get(e.getKey());
+            final ConfigEntry ce = config.get(e.getKey());
             if (ce.allowedCount > 0) { // count has priority
                 if (e.getValue() > ce.allowedCount) return false;
             } else if (e.getValue() > ratio * ce.percentage) return false;
@@ -268,9 +270,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         if (doorState) {
             this.mEfficiency = Math.max(0, this.mEfficiency - 200);
         }
-        for (byte i = 0; i < 6; i++) {
-            byte t = (byte) Math.max(1, (byte) (15 / (10000f / this.mEfficiency)));
-            aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, t);
+        for (byte tSide : ALL_VALID_SIDES) {
+            final byte t = (byte) Math.max(1, (byte) (15 / (10000f / this.mEfficiency)));
+            aBaseMetaTileEntity.setInternalOutputRedstoneSignal(tSide, t);
         }
         this.mHeight = -y;
         return true;
@@ -430,7 +432,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
     public static void loadConfig(Configuration cfg) {
         if (!cfg.hasCategory(category)) setDefaultConfigValues(cfg);
         for (ConfigCategory cc : cfg.getCategory(category).getChildren()) {
-            String name = cc.get("Name").getString();
+            final String name = cc.get("Name").getString();
             if (cc.containsKey("Count")) {
                 if (cc.containsKey("Meta"))
                     config.put(