$ Fixed #425.

% Updated CircleCI config.yml one last time.

5 files changed, 8 insertions, 40 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 345792b86b..2be7471253 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
       
       
     environment:
-      JVM_OPTS: -Xmx3200m
+      JVM_OPTS: -Xms2048m Xmx4000m
       
       
     steps:
@@ -46,7 +46,7 @@ jobs:
           command: wget https://alkcorp.overminddl1.com/GTPP_BuildScript.sh
           
       - run:
-          name: Run "${CIRCLE_PROJECT_REPONAME}" Build Script
+          name: Run Build Script
           command: sh GTPP_BuildScript.sh ${CIRCLE_BUILD_NUM} "${CIRCLE_BRANCH}" "${CIRCLE_USERNAME}" "${CIRCLE_SHA1}" "${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_PROJECT_USERNAME}" "https://github.com/draknyte1/GTplusplus/archive/master.zip"
 
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 873c93aae1..9393ca08be 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -16,6 +16,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.TAE;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -1586,6 +1587,11 @@ GT_MetaTileEntity_MultiBlockBase {
 			Block aFoundBlock, int aFoundMeta, Block aExpectedBlock, int aExpectedMeta) {
 		boolean isHatch = false;
 		if (aBaseMetaTileEntity != null) {
+			
+			if (aCasingID < 64) {
+				aCasingID = TAE.GTPP_INDEX(aCasingID);
+			}
+			
 			isHatch = this.addToMachineList(aBaseMetaTileEntity, aCasingID);
 			if (isHatch) {
 				return true;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index e627e99aa7..9c9fa7fa58 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -51,7 +51,6 @@ extends GregtechMeta_MultiBlockBase {
 				"1x Output Bus",
 				"1x Input Hatch",
 				"1x Energy Hatch",
-				"Maintenance Hatch must be at the back, centered",
 		};
 	}
 
@@ -129,25 +128,10 @@ extends GregtechMeta_MultiBlockBase {
 					}
 				}
 			}
-			if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() != 0)) {
-				Logger.INFO("Use Busses, Not Hatches for Input/Output.");
-				return false;
-			}
 			if ((this.mInputBusses.size() == 0) || (this.mOutputBusses.size() == 0)) {
 				Logger.INFO("Incorrect amount of Input & Output busses.");
 				return false;
 			}
-			this.mMaintenanceHatches.clear();
-			final IGregTechTileEntity tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
-			if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
-				if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
-					this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
-					((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = this.getCasingTextureIndex();
-				} else {
-					Logger.INFO("Maintenance hatch must be in the middle block on the back.");
-					return false;
-				}
-			}
 			if ((this.mMaintenanceHatches.size() != 1)) {
 				Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
 				return false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index 0b1691358c..e407e28b0e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -176,17 +176,6 @@ extends GregtechMeta_MultiBlockBase {
 				Logger.WARNING("Incorrect amount of Input || Output busses.");
 				return false;
 			}
-			this.mMaintenanceHatches.clear();
-			final IGregTechTileEntity tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
-			if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
-				if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
-					this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
-					((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = this.getCasingTextureIndex();
-				} else {
-					Logger.WARNING("Maintenance hatch must be in the middle block on the back.");
-					return false;
-				}
-			}
 			if ((this.mMaintenanceHatches.size() != 1)) {
 				Logger.WARNING("Incorrect amount of Maintenance hatches.");
 				return false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index bf33892420..502b5e47b2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -144,17 +144,6 @@ extends GregtechMeta_MultiBlockBase {
 				Logger.INFO("Incorrect amount of Input & Output busses.");
 				return false;
 			}
-			this.mMaintenanceHatches.clear();
-			final IGregTechTileEntity tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
-			if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
-				if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
-					this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
-					((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = this.getCasingTextureIndex();
-				} else {
-					Logger.INFO("Maintenance hatch must be in the middle block on the back.");
-					return false;
-				}
-			}
 			if ((this.mMaintenanceHatches.size() != 1)) {
 				Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
 				return false;