~Changed Coke Oven Recipes

~Cleaned up a handful of classes (ModItems.java, RECIPES_Machines.java, Utils.java & UtilsItems.java)

+Added a handful of DEBUG classes (To resolve multiblock shaping issues)
+Added GregtechMetaTileEntityIndustrialPlatePress.java
+Added textures for itemStickyRubber, itemIngotBatteryAlloy & itemPlateBatteryAlloy.
+Added a basic wrapper for direct MineTweaker script usage (Ultra W.I.P.)
>This will probably be changed to preload .zs scripts, regex and handle appropriately, but undecided.

3 files changed, 246 insertions, 125 deletions

diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java
index 78f05b157c..266263380e 100644
--- a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java
@@ -1,6 +1,5 @@
 package miscutil.gregtech.api.init.machines;
 
-import miscutil.core.util.Utils;
 import miscutil.gregtech.api.enums.GregtechItemList;
 import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
@@ -11,10 +10,10 @@ public class GregtechIndustrialPlatePress
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		/*if (miscutil.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Press Multiblock.");
 			run1();
-		}
+		}*/
 
 	}
 
diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index 65c58b35db..7c96c7e913 100644
--- a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
+import miscutil.core.util.Utils;
 import miscutil.gregtech.api.gui.GUI_MultiMachine;
 import miscutil.gregtech.api.util.GregtechRecipe;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -171,6 +172,9 @@ public class GregtechMetaTileEntityIndustrialCokeOven
 	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
         int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+        int xr = aBaseMetaTileEntity.getXCoord();
+    	int yr = aBaseMetaTileEntity.getYCoord();
+    	int zr = aBaseMetaTileEntity.getZCoord();
         this.mLevel = 0;
         if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) {
             return false;
@@ -208,8 +212,20 @@ public class GregtechMetaTileEntityIndustrialCokeOven
             }
         }
         for (int i = -1; i < 2; i++) {
+        	xr = aBaseMetaTileEntity.getXCoord();
+        	yr = aBaseMetaTileEntity.getYCoord();
+        	zr = aBaseMetaTileEntity.getZCoord();
+        	Utils.LOG_INFO("STEP 1 - x ["+xr+"]  y ["+yr+"]  z ["+zr+"]");
             for (int j = -1; j < 2; j++) {
+            	xr = aBaseMetaTileEntity.getXCoord();
+            	yr = aBaseMetaTileEntity.getYCoord();
+            	zr = aBaseMetaTileEntity.getZCoord();
+            	Utils.LOG_INFO("STEP 2 - x ["+xr+"]  y ["+yr+"]  z ["+zr+"]");
                 if ((xDir + i != 0) || (zDir + j != 0)) {
+                	xr = aBaseMetaTileEntity.getXCoord();
+                	yr = aBaseMetaTileEntity.getYCoord();
+                	zr = aBaseMetaTileEntity.getZCoord();
+                	Utils.LOG_INFO("STEP 3 - x ["+xr+"]  y ["+yr+"]  z ["+zr+"]");
                     IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j);
                     if ((!addMaintenanceToMachineList(tTileEntity, 1)) && (!addInputToMachineList(tTileEntity, 1)) && (!addOutputToMachineList(tTileEntity, 1)) && (!addEnergyInputToMachineList(tTileEntity, 1))) {
                         if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != ModBlocks.blockCasingsMisc) {
diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index 0084deb2a2..8ed5a90731 100644
--- a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -13,131 +13,237 @@ import gregtech.api.util.GT_Utility;
 
 import java.util.ArrayList;
 
+import miscutil.core.util.Utils;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class GregtechMetaTileEntityIndustrialPlatePress
-        extends GT_MetaTileEntity_MultiBlockBase {
-    public GregtechMetaTileEntityIndustrialPlatePress(int aID, String aName, String aNameRegional) {
-        super(aID, aName, aNameRegional);
-    }
-
-    public GregtechMetaTileEntityIndustrialPlatePress(String aName) {
-        super(aName);
-    }
-
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntityIndustrialPlatePress(this.mName);
-    }
-
-    public String[] getDescription() {
-        return new String[]{"Controller Block for the Vacuum Freezer", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Frost Proof Casings for the rest (16 at least!)"};
-    }
-
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
-            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)};
-        }
-        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17]};
-    }
-
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "VacuumFreezer.png");
-    }
-
-    public GT_Recipe.GT_Recipe_Map getRecipeMap() {
-        return GT_Recipe.GT_Recipe_Map.sBenderRecipes;
-    }
-
-    public boolean isCorrectMachinePart(ItemStack aStack) {
-        return true;
-    }
-
-    public boolean isFacingValid(byte aFacing) {
-        return aFacing > 1;
-    }
-
-    public boolean checkRecipe(ItemStack aStack) {
-        ArrayList<ItemStack> tInputList = getStoredInputs();
-        for (ItemStack tInput : tInputList) {
-            long tVoltage = getMaxInputVoltage();
-            byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-
-            GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput});
-            if (tRecipe != null) {
-                if (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) {
-                    this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
-                    this.mEfficiencyIncrease = 10000;
-                    if (tRecipe.mEUt <= 16) {
-                        this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
-                        this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
-                    } else {
-                        this.mEUt = tRecipe.mEUt;
-                        this.mMaxProgresstime = tRecipe.mDuration;
-                        while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
-                            this.mEUt *= 4;
-                            this.mMaxProgresstime /= 2;
-                        }
-                    }
-                    if (this.mEUt > 0) {
-                        this.mEUt = (-this.mEUt);
-                    }
-                    this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-                    this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
-                    updateSlots();
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
-        int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
-        int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
-        if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
-            return false;
-        }
-        int tAmount = 0;
-        for (int i = -2; i < 3; i++) {
-            for (int j = -1; j < 2; j++) {
-                for (int h = -1; h < 2; h++) {
-                    if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {
-                        IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
-                        if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) {
-                            if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings2) {
-                                return false;
-                            }
-                            if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) {
-                                return false;
-                            }
-                            tAmount++;
-                        }
-                    }
-                }
-            }
-        }
-        return tAmount >= 16;
-    }
-
-    public int getMaxEfficiency(ItemStack aStack) {
-        return 10000;
-    }
-
-    public int getPollutionPerTick(ItemStack aStack) {
-        return 0;
-    }
-
-    public int getDamageToComponent(ItemStack aStack) {
-        return 0;
-    }
-
-    public int getAmountOfOutputs() {
-        return 1;
-    }
-
-    public boolean explodesOnComponentBreak(ItemStack aStack) {
-        return false;
-    }
+extends GT_MetaTileEntity_MultiBlockBase {
+	public GregtechMetaTileEntityIndustrialPlatePress(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GregtechMetaTileEntityIndustrialPlatePress(String aName) {
+		super(aName);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntityIndustrialPlatePress(this.mName);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{"Controller Block for the Vacuum Freezer", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Frost Proof Casings for the rest (16 at least!)"};
+	}
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)};
+		}
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17]};
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "VacuumFreezer.png");
+	}
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
+		return GT_Recipe.GT_Recipe_Map.sBenderRecipes;
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack) {
+		return true;
+	}
+
+	@Override
+	public boolean isFacingValid(byte aFacing) {
+		return aFacing > 1;
+	}
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+		ArrayList<ItemStack> tInputList = getStoredInputs();
+		for (ItemStack tInput : tInputList) {
+			long tVoltage = getMaxInputVoltage();
+			byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+
+			GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput});
+			if (tRecipe != null) {
+				if (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) {
+					this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+					this.mEfficiencyIncrease = 10000;
+					if (tRecipe.mEUt <= 16) {
+						this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
+						this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
+					} else {
+						this.mEUt = tRecipe.mEUt;
+						this.mMaxProgresstime = tRecipe.mDuration;
+						while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
+							this.mEUt *= 4;
+							this.mMaxProgresstime /= 2;
+						}
+					}
+					if (this.mEUt > 0) {
+						this.mEUt = (-this.mEUt);
+					}
+					this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+					this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
+					updateSlots();
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/*public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
+			return false;
+		}
+		int stepX = 0;
+		int stepY = 0;
+		int stepZ = 0;
+
+		int tAmount = 0;
+		for (int i = -1; i < 2; i++) {
+			stepX=+i;
+			for (int j = -1; j < 2; j++) {
+				stepZ=+j;
+				for (int h = -1; h < 2; h++) {
+					stepY=+h;
+					Utils.LOG_INFO("X:"+stepX);
+					Utils.LOG_INFO("Y:"+stepY);
+					Utils.LOG_INFO("Z:"+stepZ);
+					Utils.LOG_INFO("Block Facing - X:"+xDir+"    Z:"+zDir);
+					Utils.LOG_INFO("(h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))");
+					Utils.LOG_INFO("  "+(h != 0)+"   ||       "+(((xDir + i != 0)+"       ||       "+(zDir + j != 0))+"       &&    "+((i != 0)+"   ||   "+(j != 0))));
+					try {
+						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);						
+						Utils.LOG_INFO("IPP - RESULT - ? - ["+tTileEntity.getXCoord()+"]  y ["+tTileEntity.getYCoord()+"]  z ["+tTileEntity.getZCoord()+"] || i ["+i+"]  j ["+j+"]  h ["+h+"]");
+					} catch(Throwable t){Utils.LOG_INFO("Bad move");				
+					}
+					if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {
+						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
+						if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) {
+							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings2) {
+								return false;
+							}
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) {
+								return false;
+							}
+							tAmount++;
+						}
+					}		
+
+				}
+			}
+		}
+		return tAmount >= 16;
+	}*/
+
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
+			return false;
+		}
+		int stepX = aBaseMetaTileEntity.getXCoord();
+		int stepY = aBaseMetaTileEntity.getYCoord();
+		int stepZ = aBaseMetaTileEntity.getZCoord();
+		int temp = 0;
+
+		Utils.LOG_INFO("Starting Block located @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]");	
+
+		int tAmount = 0;
+		switch (xDir) {
+		case -1:
+			stepX++;
+			Utils.LOG_INFO("Modifying stepX + accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]");	
+			break;
+
+		case 1:
+			stepX--;
+			Utils.LOG_INFO("Modifying stepX - accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]");	
+			break;
+		}
+		switch (zDir) {
+		case -1:
+			stepZ++;
+			Utils.LOG_INFO("Modifying stepZ + accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]");	
+			break;
+
+		case 1:
+			stepZ--;
+			Utils.LOG_INFO("Modifying stepZ - accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]");	
+			break;
+		}
+
+		for (int i = stepX-1; i <= stepX+1; i++){
+			for (int j = stepZ-1; j <= stepZ+1; j++){
+				for (int h = stepY-1; h <= stepY+1; h++){	
+
+
+					Utils.LOG_INFO("Block Facing - X:"+xDir+"    Z:"+zDir);
+					Utils.LOG_INFO("(h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))");
+					Utils.LOG_INFO("  "+(h != 0)+"   ||       "+(((xDir + i != 0)+"       ||       "+(zDir + j != 0))+"       &&    "+((i != 0)+"   ||   "+(j != 0))));
+
+					try {
+						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);						
+						Utils.LOG_INFO("IPP - RESULT - ? - ["+tTileEntity.getXCoord()+"]  y ["+tTileEntity.getYCoord()+"]  z ["+tTileEntity.getZCoord()+"] || i ["+i+"]  j ["+j+"]  h ["+h+"]");
+					} catch(Throwable t){Utils.LOG_INFO("Checking Non-Hatch/Bus Block/Casing");				
+					}
+					if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {
+						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
+						if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) {
+							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings2) {
+								return false;
+							}
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) {
+								return false;
+							}
+							tAmount++;
+						}
+					}	
+				}
+			}
+		}
+
+
+		return tAmount >= 16;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 1;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack) {
+		return false;
+	}
 }