fuel cell now forms in all 6 directions

3 files changed, 117 insertions, 64 deletions

diff --git a/src/main/java/kekztech/Util.java b/src/main/java/kekztech/Util.java
index ccbcc799e6..78dee44f75 100644
--- a/src/main/java/kekztech/Util.java
+++ b/src/main/java/kekztech/Util.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.joml.Vector3i;
+import org.joml.Vector3ic;
+
 import items.ErrorItem;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -11,6 +14,42 @@ import net.minecraftforge.oredict.OreDictionary;
 
 public class Util {
 	
+	public static Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) {
+		final Vector3i offset = new Vector3i();
+		
+		// either direction on z-axis
+		if(forgeDirection.x() == 0 && forgeDirection.z() == -1) {
+			offset.x = x;
+			offset.y = y;
+			offset.z = z;
+		}
+		if(forgeDirection.x() == 0 && forgeDirection.z() == 1) {
+			offset.x = -x;
+			offset.y = y;
+			offset.z = -z;
+		}
+		// either direction on x-axis
+		if(forgeDirection.x() == -1 && forgeDirection.z() == 0) {
+			offset.x = z;
+			offset.y = y;
+			offset.z = -x;
+		}
+		if(forgeDirection.x() == 1 && forgeDirection.z() == 0) {
+			offset.x = -z;
+			offset.y = y;
+			offset.z = x;
+		}
+		// either direction on y-axis
+		if(forgeDirection.y() == -1) {
+			offset.x = x;
+			offset.y = z;
+			offset.z = y;
+		}
+		
+		return offset;
+	}
+	
+	@Deprecated
 	public static ItemStack getStackofAmountFromOreDict(String oredictName, final int amount){
 		final ArrayList<ItemStack> list = OreDictionary.getOres(oredictName);
 		if(!list.isEmpty()) {
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
index f5fa228392..522da09b8f 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.joml.Vector3i;
+import org.joml.Vector3ic;
+
 import blocks.Block_YSZUnit;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -17,6 +20,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import kekztech.Util;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -140,24 +144,26 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 	
 	@Override
 	public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {		
-		
-		final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX;
-		final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ;
-
+		// Figure out the vector for the direction the back face of the controller is facing
+		final Vector3ic forgeDirection = new Vector3i(
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX,
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetY,
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ
+				);
 		int minCasingAmount = 12; 
-		boolean checklist = true; // if this is still true at the end, machine is good to go :)
+		boolean formationChecklist = true; // if this is still true at the end, machine is good to go :)
 		
-		// Front slice
+		// Front slice			
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
 				if(X == 0 && Y == 0) {
 					continue; // is controller
 				}
+				
 				// Get next TE
-				final int THIS_X = XDIR_BACKFACE + X;
-				final int THIS_Z = ZDIR_BACKFACE + -1;
+				final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, 0);
 				IGregTechTileEntity currentTE = 
-						thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+						thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());
 				
 				// Tries to add TE as either of those kinds of hatches.
 				// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -166,11 +172,12 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 					&& !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) {
 					
 					// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-					if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+					if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+							&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 						// Seems to be valid casing. Decrement counter.
 						minCasingAmount--;
 					} else {
-						checklist = false;
+						formationChecklist = false;
 					}
 				}
 			}
@@ -179,26 +186,25 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 		// Middle three slices
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
-				for(int Z = 0; Z < 3; Z++) {
-					final int THIS_X = XDIR_BACKFACE + X;
-					final int THIS_Z = ZDIR_BACKFACE + Z;
+				for(int Z = -1; Z >= -3; Z--) {
+					final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, Z);
 					if(X == 0 && Y == 0) {
-						if(!thisController.getBlockOffset(THIS_X, 0, THIS_Z).getUnlocalizedName()
+						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
 								.equals(Block_YSZUnit.getInstance().getUnlocalizedName())) {
-							checklist = false;
+							formationChecklist = false;
 						}
 						continue;
 					}
 					if(Y == 0 && (X == -1 || X == 1)) {
-						if(!thisController.getBlockOffset(THIS_X, 0, THIS_Z).getUnlocalizedName()
+						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
 								.equals("blockAlloyGlass")) {
-							checklist = false;
+							formationChecklist = false;
 						}
 						continue;
 					}
 					// Get next TE
 					IGregTechTileEntity currentTE = 
-							thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+							thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
 					
 					// Tries to add TE as either of those kinds of hatches.
 					// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -207,11 +213,12 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 						&& !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) {
 						
 						// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-						if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+						if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+								&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 							// Seems to be valid casing. Decrement counter.
 							minCasingAmount--;
 						} else {
-							checklist = false;
+							formationChecklist = false;
 						}
 					}
 				}
@@ -222,10 +229,9 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
 				// Get next TE
-				final int THIS_X = XDIR_BACKFACE + X;
-				final int THIS_Z = ZDIR_BACKFACE + 3;
+				final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, -4);
 				IGregTechTileEntity currentTE = 
-						thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+						thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
 				
 				// Tries to add TE as either of those kinds of hatches.
 				// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -235,30 +241,31 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 					&& !super.addDynamoToMachineList(currentTE, CASING_TEXTURE_ID)) {
 					
 					// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-					if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+					if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+							&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 						// Seems to be valid casing. Decrement counter.
 						minCasingAmount--;
 					} else {
-						checklist = false;
+						formationChecklist = false;
 					}
 				}
 			}
-		}
+		}		
 		
 		if(minCasingAmount > 0) {
-			checklist = false;
+			formationChecklist = false;
 		}
 		
 		if(this.mDynamoHatches.size() != 1) {
 			System.out.println("Exactly one dynamo hatch is required!");
-			checklist = false;
+			formationChecklist = false;
 		}
 		if(this.mInputHatches.size() < 2) {
 			System.out.println("At least two input hatches are required!");
-			checklist = false;
+			formationChecklist = false;
 		}
 		
-		return checklist;
+		return formationChecklist;
 	}
 	
 	@Override
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
index b3cee6da6a..c645ce464a 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.joml.Vector3i;
+import org.joml.Vector3ic;
+
 import blocks.Block_GDCUnit;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -17,6 +20,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import kekztech.Util;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -139,24 +143,26 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 	
 	@Override
 	public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {		
-
-		final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX;
-		final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ;
-
+		// Figure out the vector for the direction the back face of the controller is facing
+		final Vector3ic forgeDirection = new Vector3i(
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX,
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetY,
+				ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ
+				);
 		int minCasingAmount = 12; 
-		boolean checklist = true; // if this is still true at the end, machine is good to go :)
+		boolean formationChecklist = true; // if this is still true at the end, machine is good to go :)
 		
-		// Front slice
+		// Front slice			
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
 				if(X == 0 && Y == 0) {
 					continue; // is controller
 				}
+				
 				// Get next TE
-				final int THIS_X = XDIR_BACKFACE + X;
-				final int THIS_Z = ZDIR_BACKFACE + -1;
+				final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, 0);
 				IGregTechTileEntity currentTE = 
-						thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+						thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());
 				
 				// Tries to add TE as either of those kinds of hatches.
 				// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -165,11 +171,12 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 					&& !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) {
 					
 					// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-					if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+					if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+							&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 						// Seems to be valid casing. Decrement counter.
 						minCasingAmount--;
 					} else {
-						checklist = false;
+						formationChecklist = false;
 					}
 				}
 			}
@@ -178,26 +185,25 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 		// Middle three slices
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
-				for(int Z = 0; Z < 3; Z++) {
-					final int THIS_X = XDIR_BACKFACE + X;
-					final int THIS_Z = ZDIR_BACKFACE + Z;
+				for(int Z = -1; Z >= -3; Z--) {
+					final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, Z);
 					if(X == 0 && Y == 0) {
-						if(!thisController.getBlockOffset(THIS_X, 0, THIS_Z).getUnlocalizedName()
+						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
 								.equals(Block_GDCUnit.getInstance().getUnlocalizedName())) {
-							checklist = false;
+							formationChecklist = false;
 						}
 						continue;
 					}
 					if(Y == 0 && (X == -1 || X == 1)) {
-						if(!thisController.getBlockOffset(THIS_X, 0, THIS_Z).getUnlocalizedName()
+						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
 								.equals("blockAlloyGlass")) {
-							checklist = false;
+							formationChecklist = false;
 						}
 						continue;
 					}
 					// Get next TE
 					IGregTechTileEntity currentTE = 
-							thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+							thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
 					
 					// Tries to add TE as either of those kinds of hatches.
 					// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -206,11 +212,12 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 						&& !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) {
 						
 						// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-						if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+						if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+								&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 							// Seems to be valid casing. Decrement counter.
 							minCasingAmount--;
 						} else {
-							checklist = false;
+							formationChecklist = false;
 						}
 					}
 				}
@@ -221,10 +228,9 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 		for(int X = -1; X <= 1; X++) {
 			for(int Y = -1; Y <= 1; Y++) {
 				// Get next TE
-				final int THIS_X = XDIR_BACKFACE + X;
-				final int THIS_Z = ZDIR_BACKFACE + 3;
+				final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, -4);
 				IGregTechTileEntity currentTE = 
-						thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z
+						thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
 				
 				// Tries to add TE as either of those kinds of hatches.
 				// The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++)
@@ -234,30 +240,31 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 					&& !super.addDynamoToMachineList(currentTE, CASING_TEXTURE_ID)) {
 					
 					// If it's not a hatch, is it the right casing for this machine? Check block and block meta.
-					if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) {
+					if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) 
+							&& (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) {
 						// Seems to be valid casing. Decrement counter.
 						minCasingAmount--;
 					} else {
-						checklist = false;
+						formationChecklist = false;
 					}
 				}
 			}
-		}
+		}		
 		
 		if(minCasingAmount > 0) {
-			checklist = false;
+			formationChecklist = false;
 		}
 		
-		if(this.mDynamoHatches.size() < 1) {
-			System.out.println("At least one dynamo hatch is required!");
-			checklist = false;
+		if(this.mDynamoHatches.size() != 1) {
+			System.out.println("Exactly one dynamo hatch is required!");
+			formationChecklist = false;
 		}
 		if(this.mInputHatches.size() < 2) {
 			System.out.println("At least two input hatches are required!");
-			checklist = false;
+			formationChecklist = false;
 		}
 		
-		return checklist;
+		return formationChecklist;
 	}
 	
 	@Override