+ Re-added Industrial Plate Presser

+ Added a fresh mcmod.info

6 files changed, 57 insertions, 149 deletions

diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
index e57288f963..9b56389f7f 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
@@ -24,6 +24,7 @@ import miscutil.core.handler.registration.gregtech.GregtechEnergyBuffer;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialCentrifuge;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialCokeOven;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress;
+import miscutil.core.handler.registration.gregtech.GregtechIronBlastFurnace;
 import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator;
 import miscutil.core.handler.registration.gregtech.GregtechSafeBlock;
 import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser;
@@ -81,6 +82,7 @@ public class COMPAT_HANDLER {
 		GregtechConduits.run();
 		GregtechSteamCondenser.run();
 		GregtechSafeBlock.run();
+		GregtechIronBlastFurnace.run();
 		GregtechIndustrialCentrifuge.run();
 		GregtechIndustrialCokeOven.run();
 		GregtechIndustrialPlatePress.run();
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
index 1a4698482b..dcd2715e61 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,5 +1,6 @@
 package miscutil.core.handler.registration.gregtech;
 
+import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
@@ -10,10 +11,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/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
new file mode 100644
index 0000000000..43df1fad1d
--- /dev/null
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
@@ -0,0 +1,25 @@
+package miscutil.core.handler.registration.gregtech;
+
+import miscutil.core.util.Utils;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
+
+public class GregtechIronBlastFurnace
+{
+
+
+
+	public static void run()
+	{
+		if (miscutil.core.lib.LoadedMods.Gregtech){
+			Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Iron Blast Furnace.");
+			run1();
+		}
+
+	}
+
+	private static void run1()
+	{
+		GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntityIronBlastFurnace(768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L));
+	}
+}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
index f463ef0387..746cce0ff8 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
@@ -3,7 +3,6 @@ package miscutil.core.handler.registration.gregtech;
 import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
 
 public class GregtechSteamCondenser
 {
@@ -23,15 +22,6 @@ public class GregtechSteamCondenser
 	{
 		//Steam Condensors
 		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
-		//GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.ElectricalSteel),Character.valueOf('T'), ItemList.Electric_Pump_MV });
-
-
-		GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntityIronBlastFurnace(768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L));
-		//GregtechItemList.Machine_Electric_BlastFurnace.set(new GregtechMetaTileEntityElectricBlastFurnace(796, "electric.blastfurnace", "Electric Blast Furnace").getStackForm(1L));
 		
-		//ItemUtils.recipeBuilder(slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9, resultItem);
-		
-		//GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_BlastFurnace.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PFP", "FwF", "PFP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Bronze), Character.valueOf('F'), OreDictNames.craftingFurnace});
-
 	}
 }
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index 9f09b8db55..5bea91cf8c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -13,7 +13,6 @@ 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;
@@ -73,7 +72,7 @@ extends GT_MetaTileEntity_MultiBlockBase {
 			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});
+			GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBenderRecipes.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);
@@ -102,125 +101,35 @@ extends GT_MetaTileEntity_MultiBlockBase {
 		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;
-	}
+        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 = -1; i < 2; 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;
+    }
 
 	@Override
 	public int getMaxEfficiency(ItemStack aStack) {
diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info
deleted file mode 100644
index de3273155e..0000000000
--- a/src/Java/miscutil/mcmod.info
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @version 1.3.4
- * @author Alkalus
- * In-game info for project: MiscUtils.
- */
-[ { "modid"        : "miscutil"
-  , "name"         : "Misc Utils."
-  , "description"  : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
-  , "version"      : "1.3.4"
-  , "mcversion"    : "1.7.10"
-  , "url"          : ""
-  , "updateUrl"    : ""
-  , "authorList"   : ["Alkalus"]
-  , "credits"      : ""
-  , "logoFile"     : ""
-  , "screenshots"  : []
-  , "dependencies" : ["Forge10.13.0.1448"]
-  }
-]