% Changed Construction of the LFTR, now it's 7x7x4, in terms of LxWxH.

+ LFTR is now registered on startup for internal testing, expect results soon.

1 files changed, 27 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index 2b459d31f3..4f893cc556 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -143,36 +143,36 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
 		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2;
 		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2;
-		for (int i = -10; i < 11; i++) {
-			for (int j = -10; j < 11; j++) {
-				for (int h = 0; h < 8; h++) {
+		for (int i = -3; i < 4; i++) {
+			for (int j = -3; j < 4; j++) {
+				for (int h = 0; h < 4; h++) {
 					IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
 
-					if ((i != -10 && i != 10) && (j != -10 && j != 10)) {// Reactor Floor/Roof inner 18x18						
-						if (h == 0 || h == 7) {// Reactor Floor & Roof (Inner 18x18) + muffler x4
+					if ((i != -3 && i != 3) && (j != -3 && j != 3)) {// Reactor Floor/Roof inner 7x7						
+						if (h == 0 || h == 4) {// Reactor Floor & Roof (Inner 7x7) + muffler x4
 							if ((!addMufflerToMachineList(tTileEntity, 66))) {
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the top layers inner 3x3.");
 									return false;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 9) {
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the top layers inner 3x3.");
 									return false;
 								}
 							}
 						} else {// Inside 6 layers, mostly air							
-							if ((i != -8 && i != 8) && (j != -8 && j != 8)) {// Reactor Floor/Roof inner 18x18
+							if ((i != -1 && i != 1) && (j != -1 && j != 1)) {// Reactor Floor/Roof inner 5x5
 								if (!aBaseMetaTileEntity.getAirOffset(xDir + i, h, zDir + j)) {
 									Utils.LOG_INFO("Make sure the inner 3x3 of the Multiblock is Air.");
 									return false;
 								}
 							}
-							else { //carbon moderation rods
+							else { //carbon moderation rods are at 1,1 & -1,-1 & 1,-1 & -1,1
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the top layers inner 3x3.");
 									return false;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 9) {
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the top layers inner 3x3.");
 									return false;
 								}
@@ -182,40 +182,47 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 
 					else {// Reactor Exterior
 						if (h == 1) {
-
-							if ((i == -2 || i == 2) && (j == -2 || j == 2)){
+							if ((i == -3 || i == 3) && (j == -3 || j == 3)){
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the corners in the second layer.");
 									return false;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 9) {
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the corners in the second layer.");
 									return false;
 								}
 							}
 
-							else if ((i != -2 || i != 2) && (j != -2 || j != 2)){
-								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != IC2Glass) {
+							else if ((i != -3 || i != 3) && (j != -3 || j != 3)){								
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
+									Utils.LOG_INFO("Glass Casings Missing from somewhere in the second layer.");
+									return false;
+								}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) {
 									Utils.LOG_INFO("Glass Casings Missing from somewhere in the second layer.");
 									return false;
 								}
 							}
 						}
 						if (h == 2) {
-							if ((i == -2 || i == 2) && (j == -2 || j == 2)){
+							if ((i == -3 || i == 3) && (j == -3 || j == 3)){
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the corners in the third layer.");
 									return false;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 9) {
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the corners in the third layer.");
 									return false;
 								}
 							}
 
-							else if ((i != -2 || i != 2) && (j != -2 || j != 2)){
-								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != IC2Glass) {
-									Utils.LOG_INFO("Glass Casings Missing from somewhere in the third layer.");
+							else if ((i != -3 || i != 3) && (j != -3 || j != 3)){
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
+									Utils.LOG_INFO("Glass Casings Missing from somewhere in the second layer.");
+									return false;
+								}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) {
+									Utils.LOG_INFO("Glass Casings Missing from somewhere in the second layer.");
 									return false;
 								}
 							}
@@ -225,7 +232,7 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 								Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the edges on the top layer.");
 								return false;
 							}
-							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 9) {
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
 								Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the edges on the top layer.");
 								return false;
 							}