diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines')
4 files changed, 218 insertions, 126 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java index 43c48232d8..cb0ec59f22 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java @@ -5,14 +5,9 @@ import net.minecraftforge.fluids.FluidStack; public class RECIPEHANDLER_AssemblyLine { - public static boolean addAssemblylineRecipe( - ItemStack paramItemStack1, - int paramInt1, - ItemStack[] paramArrayOfItemStack, - FluidStack[] paramArrayOfFluidStack, - ItemStack paramItemStack2, - int paramInt2, - int paramInt3) { + public static boolean addAssemblylineRecipe(ItemStack paramItemStack1, int paramInt1, + ItemStack[] paramArrayOfItemStack, FluidStack[] paramArrayOfFluidStack, ItemStack paramItemStack2, + int paramInt2, int paramInt3) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java index 627241cd53..599b98ed86 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java @@ -1,9 +1,10 @@ package gtPlusPlus.xmod.gregtech.recipes.machines; -import gtPlusPlus.api.objects.Logger; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.Logger; + public class RECIPEHANDLER_CokeOven { public static void debug1() { @@ -14,75 +15,105 @@ public class RECIPEHANDLER_CokeOven { Logger.WARNING("My name is Ralph and I will be your humble host."); } - public static void debug2( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug3( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug4( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); } - public static void debug5( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { - Logger.INFO("Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName() + " & " - + aFluidOutput.getFluid().getName() + ", Using " + aInput1.getDisplayName() + " & " - + aInput2.getDisplayName() + " & liquid " - + aFluidInput.getFluid().getName() + ". This takes " + (aDuration / 20) + " seconds for " + aEUt - + "eu/t."); + public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { + Logger.INFO( + "Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName() + + " & " + + aFluidOutput.getFluid().getName() + + ", Using " + + aInput1.getDisplayName() + + " & " + + aInput2.getDisplayName() + + " & liquid " + + aFluidInput.getFluid().getName() + + ". This takes " + + (aDuration / 20) + + " seconds for " + + aEUt + + "eu/t."); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java index b9f4c11887..fc9ed99ffe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.recipes.machines; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class RECIPEHANDLER_Dehydrator { public static void debug1() { @@ -15,70 +16,90 @@ public class RECIPEHANDLER_Dehydrator { Logger.WARNING("My name is Willus and I will be your humble host."); } - public static void debug2( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug3( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug4( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack aOutput, - final int aDuration, - final int aEUt) { + public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); - Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:" - + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aInput1:" + aInput1.toString() + + " aInput2:" + + aInput2.toString() + + " aFluidInput:" + + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aOutput:" + + aOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); } - public static void debug5( - final ItemStack aInput1, - final ItemStack aInput2, - final FluidStack aFluidInput, - final FluidStack aFluidOutput, - final ItemStack[] aOutput, - final int aDuration, - final int aEUt) { + public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack[] aOutput, final int aDuration, final int aEUt) { String inputAname; String inputBname; @@ -109,9 +130,21 @@ public class RECIPEHANDLER_Dehydrator { outputFluidName = "null"; } - Logger.INFO("Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput) - + " & " + outputFluidName + ", Using " + inputAname + " & " + inputBname + " & liquid " + inputFluidname - + ". This takes " + (aDuration / 20) + " seconds for " + aEUt + "eu/t."); + Logger.INFO( + "Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput) + + " & " + + outputFluidName + + ", Using " + + inputAname + + " & " + + inputBname + + " & liquid " + + inputFluidname + + ". This takes " + + (aDuration / 20) + + " seconds for " + + aEUt + + "eu/t."); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java index 6523e0a6f6..ea2f4a95fe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.recipes.machines; -import gtPlusPlus.api.objects.Logger; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.Logger; + public class RECIPEHANDLER_MatterFabricator { public static void debug1() { @@ -13,42 +14,66 @@ public class RECIPEHANDLER_MatterFabricator { Logger.WARNING("My name is Ralph and I will be your humble host."); } - public static void debug2( - final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public static void debug2(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, + final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aFluidInput:" + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug3( - final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public static void debug3(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, + final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aFluidInput:" + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); } - public static void debug4( - final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public static void debug4(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, + final int aEUt) { Logger.WARNING("=================================================================================="); Logger.WARNING("Taking a step forward."); Logger.WARNING( "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aFluidInput:" + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); Logger.WARNING("Passed."); - Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() - + " aDuration:" + aDuration + " aEU/t:" + aEUt); + Logger.WARNING( + "aFluidInput:" + aFluidInput.toString() + + " aFluidOutput:" + + aFluidOutput.toString() + + " aDuration:" + + aDuration + + " aEU/t:" + + aEUt); } - public static void debug5( - final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public static void debug5(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, + final int aEUt) { String a = "nothing"; String b = ""; @@ -59,8 +84,16 @@ public class RECIPEHANDLER_MatterFabricator { b = aFluidOutput.getFluid().getName(); } - Logger.INFO("Successfully added a Matter Fabrication recipe for: " + b + ", Using " + " liquid " + a - + ". This takes " + (aDuration / 20) + " seconds for " + aEUt + "eu/t."); + Logger.INFO( + "Successfully added a Matter Fabrication recipe for: " + b + + ", Using " + + " liquid " + + a + + ". This takes " + + (aDuration / 20) + + " seconds for " + + aEUt + + "eu/t."); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); Logger.WARNING("=================================================================================="); |